Changeset 92707 in webkit

Timestamp:

Aug 9, 2011 2:17:42 PM (13 years ago)

Author:

abarth@webkit.org

Message:

Enable CORS for garden-o-matic
​https://bugs.webkit.org/show_bug.cgi?id=65936

Reviewed by Dimitri Glazkov.

This patch will allow the hosted instance of garden-o-matic to
communicate with the local server.

• Scripts/webkitpy/tool/servers/gardeningserver.py:
• Scripts/webkitpy/tool/servers/reflectionhandler.py:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/tool/servers/gardeningserver.py (modified) (1 diff)
• Scripts/webkitpy/tool/servers/reflectionhandler.py (modified) (4 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-08-09  Adam Barth  <abarth@webkit.org>
+
+        Enable CORS for garden-o-matic
+        https://bugs.webkit.org/show_bug.cgi?id=65936
+
+        Reviewed by Dimitri Glazkov.
+
+        This patch will allow the hosted instance of garden-o-matic to
+        communicate with the local server.
+
+        * Scripts/webkitpy/tool/servers/gardeningserver.py:
+        * Scripts/webkitpy/tool/servers/reflectionhandler.py:
+
 2011-08-09  Adam Barth  <abarth@webkit.org>
 

trunk/Tools/Scripts/webkitpy/tool/servers/gardeningserver.py

@@ -104 +104 @@
         "TestFailures")
 
+    allow_cross_origin_requests = True
+
     def _run_webkit_patch(self, args):
         return self.server.tool.executive.run_command([self.server.tool.path()] + args, cwd=self.server.tool.scm().checkout_root)

trunk/Tools/Scripts/webkitpy/tool/servers/reflectionhandler.py

@@ -56 +56 @@
     STATIC_FILE_DIRECTORY = None
 
+    # Setting this flag to True causes the server to send
+    #   Access-Control-Allow-Origin: *
+    # with every response.
+    allow_cross_origin_requests = False
+
     def do_GET(self):
         self._handle_request()
@@ -101 +106 @@
         threading.Thread(target=lambda: self.server.shutdown()).start()
 
+    def _send_access_control_header(self):
+        if self.allow_cross_origin_requests:
+            self.send_header('Access-Control-Allow-Origin', '*')
+
     def _serve_text(self, text):
         self.send_response(200)
+        self._send_access_control_header()
         self.send_header("Content-type", "text/plain")
         self.end_headers()
@@ -109 +119 @@
     def _serve_json(self, json_object):
         self.send_response(200)
+        self._send_access_control_header()
         self.send_header('Content-type', 'application/json')
         self.end_headers()
@@ -119 +130 @@
         with codecs.open(file_path, "rb") as static_file:
             self.send_response(200)
+            self._send_access_control_header()
             self.send_header("Content-Length", os.path.getsize(file_path))
             mime_type, encoding = mimetypes.guess_type(file_path)