svn commit: r1495054 - in /subversion/site/publish/docs/javahl: 1.6/index.html 1.7/index.html 1.8/index.html

[breser]

Author: breser
Date: Thu Jun 20 15:36:36 2013
New Revision: 1495054

URL: http://svn.apache.org/r1495054
Log:
Fix CVE-2013-1571 in our javadoc pages by running Sun's JavadocUpdaterTool.

Modified:
    subversion/site/publish/docs/javahl/1.6/index.html
    subversion/site/publish/docs/javahl/1.7/index.html
    subversion/site/publish/docs/javahl/1.8/index.html

Modified: subversion/site/publish/docs/javahl/1.6/index.html
URL: 
http://svn.apache.org/viewvc/subversion/site/publish/docs/javahl/1.6/index.html?rev=1495054&r1=1495053&r2=1495054&view=diff
==============================================================================
--- subversion/site/publish/docs/javahl/1.6/index.html (original)
+++ subversion/site/publish/docs/javahl/1.6/index.html Thu Jun 20 15:36:36 2013
@@ -12,6 +12,42 @@ Generated Documentation (Untitled)
         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: subversion/site/publish/docs/javahl/1.7/index.html
URL: 
http://svn.apache.org/viewvc/subversion/site/publish/docs/javahl/1.7/index.html?rev=1495054&r1=1495053&r2=1495054&view=diff
==============================================================================
--- subversion/site/publish/docs/javahl/1.7/index.html (original)
+++ subversion/site/publish/docs/javahl/1.7/index.html Thu Jun 20 15:36:36 2013
@@ -12,6 +12,42 @@ Generated Documentation (Untitled)
         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: subversion/site/publish/docs/javahl/1.8/index.html
URL: 
http://svn.apache.org/viewvc/subversion/site/publish/docs/javahl/1.8/index.html?rev=1495054&r1=1495053&r2=1495054&view=diff
==============================================================================
--- subversion/site/publish/docs/javahl/1.8/index.html (original)
+++ subversion/site/publish/docs/javahl/1.8/index.html Thu Jun 20 15:36:36 2013
@@ -12,6 +12,42 @@ Generated Documentation (Untitled)
         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;