Bug 1282947: parse 'code' GET parameter as integer in cors-makeheader.py; r?jdm draft
authorDecky Coss <coss@cosstropolis.com>
Fri, 01 Jul 2016 17:28:12 -0400
changeset 384601 dfdd7e4e570c73796f90bd8161321374a14da2a3
parent 383145 fdcee57b4e4f66a82831ab01e61500da98a858e8
child 524752 9eabb1987ef914cceebe1d141975aea2c827a095
push id22324
push usercoss@cosstropolis.com
push dateWed, 06 Jul 2016 19:43:23 +0000
reviewersjdm
bugs1282947
milestone50.0a1
Bug 1282947: parse 'code' GET parameter as integer in cors-makeheader.py; r?jdm MozReview-Commit-ID: 6rQCEWKLTYZ
testing/web-platform/meta/cors/redirect-preflight.htm.ini
testing/web-platform/tests/cors/resources/cors-makeheader.py
deleted file mode 100644
--- a/testing/web-platform/meta/cors/redirect-preflight.htm.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-[redirect-preflight.htm]
-  type: testharness
-  [Disallow redirect 301 after succesful (200) preflight]
-    expected: FAIL
-
-  [Disallow redirect 302 after succesful (200) preflight]
-    expected: FAIL
-
-  [Disallow redirect 303 after succesful (200) preflight]
-    expected: FAIL
-
-  [Disallow redirect 307 after succesful (200) preflight]
-    expected: FAIL
-
-  [Disallow redirect 308 after succesful (200) preflight]
-    expected: FAIL
-
--- a/testing/web-platform/tests/cors/resources/cors-makeheader.py
+++ b/testing/web-platform/tests/cors/resources/cors-makeheader.py
@@ -23,17 +23,21 @@ def main(request, response):
     #Preflight
     if 'headers' in request.GET:
         response.headers.set("Access-Control-Allow-Headers", request.GET.first('headers'))
     if 'credentials' in request.GET:
         response.headers.set("Access-Control-Allow-Credentials", request.GET.first('credentials'))
     if 'methods' in request.GET:
         response.headers.set("Access-Control-Allow-Methods", request.GET.first('methods'))
 
-    code = request.GET.first('code', None)
+    code_raw = request.GET.first('code', None)
+    if code_raw:
+        code = int(code_raw)
+    else:
+        code = None
     if request.method == 'OPTIONS':
         #Override the response code if we're in a preflight and it's asked
         if 'preflight' in request.GET:
             code = int(request.GET.first('preflight'))
 
         #Log that the preflight actually happened if we have an ident
         if 'token' in request.GET:
             request.server.stash.put(request.GET['token'], True)
@@ -56,9 +60,8 @@ def main(request, response):
     headers['get_value'] = request.GET.first('get_value', '')
 
     body = json.dumps(headers)
 
     if code:
         return (code, "StatusText"), [], body
     else:
         return body
-