[java-idp-oidc] branch main updated: JOIDC-215 - Prefix form_post response parameter keys in Velocity context

[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-oidc.

View the commit online:
http://git.shibboleth.net/view/?p=java-idp-oidc.git;a=commit;h=4205dd1f3a8cfcd5ad13d09606e7a63999b69f65

The following commit(s) were added to refs/heads/main by this push:
     new 4205dd1f JOIDC-215 - Prefix form_post response parameter keys in Velocity context
4205dd1f is described below

commit 4205dd1f3a8cfcd5ad13d09606e7a63999b69f65
Author: Henri Mikkonen <henri.mikkonen at iki.fi>
AuthorDate: Wed Jun 12 10:47:52 2024 +0300

    JOIDC-215 - Prefix form_post response parameter keys in Velocity context
    
    https://shibboleth.atlassian.net/browse/JOIDC-215
    
    Use 'parameter_' -prefix for the response message parameters
---
 .../op/encoding/impl/NimbusResponseEncoder.java    |  2 +-
 .../src/main/resources/templates/oidc-form-post.vm | 27 ++++++++--------------
 2 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/encoding/impl/NimbusResponseEncoder.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/encoding/impl/NimbusResponseEncoder.java
index 1af2b5a8..07f65a13 100644
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/encoding/impl/NimbusResponseEncoder.java
+++ b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/encoding/impl/NimbusResponseEncoder.java
@@ -155,7 +155,7 @@ public class NimbusResponseEncoder extends AbstractHttpServletResponseMessageEnc
     private VelocityContext doPostEncode(@Nonnull final AuthorizationResponse message) {
         final VelocityContext context = new VelocityContext();
         for (final Entry<String, List<String>> entry : message.toParameters().entrySet()) {
-            context.put(entry.getKey(), entry.getValue().get(0));
+            context.put("parameter_" + entry.getKey(), entry.getValue().get(0));
         }
         context.put("action", HTMLEncoder.encodeForHTMLAttribute(message.getRedirectionURI().toString()));
         if (cspDigester != null) {
diff --git a/idp-oidc-extension-impl/src/main/resources/templates/oidc-form-post.vm b/idp-oidc-extension-impl/src/main/resources/templates/oidc-form-post.vm
index eb62b0d8..a80873f4 100644
--- a/idp-oidc-extension-impl/src/main/resources/templates/oidc-form-post.vm
+++ b/idp-oidc-extension-impl/src/main/resources/templates/oidc-form-post.vm
@@ -22,24 +22,15 @@
 
     <form action="${action}" method="post">
         <div>
-            #if($code)
-            <input type="hidden" name="code" value="${code}" />#end #if($state)
-
-            <input type="hidden" name="state" value="${state}" />#end #if($access_token)
-
-            <input type="hidden" name="access_token" value="${access_token}" />#end #if($token_type)
-
-            <input type="hidden" name="token_type" value="${token_type}" />#end #if($id_token)
-
-            <input type="hidden" name="id_token" value="${id_token}" />#end #if($expires_in)
-
-            <input type="hidden" name="expires_in" value="${expires_in}" />#end #if($error)
-
-            <input type="hidden" name="error" value="${error}" />#end #if($error_description)
-
-            <input type="hidden" name="error_description" value="${error_description}" />#end #if($error_uri)
-
-            <input type="hidden" name="error_uri" value="${error_uri}" />#end
+            #if($parameter_code)<input type="hidden" name="code" value="${parameter_code}" />#end
+            #if($parameter_state)<input type="hidden" name="state" value="${parameter_state}" />#end
+            #if($parameter_access_token)<input type="hidden" name="access_token" value="${parameter_access_token}" />#end
+            #if($parameter_token_type)<input type="hidden" name="token_type" value="${parameter_token_type}" />#end
+            #if($parameter_id_token)<input type="hidden" name="id_token" value="${parameter_id_token}" />#end
+            #if($parameter_expires_in)<input type="hidden" name="expires_in" value="${parameter_expires_in}" />#end
+            #if($parameter_error)<input type="hidden" name="error" value="${parameter_error}" />#end
+            #if($parameter_error_description)<input type="hidden" name="error_description" value="${parameter_error_description}" />#end
+            #if($parameter_error_uri)<input type="hidden" name="error_uri" value="${parameter_error_uri}" />#end
         </div>
         <noscript>
             <div>

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