mirror of
https://github.com/servo/servo.git
synced 2025-08-03 12:40:06 +01:00
Update web-platform-tests to revision 5934bd3aca20a07917ad46fe7cebe10c68d5e497
This commit is contained in:
parent
e41f1662dc
commit
64b58d76c6
67 changed files with 656 additions and 278 deletions
|
@ -1,58 +1,58 @@
|
|||
def main(request, response):
|
||||
headers = [("Content-Type", "text/plain")]
|
||||
stashed_data = {'control_request_headers': "", 'preflight': "0", 'preflight_referrer': ""}
|
||||
headers = [(b"Content-Type", b"text/plain")]
|
||||
stashed_data = {b'control_request_headers': b"", b'preflight': b"0", b'preflight_referrer': b""}
|
||||
|
||||
token = None
|
||||
if "token" in request.GET:
|
||||
token = request.GET.first("token")
|
||||
if b"token" in request.GET:
|
||||
token = request.GET.first(b"token")
|
||||
|
||||
if "origin" in request.GET:
|
||||
for origin in request.GET['origin'].split(", "):
|
||||
headers.append(("Access-Control-Allow-Origin", origin))
|
||||
if b"origin" in request.GET:
|
||||
for origin in request.GET[b'origin'].split(b", "):
|
||||
headers.append((b"Access-Control-Allow-Origin", origin))
|
||||
else:
|
||||
headers.append(("Access-Control-Allow-Origin", "*"))
|
||||
headers.append((b"Access-Control-Allow-Origin", b"*"))
|
||||
|
||||
if "clear-stash" in request.GET:
|
||||
if b"clear-stash" in request.GET:
|
||||
if request.server.stash.take(token) is not None:
|
||||
return headers, "1"
|
||||
return headers, b"1"
|
||||
else:
|
||||
return headers, "0"
|
||||
return headers, b"0"
|
||||
|
||||
if "credentials" in request.GET:
|
||||
headers.append(("Access-Control-Allow-Credentials", "true"))
|
||||
if b"credentials" in request.GET:
|
||||
headers.append((b"Access-Control-Allow-Credentials", b"true"))
|
||||
|
||||
if request.method == "OPTIONS":
|
||||
if not "Access-Control-Request-Method" in request.headers:
|
||||
response.set_error(400, "No Access-Control-Request-Method header")
|
||||
return "ERROR: No access-control-request-method in preflight!"
|
||||
if request.method == u"OPTIONS":
|
||||
if not b"Access-Control-Request-Method" in request.headers:
|
||||
response.set_error(400, u"No Access-Control-Request-Method header")
|
||||
return b"ERROR: No access-control-request-method in preflight!"
|
||||
|
||||
if request.headers.get("Accept", "") != "*/*":
|
||||
response.set_error(400, "Request does not have 'Accept: */*' header")
|
||||
return "ERROR: Invalid access in preflight!"
|
||||
if request.headers.get(b"Accept", b"") != b"*/*":
|
||||
response.set_error(400, u"Request does not have 'Accept: */*' header")
|
||||
return b"ERROR: Invalid access in preflight!"
|
||||
|
||||
if "control_request_headers" in request.GET:
|
||||
stashed_data['control_request_headers'] = request.headers.get("Access-Control-Request-Headers", None)
|
||||
if b"control_request_headers" in request.GET:
|
||||
stashed_data[b'control_request_headers'] = request.headers.get(b"Access-Control-Request-Headers", None)
|
||||
|
||||
if "max_age" in request.GET:
|
||||
headers.append(("Access-Control-Max-Age", request.GET['max_age']))
|
||||
if b"max_age" in request.GET:
|
||||
headers.append((b"Access-Control-Max-Age", request.GET[b'max_age']))
|
||||
|
||||
if "allow_headers" in request.GET:
|
||||
headers.append(("Access-Control-Allow-Headers", request.GET['allow_headers']))
|
||||
if b"allow_headers" in request.GET:
|
||||
headers.append((b"Access-Control-Allow-Headers", request.GET[b'allow_headers']))
|
||||
|
||||
if "allow_methods" in request.GET:
|
||||
headers.append(("Access-Control-Allow-Methods", request.GET['allow_methods']))
|
||||
if b"allow_methods" in request.GET:
|
||||
headers.append((b"Access-Control-Allow-Methods", request.GET[b'allow_methods']))
|
||||
|
||||
preflight_status = 200
|
||||
if "preflight_status" in request.GET:
|
||||
preflight_status = int(request.GET.first("preflight_status"))
|
||||
if b"preflight_status" in request.GET:
|
||||
preflight_status = int(request.GET.first(b"preflight_status"))
|
||||
|
||||
stashed_data['preflight'] = "1"
|
||||
stashed_data['preflight_referrer'] = request.headers.get("Referer", "")
|
||||
stashed_data['preflight_user_agent'] = request.headers.get("User-Agent", "")
|
||||
stashed_data[b'preflight'] = b"1"
|
||||
stashed_data[b'preflight_referrer'] = request.headers.get(b"Referer", b"")
|
||||
stashed_data[b'preflight_user_agent'] = request.headers.get(b"User-Agent", b"")
|
||||
if token:
|
||||
request.server.stash.put(token, stashed_data)
|
||||
|
||||
return preflight_status, headers, ""
|
||||
return preflight_status, headers, b""
|
||||
|
||||
|
||||
if token:
|
||||
|
@ -60,19 +60,19 @@ def main(request, response):
|
|||
if data:
|
||||
stashed_data = data
|
||||
|
||||
if "checkUserAgentHeaderInPreflight" in request.GET and request.headers.get("User-Agent") != stashed_data['preflight_user_agent']:
|
||||
return 400, headers, "ERROR: No user-agent header in preflight"
|
||||
if b"checkUserAgentHeaderInPreflight" in request.GET and request.headers.get(b"User-Agent") != stashed_data[b'preflight_user_agent']:
|
||||
return 400, headers, b"ERROR: No user-agent header in preflight"
|
||||
|
||||
#use x-* headers for returning value to bodyless responses
|
||||
headers.append(("Access-Control-Expose-Headers", "x-did-preflight, x-control-request-headers, x-referrer, x-preflight-referrer, x-origin"))
|
||||
headers.append(("x-did-preflight", stashed_data['preflight']))
|
||||
if stashed_data['control_request_headers'] != None:
|
||||
headers.append(("x-control-request-headers", stashed_data['control_request_headers']))
|
||||
headers.append(("x-preflight-referrer", stashed_data['preflight_referrer']))
|
||||
headers.append(("x-referrer", request.headers.get("Referer", "")))
|
||||
headers.append(("x-origin", request.headers.get("Origin", "")))
|
||||
headers.append((b"Access-Control-Expose-Headers", b"x-did-preflight, x-control-request-headers, x-referrer, x-preflight-referrer, x-origin"))
|
||||
headers.append((b"x-did-preflight", stashed_data[b'preflight']))
|
||||
if stashed_data[b'control_request_headers'] != None:
|
||||
headers.append((b"x-control-request-headers", stashed_data[b'control_request_headers']))
|
||||
headers.append((b"x-preflight-referrer", stashed_data[b'preflight_referrer']))
|
||||
headers.append((b"x-referrer", request.headers.get(b"Referer", b"")))
|
||||
headers.append((b"x-origin", request.headers.get(b"Origin", b"")))
|
||||
|
||||
if token:
|
||||
request.server.stash.put(token, stashed_data)
|
||||
|
||||
return headers, ""
|
||||
return headers, b""
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue