FEDIZ-184 - Remove OGNL parser from the IdP
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/6fc7f301 Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/6fc7f301 Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/6fc7f301 Branch: refs/heads/master Commit: 6fc7f301d685c373b1a9c5258658fd56fc95b5f4 Parents: 4a08fe5 Author: Colm O hEigeartaigh <[email protected]> Authored: Wed Dec 14 12:25:40 2016 +0000 Committer: Colm O hEigeartaigh <[email protected]> Committed: Wed Dec 14 12:25:40 2016 +0000 ---------------------------------------------------------------------- pom.xml | 1 - services/idp/pom.xml | 18 ------------------ .../webapp/WEB-INF/config/idp-core-servlet.xml | 5 +---- .../WEB-INF/flows/federation-validate-request.xml | 6 +++--- .../WEB-INF/flows/saml-validate-request.xml | 4 ++-- 5 files changed, 6 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/6fc7f301/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 5d60422..b15207e 100644 --- a/pom.xml +++ b/pom.xml @@ -62,7 +62,6 @@ <jetty9.version>9.3.9.v20160517</jetty9.version> <junit.version>4.12</junit.version> <log4j.version>1.2.17</log4j.version> - <ognl.version>3.1.11</ognl.version> <openjpa.version>2.4.1</openjpa.version> <servlet.version>2.5</servlet.version> <slf4j.version>1.7.21</slf4j.version> http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/6fc7f301/services/idp/pom.xml ---------------------------------------------------------------------- diff --git a/services/idp/pom.xml b/services/idp/pom.xml index 25556df..7247039 100644 --- a/services/idp/pom.xml +++ b/services/idp/pom.xml @@ -99,12 +99,6 @@ <groupId>org.springframework.webflow</groupId> <artifactId>spring-webflow</artifactId> <version>2.4.4.RELEASE</version> - <exclusions> - <exclusion> - <groupId>opensymphony</groupId> - <artifactId>ognl</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.springframework.security</groupId> @@ -117,18 +111,6 @@ <version>${spring.security.version}</version> </dependency> <dependency> - <groupId>ognl</groupId> - <artifactId>ognl</artifactId> - <version>${ognl.version}</version> - <scope>runtime</scope> - <exclusions> - <exclusion> - <groupId>javassist</groupId> - <artifactId>javassist</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> <groupId>org.javassist</groupId> <artifactId>javassist</artifactId> <version>${javassist.version}</version> http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/6fc7f301/services/idp/src/main/webapp/WEB-INF/config/idp-core-servlet.xml ---------------------------------------------------------------------- diff --git a/services/idp/src/main/webapp/WEB-INF/config/idp-core-servlet.xml b/services/idp/src/main/webapp/WEB-INF/config/idp-core-servlet.xml index 542360e..3d62ad9 100644 --- a/services/idp/src/main/webapp/WEB-INF/config/idp-core-servlet.xml +++ b/services/idp/src/main/webapp/WEB-INF/config/idp-core-servlet.xml @@ -54,10 +54,7 @@ </property> </bean> - <bean id="expressionParser" class="org.springframework.webflow.expression.WebFlowOgnlExpressionParser" /> - - <webflow:flow-builder-services id="builder" view-factory-creator="viewFactoryCreator" - expression-parser="expressionParser" /> + <webflow:flow-builder-services id="builder" view-factory-creator="viewFactoryCreator" /> <webflow:flow-registry id="flowRegistry" flow-builder-services="builder"> <webflow:flow-location path="/WEB-INF/flows/federation-validate-request.xml" id="federation" /> http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/6fc7f301/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 3581ef2..ea9ce68 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 @@ -231,7 +231,7 @@ <transition on="cancel" to="redirect" /> </view-state> - <view-state id="redirect" view="externalRedirect:${flowScope.wreply}" /> + <view-state id="redirect" view="externalRedirect:#{flowScope.wreply}" /> <!-- normal exit point for logout --> <end-state id="invalidateSessionAction" view="signoutresponse"> @@ -250,7 +250,7 @@ </end-state> <!-- redirect to remote idp --> - <end-state id="redirectToTrustedIDP" view="externalRedirect:${flowScope.remoteIdpUrl}"> + <end-state id="redirectToTrustedIDP" view="externalRedirect:#{flowScope.remoteIdpUrl}"> <!-- <on-entry> <set name="flowScope.remoteIdpUrl" @@ -265,7 +265,7 @@ --> </end-state> - <end-state id="redirectToLocalIDP" view="externalRedirect:${flowScope.localIdpUrl}"> + <end-state id="redirectToLocalIDP" view="externalRedirect:#{flowScope.localIdpUrl}"> <on-entry> <set name="flowScope.localIdpUrl" value="flowScope.idpConfig.idpUrl http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/6fc7f301/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 e1993b9..1f12890 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 @@ -246,7 +246,7 @@ </on-entry> </end-state> - <end-state id="redirectToLocalIDP" view="externalRedirect:${flowScope.localIdpUrl}"> + <end-state id="redirectToLocalIDP" view="externalRedirect:#{flowScope.localIdpUrl}"> <on-entry> <evaluate expression="localRedirectCreator.createRedirectURL(flowRequestContext, flowScope.idpConfig)" result="flowScope.localIdpUrl"/> @@ -254,6 +254,6 @@ </end-state> <!-- redirect to remote idp --> - <end-state id="redirectToTrustedIDP" view="externalRedirect:${flowScope.remoteIdpUrl}" /> + <end-state id="redirectToTrustedIDP" view="externalRedirect:#{flowScope.remoteIdpUrl}" /> </flow>
