You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2016/04/13 17:39:00 UTC
[2/4] cxf-fediz git commit: [FEDIZ-164] - IdP default flow doesn't
support multiple realms
[FEDIZ-164] - IdP default flow doesn't support multiple realms
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/ec486bf6
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/ec486bf6
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/ec486bf6
Branch: refs/heads/master
Commit: ec486bf662ef504c177a80ec031dca48aedfe806
Parents: 188e20c
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Wed Apr 13 15:32:54 2016 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Wed Apr 13 15:32:54 2016 +0100
----------------------------------------------------------------------
.../src/main/webapp/WEB-INF/flows/federation-validate-request.xml | 2 +-
.../idp/src/main/webapp/WEB-INF/flows/saml-validate-request.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/ec486bf6/services/idp/src/main/webapp/WEB-INF/flows/federation-validate-request.xml
----------------------------------------------------------------------
diff --git a/services/idp/src/main/webapp/WEB-INF/flows/federation-validate-request.xml b/services/idp/src/main/webapp/WEB-INF/flows/federation-validate-request.xml
index a242c80..2964176 100644
--- a/services/idp/src/main/webapp/WEB-INF/flows/federation-validate-request.xml
+++ b/services/idp/src/main/webapp/WEB-INF/flows/federation-validate-request.xml
@@ -38,7 +38,7 @@
<set name="flowScope.code" value="requestParameters.code" />
<evaluate expression="requestScope.getString('wauth','default')"
result="flowScope.wauth" />
- <set name="flowScope.idpConfig" value="config.getIDP(null)" />
+ <set name="flowScope.idpConfig" value="config.getIDP(fedizEntryPoint.getRealm())" />
</on-entry>
<if test="requestParameters.wa == 'wsignout1.0' or requestParameters.wa == 'wsignoutcleanup1.0'"
then="selectSignOutProcess" />
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/ec486bf6/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 ae05ae2..4479a5b 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
@@ -28,7 +28,7 @@
<set name="flowScope.RelayState" value="requestParameters.RelayState" />
<set name="flowScope.SAMLRequest" value="requestParameters.SAMLRequest" />
<set name="flowScope.Signature" value="requestParameters.Signature" />
- <set name="flowScope.idpConfig" value="config.getIDP(null)" />
+ <set name="flowScope.idpConfig" value="config.getIDP(fedizEntryPoint.getRealm())" />
</on-entry>
<if test="requestParameters.RelayState == null or requestParameters.RelayState.length() == 0"
then="handleBadRequestError" />