nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-04-05 21:18:13 -05:00
Code

[PM-5149] unique SP entity id for organization sso configs (#3520)

Browse Source 
* org specific sp entity id

* updates

* dont default true
This commit is contained in:
Kyle Spearrin 2024-01-18 16:54:01 -05:00 committed by GitHub
parent ef359c3cf1
commit 4b6299a055
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bitwarden_license/src/Sso/Utilities/DynamicAuthenticationSchemeProvider.cs
View File

@ -349,7 +349,9 @@ public class DynamicAuthenticationSchemeProvider : AuthenticationSchemeProvider
} }
var spEntityId = new Sustainsys.Saml2.Metadata.EntityId( var spEntityId = new Sustainsys.Saml2.Metadata.EntityId(
SsoConfigurationData.BuildSaml2ModulePath(_globalSettings.BaseServiceUri.Sso)); SsoConfigurationData.BuildSaml2ModulePath(
_globalSettings.BaseServiceUri.Sso,
config.SpUniqueEntityId ? name : null));
bool? allowCreate = null; bool? allowCreate = null;
if (config.SpNameIdFormat != Saml2NameIdFormat.Transient) if (config.SpNameIdFormat != Saml2NameIdFormat.Transient)
{ {

2
src/Api/Auth/Models/Request/OrganizationSsoRequestModel.cs
View File

@ -66,6 +66,7 @@ public class SsoConfigurationDataRequest : IValidatableObject
public string ExpectedReturnAcrValue { get; set; } public string ExpectedReturnAcrValue { get; set; }
// SAML2 SP // SAML2 SP
public bool? SpUniqueEntityId { get; set; }
public Saml2NameIdFormat SpNameIdFormat { get; set; } public Saml2NameIdFormat SpNameIdFormat { get; set; }
public string SpOutboundSigningAlgorithm { get; set; } public string SpOutboundSigningAlgorithm { get; set; }
public Saml2SigningBehavior SpSigningBehavior { get; set; } public Saml2SigningBehavior SpSigningBehavior { get; set; }
@ -190,6 +191,7 @@ public class SsoConfigurationDataRequest : IValidatableObject
IdpAllowUnsolicitedAuthnResponse = IdpAllowUnsolicitedAuthnResponse.GetValueOrDefault(), IdpAllowUnsolicitedAuthnResponse = IdpAllowUnsolicitedAuthnResponse.GetValueOrDefault(),
IdpDisableOutboundLogoutRequests = IdpDisableOutboundLogoutRequests.GetValueOrDefault(), IdpDisableOutboundLogoutRequests = IdpDisableOutboundLogoutRequests.GetValueOrDefault(),
IdpWantAuthnRequestsSigned = IdpWantAuthnRequestsSigned.GetValueOrDefault(), IdpWantAuthnRequestsSigned = IdpWantAuthnRequestsSigned.GetValueOrDefault(),
SpUniqueEntityId = SpUniqueEntityId.GetValueOrDefault(),
SpNameIdFormat = SpNameIdFormat, SpNameIdFormat = SpNameIdFormat,
SpOutboundSigningAlgorithm = SpOutboundSigningAlgorithm ?? SamlSigningAlgorithms.Sha256, SpOutboundSigningAlgorithm = SpOutboundSigningAlgorithm ?? SamlSigningAlgorithms.Sha256,
SpSigningBehavior = SpSigningBehavior, SpSigningBehavior = SpSigningBehavior,

4
src/Api/Auth/Models/Response/OrganizationSsoResponseModel.cs
View File

@ -33,7 +33,8 @@ public class SsoUrls
{ {
CallbackPath = SsoConfigurationData.BuildCallbackPath(globalSettings.BaseServiceUri.Sso); CallbackPath = SsoConfigurationData.BuildCallbackPath(globalSettings.BaseServiceUri.Sso);
SignedOutCallbackPath = SsoConfigurationData.BuildSignedOutCallbackPath(globalSettings.BaseServiceUri.Sso); SignedOutCallbackPath = SsoConfigurationData.BuildSignedOutCallbackPath(globalSettings.BaseServiceUri.Sso);
SpEntityId = SsoConfigurationData.BuildSaml2ModulePath(globalSettings.BaseServiceUri.Sso); SpEntityIdStatic = SsoConfigurationData.BuildSaml2ModulePath(globalSettings.BaseServiceUri.Sso);
SpEntityId = SsoConfigurationData.BuildSaml2ModulePath(globalSettings.BaseServiceUri.Sso, organizationId);
SpMetadataUrl = SsoConfigurationData.BuildSaml2MetadataUrl(globalSettings.BaseServiceUri.Sso, organizationId); SpMetadataUrl = SsoConfigurationData.BuildSaml2MetadataUrl(globalSettings.BaseServiceUri.Sso, organizationId);
SpAcsUrl = SsoConfigurationData.BuildSaml2AcsUrl(globalSettings.BaseServiceUri.Sso, organizationId); SpAcsUrl = SsoConfigurationData.BuildSaml2AcsUrl(globalSettings.BaseServiceUri.Sso, organizationId);
} }
@ -41,6 +42,7 @@ public class SsoUrls
public string CallbackPath { get; set; } public string CallbackPath { get; set; }
public string SignedOutCallbackPath { get; set; } public string SignedOutCallbackPath { get; set; }
public string SpEntityId { get; set; } public string SpEntityId { get; set; }
public string SpEntityIdStatic { get; set; }
public string SpMetadataUrl { get; set; } public string SpMetadataUrl { get; set; }
public string SpAcsUrl { get; set; } public string SpAcsUrl { get; set; }
} }

1
src/Core/Auth/Models/Data/SsoConfigurationData.cs
View File

@ -70,6 +70,7 @@ public class SsoConfigurationData
public bool IdpWantAuthnRequestsSigned { get; set; } public bool IdpWantAuthnRequestsSigned { get; set; }
// SAML2 SP // SAML2 SP
public bool SpUniqueEntityId { get; set; }
public Saml2NameIdFormat SpNameIdFormat { get; set; } public Saml2NameIdFormat SpNameIdFormat { get; set; }
public string SpOutboundSigningAlgorithm { get; set; } public string SpOutboundSigningAlgorithm { get; set; }
public Saml2SigningBehavior SpSigningBehavior { get; set; } public Saml2SigningBehavior SpSigningBehavior { get; set; }