cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [4/4] cxf-fediz git commit: Fixing previous commits
Date Fri, 09 Dec 2016 18:56:34 GMT
Fixing previous commits


Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/be7868b6
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/be7868b6
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/be7868b6

Branch: refs/heads/master
Commit: be7868b69f8301797995df7288002720c2340768
Parents: eca606d
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Fri Dec 9 18:56:19 2016 +0000
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Fri Dec 9 18:56:19 2016 +0000

----------------------------------------------------------------------
 .../src/main/webapp/WEB-INF/flows/saml-validate-request.xml   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/be7868b6/services/idp/src/main/webapp/WEB-INF/flows/saml-validate-request.xml
----------------------------------------------------------------------
diff --git a/services/idp/src/main/webapp/WEB-INF/flows/saml-validate-request.xml b/services/idp/src/main/webapp/WEB-INF/flows/saml-validate-request.xml
index 32de331..9d4288b 100644
--- a/services/idp/src/main/webapp/WEB-INF/flows/saml-validate-request.xml
+++ b/services/idp/src/main/webapp/WEB-INF/flows/saml-validate-request.xml
@@ -63,7 +63,7 @@
     </decision-state>
     
     <decision-state id="selectOIDCAuthorizationCodeFlowProcess">
-         <on-entry>
+        <on-entry>
             <set name="flowScope.state" value="requestParameters.state" />
             <set name="flowScope.request_context" value="requestParameters.state" />
             <set name="flowScope.code" value="requestParameters.code" />
@@ -78,6 +78,11 @@
         <evaluate expression="authnRequestParser.parseSAMLRequest(flowRequestContext,
flowScope.idpConfig,
                                                               flowScope.SAMLRequest, flowScope.Signature,
                                                               flowScope.RelayState)" />
+        <transition to="retrieveConsumerURL"/>
+        <transition on-exception="org.apache.cxf.fediz.core.exception.ProcessingException"
to="viewBadRequest" />
+    </action-state>
+    
+    <action-state id="retrieveConsumerURL">
         <evaluate expression="authnRequestParser.retrieveConsumerURL(flowRequestContext)"

                   result="flowScope.consumerURL"/>
         <transition to="signinSAMLRequest"/>


Mime
View raw message