Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision
Loading items

Target

Select target project
  • coscine/backend/apis/sts
1 result
Select Git revision
Loading items
Show changes
Commits on Source (3)
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<GenerateDocumentationFile>true</GenerateDocumentationFile> <GenerateDocumentationFile>true</GenerateDocumentationFile>
<TargetFramework>net6.0</TargetFramework> <TargetFramework>net6.0</TargetFramework>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo> <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<Version>4.0.5</Version> <Version>4.0.6</Version>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<Authors>RWTH Aachen University</Authors> <Authors>RWTH Aachen University</Authors>
......
...@@ -26,11 +26,11 @@ namespace Coscine.Api.STS ...@@ -26,11 +26,11 @@ namespace Coscine.Api.STS
/// so that the IdentityProviders and other entries can be accessed. /// so that the IdentityProviders and other entries can be accessed.
/// </summary> /// </summary>
public static Saml2Options CurrentSaml2Options; public static Saml2Options CurrentSaml2Options;
private ApplicationInformation _applicationInformation; private ApplicationInformation _applicationInformation;
public Startup() public Startup()
{ {
} }
public override void SetBasePath(ApplicationInformation applicationInformation) public override void SetBasePath(ApplicationInformation applicationInformation)
...@@ -39,7 +39,6 @@ namespace Coscine.Api.STS ...@@ -39,7 +39,6 @@ namespace Coscine.Api.STS
_applicationInformation = applicationInformation; _applicationInformation = applicationInformation;
} }
public override void ConfigureServicesExtensionLate(IServiceCollection services) public override void ConfigureServicesExtensionLate(IServiceCollection services)
{ {
base.ConfigureServicesExtensionLate(services); base.ConfigureServicesExtensionLate(services);
...@@ -106,9 +105,14 @@ namespace Coscine.Api.STS ...@@ -106,9 +105,14 @@ namespace Coscine.Api.STS
var pfx = Program.Configuration.GetAndWait("coscine/global/sts/pfx"); var pfx = Program.Configuration.GetAndWait("coscine/global/sts/pfx");
var passwordString = Program.Configuration.GetStringAndWait("coscine/global/sts/pfxpassword"); var passwordString = Program.Configuration.GetStringAndWait("coscine/global/sts/pfxpassword");
var pfxFuture = Program.Configuration.GetAndWait("coscine/global/sts/pfxFuture");
var passwordStringFuture = Program.Configuration.GetStringAndWait("coscine/global/sts/pfxpasswordFuture");
var x509Certificate2 = new X509Certificate2(pfx, passwordString); var x509Certificate2 = new X509Certificate2(pfx, passwordString);
var x509CertificateFuture = new X509Certificate2(pfxFuture, passwordStringFuture);
options.SPOptions.ServiceCertificates.Add(x509Certificate2); options.SPOptions.ServiceCertificates.Add(x509Certificate2);
options.SPOptions.ServiceCertificates.Add(new ServiceCertificate() { Certificate = x509CertificateFuture, Status = CertificateStatus.Future, Use = CertificateUse.Both });
options.SPOptions.WantAssertionsSigned = true; options.SPOptions.WantAssertionsSigned = true;
// For dealing with `'DeclarationReference' must be an absolute Uri`` // For dealing with `'DeclarationReference' must be an absolute Uri``
......