Skip to content
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

Jump to bottom

Fixed SA's EntityConfiguration issue #29

Merged
merged 3 commits into from
May 28, 2024
Merged

Fixed SA's EntityConfiguration issue #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5218ba0
Update IdentityProvidersHandler.cs
MithrandirTheWizard May 28, 2024
3d72bc2
Update SpidCieOIDCConfiguration.cs
MithrandirTheWizard May 28, 2024
18f6bae
Update RPOpenIdFederationMiddleware.cs
MithrandirTheWizard May 28, 2024
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
61 changes: 31 additions & 30 deletions src/Spid.Cie.OIDC.AspNetCore/Middlewares/RPOpenIdFederationMiddleware.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,34 +132,35 @@ private RPEntityConfiguration GetEntityConfiguration(RelyingParty rp, ICryptoSer
}

private SAEntityConfiguration GetEntityConfiguration(Aggregator agg, ICryptoService cryptoService)
{
return new SAEntityConfiguration()
{
ExpiresOn = DateTimeOffset.UtcNow.AddMinutes(SpidCieConst.EntityConfigurationExpirationInMinutes),
IssuedAt = DateTimeOffset.UtcNow,
AuthorityHints = agg.AuthorityHints,
Issuer = agg.Id,
Subject = agg.Id,
TrustMarks = agg.TrustMarks,
JWKS = cryptoService.GetJWKS(agg.OpenIdFederationCertificates),
Metadata = new SAMetadata_SpidCieOIDCConfiguration()
{
FederationEntity = new SA_SpidCieOIDCFederationEntity()
{
Contacts = agg.Contacts,
HomepageUri = agg.HomepageUri,
LogoUri = agg.LogoUri,
OrganizationName = agg.OrganizationName,
PolicyUri = agg.PolicyUri,
FederationResolveEndpoint = $"{agg.Id.EnsureTrailingSlash()}{SpidCieConst.ResolveEndpointPath}",
FederationFetchEndpoint = $"{agg.Id.EnsureTrailingSlash()}{SpidCieConst.FetchEndpointPath}",
FederationListEndpoint = $"{agg.Id.EnsureTrailingSlash()}{SpidCieConst.ListEndpointPath}",
},
TrustMarkIssuer = new SA_TrustMarkIssuer()
{
FederationStatusEndpoint = $"{agg.Id.EnsureTrailingSlash()}{SpidCieConst.TrustMarkStatusEndpointPath}"
}
}
};
}
{
return new SAEntityConfiguration()
{
ExpiresOn = DateTimeOffset.UtcNow.AddMinutes(SpidCieConst.EntityConfigurationExpirationInMinutes),
IssuedAt = DateTimeOffset.UtcNow,
AuthorityHints = agg.AuthorityHints,
Issuer = agg.Id,
Subject = agg.Id,
TrustMarks = agg.TrustMarks,
JWKS = cryptoService.GetJWKS(agg.OpenIdFederationCertificates),
Metadata = new SAMetadata_SpidCieOIDCConfiguration()
{
FederationEntity = new SA_SpidCieOIDCFederationEntity()
{
Contacts = agg.Contacts,
HomepageUri = agg.HomepageUri,
LogoUri = agg.LogoUri,
OrganizationName = agg.OrganizationName,
PolicyUri = agg.PolicyUri,
FederationResolveEndpoint = $"{agg.Id.EnsureTrailingSlash()}{SpidCieConst.ResolveEndpointPath}",
FederationFetchEndpoint = $"{agg.Id.EnsureTrailingSlash()}{SpidCieConst.FetchEndpointPath}",
FederationListEndpoint = $"{agg.Id.EnsureTrailingSlash()}{SpidCieConst.ListEndpointPath}",
FederationTrustMarkStatusEndpoint = $"{agg.Id.EnsureTrailingSlash()}{SpidCieConst.TrustMarkStatusEndpointPath}"
}//,
//TrustMarkIssuer = new SA_TrustMarkIssuer()
//{
// FederationStatusEndpoint = $"{agg.Id.EnsureTrailingSlash()}{SpidCieConst.TrustMarkStatusEndpointPath}"
//}
}
};
}
}
7 changes: 5 additions & 2 deletions src/Spid.Cie.OIDC.AspNetCore/Models/SpidCieOIDCConfiguration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ internal sealed class SAMetadata_SpidCieOIDCConfiguration
[ExcludeFromCodeCoverage]
internal sealed class SA_TrustMarkIssuer
{
[JsonPropertyName("federation_status_endpoint")]
public string FederationStatusEndpoint { get; set; }
//[JsonPropertyName("federation_status_endpoint")]
//public string FederationStatusEndpoint { get; set; }
}

[ExcludeFromCodeCoverage]
Expand Down Expand Up @@ -118,6 +118,9 @@ internal sealed class SA_SpidCieOIDCFederationEntity

[JsonPropertyName("federation_list_endpoint")]
public string FederationListEndpoint { get; set; }

[JsonPropertyName("federation_trust_mark_status_endpoint")]
public string FederationTrustMarkStatusEndpoint { get; set; }
}

[ExcludeFromCodeCoverage]
Expand Down
36 changes: 18 additions & 18 deletions src/Spid.Cie.OIDC.AspNetCore/Services/IdentityProvidersHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,23 +59,23 @@ public async Task<IEnumerable<IdentityProvider>> GetIdentityProviders()
return result;
}

private static IdentityProvider CreateSpidIdentityProvider(IdPEntityConfiguration conf)
=> new SpidIdentityProvider()
{
EntityConfiguration = conf,
Uri = conf.Subject ?? string.Empty,
OrganizationLogoUrl = conf.Metadata.OpenIdProvider.AdditionalData["logo_uri"] as string ?? string.Empty,
OrganizationName = conf.Metadata.OpenIdProvider.AdditionalData["organization_name"] as string ?? string.Empty,
SupportedAcrValues = conf.Metadata.OpenIdProvider.AcrValuesSupported.ToList(),
};
private static IdentityProvider CreateSpidIdentityProvider(IdPEntityConfiguration conf)
=> new SpidIdentityProvider()
{
EntityConfiguration = conf,
Uri = conf.Subject ?? string.Empty,
OrganizationLogoUrl = conf.Metadata.OpenIdProvider.AdditionalData.TryGetValue("logo_uri", out object? logoUri) ? logoUri as string ?? string.Empty : string.Empty,
OrganizationName = conf.Metadata.OpenIdProvider.AdditionalData.TryGetValue("organization_name", out object? organizationName) ? organizationName as string ?? string.Empty : string.Empty,
SupportedAcrValues = conf.Metadata.OpenIdProvider.AcrValuesSupported.ToList(),
};

private static IdentityProvider CreateCieIdentityProvider(IdPEntityConfiguration conf)
=> new CieIdentityProvider()
{
EntityConfiguration = conf,
Uri = conf.Subject ?? string.Empty,
OrganizationLogoUrl = conf.Metadata.OpenIdProvider.AdditionalData["logo_uri"] as string ?? string.Empty,
OrganizationName = conf.Metadata.OpenIdProvider.AdditionalData["organization_name"] as string ?? string.Empty,
SupportedAcrValues = conf.Metadata.OpenIdProvider.AcrValuesSupported.ToList(),
};
private static IdentityProvider CreateCieIdentityProvider(IdPEntityConfiguration conf)
=> new CieIdentityProvider()
{
EntityConfiguration = conf,
Uri = conf.Subject ?? string.Empty,
OrganizationLogoUrl = conf.Metadata.OpenIdProvider.AdditionalData.TryGetValue("logo_uri", out object? logoUri) ? logoUri as string ?? string.Empty : string.Empty,
OrganizationName = conf.Metadata.OpenIdProvider.AdditionalData.TryGetValue("organization_name", out object? organizationName) ? organizationName as string ?? string.Empty : string.Empty,
SupportedAcrValues = conf.Metadata.OpenIdProvider.AcrValuesSupported.ToList(),
};
}
Loading