Repository: cxf-fediz Updated Branches: refs/heads/master 66a90fef2 -> 0b04bdd50
Simplifying SAML error response Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/9a61405d Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/9a61405d Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/9a61405d Branch: refs/heads/master Commit: 9a61405d1068ff81d2a399169878d5f0f947f7da Parents: 66a90fe Author: Colm O hEigeartaigh <[email protected]> Authored: Mon Dec 5 12:13:25 2016 +0000 Committer: Colm O hEigeartaigh <[email protected]> Committed: Mon Dec 5 12:13:25 2016 +0000 ---------------------------------------------------------------------- .../webapp/WEB-INF/flows/saml-validate-request.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/9a61405d/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 e2bc680..7cda428 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 @@ -55,11 +55,11 @@ <set name="flowScope.Signature" value="requestParameters.Signature" /> </on-entry> <if test="requestParameters.RelayState == null or requestParameters.RelayState.isEmpty()" - then="handleBadRequestError" /> + then="viewBadRequest" /> <if test="requestParameters.SAMLRequest != null and !requestParameters.SAMLRequest.isEmpty()" then="signinSAMLRequest" /> <if test="requestParameters.SAMLResponse == null or requestParameters.SAMLResponse.isEmpty()" - then="handleBadRequestError" else="signinResponse" /> + then="viewBadRequest" else="signinResponse" /> </decision-state> <subflow-state id="signinSAMLRequest" subflow="signinSAMLRequest"> @@ -79,7 +79,7 @@ <set name="flowScope.idpToken" value="currentEvent.attributes.idpToken" /> <set name="flowScope.saml_authn_request" value="currentEvent.attributes.saml_authn_request" /> </transition> - <transition on="viewBadRequest" to="handleBadRequestError"> + <transition on="viewBadRequest" to="viewBadRequest"> <set name="flowScope.saml_authn_request" value="currentEvent.attributes.saml_authn_request" /> </transition> <transition on="scInternalServerError" to="scInternalServerError" /> @@ -127,7 +127,7 @@ </on-entry> <evaluate expression="signinParametersCacheAction.storeRPConfigInSession(flowRequestContext)"/> <transition to="produceSAMLResponse" /> - <transition on-exception="org.apache.cxf.fediz.core.exception.ProcessingException" to="handleBadRequestError" /> + <transition on-exception="org.apache.cxf.fediz.core.exception.ProcessingException" to="viewBadRequest" /> <transition on-exception="java.lang.Throwable" to="scInternalServerError" /> </action-state> @@ -164,17 +164,17 @@ </action-state> <!-- abnormal exit point --> - <decision-state id="handleBadRequestError"> + <decision-state id="viewBadRequest"> <on-entry> <evaluate expression="authnRequestParser.retrieveConsumerURL(flowRequestContext)" result="requestScope.samlAction"/> </on-entry> <!-- See if we managed to at least parse the request to get the response URL --> <if test="requestScope.samlAction == null or requestScope.samlAction.isEmpty()" - then="viewBadRequestParsingError" else="viewBadRequest"/> + then="viewBadRequestParsingError" else="viewBadRequestResponse"/> </decision-state> - <end-state id="viewBadRequest" view="samlsigninresponseform"> + <end-state id="viewBadRequestResponse" view="samlsigninresponseform"> <on-entry> <evaluate expression="authnRequestParser.retrieveConsumerURL(flowRequestContext)" result="requestScope.samlAction"/>
