whistle 2.9.4 → 2.9.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/biz/webui/cgi-bin/create-cert.js +13 -5
- package/biz/webui/cgi-bin/util.js +1 -0
- package/biz/webui/htdocs/index.html +1 -1
- package/biz/webui/htdocs/js/index.js +33 -33
- package/lib/handlers/file-proxy.js +6 -6
- package/lib/https/ca.js +15 -7
- package/lib/plugins/index.js +5 -5
- package/lib/plugins/proxy.js +6 -1
- package/lib/rules/index.js +3 -1
- package/lib/rules/rules.js +6 -3
- package/lib/rules/util.js +2 -2
- package/lib/util/index.js +9 -2
- package/package.json +2 -2
|
@@ -1,15 +1,21 @@
|
|
|
1
1
|
var Zip = require('node-native-zip2');
|
|
2
2
|
var Buffer = require('safe-buffer').Buffer;
|
|
3
|
-
var
|
|
3
|
+
var qs = require('querystring');
|
|
4
|
+
var ca = require('../../../lib/https/ca');
|
|
4
5
|
|
|
5
|
-
var URL_RE = /^(?:(
|
|
6
|
+
var URL_RE = /^(?:([\w.-]+:)?\/\/)?([\w.=&!~*'()%-]+)/i;
|
|
7
|
+
var ILLEGAL_CHARS_RE = /[=&!~*'()%]/;
|
|
6
8
|
|
|
7
9
|
function parseDomain(domain) {
|
|
8
10
|
domain = domain && typeof domain === 'string' && domain.trim();
|
|
9
|
-
if (!domain || domain.length >
|
|
11
|
+
if (!domain || domain.length > 256 || !URL_RE.test(domain)) {
|
|
10
12
|
return;
|
|
11
13
|
}
|
|
12
|
-
|
|
14
|
+
domain = RegExp.$2.toLowerCase();
|
|
15
|
+
if (RegExp.$1 === 'root:') {
|
|
16
|
+
return qs.parse(domain);
|
|
17
|
+
}
|
|
18
|
+
return ILLEGAL_CHARS_RE.test(domain) ? null : domain;
|
|
13
19
|
}
|
|
14
20
|
|
|
15
21
|
module.exports = function(req, res) {
|
|
@@ -17,8 +23,10 @@ module.exports = function(req, res) {
|
|
|
17
23
|
if (!domain) {
|
|
18
24
|
return res.status(400).end('Bad Request');
|
|
19
25
|
}
|
|
20
|
-
var
|
|
26
|
+
var isStr = typeof domain == 'string';
|
|
27
|
+
var cert = isStr ? ca.createCertificate(domain) : ca.createRootCA(domain);
|
|
21
28
|
var zip = new Zip();
|
|
29
|
+
domain = isStr ? domain : 'root';
|
|
22
30
|
var dir = domain + '/' + domain;
|
|
23
31
|
zip.add(dir + '.crt', Buffer.from(cert.cert));
|
|
24
32
|
zip.add(dir + '.key', Buffer(cert.key));
|