You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by ph...@apache.org on 2013/06/21 09:00:36 UTC

svn commit: r1495300 - in /zookeeper/bookkeeper/site/content/docs: r4.0.0/apidocs/index.html r4.1.0/apidocs/index.html r4.2.0/apidocs/index.html r4.2.1/apidocs/index.html

Author: phunt
Date: Fri Jun 21 07:00:36 2013
New Revision: 1495300

URL: http://svn.apache.org/r1495300
Log:
Fixed Frame injection vulnerability in published Javadoc recently identified/fixed by Oracle

Modified:
    zookeeper/bookkeeper/site/content/docs/r4.0.0/apidocs/index.html
    zookeeper/bookkeeper/site/content/docs/r4.1.0/apidocs/index.html
    zookeeper/bookkeeper/site/content/docs/r4.2.0/apidocs/index.html
    zookeeper/bookkeeper/site/content/docs/r4.2.1/apidocs/index.html

Modified: zookeeper/bookkeeper/site/content/docs/r4.0.0/apidocs/index.html
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/site/content/docs/r4.0.0/apidocs/index.html?rev=1495300&r1=1495299&r2=1495300&view=diff
==============================================================================
--- zookeeper/bookkeeper/site/content/docs/r4.0.0/apidocs/index.html (original)
+++ zookeeper/bookkeeper/site/content/docs/r4.0.0/apidocs/index.html Fri Jun 21 07:00:36 2013
@@ -13,6 +13,42 @@ bookkeeper 4.0.0 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: zookeeper/bookkeeper/site/content/docs/r4.1.0/apidocs/index.html
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/site/content/docs/r4.1.0/apidocs/index.html?rev=1495300&r1=1495299&r2=1495300&view=diff
==============================================================================
--- zookeeper/bookkeeper/site/content/docs/r4.1.0/apidocs/index.html (original)
+++ zookeeper/bookkeeper/site/content/docs/r4.1.0/apidocs/index.html Fri Jun 21 07:00:36 2013
@@ -13,6 +13,42 @@ bookkeeper 4.1.0 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: zookeeper/bookkeeper/site/content/docs/r4.2.0/apidocs/index.html
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/site/content/docs/r4.2.0/apidocs/index.html?rev=1495300&r1=1495299&r2=1495300&view=diff
==============================================================================
--- zookeeper/bookkeeper/site/content/docs/r4.2.0/apidocs/index.html (original)
+++ zookeeper/bookkeeper/site/content/docs/r4.2.0/apidocs/index.html Fri Jun 21 07:00:36 2013
@@ -11,6 +11,42 @@
         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: zookeeper/bookkeeper/site/content/docs/r4.2.1/apidocs/index.html
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/site/content/docs/r4.2.1/apidocs/index.html?rev=1495300&r1=1495299&r2=1495300&view=diff
==============================================================================
--- zookeeper/bookkeeper/site/content/docs/r4.2.1/apidocs/index.html (original)
+++ zookeeper/bookkeeper/site/content/docs/r4.2.1/apidocs/index.html Fri Jun 21 07:00:36 2013
@@ -13,6 +13,42 @@ bookkeeper 4.1.0 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;