fix: decouple security group check from domain restriction#1382
Open
damsleth wants to merge 1 commit into
Open
fix: decouple security group check from domain restriction#1382damsleth wants to merge 1 commit into
damsleth wants to merge 1 commit into
Conversation
The security-group guard short-circuited when `domainRestriction` was
unset, turning `mail.includes('@undefined')` into a deny-all for any
tenant that enabled `securityGroupEnabled` without enabling
`domainRestrictionEnabled`. Gate security-group membership on its own
flag, and apply domain restriction only when both
`domainRestrictionEnabled` and `domainRestriction` are set, matching
the independent toggles in the admin UI.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
checkSecurityGroupMembershipshort-circuited before hitting Graph whensettings.domainRestrictionwas unset, becausemail.includes('@undefined')always returned false. This blocked every legitimate member when a tenant enabledsecurityGroupEnabled=truewithout also enablingdomainRestrictionEnabled.securityGroupEnabled+securityGroupIdonly, and applies domain restriction only whendomainRestrictionEnabledis true anddomainRestrictionhas a value - matching the independent admin UI toggles.require.cacheso the short-circuit branches never touch the network.Release note
Tenants that relied on the de facto coupling (security group enabled + empty domain restriction acting as a deny-all) will now see Graph membership checks succeed. Configure both
securityGroupEnabledanddomainRestrictionEnabledexplicitly to preserve the old semantics.Test plan
npm run lintnpm test(the 5 pre-existing uncaught exceptions ondevare unrelated; new suite passes)securityGroupEnabled=true,domainRestrictionEnabled=falsecan sign in