Skip to content

Commit a5e608b

Browse files
dushaniwdushaniw
committed
Merge branch 'master' of github.com:wso2-extensions/identity-inbound-auth-oauth into new-claim-token-persist
2 parents 77a57ce + 83dc470 commit a5e608b

File tree

67 files changed

+3155
-162
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+3155
-162
lines changed

‎components/org.wso2.carbon.identity.api.server.dcr/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
<parent>
66
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
77
<artifactId>identity-inbound-auth-oauth</artifactId>
8-
<version>6.11.162-SNAPSHOT</version>
8+
<version>6.11.172-SNAPSHOT</version>
99
<relativePath>../..</relativePath>
1010
</parent>
1111

1212
<artifactId>org.wso2.carbon.identity.api.server.dcr</artifactId>
13-
<version>6.11.162-SNAPSHOT</version>
13+
<version>6.11.172-SNAPSHOT</version>
1414
<name>WSO2 Carbon - User DCR Rest API</name>
1515
<description>WSO2 Carbon - User DCR Rest API</description>
1616

‎components/org.wso2.carbon.identity.api.server.dcr/src/gen/java/org/wso2/carbon/identity/oauth2/dcr/endpoint/dto/ApplicationDTO.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ public class ApplicationDTO {
4848
private String subjectType = null;
4949
private String requestObjectEncryptionAlgorithm = null;
5050
private String requestObjectEncryptionMethod = null;
51+
private String softwareStatement = null;
5152

5253

5354
/**
@@ -264,6 +265,16 @@ public void setRequestObjectEncryptionMethod(String requestObjectEncryptionMetho
264265
this.requestObjectEncryptionMethod = requestObjectEncryptionMethod;
265266
}
266267

268+
@ApiModelProperty(value = "")
269+
@JsonProperty("software_statement")
270+
public String getSoftwareStatement() {
271+
return softwareStatement;
272+
}
273+
274+
public void setSoftwareStatement(String softwareStatement) {
275+
this.softwareStatement = softwareStatement;
276+
}
277+
267278
@Override
268279
public String toString() {
269280
StringBuilder sb = new StringBuilder();

‎components/org.wso2.carbon.identity.api.server.dcr/src/main/java/org/wso2/carbon/identity/oauth2/dcr/endpoint/util/DCRMUtils.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,10 @@ public static void handleErrorResponse(DCRMException dcrmException, Log log) thr
159159
status = Response.Status.UNAUTHORIZED;
160160
} else if (errorCode.startsWith(FORBIDDEN_STATUS)) {
161161
status = Response.Status.FORBIDDEN;
162+
} else if (errorCode.startsWith(DCRMConstants.ErrorCodes.INVALID_CLIENT_METADATA) ||
163+
errorCode.startsWith(DCRMConstants.ErrorCodes.INVALID_SOFTWARE_STATEMENT)) {
164+
status = Response.Status.BAD_REQUEST;
165+
isStatusOnly = false;
162166
}
163167
}
164168
throw buildDCRMEndpointException(status, errorCode, dcrmException.getMessage(), isStatusOnly);
@@ -229,6 +233,7 @@ public static ApplicationDTO getApplicationDTOFromApplication(Application applic
229233
applicationDTO.setRequestObjectEncryptionMethod(application.getRequestObjectEncryptionMethod());
230234
applicationDTO.setRequirePushAuthorizationRequest(application.isRequirePushedAuthorizationRequests());
231235
applicationDTO.setTlsClientCertificateBoundAccessToken(application.isTlsClientCertificateBoundAccessTokens());
236+
applicationDTO.setSoftwareStatement(application.getSoftwareStatement());
232237
return applicationDTO;
233238
}
234239

@@ -265,6 +270,9 @@ private static DCRMEndpointException buildDCRMEndpointException(Response.Status
265270
if (code.equals(DCRMConstants.ErrorMessages.BAD_REQUEST_INVALID_REDIRECT_URI.toString())) {
266271
error = DCRMConstants.ErrorCodes.INVALID_REDIRECT_URI;
267272
}
273+
if (code.equals(DCRMConstants.ErrorCodes.INVALID_SOFTWARE_STATEMENT)) {
274+
error = DCRMConstants.ErrorCodes.INVALID_SOFTWARE_STATEMENT;
275+
}
268276

269277
ErrorDTO errorDTO = new ErrorDTO();
270278
errorDTO.setError(error);

‎components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
<parent>
66
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
77
<artifactId>identity-inbound-auth-oauth</artifactId>
8-
<version>6.11.162-SNAPSHOT</version>
8+
<version>6.11.172-SNAPSHOT</version>
99
<relativePath>../..</relativePath>
1010
</parent>
1111

1212
<artifactId>org.wso2.carbon.identity.api.server.oauth.scope</artifactId>
13-
<version>6.11.162-SNAPSHOT</version>
13+
<version>6.11.172-SNAPSHOT</version>
1414

1515
<name>WSO2 Carbon - Identity OAuth 2.0 Scope Rest APIs</name>
1616
<description>Rest APIs for OAuth 2.0 Scope Handling</description>

‎components/org.wso2.carbon.identity.discovery/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
2222
<artifactId>identity-inbound-auth-oauth</artifactId>
2323
<relativePath>../../pom.xml</relativePath>
24-
<version>6.11.162-SNAPSHOT</version>
24+
<version>6.11.172-SNAPSHOT</version>
2525
</parent>
2626

2727
<modelVersion>4.0.0</modelVersion>

‎components/org.wso2.carbon.identity.oauth.ciba/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<artifactId>identity-inbound-auth-oauth</artifactId>
2222
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
23-
<version>6.11.162-SNAPSHOT</version>
23+
<version>6.11.172-SNAPSHOT</version>
2424
<relativePath>../../pom.xml</relativePath>
2525
</parent>
2626

‎components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
2323
<artifactId>identity-inbound-auth-oauth</artifactId>
2424
<relativePath>../../pom.xml</relativePath>
25-
<version>6.11.162-SNAPSHOT</version>
25+
<version>6.11.172-SNAPSHOT</version>
2626
</parent>
2727

2828
<modelVersion>4.0.0</modelVersion>

‎components/org.wso2.carbon.identity.oauth.common/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
2424
<artifactId>identity-inbound-auth-oauth</artifactId>
2525
<relativePath>../../pom.xml</relativePath>
26-
<version>6.11.162-SNAPSHOT</version>
26+
<version>6.11.172-SNAPSHOT</version>
2727
</parent>
2828

2929
<modelVersion>4.0.0</modelVersion>

‎components/org.wso2.carbon.identity.oauth.common/src/main/java/org/wso2/carbon/identity/oauth/common/OAuthConstants.java

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,8 +228,33 @@ public static SubjectType fromValue(String text) {
228228
public static final String ORG_ID = "org_id";
229229
public static final String IS_FAPI_CONFORMANT_APP = "isFAPIConformant";
230230
public static final String ENABLE_FAPI = "OAuth.OpenIDConnect.FAPI.EnableFAPIValidation";
231-
public static final String IS_THIRD_PARTY_APP = "isThirdPartyApp";
231+
public static final String ENABLE_DCR_FAPI_ENFORCEMENT = "OAuth.DCRM.EnableFAPIEnforcement";
232+
public static final String FAPI_CLIENT_AUTH_METHOD_CONFIGURATION = "OAuth.OpenIDConnect.FAPI." +
233+
"AllowedClientAuthenticationMethods.AllowedClientAuthenticationMethod";
234+
public static final String FAPI_SIGNATURE_ALGORITHM_CONFIGURATION = "OAuth.OpenIDConnect.FAPI." +
235+
"AllowedSignatureAlgorithms.AllowedSignatureAlgorithm";
236+
public static final String VALIDATE_SECTOR_IDENTIFIER = "OAuth.DCRM.EnableSectorIdentifierURIValidation";
237+
public static final String TOKEN_EP_SIGNATURE_ALG_CONFIGURATION = "OAuth.OpenIDConnect" +
238+
".SupportedTokenEndpointSigningAlgorithms.SupportedTokenEndpointSigningAlgorithm";
239+
public static final String ID_TOKEN_SIGNATURE_ALG_CONFIGURATION = "OAuth.OpenIDConnect" +
240+
".SupportedIDTokenSigningAlgorithms.SupportedIDTokenSigningAlgorithm";
241+
public static final String REQUEST_OBJECT_SIGNATURE_ALG_CONFIGURATION = "OAuth.OpenIDConnect" +
242+
".SupportedRequestObjectSigningAlgorithms.SupportedRequestObjectSigningAlgorithm";
243+
public static final String ID_TOKEN_ENCRYPTION_ALGORITHM = "OAuth.OpenIDConnect." +
244+
"SupportedIDTokenEncryptionAlgorithms.SupportedIDTokenEncryptionAlgorithm";
245+
public static final String REQUEST_OBJECT_ENCRYPTION_ALGORITHM = "OAuth.OpenIDConnect." +
246+
"SupportedRequestObjectEncryptionAlgorithms.SupportedRequestObjectEncryptionAlgorithm";
247+
public static final String ID_TOKEN_ENCRYPTION_METHOD = "OAuth.OpenIDConnect.SupportedIDTokenEncryptionMethods." +
248+
"SupportedIDTokenEncryptionMethod";
249+
public static final String REQUEST_OBJECT_ENCRYPTION_METHOD = "OAuth.OpenIDConnect." +
250+
"SupportedRequestObjectEncryptionMethods.SupportedRequestObjectEncryptionMethod";
251+
public static final String IS_PUSH_AUTHORIZATION_REQUEST = "isPushAuthorizationRequest";
252+
232253

254+
public static final String IS_THIRD_PARTY_APP = "isThirdPartyApp";
255+
public static final String PRIVATE_KEY_JWT = "private_key_jwt";
256+
public static final String TLS_CLIENT_AUTH = "tls_client_auth";
257+
public static final String RESTRICTED_ENCRYPTION_ALGORITHM = "RSA1_5";
233258

234259
private OAuthConstants() {
235260

@@ -601,6 +626,8 @@ public static class SignatureAlgorithms {
601626
public static final String SHA1 = "SHA-1";
602627
public static final String KID_HASHING_ALGORITHM = SHA256;
603628
public static final String PREVIOUS_KID_HASHING_ALGORITHM = SHA1;
629+
public static final String PS256 = "PS256";
630+
public static final String ES256 = "ES256";
604631

605632
private SignatureAlgorithms() {
606633

‎components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
77
<artifactId>identity-inbound-auth-oauth</artifactId>
88
<relativePath>../../pom.xml</relativePath>
9-
<version>6.11.162-SNAPSHOT</version>
9+
<version>6.11.172-SNAPSHOT</version>
1010
</parent>
1111

1212
<modelVersion>4.0.0</modelVersion>

0 commit comments

Comments
 (0)