Skip to content

feat(sso): add SSO_ENTRA_TEAM_MAPPING env var for declarative team mapping #3999

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ecthelion77 wants to merge 1 commit into from
Closed

feat(sso): add SSO_ENTRA_TEAM_MAPPING env var for declarative team mapping #3999

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions mcpgateway/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,6 +385,7 @@ class Settings(BaseSettings):
sso_entra_graph_api_enabled: bool = Field(default=True, description="Enable Microsoft Graph fallback for EntraID groups overage claims")
sso_entra_graph_api_timeout: int = Field(default=10, ge=1, le=120, description="Timeout in seconds for Microsoft Graph group fallback requests")
sso_entra_graph_api_max_groups: int = Field(default=0, ge=0, description="Maximum groups to keep from Graph fallback (0 = no limit)")
sso_entra_team_mapping: Dict[str, Any] = Field(default_factory=dict, description="Map EntraID groups to ContextForge teams (JSON: {group_id: {team_id: ..., role: member|owner}})")

sso_adfs_enabled: bool = Field(default=False, description="Enable ADFS OIDC authentication")
sso_adfs_client_id: Optional[str] = Field(default=None, description="ADFS OAuth client ID")
Expand Down
11 changes: 7 additions & 4 deletions mcpgateway/utils/sso_bootstrap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ def get_predefined_sso_providers() -> List[Dict]:
"scope": "openid profile email User.Read",
"trusted_domains": settings.sso_trusted_domains,
"auto_create_users": settings.sso_auto_create_users,
"team_mapping": {},
"team_mapping": settings.sso_entra_team_mapping,
"provider_metadata": {
"groups_claim": settings.sso_entra_groups_claim,
"role_mappings": settings.sso_entra_role_mappings,
Expand Down Expand Up @@ -414,9 +414,12 @@ async def bootstrap_sso_providers() -> None:
if existing_provider.scope and existing_provider.scope != "openid profile email" and provider_config.get("scope") == "openid profile email":
provider_config["scope"] = existing_provider.scope

# Preserve DB team_mapping if env provides empty mapping
if existing_provider.team_mapping and not provider_config.get("team_mapping"):
provider_config["team_mapping"] = existing_provider.team_mapping
# Smart merge for team_mapping: same strategy as provider_metadata.
# Env provides base mapping, DB values override (Admin API changes survive restarts).
if "team_mapping" in provider_config:
env_mapping = provider_config["team_mapping"] or {}
db_mapping = existing_provider.team_mapping or {}
provider_config["team_mapping"] = {**env_mapping, **db_mapping}

updated = await sso_service.update_provider(existing_provider.id, provider_config)
if updated:
Expand Down