Mobrovac has submitted this change and it was merged.
Change subject: Tests: Set the protocol scheme to HTTPS
......................................................................
Tests: Set the protocol scheme to HTTPS
BetaCluster is now enforcing HTTPS and returns a 403 for HTTP requests,
so use HTTPS for every request to the MW and RESTBase APIs.
Change-Id: Iaeb4b86ef591409d40be4350f301a134cecb2388
---
M config.dev.yaml
M lib/api-util.js
2 files changed, 3 insertions(+), 4 deletions(-)
Approvals:
Mobrovac: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/config.dev.yaml b/config.dev.yaml
index b3f0858..c0e04e2 100644
--- a/config.dev.yaml
+++ b/config.dev.yaml
@@ -64,14 +64,14 @@
# the template used for contacting the MW API
mwapi_req:
method: post
- uri: '{{scheme}}://{{domain}}/w/api.php'
+ uri: 'https://{{domain}}/w/api.php'
headers:
user-agent: '{{user-agent}}'
body: '{{ default(request.query, {}) }}'
# the template used for contacting RESTBase
restbase_req:
method: get
- uri: '{{scheme}}://{{domain}}/api/rest_v1/{+path}'
+ uri: 'https://{{domain}}/api/rest_v1/{+path}'
query: '{{ default(request.query, {}) }}'
headers: '{{request.headers}}'
body: '{{request.body}}'
diff --git a/lib/api-util.js b/lib/api-util.js
index 0f58fdf..06a9ae9 100644
--- a/lib/api-util.js
+++ b/lib/api-util.js
@@ -23,8 +23,7 @@
var request = app.mwapi_tpl.expand({
request: {
- params: { domain: domain,
- scheme: domain.indexOf('beta.wmflabs.org') !== -1 ?
'http' : 'https' },
+ params: { domain: domain },
headers: { 'user-agent': app.conf.user_agent },
query: query
}
--
To view, visit https://gerrit.wikimedia.org/r/309003
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iaeb4b86ef591409d40be4350f301a134cecb2388
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/mobileapps
Gerrit-Branch: master
Gerrit-Owner: Mobrovac <mobro...@wikimedia.org>
Gerrit-Reviewer: BearND <bsitzm...@wikimedia.org>
Gerrit-Reviewer: Dbrant <dbr...@wikimedia.org>
Gerrit-Reviewer: Fjalapeno <cfl...@wikimedia.org>
Gerrit-Reviewer: GWicke <gwi...@wikimedia.org>
Gerrit-Reviewer: Jhernandez <jhernan...@wikimedia.org>
Gerrit-Reviewer: Mholloway <mhollo...@wikimedia.org>
Gerrit-Reviewer: Mhurd <mh...@wikimedia.org>
Gerrit-Reviewer: Mobrovac <mobro...@wikimedia.org>
Gerrit-Reviewer: Niedzielski <sniedziel...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
