From ad442cb2f342e9c964ee3648fff629aaa2952089 Mon Sep 17 00:00:00 2001 From: Adhidarma Hadiwinoto <me@adhisimon.org> Date: Mon, 11 Mar 2019 13:34:43 +0700 Subject: [PATCH] No SSL for ip --- index.js | 14 +++++++++++++- package-lock.json | 13 +++++++++++++ package.json | 1 + 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/index.js b/index.js index ba6e900..8a9ee75 100644 --- a/index.js +++ b/index.js @@ -2,7 +2,9 @@ process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0'; +const URL = require('url'); const fs = require('fs'); +const isIp = require('is-ip'); const config = require(__dirname + '/config.json'); fs.existsSync('certs') || fs.mkdirSync('certs'); @@ -15,11 +17,21 @@ for (let i=0; i < hostsCount; i++) { console.log(`Registering ${host.host} to ${host.target}`); if (!host.disable) { const options = host.options || config.default_host_options; + const optionsWoSSL = JSON.parse(JSON.stringify(options)); + delete optionsWoSSL.ssl; + if (!options) { redbird.register(host.host, host.target); } else { - redbird.register(host.host, host.target, options); + + if isIp(URL.parse(host.host).hostname) { + redbird.register(host.host, host.target, optionsWoSSL); + } + else { + redbird.register(host.host, host.target, options); + } + } } diff --git a/package-lock.json b/package-lock.json index 25448c1..3127b6a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -470,11 +470,24 @@ "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" }, + "ip-regex": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz", + "integrity": "sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=" + }, "is": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/is/-/is-3.3.0.tgz", "integrity": "sha512-nW24QBoPcFGGHJGUwnfpI7Yc5CdqWNdsyHQszVE/z2pKHXzh7FZ5GWhJqSyaQ9wMkQnsTx+kAI8bHlCX4tKdbg==" }, + "is-ip": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-ip/-/is-ip-2.0.0.tgz", + "integrity": "sha1-aO6gfooKCpTC0IDdZ0xzGrKkYas=", + "requires": { + "ip-regex": "^2.0.0" + } + }, "is-my-ip-valid": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-my-ip-valid/-/is-my-ip-valid-1.0.0.tgz", diff --git a/package.json b/package.json index a8a5a23..0ccade5 100644 --- a/package.json +++ b/package.json @@ -17,6 +17,7 @@ "author": "Adhidarma Hadiwinoto <me@adhisimon.org>", "license": "ISC", "dependencies": { + "is-ip": "^2.0.0", "redbird": "^0.9.0" } } -- 1.9.0