[java-centralized-discovery COMMIT] in /branches/REL_1: doc/RELEASE-NOTES.txt src/main/webapp/wayf.jsp

[noreply at shibboleth.net]

Author: rdw
Date: Thu Aug 16 09:25:14 2012
New Revision: 2224

URL: http://svn.shibboleth.net/view/java-centralized-discovery?rev=2224&view=rev
Log:
https://issues.shibboleth.net/jira/browse/SDSJ-112

Modified:
    branches/REL_1/doc/RELEASE-NOTES.txt
    branches/REL_1/src/main/webapp/wayf.jsp

Modified: branches/REL_1/doc/RELEASE-NOTES.txt
URL: http://svn.shibboleth.net/view/java-centralized-discovery/branches/REL_1/doc/RELEASE-NOTES.txt?rev=2224&r1=2223&r2=2224&view=diff
==============================================================================
--- branches/REL_1/doc/RELEASE-NOTES.txt (original)
+++ branches/REL_1/doc/RELEASE-NOTES.txt Thu Aug 16 09:25:14 2012
@@ -1,4 +1,9 @@
+Changes in Release 1.2.2
+=============================================
+[SDSJ-112] Use ESAPI for URLs now that OpenSAML supports it.
+
 Changes in Release 1.2.1
+=============================================
 [SDSJ-109] Remove extra escaping in the JSP.  rely entirely on ESAPI (and java.net.URLEncoder.encode where it won't work)
 [SDSJ-108] Inversion of a parameter by overkeen refactorization
 
@@ -24,4 +29,4 @@
 [SDSJ-82] Make <Mdui> extensions available to the JSP.
 [SDSJ-61] DS looses last known good data if it is presented with bad metadata
 
-And updated to OpenSAML 2.5.1
+And updated to OpenSAML 2.5.1

Modified: branches/REL_1/src/main/webapp/wayf.jsp
URL: http://svn.shibboleth.net/view/java-centralized-discovery/branches/REL_1/src/main/webapp/wayf.jsp?rev=2224&r1=2223&r2=2224&view=diff
==============================================================================
--- branches/REL_1/src/main/webapp/wayf.jsp (original)
+++ branches/REL_1/src/main/webapp/wayf.jsp Thu Aug 16 09:25:14 2012
@@ -12,10 +12,6 @@
 <%request.setCharacterEncoding("UTF-8");%>
 <%response.setCharacterEncoding("UTF-8");%>
 
-<%! String doEncode(Object what) throws java.io.UnsupportedEncodingException { 
-    return java.net.URLEncoder.encode(what.toString(), "utf-8");
-} 
-%>
 <%
 Object requestURL = request.getAttribute("requestURL");
 
@@ -199,14 +195,12 @@
         <logic:iterate id="site" name="cookieList">
             <p  class="text">
               <logic:present name="entityID" scope="request">
-                 <a tabindex="10" href="<esapi:encodeForHTMLAttribute><%=requestURL%></esapi:encodeForHTMLAttribute>
-?entityID=<%=doEncode(entityID)%>&return=<%=doEncode(returnX)%>&returnIDxParam=<%=doEncode(returnIDParam)%>&cache=perm&action=selection&origin=<%=doEncode(((IdPSite)site).getName())%>">
+                 <a tabindex="10" href="<esapi:encodeForHTMLAttribute><%=requestURL%></esapi:encodeForHTMLAttribute>?entityID=<esapi:encodeForURL><%=entityID%></esapi:encodeForURL>&return=<esapi:encodeForURL><%=returnX%></esapi:encodeForURL>&returnIDxParam=<esapi:encodeForURL><%=returnIDParam%></esapi:encodeForURL>&cache=perm&action=selection&origin=<esapi:encodeForURL><jsp:getProperty name="site" property="name" /></esapi:encodeForURL>">
                     <esapi:encodeForHTML><jsp:getProperty name="site" property="displayName" /></esapi:encodeForHTML>
                 </a>
               </logic:present>
               <logic:notPresent name="entityID" scope="request">
-                <a tabindex="10" href="<esapi:encodeForHTMLAttribute><%=requestURL%></esapi:encodeForHTMLAttribute>
-?target=<%=doEncode(target)%>&shire=<%=doEncode(shire)%>&providerId=<%=doEncode(providerId)%>&time=<%=doEncode(time)%>&cache=perm&action=selection&origin=<%=doEncode(((IdPSite)site).getName())%> ">
+                <a tabindex="10" href="<esapi:encodeForHTMLAttribute><%=requestURL%></esapi:encodeForHTMLAttribute>?target=<esapi:encodeForURL><%=target%></esapi:encodeForURL>&shire=<esapi:encodeForURL><%=shire%></esapi:encodeForURL>&providerId=<esapi:encodeForURL><%=providerId%></esapi:encodeForURL>&time=<esapi:encodeForURL><%=time%></esapi:encodeForURL>&cache=perm&action=selection&origin=<esapi:encodeForURL><jsp:getProperty name="site" property="name" /></esapi:encodeForURL>">
                     <esapi:encodeForHTML><jsp:getProperty name="site" property="displayName" /></esapi:encodeForHTML>
                 </a>
               </logic:notPresent>
@@ -531,7 +525,6 @@
 <!--CONFIG-->
 Need assistance? Send mail to <a tabindex="120" href="mailto:user at domain">administrator's name</a> with description.
         </p>
-        <div class="logo"><img src="images/logo.gif" alt="logo" /></div>
     </div>
 
 <logic:present name="showComments" scope="Request">