Skip to content

Include PAR in mtls aliases #1955

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

Merged
josephdecock merged 2 commits into from
Apr 11, 2025
Merged

Include PAR in mtls aliases #1955

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ac3ddff
Include PAR in mtls aliases
josephdecock Apr 9, 2025
36fdbd3
Replace deprecated ToEpochTime with ToUnixTimeSeconds
josephdecock Apr 11, 2025
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
2 changes: 1 addition & 1 deletion Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<PackageVersion Include="Duende.AccessTokenManagement" Version="3.2.0" />
<PackageVersion Include="Duende.AccessTokenManagement.OpenIdConnect" Version="3.2.0" />
<PackageVersion Include="Duende.AspNetCore.Authentication.JwtBearer" Version="0.1.3" />
<PackageVersion Include="Duende.IdentityModel" Version="7.0.0" />
<PackageVersion Include="Duende.IdentityModel" Version="7.1.0-preview.1" />
<PackageVersion Include="Duende.IdentityModel.OidcClient" Version="6.0.1" />
<PackageVersion Include="Duende.IdentityServer" Version="7.1.0" />
<PackageVersion Include="IdentityModel.AspNetCore.OAuth2Introspection" Version="6.2.0" />
Expand Down
2 changes: 1 addition & 1 deletion identity-server/clients/src/ConsolePrivateKeyJwtClient/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ static string CreateClientToken(SigningCredentials credential, string clientId,
[
new Claim(JwtClaimTypes.JwtId, Guid.NewGuid().ToString()),
new Claim(JwtClaimTypes.Subject, clientId),
new Claim(JwtClaimTypes.IssuedAt, now.ToEpochTime().ToString(), ClaimValueTypes.Integer64)
new Claim(JwtClaimTypes.IssuedAt, ((DateTimeOffset) now).ToUnixTimeSeconds().ToString(), ClaimValueTypes.Integer64)
],
now,
now.AddMinutes(1),
Expand Down
2 changes: 1 addition & 1 deletion identity-server/clients/src/MvcJarJwt/AssertionService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public string CreateClientToken()
{
new Claim(JwtClaimTypes.JwtId, Guid.NewGuid().ToString()),
new Claim(JwtClaimTypes.Subject, "mvc.jar.jwt"),
new Claim(JwtClaimTypes.IssuedAt, now.ToEpochTime().ToString(), ClaimValueTypes.Integer64)
new Claim(JwtClaimTypes.IssuedAt, ((DateTimeOffset) now).ToUnixTimeSeconds().ToString(), ClaimValueTypes.Integer64)
},
now,
now.AddMinutes(1),
Expand Down
2 changes: 1 addition & 1 deletion identity-server/clients/src/MvcJarUriJwt/AssertionService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public string CreateClientToken()
{
new Claim(JwtClaimTypes.JwtId, Guid.NewGuid().ToString()),
new Claim(JwtClaimTypes.Subject, "mvc.jar.jwt"),
new Claim(JwtClaimTypes.IssuedAt, now.ToEpochTime().ToString(), ClaimValueTypes.Integer64)
new Claim(JwtClaimTypes.IssuedAt, ((DateTimeOffset) now).ToUnixTimeSeconds().ToString(), ClaimValueTypes.Integer64)
},
now,
now.AddMinutes(1),
Expand Down
5 changes: 5 additions & 0 deletions identity-server/src/IdentityServer/ResponseHandling/Default/DiscoveryResponseGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,11 @@ public virtual async Task<Dictionary<string, object>> CreateDiscoveryDocumentAsy
mtlsEndpoints.Add(OidcConstants.Discovery.DeviceAuthorizationEndpoint, ConstructMtlsEndpoint(ProtocolRoutePaths.DeviceAuthorization));
}

if (Options.Endpoints.EnablePushedAuthorizationEndpoint)
{
mtlsEndpoints.Add(OidcConstants.Discovery.PushedAuthorizationRequestEndpoint, ConstructMtlsEndpoint(ProtocolRoutePaths.PushedAuthorization));
}

if (mtlsEndpoints.Any())
{
entries.Add(OidcConstants.Discovery.MtlsEndpointAliases, mtlsEndpoints);
Expand Down
2 changes: 1 addition & 1 deletion identity-server/src/IdentityServer/Validation/Default/IntrospectionRequestValidator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ private async Task<IEnumerable<Claim>> GetRefreshTokenClaimsAsync(string token,
var refreshValidationResult = await _refreshTokenService.ValidateRefreshTokenAsync(token, client);
if (!refreshValidationResult.IsError)
{
var iat = refreshValidationResult.RefreshToken.CreationTime.ToEpochTime();
var iat = ((DateTimeOffset)refreshValidationResult.RefreshToken.CreationTime).ToUnixTimeSeconds();
var claims = new List<Claim>
{
new Claim("client_id", client.ClientId),
Expand Down
14 changes: 14 additions & 0 deletions ...server/test/IdentityServer.IntegrationTests/Endpoints/Discovery/DiscoveryEndpointTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,4 +318,18 @@ public void Cannot_get_entries_for_document_discovery_cache_if_enabled()
Should.Throw<InvalidOperationException>(() =>
result.Entries.Add("Joe", "Good Stuff"));
}

[Fact]
[Trait("Category", Category)]
public async Task par_is_included_in_mtls_aliases()
{
var pipeline = new IdentityServerPipeline();
pipeline.Initialize();

pipeline.Options.MutualTls.Enabled = true;


var result = await pipeline.BackChannelClient.GetDiscoveryDocumentAsync("https://server/.well-known/openid-configuration");
result.MtlsEndpointAliases.PushedAuthorizationRequestEndpoint.ShouldNotBeNull();
}
}
Loading