Changeset 33491 in webkit

Timestamp:

May 15, 2008 10:22:44 AM (16 years ago)

Author:

ap@webkit.org

Message:

Reviewed by Dan Bernstein.

​https://bugs.webkit.org/show_bug.cgi?id=10707
DumpRenderTree should not be able to access non-local resources

• DumpRenderTree/mac/ResourceLoadDelegate.mm: (-[ResourceLoadDelegate webView:resource:willSendRequest:redirectResponse:fromDataSource:]): Block them, and complain.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/doctypes/resources/TestDoctype.js (modified) (1 diff)
• LayoutTests/svg/custom/loadevents-capturing.svg (modified) (1 diff)
• LayoutTests/svg/custom/loadevents-externalresourcesrequired-displaynone.svg (modified) (1 diff)
• LayoutTests/svg/custom/loadevents-externalresourcesrequired.svg (modified) (1 diff)
• LayoutTests/svg/custom/loadevents-normal-displaynone.svg (modified) (1 diff)
• LayoutTests/svg/custom/loadevents-normal.svg (modified) (1 diff)
• WebKitTools/ChangeLog (modified) (1 diff)
• WebKitTools/DumpRenderTree/mac/ResourceLoadDelegate.mm (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2008-05-15  Alexey Proskuryakov  <ap@webkit.org>
+
+        Reviewed by Dan Bernstein.
+
+        https://bugs.webkit.org/show_bug.cgi?id=10707
+        DumpRenderTree should not be able to access non-local resources
+
+        * fast/doctypes/resources/TestDoctype.js:
+        * svg/custom/loadevents-capturing.svg:
+        * svg/custom/loadevents-externalresourcesrequired-displaynone.svg:
+        * svg/custom/loadevents-externalresourcesrequired.svg:
+        * svg/custom/loadevents-normal-displaynone.svg:
+        * svg/custom/loadevents-normal.svg:
+
 2008-05-15  Alexey Proskuryakov  <ap@webkit.org>
 

trunk/LayoutTests/fast/doctypes/resources/TestDoctype.js

@@ -7 +7 @@
 {
     var div = doc.createElement('div');
-    div.innerHTML = "<img src='http://www.google.com/intl/en_ALL/images/logo.gif' style='background-color: green; width: 100px; height: 100px'><br><img src='http://www.google.com/intl/en_ALL/images/logo.gif' style='background-color: green; width: 100px; height: 100px'>";
+    div.innerHTML = "<img src='' style='background-color: green; width: 100px; height: 100px'><br><img src='' style='background-color: green; width: 100px; height: 100px'>";
     doc.body.appendChild(div);
     var hasQuirk = doc.defaultView.getComputedStyle(div, "").getPropertyValue("height") == "200px";

trunk/LayoutTests/svg/custom/loadevents-capturing.svg

@@ -29 +29 @@
   </script>
   <g>
-    <image externalResourcesRequired="false" id="image" width="100" height="100" xlink:href="http://trac.webkit.org/projects/webkit/browser/trunk/LayoutTests/svg/custom/resources/green-checker.png?format=raw" />
+    <image externalResourcesRequired="false" id="image" width="100" height="100" xlink:href="resources/green-checker.png" />
     <text y="130" x="20">This tests that load dispatching works when there are no</text>
     <text y="150" x="20">direct listeners, but there are capturing event listeners on an ancestor. Bug 16447</text>

trunk/LayoutTests/svg/custom/loadevents-externalresourcesrequired-displaynone.svg

@@ -24 +24 @@
   </script>
   <g onload="reportLoadEvent(this)">
-    <image display="none" externalResourcesRequired="true" id="image" onload="reportLoadEvent(this)" width="100" height="100" xlink:href="http://trac.webkit.org/projects/webkit/browser/trunk/LayoutTests/svg/custom/resources/green-checker.png?format=raw" />
+    <image display="none" externalResourcesRequired="true" id="image" onload="reportLoadEvent(this)" width="100" height="100" xlink:href="resources/green-checker.png" />
     <text y="130" x="20">This tests load dispatching order with externalResourcesRequired and an image that does not render(display=none). Bug 16447</text>
     <text y="150" x="20" id="console" onload="reportLoadEvent(this)"/>

trunk/LayoutTests/svg/custom/loadevents-externalresourcesrequired.svg

@@ -24 +24 @@
   </script>
   <g onload="reportLoadEvent(this)">
-    <image externalResourcesRequired="true" id="image" onload="reportLoadEvent(this)" width="100" height="100" xlink:href="http://trac.webkit.org/projects/webkit/browser/trunk/LayoutTests/svg/custom/resources/green-checker.png?format=raw" />
+    <image externalResourcesRequired="true" id="image" onload="reportLoadEvent(this)" width="100" height="100" xlink:href="resources/green-checker.png" />
     <text y="130" x="20">This tests load dispatching order with externalResourcesRequired. Bug 16447</text>
     <text y="150" x="20" id="console" onload="reportLoadEvent(this)"/>

trunk/LayoutTests/svg/custom/loadevents-normal-displaynone.svg

@@ -24 +24 @@
   </script>
   <g onload="reportLoadEvent(this)">
-    <image display="none" externalResourcesRequired="false" id="image" onload="reportLoadEvent(this)" width="100" height="100" xlink:href="http://trac.webkit.org/projects/webkit/browser/trunk/LayoutTests/svg/custom/resources/green-checker.png?format=raw" />
+    <image display="none" externalResourcesRequired="false" id="image" onload="reportLoadEvent(this)" width="100" height="100" xlink:href="resources/green-checker.png" />
     <text y="130" x="20">This tests normal load dispatching order and an image that does not render(display=none). Bug 16447</text>
     <text y="150" x="20" id="console" onload="reportLoadEvent(this)"/>

trunk/LayoutTests/svg/custom/loadevents-normal.svg

@@ -24 +24 @@
   </script>
   <g onload="reportLoadEvent(this)">
-    <image externalResourcesRequired="false" id="image" onload="reportLoadEvent(this)" width="100" height="100" xlink:href="http://trac.webkit.org/projects/webkit/browser/trunk/LayoutTests/svg/custom/resources/green-checker.png?format=raw" />
+    <image externalResourcesRequired="false" id="image" onload="reportLoadEvent(this)" width="100" height="100" xlink:href="resources/green-checker.png" />
     <text y="130" x="20">This tests normal load dispatching order. Bug 16447</text>
     <text y="150" x="20" id="console" onload="reportLoadEvent(this)"/>

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2008-05-15  Alexey Proskuryakov  <ap@webkit.org>
+
+        Reviewed by Dan Bernstein.
+
+        https://bugs.webkit.org/show_bug.cgi?id=10707
+        DumpRenderTree should not be able to access non-local resources
+
+        * DumpRenderTree/mac/ResourceLoadDelegate.mm:
+        (-[ResourceLoadDelegate webView:resource:willSendRequest:redirectResponse:fromDataSource:]):
+        Block them, and complain.
+
 2008-05-15  Kevin Ollivier  <kevino@theolliviers.com>
 

trunk/WebKitTools/DumpRenderTree/mac/ResourceLoadDelegate.mm

@@ -120 +120 @@
         NSString *string = [NSString stringWithFormat:@"%@ - willSendRequest %@ redirectResponse %@", identifier, [newRequest _drt_descriptionSuitableForTestResult],
             [redirectResponse _drt_descriptionSuitableForTestResult]];
-        printf ("%s\n", [string UTF8String]);
+        printf("%s\n", [string UTF8String]);
     }    
-    
-    if (disallowedURLs && CFSetContainsValue(disallowedURLs, [newRequest URL]))
+
+    NSURL *url = [newRequest URL];
+    NSString *host = [url host];
+    if (host
+        && (NSOrderedSame == [[url scheme] caseInsensitiveCompare:@"http"] || NSOrderedSame == [[url scheme] caseInsensitiveCompare:@"https"])
+        && NSOrderedSame != [host compare:@"127.0.0.1"]
+        && NSOrderedSame != [host compare:@"255.255.255.255"] // used in some tests that expect to get back an error
+        && NSOrderedSame != [host caseInsensitiveCompare:@"localhost"]) {
+        fprintf(stderr, "Blocked access to external URL %s\n", [[url absoluteString] cStringUsingEncoding:NSUTF8StringEncoding]);
+        return nil;
+    }
+
+    if (disallowedURLs && CFSetContainsValue(disallowedURLs, url))
         return nil;