Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 10:44:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1850665 - Alter location URL and request headers to not be blocked when requesting location queue. r=perftest-reviewers,kshampur

Browse Source 
A week ago we got a permafail when requesting to know the location queue for certain data centres for webpagetest
I investigated and found the request was being blocked by cloudflare for some security reasons
Modifying the request URL and modifying headers resolved the issue

Differential Revision: https://phabricator.services.mozilla.com/D187497
This commit is contained in:
andrej 2023-09-07 16:12:48 +00:00
parent 6ca58e70d8
commit 1f4fea0034
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
python/mozperftest/mozperftest/test/webpagetest.py
View File

@ -237,7 +237,7 @@ class WebPageTest(Layer):
location_list = {}
try:
location_list = self.request_with_timeout(
"https://www.webpagetest.org/getLocations.php?f=json"
"https://webpagetest.org/getLocations.php?f=json"
)["data"]
except Exception:
self.error(
@ -255,7 +255,8 @@ class WebPageTest(Layer):
)
def request_with_timeout(self, url):
requested_results = requests.get(url)
request_header = {"Host": "www.webpagetest.org"}
requested_results = requests.get(url, headers=request_header)
results_of_request = json.loads(requested_results.text)
start = time.monotonic()
if (
@ -271,7 +272,7 @@ class WebPageTest(Layer):
and results_of_request["statusCode"] != 200
)
):
requested_results = requests.get(url)
requested_results = requests.get(url, headers=request_header)
results_of_request = json.loads(requested_results.text)
time.sleep(self.wait_between_requests)
if time.monotonic() - start > self.timeout_limit:
@ -310,7 +311,7 @@ class WebPageTest(Layer):
wpt_test_request_link = self.create_wpt_request_link(options, website)
send_wpt_test_request = self.request_with_timeout(wpt_test_request_link)[
"data"
]["jsonUrl"]
]["jsonUrl"].replace("www.", "")
results_of_test = self.request_with_timeout(send_wpt_test_request)
return results_of_test
@ -319,7 +320,7 @@ class WebPageTest(Layer):
for key_value_pair in list(options.items())[6:]:
test_parameters += "&{}={}".format(*key_value_pair)
return (
f"https://www.webpagetest.org/runtest.php?url={website_to_be_tested}&k={self.WPT_key}&"
f"https://webpagetest.org/runtest.php?url={website_to_be_tested}&k={self.WPT_key}&"
f"location={options['location']}:{options['browser']}.{options['connection']}&"
f"f=json{test_parameters}"
)