[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources/system/flows: authn/jaas-authn-flow.xml authn/l...

[noreply at shibboleth.net]

Author: tzeller
Date: Wed Apr 16 23:29:16 2014
New Revision: 5737

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5737&view=rev
Log:
OSJ-69 Replace OWASP ESAPI Encoder with the java-support HTMLEncoder in IdP flows.

Modified:
    trunk/idp-conf/src/main/resources/system/flows/authn/jaas-authn-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/ldap-authn-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-flow.xml

Modified: trunk/idp-conf/src/main/resources/system/flows/authn/jaas-authn-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/authn/jaas-authn-flow.xml?rev=5737&r1=5736&r2=5737&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/authn/jaas-authn-flow.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/authn/jaas-authn-flow.xml Wed Apr 16 23:29:16 2014
@@ -22,7 +22,7 @@
             <evaluate expression="flowRequestContext.getConversationScope().get('org.opensaml.profile.context.ProfileRequestContext')" result="viewScope.profileRequestContext" />
             <evaluate expression="profileRequestContext.getSubcontext(T(net.shibboleth.idp.authn.context.AuthenticationContext))" result="viewScope.authenticationContext" />
             <evaluate expression="authenticationContext.getSubcontext(T(net.shibboleth.idp.authn.context.AuthenticationErrorContext))" result="viewScope.authenticationErrorContext" />
-            <evaluate expression="T(org.owasp.esapi.ESAPI).encoder()" result="viewScope.encoder" />
+            <evaluate expression="T(net.shibboleth.utilities.java.support.encoder.HTMLEncoder)" result="viewScope.encoder" />
         </on-render>
         <transition on="proceed" to="ExtractUsernamePasswordFromFormRequest" />
     </view-state>

Modified: trunk/idp-conf/src/main/resources/system/flows/authn/ldap-authn-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/authn/ldap-authn-flow.xml?rev=5737&r1=5736&r2=5737&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/authn/ldap-authn-flow.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/authn/ldap-authn-flow.xml Wed Apr 16 23:29:16 2014
@@ -24,7 +24,7 @@
             <evaluate expression="authenticationContext.getSubcontext(T(net.shibboleth.idp.authn.context.AuthenticationErrorContext))" result="viewScope.authenticationErrorContext" />
             <evaluate expression="authenticationContext.getSubcontext(T(net.shibboleth.idp.authn.context.AuthenticationWarningContext))" result="viewScope.authenticationWarningContext" />
             <evaluate expression="authenticationContext.getSubcontext(T(net.shibboleth.idp.authn.context.LDAPResponseContext))" result="viewScope.ldapResponseContext" />
-            <evaluate expression="T(org.owasp.esapi.ESAPI).encoder()" result="viewScope.encoder" />
+            <evaluate expression="T(net.shibboleth.utilities.java.support.encoder.HTMLEncoder)" result="viewScope.encoder" />
         </on-render>
         <transition on="proceed" to="ExtractUsernamePasswordFromFormRequest" />
     </view-state>

Modified: trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-flow.xml?rev=5737&r1=5736&r2=5737&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-flow.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-flow.xml Wed Apr 16 23:29:16 2014
@@ -144,7 +144,7 @@
         <on-entry>
             <evaluate expression="flowRequestContext.getConversationScope().get('org.opensaml.profile.context.ProfileRequestContext')" result="requestScope.profileRequestContext" />
             <evaluate expression="profileRequestContext.getSubcontext(T(org.opensaml.profile.context.ErrorEventContext))" result="requestScope.errorEventContext" />
-            <evaluate expression="T(org.owasp.esapi.ESAPI).encoder()" result="requestScope.encoder" />
+            <evaluate expression="T(net.shibboleth.utilities.java.support.encoder.HTMLEncoder)" result="requestScope.encoder" />
         </on-entry>
     </end-state>