[java-idp-plugin-oidc-config] branch main updated: JOIDC-152 - Implement maximum refresh time and/or maximum refresh uses.

[Henri Mikkonen]

This is an automated email from the git hooks/post-receive script.

hjmikkon pushed a commit to branch main
in repository java-idp-plugin-oidc-config.

View the commit online:
http://git.shibboleth.net/view/?p=java-idp-plugin-oidc-config.git;a=commit;h=4bca00e7690ce49babaea531eae2d3547a82c446

The following commit(s) were added to refs/heads/main by this push:
     new 4bca00e  JOIDC-152 - Implement maximum refresh time and/or maximum refresh uses.
4bca00e is described below

commit 4bca00e7690ce49babaea531eae2d3547a82c446
Author: Henri Mikkonen <henri.mikkonen at iki.fi>
AuthorDate: Wed May 3 12:31:56 2023 +0300

    JOIDC-152 - Implement maximum refresh time and/or maximum refresh uses.
    
    https://shibboleth.atlassian.net/browse/JOIDC-152
    
    Log deprecation warning if 'idp.oidc.refreshToken.defaultLifetime' property is set in the environment
    Still use it as a backup for the new 'idp.oidc.refreshToken.defaultTimeout' property
---
 .../resources/META-INF/net.shibboleth.idp/postconfig.xml     | 12 ++++++++++++
 .../net/shibboleth/idp/service/relying-party/postconfig.xml  |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/oidc-config-impl/src/main/resources/META-INF/net.shibboleth.idp/postconfig.xml b/oidc-config-impl/src/main/resources/META-INF/net.shibboleth.idp/postconfig.xml
index b2ca4eb..4ecac14 100644
--- a/oidc-config-impl/src/main/resources/META-INF/net.shibboleth.idp/postconfig.xml
+++ b/oidc-config-impl/src/main/resources/META-INF/net.shibboleth.idp/postconfig.xml
@@ -25,4 +25,16 @@
         p:httpClient="#{getObject('shibboleth.oidc.NonBrowser.HttpClient') ?: getObject('shibboleth.InternalHttpClient')}"
         p:httpClientSecurityParameters="#{getObject('shibboleth.oidc.NonBrowser.HttpClientSecurityParameters')}" />
 
+    <bean class="net.shibboleth.idp.spring.DeprecatedPropertyBean">
+        <property name="deprecatedProperties">
+            <map>
+                <entry key="idp.oidc.refreshToken.defaultLifetime" value="idp.oidc.refreshToken.defaultTimeout" />
+             </map>
+        </property>
+        <property name="deadProperties">
+            <list>
+            </list>
+        </property>
+    </bean>
+
 </beans>
\ No newline at end of file
diff --git a/oidc-config-impl/src/main/resources/META-INF/net/shibboleth/idp/service/relying-party/postconfig.xml b/oidc-config-impl/src/main/resources/META-INF/net/shibboleth/idp/service/relying-party/postconfig.xml
index 868b6f4..b2b2f80 100644
--- a/oidc-config-impl/src/main/resources/META-INF/net/shibboleth/idp/service/relying-party/postconfig.xml
+++ b/oidc-config-impl/src/main/resources/META-INF/net/shibboleth/idp/service/relying-party/postconfig.xml
@@ -46,7 +46,7 @@
         p:iDTokenLifetime="%{idp.oidc.idToken.defaultLifetime:PT1H}"
         p:accessTokenType="%{idp.oauth2.accessToken.type:}"
         p:accessTokenLifetime="%{idp.oidc.accessToken.defaultLifetime:PT10M}"
-        p:refreshTokenTimeout="%{idp.oidc.refreshToken.defaultTimeout:PT2H}"
+        p:refreshTokenTimeout="%{idp.oidc.refreshToken.defaultTimeout:%{idp.oidc.refreshToken.defaultLifetime:PT2H}}"
         p:refreshTokenChainLifetime="%{idp.oidc.refreshToken.defaultChainLifetime:PT2H}"
         p:alwaysIncludedAttributes="%{idp.oidc.alwaysIncludedAttributes:}"        
         p:tokenEndpointAuthMethod="%{idp.oidc.rp.client.authenticationMethod:client_secret_basic}"

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.