jenkins-bot has submitted this change and it was merged.
Change subject: (Bug 70761) Add strictSSL option to ParsoidConfig
......................................................................
(Bug 70761) Add strictSSL option to ParsoidConfig
Default require SSL certificates to be valid
Set to false when using self-signed SSL certificates
Change-Id: I3e8d2e00f42555bf554e03bc375e5e986d5d3571
---
M api/localsettings.js.example
M lib/mediawiki.ApiRequest.js
M lib/mediawiki.ParsoidConfig.js
3 files changed, 16 insertions(+), 0 deletions(-)
Approvals:
Subramanya Sastry: Looks good to me, approved
jenkins-bot: Verified
diff --git a/api/localsettings.js.example b/api/localsettings.js.example
index 9235892..61e5492 100644
--- a/api/localsettings.js.example
+++ b/api/localsettings.js.example
@@ -44,4 +44,8 @@
// The URL of your LintBridge API endpoint
//parsoidConfig.linterAPI = 'http://lintbridge.wmflabs.org/add';
+
+ // Require SSL certificates to be valid (default true)
+ // Set to false when using self-signed SSL certificates
+ //parsoidConfig.strictSSL = false;
};
diff --git a/lib/mediawiki.ApiRequest.js b/lib/mediawiki.ApiRequest.js
index 9ccd964..7838129 100644
--- a/lib/mediawiki.ApiRequest.js
+++ b/lib/mediawiki.ApiRequest.js
@@ -251,6 +251,7 @@
uri: uri,
timeout: 40 * 1000, // 40 seconds
proxy: env.conf.wiki.apiProxyURI,
+ strictSSL: env.conf.parsoid.strictSSL,
headers: {
'User-Agent': userAgent,
'Connection': 'close'
@@ -385,6 +386,7 @@
uri: uri,
timeout: 30 * 1000, // 30 seconds
proxy: env.conf.wiki.apiProxyURI,
+ strictSSL: env.conf.parsoid.strictSSL,
headers: {
'User-Agent': userAgent,
'Connection': 'close'
@@ -477,6 +479,7 @@
uri: uri,
timeout: 16 * 1000, // 16 seconds
proxy: env.conf.wiki.apiProxyURI,
+ strictSSL: env.conf.parsoid.strictSSL,
headers: {
'User-Agent': userAgent,
'Connection': 'close'
@@ -567,6 +570,7 @@
followRedirect: false,
uri: uri,
timeout: 60 * 1000, // 60 seconds: less than 100s VE timeout so
we still finish
+ strictSSL: env.conf.parsoid.strictSSL,
headers: {
'User-Agent': userAgent,
'Connection': 'close',
@@ -655,6 +659,7 @@
uri: apiURI + '?' + qs.stringify( apiargs ),
timeout: 40 * 1000,
proxy: apiProxyURI,
+ strictSSL: env.conf.parsoid.strictSSL,
headers: {
'User-Agent': userAgent,
'Connection': 'close'
diff --git a/lib/mediawiki.ParsoidConfig.js b/lib/mediawiki.ParsoidConfig.js
index 7951bca..2ba8622 100644
--- a/lib/mediawiki.ParsoidConfig.js
+++ b/lib/mediawiki.ParsoidConfig.js
@@ -251,6 +251,13 @@
*/
ParsoidConfig.prototype.tracerBackend = null;
+/**
+ * @property {boolean} strictSSL
+ * By default require SSL certificates to be valid
+ * Set to false when using self-signed SSL certificates
+ */
+ParsoidConfig.prototype.strictSSL = true;
+
if (typeof module === "object") {
module.exports.ParsoidConfig = ParsoidConfig;
}
--
To view, visit https://gerrit.wikimedia.org/r/159811
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3e8d2e00f42555bf554e03bc375e5e986d5d3571
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Vichak <[email protected]>
Gerrit-Reviewer: Arlolra <[email protected]>
Gerrit-Reviewer: Cscott <[email protected]>
Gerrit-Reviewer: GWicke <[email protected]>
Gerrit-Reviewer: Marcoil <[email protected]>
Gerrit-Reviewer: Subramanya Sastry <[email protected]>
Gerrit-Reviewer: Vichak <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
