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 #622

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Onboard app level pvtkeyjwt reuse config #622

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f1815f5
Add the reuse pvt ket jwt config to oidc metadata.
mpmadhavig Jun 27, 2024
cdc19b7
Add the pvt ket jwt config under ClientAuthenticationConfiguration.
mpmadhavig Jun 27, 2024
6eb3204
Bump Oauth and addon versions.
mpmadhavig Jul 9, 2024
7d709f4
Fix javadoc comments.
mpmadhavig Jul 10, 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
2 changes: 2 additions & 0 deletions ...bon/identity/api/server/application/management/common/ApplicationManagementConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ private ApplicationManagementConstants() {
public static final String RBAC = "RBAC";
public static final String NO_POLICY = "NO POLICY";
public static final String SELECT_OPTION = "Select Option";
public static final String TOKEN_EP_ALLOW_REUSE_PVT_KEY_JWT_DEFAULT_VALUE = "OAuth.OpenIDConnect." +
"TokenEndpointAllowReusePrivateKeyJWT";
public static final String TOKEN_EP_SIGNATURE_ALGORITHMS_SUPPORTED = "OAuth.OpenIDConnect." +
"SupportedTokenEndpointSigningAlgorithms.SupportedTokenEndpointSigningAlgorithm";
public static final String ID_TOKEN_SIGNATURE_ALGORITHMS_SUPPORTED = "OAuth.OpenIDConnect." +
Expand Down
41 changes: 37 additions & 4 deletions ...rbon/identity/api/server/application/management/v1/ClientAuthenticationConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ public class ClientAuthenticationConfiguration {

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

/**
Expand Down Expand Up @@ -66,6 +67,30 @@ public void setTokenEndpointAuthSigningAlg(String tokenEndpointAuthSigningAlg) {
this.tokenEndpointAuthSigningAlg = tokenEndpointAuthSigningAlg;
}

/**
* Allow reuse of the private key JWT at the token endpoint.
*
* @param tokenEndpointAllowReusePvtKeyJwt Allow reuse of the private key JWT at the token endpoint.
* @return ClientAuthenticationConfiguration object.
**/
public ClientAuthenticationConfiguration tokenEndpointAllowReusePvtKeyJwt(
Boolean tokenEndpointAllowReusePvtKeyJwt) {

this.tokenEndpointAllowReusePvtKeyJwt = tokenEndpointAllowReusePvtKeyJwt;
return this;
}

@ApiModelProperty(example = "false", value = "")
@JsonProperty("tokenEndpointAllowReusePvtKeyJwt")
@Valid
public Boolean isTokenEndpointAllowReusePvtKeyJwt() {
return tokenEndpointAllowReusePvtKeyJwt;
}

public void setTokenEndpointAllowReusePvtKeyJwt(Boolean tokenEndpointAllowReusePvtKeyJwt) {
this.tokenEndpointAllowReusePvtKeyJwt = tokenEndpointAllowReusePvtKeyJwt;
}

/**
**/
public ClientAuthenticationConfiguration tlsClientAuthSubjectDn(String tlsClientAuthSubjectDn) {
Expand Down Expand Up @@ -94,14 +119,20 @@ public boolean equals(java.lang.Object o) {
return false;
}
ClientAuthenticationConfiguration clientAuthenticationConfiguration = (ClientAuthenticationConfiguration) o;
return Objects.equals(this.tokenEndpointAuthMethod, clientAuthenticationConfiguration.tokenEndpointAuthMethod) &&
Objects.equals(this.tokenEndpointAuthSigningAlg, clientAuthenticationConfiguration.tokenEndpointAuthSigningAlg) &&
Objects.equals(this.tlsClientAuthSubjectDn, clientAuthenticationConfiguration.tlsClientAuthSubjectDn);
return Objects.equals(this.tokenEndpointAuthMethod,
clientAuthenticationConfiguration.tokenEndpointAuthMethod) &&
Objects.equals(this.tokenEndpointAuthSigningAlg,
clientAuthenticationConfiguration.tokenEndpointAuthSigningAlg) &&
Objects.equals(this.tlsClientAuthSubjectDn, clientAuthenticationConfiguration.tlsClientAuthSubjectDn) &&
Objects.equals(this.tokenEndpointAllowReusePvtKeyJwt,
clientAuthenticationConfiguration.tokenEndpointAllowReusePvtKeyJwt);
}

@Override
public int hashCode() {
return Objects.hash(tokenEndpointAuthMethod, tokenEndpointAuthSigningAlg, tlsClientAuthSubjectDn);

return Objects.hash(tokenEndpointAuthMethod, tokenEndpointAuthSigningAlg, tokenEndpointAllowReusePvtKeyJwt,
tlsClientAuthSubjectDn);
}

@Override
Expand All @@ -112,6 +143,8 @@ public String toString() {

sb.append(" tokenEndpointAuthMethod: ").append(toIndentedString(tokenEndpointAuthMethod)).append("\n");
sb.append(" tokenEndpointAuthSigningAlg: ").append(toIndentedString(tokenEndpointAuthSigningAlg)).append("\n");
sb.append(" tokenEndpointAllowReusePvtKeyJwt: ").append(toIndentedString(tokenEndpointAllowReusePvtKeyJwt))
.append("\n");
sb.append(" tlsClientAuthSubjectDn: ").append(toIndentedString(tlsClientAuthSubjectDn)).append("\n");
sb.append("}");
return sb.toString();
Expand Down
29 changes: 29 additions & 0 deletions .../gen/java/org/wso2/carbon/identity/api/server/application/management/v1/OIDCMetaData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ public class OIDCMetaData {
private ClientAuthenticationMethodMetadata tokenEndpointAuthMethod;
private MetadataProperty tokenEndpointSignatureAlgorithm;
private MetadataProperty idTokenSignatureAlgorithm;
private Boolean tokenEndpointAllowReusePvtKeyJwt;
private MetadataProperty requestObjectSignatureAlgorithm;
private MetadataProperty requestObjectEncryptionAlgorithm;
private MetadataProperty requestObjectEncryptionMethod;
Expand Down Expand Up @@ -270,6 +271,31 @@ public void setTokenEndpointSignatureAlgorithm(MetadataProperty tokenEndpointSig
this.tokenEndpointSignatureAlgorithm = tokenEndpointSignatureAlgorithm;
}

/**
* Allow reuse of the private key JWT at the token endpoint.
*
* @param tokenEndpointAllowReusePvtKeyJwt Allow reuse of the private key JWT at the token endpoint.
* @return OIDCMetaData object.
**/
public OIDCMetaData tokenEndpointAllowReusePvtKeyJwt(Boolean tokenEndpointAllowReusePvtKeyJwt) {

this.tokenEndpointAllowReusePvtKeyJwt = tokenEndpointAllowReusePvtKeyJwt;
return this;
}

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

return tokenEndpointAllowReusePvtKeyJwt;
}

public void setTokenEndpointAllowReusePvtKeyJwt(Boolean tokenEndpointAllowReusePvtKeyJwt) {

this.tokenEndpointAllowReusePvtKeyJwt = tokenEndpointAllowReusePvtKeyJwt;
}

/**
**/
public OIDCMetaData idTokenSignatureAlgorithm(MetadataProperty idTokenSignatureAlgorithm) {
Expand Down Expand Up @@ -402,6 +428,7 @@ public boolean equals(java.lang.Object o) {
Objects.equals(this.accessTokenBindingType, oiDCMetaData.accessTokenBindingType) &&
Objects.equals(this.tokenEndpointAuthMethod, oiDCMetaData.tokenEndpointAuthMethod) &&
Objects.equals(this.tokenEndpointSignatureAlgorithm, oiDCMetaData.tokenEndpointSignatureAlgorithm) &&
Objects.equals(this.tokenEndpointAllowReusePvtKeyJwt, oiDCMetaData.tokenEndpointAllowReusePvtKeyJwt) &&
Objects.equals(this.tokenEndpointSignatureAlgorithm, oiDCMetaData.idTokenSignatureAlgorithm) &&
Objects.equals(this.tokenEndpointSignatureAlgorithm, oiDCMetaData.requestObjectSignatureAlgorithm) &&
Objects.equals(this.tokenEndpointSignatureAlgorithm, oiDCMetaData.requestObjectEncryptionAlgorithm) &&
Expand Down Expand Up @@ -433,6 +460,8 @@ public String toString() {
sb.append(" accessTokenBindingType: ").append(toIndentedString(accessTokenBindingType)).append("\n");
sb.append(" tokenEndpointAuthMethod: ").append(toIndentedString(tokenEndpointAuthMethod)).append("\n");
sb.append(" tokenEndpointSignatureAlgorithm: ").append(toIndentedString(tokenEndpointSignatureAlgorithm)).append("\n");
sb.append(" tokenEndpointAllowReusePvtKeyJwt: ").append(toIndentedString(tokenEndpointAllowReusePvtKeyJwt))
.append("\n");
sb.append(" idTokenSignatureAlgorithm: ").append(toIndentedString(idTokenSignatureAlgorithm)).append("\n");
sb.append(" requestObjectSignatureAlgorithm: ").append(toIndentedString(requestObjectSignatureAlgorithm)).append("\n");
sb.append(" requestObjectEncryptionAlgorithm: ").append(toIndentedString(requestObjectEncryptionAlgorithm)).append("\n");
Expand Down
3 changes: 3 additions & 0 deletions .../identity/api/server/application/management/v1/core/ServerApplicationMetadataService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,9 @@ public OIDCMetaData getOIDCMetadata() {
supportedClientAuthMethods.addAll(getClientAuthenticationMethods());
oidcMetaData.setTokenEndpointAuthMethod(
new ClientAuthenticationMethodMetadata().options(supportedClientAuthMethods));
boolean tokenEpAllowReusePvtKeyJwtDefaultValue = Boolean.parseBoolean(IdentityUtil
.getProperty(ApplicationManagementConstants.TOKEN_EP_ALLOW_REUSE_PVT_KEY_JWT_DEFAULT_VALUE));
oidcMetaData.setTokenEndpointAllowReusePvtKeyJwt(tokenEpAllowReusePvtKeyJwtDefaultValue);
List<String> tokenEpSigningAlgorithms = IdentityUtil
.getPropertyAsList(ApplicationManagementConstants.TOKEN_EP_SIGNATURE_ALGORITHMS_SUPPORTED);
oidcMetaData.setTokenEndpointSignatureAlgorithm(new MetadataProperty()
Expand Down
1 change: 1 addition & 0 deletions ...n/management/v1/core/functions/application/inbound/oauth2/ApiModelToOAuthConsumerApp.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,7 @@ private void updateClientAuthenticationConfigurations(OAuthConsumerAppDTO appDTO
if (clientAuthentication != null) {
appDTO.setTokenEndpointAuthMethod(clientAuthentication.getTokenEndpointAuthMethod());
appDTO.setTokenEndpointAuthSignatureAlgorithm(clientAuthentication.getTokenEndpointAuthSigningAlg());
appDTO.setTokenEndpointAllowReusePvtKeyJwt(clientAuthentication.isTokenEndpointAllowReusePvtKeyJwt());
appDTO.setTlsClientAuthSubjectDN(clientAuthentication.getTlsClientAuthSubjectDn());
}
}
Expand Down
1 change: 1 addition & 0 deletions ...n/management/v1/core/functions/application/inbound/oauth2/OAuthConsumerAppToApiModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,7 @@ private ClientAuthenticationConfiguration buildClientAuthenticationConfiguration
return new ClientAuthenticationConfiguration()
.tokenEndpointAuthMethod(appDTO.getTokenEndpointAuthMethod())
.tokenEndpointAuthSigningAlg(appDTO.getTokenEndpointAuthSignatureAlgorithm())
.tokenEndpointAllowReusePvtKeyJwt(appDTO.isTokenEndpointAllowReusePvtKeyJwt())
.tlsClientAuthSubjectDn(appDTO.getTlsClientAuthSubjectDN());
}

Expand Down
6 changes: 6 additions & 0 deletions ...carbon.identity.api.server.application.management.v1/src/main/resources/applications.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3729,6 +3729,9 @@ components:
tokenEndpointAuthMethod:
type: string
example: 'client_secret_basic'
tokenEndpointAllowReusePvtKeyJwt:
type: boolean
example: false
tokenEndpointAuthSigningAlg:
type: string
example: 'PS256'
Expand Down Expand Up @@ -3995,6 +3998,9 @@ components:
$ref: '#/components/schemas/MetadataProperty'
tokenEndpointAuthMethod:
$ref: '#/components/schemas/ClientAuthenticationMethodMetadata'
tokenEndpointAllowReusePvtKeyJwt:
type: boolean
default: false
tokenEndpointSignatureAlgorithm:
$ref: '#/components/schemas/MetadataProperty'
idTokenSignatureAlgorithm:
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -796,14 +796,14 @@
<findsecbugs-plugin.version>1.12.0</findsecbugs-plugin.version>
<maven.checkstyleplugin.excludes>**/gen/**/*</maven.checkstyleplugin.excludes>
<identity.event.handler.version>1.8.19</identity.event.handler.version>
<identity.inbound.oauth2.version>7.0.103</identity.inbound.oauth2.version>
<identity.inbound.oauth2.version>7.0.114</identity.inbound.oauth2.version>
<identity.inbound.saml2.version>5.11.41</identity.inbound.saml2.version>
<commons.beanutils.version>1.9.4</commons.beanutils.version>
<mavan.findbugsplugin.exclude.file>findbugs-exclude-filter.xml</mavan.findbugsplugin.exclude.file>
<carbon.kernel.version>4.9.17</carbon.kernel.version>
<carbon.multitenancy.version>4.9.10</carbon.multitenancy.version>
<org.wso2.carbon.identity.remotefetch.version>0.7.12</org.wso2.carbon.identity.remotefetch.version>
<org.wso2.carbon.identity.oauth2.token.handler.clientauth.jwt.version>2.4.21</org.wso2.carbon.identity.oauth2.token.handler.clientauth.jwt.version>
<org.wso2.carbon.identity.oauth2.token.handler.clientauth.jwt.version>2.5.13</org.wso2.carbon.identity.oauth2.token.handler.clientauth.jwt.version>
<org.wso2.carbon.logging.service.version>4.10.7</org.wso2.carbon.logging.service.version>
<org.wso2.carbon.event.publisher.version>5.2.15</org.wso2.carbon.event.publisher.version>
<identity.branding.preference.management.version>1.1.1</identity.branding.preference.management.version>
Expand Down
Loading