NuKVM/xen-orchestra
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix secure URL check.

Browse Source
This commit is contained in:
Julien Fontanet 2015-02-05 13:19:47 +01:00
parent f93f115e13
commit cecc4b1f6d
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/xo-lib/index.js
View File

@ -14,6 +14,12 @@ function notConnected() {
throw new Error('not connected'); throw new Error('not connected');
} }
function startsWith(string, target) {
return (string.lastIndexOf(target, 0) === 0);
}
//====================================================================
// Fix URL if necessary. // Fix URL if necessary.
var URL_RE = /^(?:(?:http|ws)(s)?:\/\/)?(.*?)\/*(?:\/api\/)?$/; var URL_RE = /^(?:(?:http|ws)(s)?:\/\/)?(.*?)\/*(?:\/api\/)?$/;
function fixUrl(url) { function fixUrl(url) {
@ -67,7 +73,7 @@ assign(Xo.prototype, {
this.status = 'connecting'; this.status = 'connecting';
var opts = {}; var opts = {};
if (/^https/.test(this._url)) { if (startsWith(this._url, 'wss')) {
// Due to imperfect TLS implementation in XO-Server. // Due to imperfect TLS implementation in XO-Server.
opts.rejectUnauthorized = false; opts.rejectUnauthorized = false;
} }