Vichak has uploaded a new change for review.
https://gerrit.wikimedia.org/r/159811
Change subject: Add strictSSL option to WikiConfig
......................................................................
Add strictSSL option to WikiConfig
This is optional. If true, requires SSL certificates be valid. Set to false
inorder
to use your own certificate.
Change-Id: I3e8d2e00f42555bf554e03bc375e5e986d5d3571
---
M lib/mediawiki.ApiRequest.js
M lib/mediawiki.WikiConfig.js
2 files changed, 14 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/11/159811/1
diff --git a/lib/mediawiki.ApiRequest.js b/lib/mediawiki.ApiRequest.js
index 9ccd964..ee3ad20 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.wiki.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.wiki.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.wiki.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.wiki.strictSSL,
headers: {
'User-Agent': userAgent,
'Connection': 'close',
@@ -655,6 +659,7 @@
uri: apiURI + '?' + qs.stringify( apiargs ),
timeout: 40 * 1000,
proxy: apiProxyURI,
+ strictSSL: env.conf.wiki.strictSSL,
headers: {
'User-Agent': userAgent,
'Connection': 'close'
diff --git a/lib/mediawiki.WikiConfig.js b/lib/mediawiki.WikiConfig.js
index 9eceaa1..ab801dd 100644
--- a/lib/mediawiki.WikiConfig.js
+++ b/lib/mediawiki.WikiConfig.js
@@ -25,8 +25,9 @@
* @param {string} apiProxyURI (optional) The URI of a proxy that should be
* used to access apiURI, or null to explicitly disable proxying for this
* wiki.
+ * @param {boolean} strictSSL (optional) If true, requires SSL certificates be
valid. Note: to use your own certificate
*/
-function WikiConfig( resultConf, prefix, apiURI, apiProxyURI ) {
+function WikiConfig( resultConf, prefix, apiURI, apiProxyURI, strictSSL ) {
var nsid,
name,
conf = this;
@@ -69,6 +70,13 @@
// The proxy to use for this wiki.
this.apiProxyURI = apiProxyURI;
+ // StrictSSL option for allow selfsigned certificat in https
connection; default true
+ if ( strictSSL === undefined ) {
+ this.strictSSL = true;
+ } else {
+ this.strictSSL = strictSSL;
+ }
+
if ( resultConf === null ) {
// Use the default JSON that we've already loaded above.
resultConf = baseConfig;
--
To view, visit https://gerrit.wikimedia.org/r/159811
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3e8d2e00f42555bf554e03bc375e5e986d5d3571
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Vichak <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
