Skip to content

Database governance built for humans and agents — controlling changes and access across every major database.

fix(sso): fetch github email (#19791)

ecmadaoeb31ddd65dc9
diff --git a/backend/api/v1/user_service.go b/backend/api/v1/user_service.go
index 639fd5501e..493dd3032f 100644
--- a/backend/api/v1/user_service.go
+++ b/backend/api/v1/user_service.go
@@ -137,7 +137,6 @@ func (s *UserService) ListUsers(ctx context.Context, request *connect.Request[v1
Limit: &limitPlusOne,
Offset: &offset.offset,
ShowDeleted: request.Msg.ShowDeleted,
- Workspace: common.GetWorkspaceIDFromContext(ctx),
}
filterResult, err := store.GetAccountListFilter(request.Msg.Filter)
if err != nil {
@@ -146,18 +145,25 @@ func (s *UserService) ListUsers(ctx context.Context, request *connect.Request[v1
find.FilterQ = filterResult.Query
find.ProjectID = filterResult.ProjectID
- if v := find.ProjectID; v != nil {
+ // Set workspace scope:
+ // - When ProjectID is set, workspace is required for the project member CTE query.
+ // - In SaaS mode (no ProjectID), scope to workspace IAM members to prevent cross-workspace listing.
+ if find.ProjectID != nil {
+ find.Workspace = common.GetWorkspaceIDFromContext(ctx)
+
user, ok := GetUserFromContext(ctx)
if !ok {
return nil, connect.NewError(connect.CodeInternal, errors.Errorf("user not found"))
}
- hasPermission, err := s.iamManager.CheckPermission(ctx, permission.ProjectsGet, user, common.GetWorkspaceIDFromContext(ctx), *v)
+ hasPermission, err := s.iamManager.CheckPermission(ctx, permission.ProjectsGet, user, common.GetWorkspaceIDFromContext(ctx), *find.ProjectID)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to check user permission"))
}
if !hasPermission {
return nil, connect.NewError(connect.CodePermissionDenied, errors.Errorf("user does not have permission %q", permission.ProjectsGet))
}
+ } else if s.profile.SaaS {
+ find.Workspace = common.GetWorkspaceIDFromContext(ctx)
}
users, err := s.store.ListUsers(ctx, find)
diff --git a/backend/plugin/idp/oauth2/oauth2.go b/backend/plugin/idp/oauth2/oauth2.go
index bf0a896500..f8ddf9727e 100644
--- a/backend/plugin/idp/oauth2/oauth2.go
+++ b/backend/plugin/idp/oauth2/oauth2.go
@@ -9,6 +9,7 @@ import (
"io"
"log/slog"
"net/http"
+ "net/url"
"github.com/pkg/errors"
"golang.org/x/oauth2"
@@ -116,6 +117,16 @@ func (p *IdentityProvider) UserInfo(token string) (*storepb.IdentityProviderUser
if v, ok := idp.GetValueWithKey(claims, p.config.FieldMapping.Identifier).(string); ok {
userInfo.Identifier = v
}
+
+ // GitHub-specific: when the identifier field (typically "email") is missing because the
+ // user's email is private, fetch it from the /user/emails endpoint.
+ if userInfo.Identifier == "" && p.config.FieldMapping.Identifier == "email" && isGitHubUserInfoURL(p.config.UserInfoUrl) {
+ if email, err := p.fetchGitHubPrimaryEmail(token); err == nil && email != "" {
+ userInfo.Identifier = email
+ claims["email"] = email
+ }
+ }
+
if p.config.FieldMapping.DisplayName != "" {
if v, ok := idp.GetValueWithKey(claims, p.config.FieldMapping.DisplayName).(string); ok {
userInfo.DisplayName = v
@@ -134,3 +145,49 @@ func (p *IdentityProvider) UserInfo(token string) (*storepb.IdentityProviderUser
}
return userInfo, claims, nil
}
+
+// isGitHubUserInfoURL checks if the URL points to the GitHub API.
+func isGitHubUserInfoURL(rawURL string) bool {
+ u, err := url.Parse(rawURL)
+ if err != nil {
+ return false
+ }
+ return u.Host == "api.github.com"
+}
+
+// fetchGitHubPrimaryEmail fetches the primary verified email from GitHub's /user/emails endpoint.
+func (p *IdentityProvider) fetchGitHubPrimaryEmail(token string) (string, error) {
+ req, err := http.NewRequest(http.MethodGet, "https://api.github.com/user/emails", nil)
+ if err != nil {
+ return "", err
+ }
+ req.Header.Set("Authorization", fmt.Sprintf("Bearer %s", token))
+ req.Header.Set("Accept", "application/vnd.github+json")
+
+ resp, err := p.client.Do(req)
+ if err != nil {
+ return "", err
+ }
+ defer resp.Body.Close()
+
+ body, err := io.ReadAll(resp.Body)
+ if err != nil {
+ return "", err
+ }
+
+ var emails []struct {
+ Email string `json:"email"`
+ Primary bool `json:"primary"`
+ Verified bool `json:"verified"`
+ }
+ if err := json.Unmarshal(body, &emails); err != nil {
+ return "", err
+ }
+
+ for _, e := range emails {
+ if e.Primary && e.Verified {
+ return e.Email, nil
+ }
+ }
+ return "", nil
+}
diff --git a/backend/store/principal.go b/backend/store/principal.go
index 9e9c761f5f..f42131a705 100644
--- a/backend/store/principal.go
+++ b/backend/store/principal.go
@@ -24,7 +24,8 @@ type FindUserMessage struct {
Offset *int
FilterQ *qb.Query
ProjectID *string
- // Workspace is required when ProjectID is set, for the project member CTE query.
+ // Workspace scopes user listing to workspace IAM policy members.
+ // When ProjectID is also set, includes project-level members too.
Workspace string
}
@@ -197,8 +198,9 @@ func listUserImpl(ctx context.Context, txn *sql.Tx, find *FindUserMessage) ([]*U
from := qb.Q().Space("principal")
where := qb.Q().Space("TRUE")
- // Build CTE for project filtering if needed
+ // Scope users by workspace or project membership.
if v := find.ProjectID; v != nil {
+ // Project filter: include users who are members of the project or workspace.
with.Space(`WITH all_members AS (
SELECT
jsonb_array_elements_text(jsonb_array_elements(policy.payload->'bindings')->'members') AS member,
@@ -210,6 +212,18 @@ func listUserImpl(ctx context.Context, txn *sql.Tx, find *FindUserMessage) ([]*U
SELECT ARRAY_AGG(member) AS members FROM all_members WHERE role NOT LIKE 'roles/workspace%'
)`, storepb.Policy_PROJECT.String(), "projects/"+*v, storepb.Policy_WORKSPACE.String(), storepb.Policy_IAM.String(), find.Workspace)
from.Space(`INNER JOIN project_members ON (CONCAT('users/', principal.email) = ANY(project_members.members) OR ? = ANY(project_members.members))`, common.AllUsers)
+ } else if find.Workspace != "" {
+ // Workspace IAM filter (no project): include only users who are members of the workspace IAM policy.
+ // Used in SaaS mode to prevent cross-workspace user listing.
+ with.Space(`WITH workspace_members AS (
+ SELECT ARRAY_AGG(DISTINCT member) AS members
+ FROM (
+ SELECT jsonb_array_elements_text(jsonb_array_elements(policy.payload->'bindings')->'members') AS member
+ FROM policy
+ WHERE resource_type = ? AND type = ? AND policy.workspace = ?
+ ) sub
+ )`, storepb.Policy_WORKSPACE.String(), storepb.Policy_IAM.String(), find.Workspace)
+ from.Space(`INNER JOIN workspace_members ON (CONCAT('users/', principal.email) = ANY(workspace_members.members) OR ? = ANY(workspace_members.members))`, common.AllUsers)
}
if filterQ := find.FilterQ; filterQ != nil {
diff --git a/frontend/src/react/pages/settings/IDPsPage.tsx b/frontend/src/react/pages/settings/IDPsPage.tsx
index 326b63705f..08e617c9c5 100644
--- a/frontend/src/react/pages/settings/IDPsPage.tsx
+++ b/frontend/src/react/pages/settings/IDPsPage.tsx
@@ -1161,7 +1161,7 @@ function getTemplateList(hasEnterpriseSSOFeature: boolean): OAuth2Template[] {
authUrl: "https://github.com/login/oauth/authorize",
tokenUrl: "https://github.com/login/oauth/access_token",
userInfoUrl: "https://api.github.com/user",
- scopes: ["user"],
+ scopes: ["user", "user:email"],
skipTlsVerify: false,
authStyle: OAuth2AuthStyle.IN_PARAMS,
fieldMapping: create(FieldMappingSchema, {