diff --git a/docker-jans-persistence-loader/templates/jans-auth/jans-auth-config.ob.json b/docker-jans-persistence-loader/templates/jans-auth/jans-auth-config.ob.json index d98a037ebd7..677be9d7d6e 100644 --- a/docker-jans-persistence-loader/templates/jans-auth/jans-auth-config.ob.json +++ b/docker-jans-persistence-loader/templates/jans-auth/jans-auth-config.ob.json @@ -221,7 +221,6 @@ "dcrSignatureValidationJwks": null, "dcrSignatureValidationJwksUri": null, "dcrAuthorizationWithClientCredentials": false, - "dcrSkipSignatureValidation": true, "dcrAuthorizationWithMTLS": false, "softwareStatementValidationType": "script", "softwareStatementValidationClaimName": "jwks_uri", diff --git a/jans-auth-server/model/src/main/java/io/jans/as/model/configuration/AppConfiguration.java b/jans-auth-server/model/src/main/java/io/jans/as/model/configuration/AppConfiguration.java index c48f4028d27..78b1e8e84c8 100644 --- a/jans-auth-server/model/src/main/java/io/jans/as/model/configuration/AppConfiguration.java +++ b/jans-auth-server/model/src/main/java/io/jans/as/model/configuration/AppConfiguration.java @@ -254,7 +254,6 @@ public class AppConfiguration implements Configuration { private String dcrSignatureValidationJwks; private String dcrSignatureValidationJwksUri; private Boolean dcrAuthorizationWithClientCredentials = false; - private Boolean dcrSkipSignatureValidation = false; private Boolean dcrAuthorizationWithMTLS = false; private List dcrIssuers = new ArrayList<>(); @@ -630,15 +629,6 @@ public void setFapiCompatibility(Boolean fapiCompatibility) { this.fapiCompatibility = fapiCompatibility; } - public Boolean getDcrSkipSignatureValidation() { - if (dcrSkipSignatureValidation == null) dcrSkipSignatureValidation = false; - return dcrSkipSignatureValidation; - } - - public void setDcrSkipSignatureValidation(Boolean dcrSkipSignatureValidation) { - this.dcrSkipSignatureValidation = dcrSkipSignatureValidation; - } - public Boolean getDcrAuthorizationWithClientCredentials() { if (dcrAuthorizationWithClientCredentials == null) dcrAuthorizationWithClientCredentials = false; return dcrAuthorizationWithClientCredentials; diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/register/ws/rs/RegisterValidator.java b/jans-auth-server/server/src/main/java/io/jans/as/server/register/ws/rs/RegisterValidator.java index 21540f1a96a..5de012fff2c 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/register/ws/rs/RegisterValidator.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/register/ws/rs/RegisterValidator.java @@ -87,9 +87,6 @@ public void validateRequestObject(String requestParams, JSONObject softwareState if (isFalse(appConfiguration.getDcrSignatureValidationEnabled())) { return; } - if (isTrue(appConfiguration.getDcrSkipSignatureValidation())) { - return; - } final Jwt jwt = Jwt.parseOrThrow(requestParams); final SignatureAlgorithm signatureAlgorithm = jwt.getHeader().getSignatureAlgorithm(); diff --git a/jans-config-api/docs/jans-config-api-swagger.yaml b/jans-config-api/docs/jans-config-api-swagger.yaml index afa55145ee1..288456fba42 100644 --- a/jans-config-api/docs/jans-config-api-swagger.yaml +++ b/jans-config-api/docs/jans-config-api-swagger.yaml @@ -4713,9 +4713,6 @@ components: dcrAuthorizationWithClientCredentials: type: boolean description: Boolean value indicating if DCR authorization to be performed using client credentials. - dcrSkipSignatureValidation: - type: boolean - description: Boolean value indicating if signature validation is to be skipped. statTimerIntervalInSeconds: type: integer description: Statistical data capture time interval. diff --git a/jans-config-api/server/src/test/resources/feature/config/properties/properties.feature b/jans-config-api/server/src/test/resources/feature/config/properties/properties.feature index b70e92bb5ce..db9c9c33a54 100644 --- a/jans-config-api/server/src/test/resources/feature/config/properties/properties.feature +++ b/jans-config-api/server/src/test/resources/feature/config/properties/properties.feature @@ -280,27 +280,7 @@ Feature: Verify Auth configuration endpoint When method PATCH Then status 200 And print response - - @ignore - @auth-config-patch-dcrSkipSignatureValidation -field - Scenario: Patch dcrSkipSignatureValidation Auth configuration - Given url mainUrl - And header Authorization = 'Bearer ' + accessToken - When method GET - Then status 200 - And print response - And assert response.length != null - Given url mainUrl - And header Authorization = 'Bearer ' + accessToken - And header Content-Type = 'application/json-patch+json' - And header Accept = 'application/json' - And def request_body = (response.dcrSkipSignatureValidation == null ? "[ {\"op\":\"add\", \"path\": \"/dcrSkipSignatureValidation\", \"value\":null } ]" : "[ {\"op\":\"replace\", \"path\": \"/dcrSkipSignatureValidation\", \"value\":"+response.dcrSkipSignatureValidation+"} ]") - And print 'request_body ='+request_body - And request request_body - When method PATCH - Then status 200 - And print response - + @ignore @auth-config-patch-allowIdTokenWithoutImplicitGrantType Scenario: Patch allowIdTokenWithoutImplicitGrantType Auth configuration diff --git a/jans-linux-setup/jans_setup/openbanking/templates/jans-auth/jans-auth-config.json b/jans-linux-setup/jans_setup/openbanking/templates/jans-auth/jans-auth-config.json index 3e9feb8b93a..5dd35fc8bf9 100644 --- a/jans-linux-setup/jans_setup/openbanking/templates/jans-auth/jans-auth-config.json +++ b/jans-linux-setup/jans_setup/openbanking/templates/jans-auth/jans-auth-config.json @@ -222,7 +222,6 @@ "dcrSignatureValidationJwks": null, "dcrSignatureValidationJwksUri": null, "dcrAuthorizationWithClientCredentials": false, - "dcrSkipSignatureValidation": true, "dcrAuthorizationWithMTLS": false, "softwareStatementValidationType": "script", "softwareStatementValidationClaimName": "jwks_uri",