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

Onboard app level pvtkeyjwt reuse config #20621

Merged
merged 9 commits into from
Jul 18, 2024
Merged

Onboard app level pvtkeyjwt reuse config #20621

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a50c8a0
Add tokenEndpointAllowReusePvtKeyJwt to request bodies.
mpmadhavig Jul 1, 2024
d60d07a
Add the new config to oidc metadata.
mpmadhavig Jul 1, 2024
1b2e03e
Updated test cases to validate the field.
mpmadhavig Jul 1, 2024
2887993
Merge branch 'wso2:master' into onboard-app-level-pvtkeyjwt-reuse-config
mpmadhavig Jul 1, 2024
1a28939
Correct oidc metadata format.
mpmadhavig Jul 1, 2024
fa57a1c
Fix case-insensitive issue.
mpmadhavig Jul 1, 2024
de2d115
Bump versions.
mpmadhavig Jul 17, 2024
3765313
Merge branch 'master' into onboard-app-level-pvtkeyjwt-reuse-config
mpmadhavig Jul 17, 2024
69310d8
Bump versions.
mpmadhavig Jul 17, 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
1 change: 1 addition & 0 deletions ...test/rest/api/server/application/management/v1/ApplicationManagementOAuthSuccessTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,7 @@ public void testGetOAuthInboundDetailsWithAdditionalOIDCAttributes() throws Exce
.statusCode(HttpStatus.SC_OK)
.body("idToken.idTokenSignedResponseAlg", equalTo("PS256"))
.body("clientAuthentication.tokenEndpointAuthMethod", equalTo("private_key_jwt"))
.body("clientAuthentication.tokenEndpointAllowReusePvtKeyJwt", equalTo(false))
.body("clientAuthentication.tokenEndpointAuthSigningAlg", equalTo("PS256"))
.body("requestObject.requestObjectSigningAlg", equalTo("PS256"))
.body("requestObject.encryption.algorithm", equalTo("RSA-OAEP"))
Expand Down
28 changes: 28 additions & 0 deletions ...st/rest/api/server/application/management/v1/model/ClientAuthenticationConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
public class ClientAuthenticationConfiguration {

private String tokenEndpointAuthMethod;
private Boolean tokenEndpointAllowReusePvtKeyJwt;
private String tokenEndpointAuthSigningAlg;
private String tlsClientAuthSubjectDn;

Expand All @@ -50,6 +51,33 @@ public void setTokenEndpointAuthMethod(String tokenEndpointAuthMethod) {
this.tokenEndpointAuthMethod = tokenEndpointAuthMethod;
}

/**
*
*/
public ClientAuthenticationConfiguration tokenEndpointAllowReusePvtKeyJwt(Boolean tokenEndpointAllowReusePvtKeyJwt) {

this.tokenEndpointAllowReusePvtKeyJwt = tokenEndpointAllowReusePvtKeyJwt;
return this;
}

@ApiModelProperty(example = "true", value = "")
@JsonProperty("tokenEndpointAllowReusePvtKeyJwt")
@Valid
public Boolean getTokenEndpointAllowReusePvtKeyJwt() {

return tokenEndpointAllowReusePvtKeyJwt;
}

/**
* Sets the tokenEndpointAllowReusePvtKeyJwt.
*
* @param tokenEndpointAllowReusePvtKeyJwt the tokenEndpointAllowReusePvtKeyJwt
*/
public void setTokenEndpointAllowReusePvtKeyJwt(Boolean tokenEndpointAllowReusePvtKeyJwt) {

this.tokenEndpointAllowReusePvtKeyJwt = tokenEndpointAllowReusePvtKeyJwt;
}

/**
*
**/
Expand Down
31 changes: 28 additions & 3 deletions ...entity/integration/test/rest/api/server/application/management/v1/model/OIDCMetaData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ public class OIDCMetaData {
private MetadataProperty accessTokenType;
private MetadataProperty accessTokenBindingType;
private ClientAuthenticationMethodMetadata tokenEndpointAuthMethod;
private Boolean tokenEndpointAllowReusePvtKeyJwt;
private MetadataProperty tokenEndpointSignatureAlgorithm;
private MetadataProperty idTokenSignatureAlgorithm;
private MetadataProperty requestObjectSignatureAlgorithm;
Expand Down Expand Up @@ -243,6 +244,27 @@ public void setTokenEndpointAuthMethod(ClientAuthenticationMethodMetadata tokenE
this.tokenEndpointAuthMethod = tokenEndpointAuthMethod;
}

/**
**/
public OIDCMetaData tokenEndpointAllowReusePvtKeyJwt(Boolean tokenEndpointAllowReusePvtKeyJwt) {

this.tokenEndpointAllowReusePvtKeyJwt = tokenEndpointAllowReusePvtKeyJwt;
return this;
}

@ApiModelProperty(value = "")
@JsonProperty("tokenEndpointAllowReusePvtKeyJwt")
@Valid
public Boolean getTokenEndpointAllowReusePvtKeyJwt() {

return tokenEndpointAllowReusePvtKeyJwt;
}

public void setTokenEndpointAllowReusePvtKeyJwt(Boolean tokenEndpointAllowReusePvtKeyJwt) {

this.tokenEndpointAllowReusePvtKeyJwt = tokenEndpointAllowReusePvtKeyJwt;
}

/**
**/
public OIDCMetaData tokenEndpointSignatureAlgorithm(MetadataProperty tokenEndpointSignatureAlgorithm) {
Expand Down Expand Up @@ -392,6 +414,7 @@ public boolean equals(java.lang.Object o) {
Objects.equals(this.accessTokenType, oiDCMetaData.accessTokenType) &&
Objects.equals(this.accessTokenBindingType, oiDCMetaData.accessTokenBindingType) &&
Objects.equals(this.tokenEndpointAuthMethod, oiDCMetaData.tokenEndpointAuthMethod) &&
Objects.equals(this.tokenEndpointAllowReusePvtKeyJwt, oiDCMetaData.tokenEndpointAllowReusePvtKeyJwt) &&
Objects.equals(this.tokenEndpointSignatureAlgorithm, oiDCMetaData.tokenEndpointSignatureAlgorithm) &&
Objects.equals(this.tokenEndpointSignatureAlgorithm, oiDCMetaData.idTokenSignatureAlgorithm) &&
Objects.equals(this.tokenEndpointSignatureAlgorithm, oiDCMetaData.requestObjectSignatureAlgorithm) &&
Expand All @@ -406,9 +429,9 @@ public int hashCode() {
return Objects.hash(allowedGrantTypes, defaultUserAccessTokenExpiryTime,
defaultApplicationAccessTokenExpiryTime, defaultRefreshTokenExpiryTime, defaultIdTokenExpiryTime,
idTokenEncryptionAlgorithm, idTokenEncryptionMethod, scopeValidators, accessTokenType,
accessTokenBindingType, tokenEndpointAuthMethod, tokenEndpointSignatureAlgorithm,
idTokenSignatureAlgorithm, requestObjectSignatureAlgorithm, requestObjectEncryptionAlgorithm,
requestObjectEncryptionMethod, subjectType, fapiMetadata);
accessTokenBindingType, tokenEndpointAuthMethod, tokenEndpointAllowReusePvtKeyJwt,
tokenEndpointSignatureAlgorithm, idTokenSignatureAlgorithm, requestObjectSignatureAlgorithm,
requestObjectEncryptionAlgorithm, requestObjectEncryptionMethod, subjectType, fapiMetadata);
}

@Override
Expand All @@ -429,6 +452,8 @@ public String toString() {
sb.append(" accessTokenType: ").append(toIndentedString(accessTokenType)).append("\n");
sb.append(" accessTokenBindingType: ").append(toIndentedString(accessTokenBindingType)).append("\n");
sb.append(" tokenEndpointAuthMethod: ").append(toIndentedString(tokenEndpointAuthMethod)).append("\n");
sb.append(" tokenEndpointAllowReusePvtKeyJwt: ").append(toIndentedString(tokenEndpointAllowReusePvtKeyJwt))
.append("\n");
sb.append(" tokenEndpointSignatureAlgorithm: ").append(toIndentedString(tokenEndpointSignatureAlgorithm)).append("\n");
sb.append(" idTokenSignatureAlgorithm: ").append(toIndentedString(idTokenSignatureAlgorithm)).append("\n");
sb.append(" requestObjectSignatureAlgorithm: ").append(toIndentedString(requestObjectSignatureAlgorithm)).append("\n");
Expand Down
1 change: 1 addition & 0 deletions ...pi/server/application/management/v1/create-oauth-app-with-additional-oidc-attributes.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
},
"clientAuthentication": {
"tokenEndpointAuthMethod": "private_key_jwt",
"tokenEndpointAllowReusePvtKeyJwt": false,
"tokenEndpointAuthSigningAlg": "PS256"
},
"requestObject": {
Expand Down
1 change: 1 addition & 0 deletions ...r/application/management/v1/create-oauth-app-with-invalid-id-token-signing-algorithm.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
},
"clientAuthentication": {
"tokenEndpointAuthMethod": "private_key_jwt",
"tokenEndpointAllowReusePvtKeyJwt": false,
"tokenEndpointAuthSigningAlg": "PS256"
},
"requestObject": {
Expand Down
1 change: 1 addition & 0 deletions ...tion/management/v1/create-oauth-app-with-invalid-request-object-encryption-algorithm.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
"publicClient": false,
"clientAuthentication": {
"tokenEndpointAuthMethod": "private_key_jwt",
"tokenEndpointAllowReusePvtKeyJwt": false,
"tokenEndpointAuthSigningAlg": "PS256"
},
"requestObject": {
Expand Down
1 change: 1 addition & 0 deletions ...ication/management/v1/create-oauth-app-with-invalid-request-object-encryption-method.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
"publicClient": false,
"clientAuthentication": {
"tokenEndpointAuthMethod": "private_key_jwt",
"tokenEndpointAllowReusePvtKeyJwt": false,
"tokenEndpointAuthSigningAlg": "PS256"
},
"requestObject": {
Expand Down
1 change: 1 addition & 0 deletions ...ication/management/v1/create-oauth-app-with-invalid-request-object-signing-algorithm.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
"publicClient": false,
"clientAuthentication": {
"tokenEndpointAuthMethod": "private_key_jwt",
"tokenEndpointAllowReusePvtKeyJwt": false,
"tokenEndpointAuthSigningAlg": "PS256"
},
"requestObject": {
Expand Down
1 change: 1 addition & 0 deletions ...o2/identity/integration/test/rest/api/server/application/management/v1/oidc-metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@
"SHA256withRSA"
]
},
"tokenEndpointAllowReusePvtKeyJwt": false,
"idTokenSignatureAlgorithm": {
"options": [
"Select Option",
Expand Down
6 changes: 3 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2294,7 +2294,7 @@

<!-- Identity Inbound Versions -->
<identity.inbound.auth.saml.version>5.11.42</identity.inbound.auth.saml.version>
<identity.inbound.auth.oauth.version>7.0.118</identity.inbound.auth.oauth.version>
<identity.inbound.auth.oauth.version>7.0.120</identity.inbound.auth.oauth.version>
<identity.inbound.auth.openid.version>5.10.2</identity.inbound.auth.openid.version>
<identity.inbound.auth.sts.version>5.11.7</identity.inbound.auth.sts.version>
<identity.inbound.provisioning.scim.version>5.7.7</identity.inbound.provisioning.scim.version>
Expand Down Expand Up @@ -2385,12 +2385,12 @@
<!-- Identity REST API feature -->
<identity.api.dispatcher.version>2.0.17</identity.api.dispatcher.version>
<identity.user.api.version>1.3.38</identity.user.api.version>
<identity.server.api.version>1.2.208</identity.server.api.version>
<identity.server.api.version>1.2.210</identity.server.api.version>

<identity.agent.sso.version>5.5.9</identity.agent.sso.version>
<identity.tool.samlsso.validator.version>5.5.8</identity.tool.samlsso.validator.version>
<identity.app.authz.xacml.version>2.3.2</identity.app.authz.xacml.version>
<identity.oauth.addons.version>2.5.14</identity.oauth.addons.version>
<identity.oauth.addons.version>2.5.15</identity.oauth.addons.version>
<org.wso2.carbon.extension.identity.x509certificate.version>1.1.11</org.wso2.carbon.extension.identity.x509certificate.version>
<conditional.authentication.functions.version>1.2.56</conditional.authentication.functions.version>

Expand Down