[java-plugin-shibd-oidc] branch main updated: Fix cookie names

[Codeberg]

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

codeberg pushed a commit to branch main
in repository java-plugin-shibd-oidc.

View the commit online:
https://codeberg.org/Shibboleth/java-plugin-shibd-oidc/commit/f6458f0ff125524a79856784480b30ce0646ac57

The following commit(s) were added to refs/heads/main by this push:
     new f6458f0  Fix cookie names
f6458f0 is described below

commit f6458f0ff125524a79856784480b30ce0646ac57
Author: Phil Smart <philip.smart at jisc.ac.uk>
AuthorDate: Fri Feb 6 17:44:04 2026 +0000

    Fix cookie names
    
     - even if we do not use the CookieManager for state cookie long term,
    at least for now fix the names.
---
 .../net/shibboleth/idp/flows/sp/consumer/oidc/oidc-beans.xml     | 4 ++--
 .../net/shibboleth/idp/flows/sp/initiator/oidc/oidc-beans.xml    | 9 +++++----
 .../net/shibboleth/idp/flows/sp/initiator/oidc/oidc-flow.xml     | 2 +-
 .../test/java/net/shibboleth/sp/oidc/flows/TestConstants.java    | 6 +++---
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/sp-oidc-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/consumer/oidc/oidc-beans.xml b/sp-oidc-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/consumer/oidc/oidc-beans.xml
index 21bff5c..82db963 100644
--- a/sp-oidc-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/consumer/oidc/oidc-beans.xml
+++ b/sp-oidc-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/consumer/oidc/oidc-beans.xml
@@ -42,7 +42,7 @@
     
     <bean id="ProcessNonceCorrelationCookie" class="net.shibboleth.sp.oidc.profile.impl.ProcessStateCookie" scope="prototype"
         p:cookieManager-ref="shibboleth.sp.RemotedCookieManager"
-        p:cookiePrefix="%{sp.correlation.cookiePrefix:__Host-_shibsp_req_}"
+        p:cookiePrefix="%{sp.correlation.cookiePrefix:__Host-shibsp_req_}"
         p:createOutputObjects="true"
         p:errorFatal="true"
         p:stateTokenLookupStrategy-ref="StateFromStateLookup">
@@ -54,7 +54,7 @@
     <!-- TODO should this be a cookie or go through the state manager-->
     <bean id="ProcessAuthnStateCookie" class="net.shibboleth.sp.oidc.profile.impl.ProcessStateCookie" scope="prototype"
         p:cookieManager-ref="shibboleth.sp.RemotedCookieManager"
-        p:cookiePrefix="%{sp.correlation.cookiePrefix:__Host-_shibsp_authnstate_}"
+        p:cookiePrefix="%{sp.authnstate.cookiePrefix:__Host-shibsp_authnstate_}"
         p:createOutputObjects="true"
         p:errorFatal="true"
         p:stateTokenLookupStrategy-ref="StateFromStateLookup">
diff --git a/sp-oidc-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/initiator/oidc/oidc-beans.xml b/sp-oidc-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/initiator/oidc/oidc-beans.xml
index 2b03136..f4c0477 100644
--- a/sp-oidc-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/initiator/oidc/oidc-beans.xml
+++ b/sp-oidc-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/initiator/oidc/oidc-beans.xml
@@ -307,7 +307,7 @@
     <!-- TODO not having a state token to issue a correlation cookie has been set to fatal  -->
     <bean id="IssueNonceCorrelationCookie" class="net.shibboleth.sp.oidc.profile.impl.IssueStateCookie" scope="prototype"
         p:cookieManager-ref="shibboleth.sp.RemotedCookieManager"
-        p:cookiePrefix="#{'%{sp.correlation.cookiePrefix:__Host-_shibsp_req_}'.trim()}"
+        p:cookiePrefix="#{'%{sp.correlation.cookiePrefix:__Host-shibsp_req_}'.trim()}"
         p:createOutputObjects="true"
         p:errorFatal="%{sp.stateToken.errorsFatal:true}" 
         p:stateValueLookupStrategy-ref="NonceFromStateStrategy" />
@@ -326,15 +326,16 @@
         </constructor-arg>
     </bean>
       
-   <!-- Issue a cookie with state information that is needs to be recovered to validate the response -->
+   <!-- Issue a cookie with state information that is needed to be recovered to validate the response -->
    <bean id="IssueAuthnStateCookie" class="net.shibboleth.sp.oidc.profile.impl.IssueStateCookie" scope="prototype"
         p:cookieManager-ref="shibboleth.sp.RemotedCookieManager"
-        p:cookiePrefix="#{'%{sp.correlation.cookiePrefix:__Host-_shibsp__authnstate_}'.trim()}"
+        p:cookiePrefix="#{'%{sp.authnstate.cookiePrefix:__Host-shibsp_authnstate_}'.trim()}"
         p:createOutputObjects="true"
         p:errorFatal="%{sp.stateToken.errorsFatal:true}" 
         p:stateValueLookupStrategy-ref="AuthenticationRequestStateForStorageStrategy" />
         
- <!--  <bean id="MapAuthenticationStateToStateToken" class="net.shibboleth.sp.oidc.profile.impl.MapStateToStateToken" scope="prototype"
+        <!--  TODO TRIAL -->
+    <!-- <bean id="MapAuthenticationStateToStateToken" class="net.shibboleth.sp.oidc.profile.impl.MapStateToStateToken" scope="prototype"
         p:createOutputObjects="true"
         p:errorFatal="%{sp.stateToken.errorsFatal:false}" /> -->
         
diff --git a/sp-oidc-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/initiator/oidc/oidc-flow.xml b/sp-oidc-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/initiator/oidc/oidc-flow.xml
index 7e75a35..6848e2f 100644
--- a/sp-oidc-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/initiator/oidc/oidc-flow.xml
+++ b/sp-oidc-conf-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/sp/initiator/oidc/oidc-flow.xml
@@ -55,9 +55,9 @@
     
     <action-state id="BuildOutboundMessage">    
         <evaluate expression="HandleOutboundMessage" />
+        <!-- <evaluate expression="MapAuthenticationStateToStateToken"/> TRIAL -->
         <evaluate expression="IssueNonceCorrelationCookie" />
         <evaluate expression="IssueAuthnStateCookie" />
-        <!-- <evaluate expression="MapAuthenticationStateToStateToken"/> -->
         <evaluate expression="EncodeMessage" />
         <evaluate expression="'proceed'" />
          
diff --git a/sp-oidc-conf-impl/src/test/java/net/shibboleth/sp/oidc/flows/TestConstants.java b/sp-oidc-conf-impl/src/test/java/net/shibboleth/sp/oidc/flows/TestConstants.java
index c6704bc..c8ff091 100644
--- a/sp-oidc-conf-impl/src/test/java/net/shibboleth/sp/oidc/flows/TestConstants.java
+++ b/sp-oidc-conf-impl/src/test/java/net/shibboleth/sp/oidc/flows/TestConstants.java
@@ -96,7 +96,7 @@ public final class TestConstants {
      * <pre>
      * __Host-_shibsp_req_{state}={nonce};
      * __Host-shibsp_state__{appId}_{state}={targetURL};
-     * __Host-_shibsp_authnstate_{state}={authn_request_json};
+     * __Host-shibsp_authnstate_{state}={authn_request_json};
      * </pre>
      * 
      * @param state the state used for mapping response to the stored headers
@@ -117,10 +117,10 @@ public final class TestConstants {
 
         // Compose the header with semicolons and spacing as in the example
         final StringBuilder sb = new StringBuilder();
-        sb.append("__Host-_shibsp_req_").append(state).append('=').append(nonce).append(";\n");
+        sb.append("__Host-shibsp_req_").append(state).append('=').append(nonce).append(";\n");
         sb.append("__Host-shibsp_state__").append(appID).append('_').append(state)
           .append('=').append(targetUrlB64).append("; \n");
-        sb.append("__Host-_shibsp_authnstate_").append(state).append('=').append(authnJsonEnc).append(";\n");
+        sb.append("__Host-shibsp_authnstate_").append(state).append('=').append(authnJsonEnc).append(";\n");
         System.out.println(sb.toString());
         return sb.toString().getBytes("UTF-8");
         

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