k-space/dex
Archived
10
0
Fork 0
Code Issues Pull Requests Packages Projects Activity

Merge pull request #1720 from candlerb/fix-google

Browse Source 
Allow the "google" connector to work without a service account
This commit is contained in:
Joel Speed 2020-06-19 17:10:23 +01:00 committed by GitHub
commit 9d7e472c63
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
connector/google/google.go
View File

@ -212,7 +212,7 @@ func (c *googleConnector) createIdentity(ctx context.Context, identity connector
}
var groups []string
if s.Groups && c.adminEmail != "" && c.serviceAccountFilePath != "" {
if s.Groups && c.adminSrv != nil {
groups, err = c.getGroups(claims.Email)
if err != nil {
return identity, fmt.Errorf("google: could not retrieve groups: %v", err)
@ -251,7 +251,7 @@ func (c *googleConnector) getGroups(email string) ([]string, error) {
}
for _, group := range groupsList.Groups {
// TODO (joelspeed): Make desried group key configurable
// TODO (joelspeed): Make desired group key configurable
userGroups = append(userGroups, group.Email)
}
@ -267,6 +267,12 @@ func (c *googleConnector) getGroups(email string) ([]string, error) {
// sets up super user impersonation and creates an admin client for calling
// the google admin api
func createDirectoryService(serviceAccountFilePath string, email string) (*admin.Service, error) {
if serviceAccountFilePath == "" && email == "" {
return nil, nil
}
if serviceAccountFilePath == "" || email == "" {
return nil, fmt.Errorf("directory service requires both serviceAccountFilePath and adminEmail")
}
jsonCredentials, err := ioutil.ReadFile(serviceAccountFilePath)
if err != nil {
return nil, fmt.Errorf("error reading credentials from file: %v", err)

2
examples/config-dev.yaml
View File

@ -70,7 +70,7 @@ connectors:
- type: mockCallback
id: mock
name: Example
# - type: oidc
# - type: google
# id: google
# name: Google
# config: