Merge pull request #4811 from Yoshani/master

Add config for request uri expiry time
wso2 · Aug 8, 2023 · b7b6f12 · b7b6f12
2 parents 1dce578 + 2713122
commit b7b6f12
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 0 deletions.
diff --git a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/identity.xml b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/identity.xml
@@ -582,6 +582,14 @@
             <KeySet>BCDFGHJKLMNPQRSTVWXYZbcdfghjklmnpqrstvwxyz23456789</KeySet>
         </DeviceCodeGrant>
 
+        <!--
+            Configs related to OAuth2 Pushed Authorization Requests.
+            Supported versions: IS 6.2.0 onwards.
+        -->
+        <PAR>
+            <ExpiryTime>60</ExpiryTime>
+        </PAR>
+
         <!-- Configs related to OAuth2 token persistence -->
         <TokenPersistence>
             <Enable>true</Enable>

diff --git a/...ures/identity-core/org.wso2.carbon.identity.core.server.feature/resources/identity.xml.j2 b/...ures/identity-core/org.wso2.carbon.identity.core.server.feature/resources/identity.xml.j2
@@ -836,6 +836,14 @@
           <KeySet>{{oauth.grant_type.device_code.key_set}}</KeySet>
         </DeviceCodeGrant>
 
+        <!--
+            Configs related to OAuth2 Pushed Authorization Requests.
+            Supported versions: IS 6.2.0 onwards.
+        -->
+        <PAR>
+            <ExpiryTime>{{oauth.par.expiry_time}}</ExpiryTime>
+        </PAR>
+
         <!--
             Config related to display name in Authorization Code Grant consent page.
             Default value : false

diff --git a/...y.core.server.feature/resources/org.wso2.carbon.identity.core.server.feature.default.json b/...y.core.server.feature/resources/org.wso2.carbon.identity.core.server.feature.default.json
@@ -159,6 +159,7 @@
   "oauth.grant_type.device_code.expiry_time": "10m",
   "oauth.grant_type.device_code.polling_interval": "5s",
   "oauth.grant_type.device_code.key_set": "BCDFGHJKLMNPQRSTVWXYZbcdfghjklmnpqrstvwxyz23456789",
+  "oauth.par.expiry_time": "60s",
   "oauth.grant_type.token_exchange.grant_handler": "org.wso2.carbon.identity.oauth2.grant.token.exchange.TokenExchangeGrantHandler",
   "oauth.grant_type.token_exchange.grant_validator": "org.wso2.carbon.identity.oauth2.grant.token.exchange.TokenExchangeGrantValidator",
   "oauth.grant_type.token_exchange.enable": true,

diff --git a/...e.server.feature/resources/org.wso2.carbon.identity.core.server.feature.unit-resolve.json b/...e.server.feature/resources/org.wso2.carbon.identity.core.server.feature.unit-resolve.json
@@ -78,6 +78,7 @@
     "oauth.token.validation.validation_response_jwt_validity": "m",
     "oauth.grant_type.device_code.expiry_time": "ms",
     "oauth.grant_type.device_code.polling_interval": "ms",
+    "oauth.par.expiry_time": "s",
 
     "authentication.adaptive.http_connections.default_timeout": "ms",
     "authentication.adaptive.http_connections.connection_timeout": "ms",