Return-Path: <commits-return-44437-archive-asf-public=cust-asf.ponee.io@cxf.apache.org>
X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io
Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io
Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183])
	by cust-asf2.ponee.io (Postfix) with ESMTP id 5DA44200BE5
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Fri,  9 Dec 2016 19:56:33 +0100 (CET)
Received: by cust-asf.ponee.io (Postfix)
	id 5CAAA160B1D; Fri,  9 Dec 2016 18:56:33 +0000 (UTC)
Delivered-To: archive-asf-public@cust-asf.ponee.io
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by cust-asf.ponee.io (Postfix) with SMTP id A6E88160B1E
	for <archive-asf-public@cust-asf.ponee.io>; Fri,  9 Dec 2016 19:56:32 +0100 (CET)
Received: (qmail 64804 invoked by uid 500); 9 Dec 2016 18:56:31 -0000
Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cxf.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cxf.apache.org>
List-Post: <mailto:commits@cxf.apache.org>
List-Id: <commits.cxf.apache.org>
Reply-To: dev@cxf.apache.org
Delivered-To: mailing list commits@cxf.apache.org
Received: (qmail 64632 invoked by uid 99); 9 Dec 2016 18:56:31 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 09 Dec 2016 18:56:31 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33)
	id 87CD4EEE2F; Fri,  9 Dec 2016 18:56:31 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: coheigea@apache.org
To: commits@cxf.apache.org
Date: Fri, 09 Dec 2016 18:56:34 -0000
Message-Id: <8dd8e4a0ff724df9a6b7bbf88b63f12f@git.apache.org>
In-Reply-To: <e3c65241891e4b2f9da3f96feb833bdd@git.apache.org>
References: <e3c65241891e4b2f9da3f96feb833bdd@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [4/4] cxf-fediz git commit: Fixing previous commits
archived-at: Fri, 09 Dec 2016 18:56:33 -0000

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"/>