Author: markt Date: Sun Jun 23 18:41:06 2013 New Revision: 1495870 URL: http://svn.apache.org/r1495870 Log: Fix published Javadoc affected by CVE-2013-1571. This commit has been performed by the ASF Infrastructure team.
Please ensure that your build processes are reviewed (and fixed if necessary) to ensure that any updates to this Javadoc do not re-introduce the vulnerability. Modified: axis/site/axis2/java/core/api/index.html axis/site/axis2/java/rampart/apidocs/index.html axis/site/axis2/java/sandesha/apidocs/index.html axis/site/axis2/java/transports/apidocs/index.html Modified: axis/site/axis2/java/core/api/index.html URL: http://svn.apache.org/viewvc/axis/site/axis2/java/core/api/index.html?rev=1495870&r1=1495869&r2=1495870&view=diff ============================================================================== --- axis/site/axis2/java/core/api/index.html (original) +++ axis/site/axis2/java/core/api/index.html Sun Jun 23 18:41:06 2013 @@ -13,6 +13,42 @@ Apache Axis2 - Root 1.6.2 API targetPage = targetPage.substring(1); if (targetPage.indexOf(":") != -1) targetPage = "undefined"; + if (targetPage != "" && !validURL(targetPage)) + targetPage = "undefined"; + function validURL(url) { + var pos = url.indexOf(".html"); + if (pos == -1 || pos != url.length - 5) + return false; + var allowNumber = false; + var allowSep = false; + var seenDot = false; + for (var i = 0; i < url.length - 5; i++) { + var ch = url.charAt(i); + if ('a' <= ch && ch <= 'z' || + 'A' <= ch && ch <= 'Z' || + ch == '$' || + ch == '_') { + allowNumber = true; + allowSep = true; + } else if ('0' <= ch && ch <= '9' + || ch == '-') { + if (!allowNumber) + return false; + } else if (ch == '/' || ch == '.') { + if (!allowSep) + return false; + allowNumber = false; + allowSep = false; + if (ch == '.') + seenDot = true; + if (ch == '/' && seenDot) + return false; + } else { + return false; + } + } + return true; + } function loadFrames() { if (targetPage != "" && targetPage != "undefined") top.classFrame.location = top.targetPage; Modified: axis/site/axis2/java/rampart/apidocs/index.html URL: http://svn.apache.org/viewvc/axis/site/axis2/java/rampart/apidocs/index.html?rev=1495870&r1=1495869&r2=1495870&view=diff ============================================================================== --- axis/site/axis2/java/rampart/apidocs/index.html (original) +++ axis/site/axis2/java/rampart/apidocs/index.html Sun Jun 23 18:41:06 2013 @@ -12,6 +12,42 @@ Apache Rampart targetPage = targetPage.substring(1); if (targetPage.indexOf(":") != -1) targetPage = "undefined"; + if (targetPage != "" && !validURL(targetPage)) + targetPage = "undefined"; + function validURL(url) { + var pos = url.indexOf(".html"); + if (pos == -1 || pos != url.length - 5) + return false; + var allowNumber = false; + var allowSep = false; + var seenDot = false; + for (var i = 0; i < url.length - 5; i++) { + var ch = url.charAt(i); + if ('a' <= ch && ch <= 'z' || + 'A' <= ch && ch <= 'Z' || + ch == '$' || + ch == '_') { + allowNumber = true; + allowSep = true; + } else if ('0' <= ch && ch <= '9' + || ch == '-') { + if (!allowNumber) + return false; + } else if (ch == '/' || ch == '.') { + if (!allowSep) + return false; + allowNumber = false; + allowSep = false; + if (ch == '.') + seenDot = true; + if (ch == '/' && seenDot) + return false; + } else { + return false; + } + } + return true; + } function loadFrames() { if (targetPage != "" && targetPage != "undefined") top.classFrame.location = top.targetPage; @@ -36,4 +72,4 @@ This document is designed to be viewed u Link to<A HREF="overview-summary.html">Non-frame version.</A> </NOFRAMES> </FRAMESET> -</HTML> \ No newline at end of file +</HTML> Modified: axis/site/axis2/java/sandesha/apidocs/index.html URL: http://svn.apache.org/viewvc/axis/site/axis2/java/sandesha/apidocs/index.html?rev=1495870&r1=1495869&r2=1495870&view=diff ============================================================================== --- axis/site/axis2/java/sandesha/apidocs/index.html (original) +++ axis/site/axis2/java/sandesha/apidocs/index.html Sun Jun 23 18:41:06 2013 @@ -12,6 +12,42 @@ Apache Sandesha2 targetPage = targetPage.substring(1); if (targetPage.indexOf(":") != -1) targetPage = "undefined"; + if (targetPage != "" && !validURL(targetPage)) + targetPage = "undefined"; + function validURL(url) { + var pos = url.indexOf(".html"); + if (pos == -1 || pos != url.length - 5) + return false; + var allowNumber = false; + var allowSep = false; + var seenDot = false; + for (var i = 0; i < url.length - 5; i++) { + var ch = url.charAt(i); + if ('a' <= ch && ch <= 'z' || + 'A' <= ch && ch <= 'Z' || + ch == '$' || + ch == '_') { + allowNumber = true; + allowSep = true; + } else if ('0' <= ch && ch <= '9' + || ch == '-') { + if (!allowNumber) + return false; + } else if (ch == '/' || ch == '.') { + if (!allowSep) + return false; + allowNumber = false; + allowSep = false; + if (ch == '.') + seenDot = true; + if (ch == '/' && seenDot) + return false; + } else { + return false; + } + } + return true; + } function loadFrames() { if (targetPage != "" && targetPage != "undefined") top.classFrame.location = top.targetPage; @@ -36,4 +72,4 @@ This document is designed to be viewed u Link to<A HREF="overview-summary.html">Non-frame version.</A> </NOFRAMES> </FRAMESET> -</HTML> \ No newline at end of file +</HTML> Modified: axis/site/axis2/java/transports/apidocs/index.html URL: http://svn.apache.org/viewvc/axis/site/axis2/java/transports/apidocs/index.html?rev=1495870&r1=1495869&r2=1495870&view=diff ============================================================================== --- axis/site/axis2/java/transports/apidocs/index.html (original) +++ axis/site/axis2/java/transports/apidocs/index.html Sun Jun 23 18:41:06 2013 @@ -13,6 +13,42 @@ Apache Axis2 - Transport - Root 1.0.0 AP targetPage = targetPage.substring(1); if (targetPage.indexOf(":") != -1) targetPage = "undefined"; + if (targetPage != "" && !validURL(targetPage)) + targetPage = "undefined"; + function validURL(url) { + var pos = url.indexOf(".html"); + if (pos == -1 || pos != url.length - 5) + return false; + var allowNumber = false; + var allowSep = false; + var seenDot = false; + for (var i = 0; i < url.length - 5; i++) { + var ch = url.charAt(i); + if ('a' <= ch && ch <= 'z' || + 'A' <= ch && ch <= 'Z' || + ch == '$' || + ch == '_') { + allowNumber = true; + allowSep = true; + } else if ('0' <= ch && ch <= '9' + || ch == '-') { + if (!allowNumber) + return false; + } else if (ch == '/' || ch == '.') { + if (!allowSep) + return false; + allowNumber = false; + allowSep = false; + if (ch == '.') + seenDot = true; + if (ch == '/' && seenDot) + return false; + } else { + return false; + } + } + return true; + } function loadFrames() { if (targetPage != "" && targetPage != "undefined") top.classFrame.location = top.targetPage;