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

Added SP ACS URL to Config Screen (#920)

Browse Source
This commit is contained in:
Chad Scharf 2020-09-08 13:04:26 -04:00 committed by GitHub
parent 6574d083fe
commit a997440e3d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bitwarden_license/src/Portal/Models/SsoConfigDataViewModel.cs
View File

@ -24,6 +24,7 @@ namespace Bit.Portal.Models
MetadataAddress = configurationData.MetadataAddress; MetadataAddress = configurationData.MetadataAddress;
GetClaimsFromUserInfoEndpoint = configurationData.GetClaimsFromUserInfoEndpoint; GetClaimsFromUserInfoEndpoint = configurationData.GetClaimsFromUserInfoEndpoint;
SpEntityId = configurationData.BuildSaml2ModulePath(globalSettings.BaseServiceUri.Sso); SpEntityId = configurationData.BuildSaml2ModulePath(globalSettings.BaseServiceUri.Sso);
SpAcsUrl = configurationData.BuildSaml2AcsUrl(globalSettings.BaseServiceUri.Sso);
IdpEntityId = configurationData.IdpEntityId; IdpEntityId = configurationData.IdpEntityId;
IdpBindingType = configurationData.IdpBindingType; IdpBindingType = configurationData.IdpBindingType;
IdpSingleSignOnServiceUrl = configurationData.IdpSingleSignOnServiceUrl; IdpSingleSignOnServiceUrl = configurationData.IdpSingleSignOnServiceUrl;
@ -64,6 +65,8 @@ namespace Bit.Portal.Models
// SAML2 SP // SAML2 SP
[Display(Name = "SpEntityId")] [Display(Name = "SpEntityId")]
public string SpEntityId { get; set; } public string SpEntityId { get; set; }
[Display(Name = "SpAcsUrl")]
public string SpAcsUrl { get; set; }
[Display(Name = "NameIdFormat")] [Display(Name = "NameIdFormat")]
public Saml2NameIdFormat SpNameIdFormat { get; set; } public Saml2NameIdFormat SpNameIdFormat { get; set; }
[Display(Name = "OutboundSigningAlgorithm")] [Display(Name = "OutboundSigningAlgorithm")]

6
bitwarden_license/src/Portal/Views/Sso/Index.cshtml
View File

@ -113,6 +113,12 @@
<input asp-for="Data.SpEntityId" class="form-control" readonly> <input asp-for="Data.SpEntityId" class="form-control" readonly>
</div> </div>
</div> </div>
<div class="row">
<div class="col-6 form-group">
<label asp-for="Data.SpAcsUrl">@i18nService.T("SpAcsUrl")</label>
<input asp-for="Data.SpAcsUrl" class="form-control" readonly>
</div>
</div>
<div class="row"> <div class="row">
<div class="col-6 form-group"> <div class="col-6 form-group">
<label asp-for="Data.SpNameIdFormat">@i18nService.T("NameIdFormat")</label> <label asp-for="Data.SpNameIdFormat">@i18nService.T("NameIdFormat")</label>

5
src/Core/Models/Data/SsoConfigurationData.cs
View File

@ -53,6 +53,11 @@ namespace Bit.Core.Models.Data
return BuildSsoUrl(_saml2ModulePath, ssoUri); return BuildSsoUrl(_saml2ModulePath, ssoUri);
} }
public string BuildSaml2AcsUrl(string ssoUri = null)
{
return string.Concat(BuildSaml2ModulePath(ssoUri), "/Acs");
}
private string BuildSsoUrl(string relativePath, string ssoUri) private string BuildSsoUrl(string relativePath, string ssoUri)
{ {
if (string.IsNullOrWhiteSpace(ssoUri) || if (string.IsNullOrWhiteSpace(ssoUri) ||

3
src/Core/Resources/SharedResources.en.resx
View File

@ -265,6 +265,9 @@
<data name="SpEntityId" xml:space="preserve"> <data name="SpEntityId" xml:space="preserve">
<value>SP Entity ID</value> <value>SP Entity ID</value>
</data> </data>
<data name="SpAcsUrl" xml:space="preserve">
<value>Assertion Consumer Service (ACS) URL</value>
</data>
<data name="SpValidateCertificates" xml:space="preserve"> <data name="SpValidateCertificates" xml:space="preserve">
<value>Validate Certificates</value> <value>Validate Certificates</value>
</data> </data>