.gitignore

@@ -6,4 +6,4 @@ node_modules
 bench/env
 bench/results
 bench/html
-
+dist

bin/configurable-http-proxy

@@ -14,7 +14,7 @@ var fs = require('fs'),
     log = require('winston');
 
 args
-    .version('0.3.0')
+    .version('0.4.0')
     // .option('-h', '--help', 'show help')
     .option('--ip <n>', 'Public-facing IP of the proxy')
     .option('--port <n>', 'Public-facing port of the proxy', parseInt)
@@ -25,6 +25,7 @@ args
     .option('--api-ssl-key <keyfile>', 'SSL key to use, if any, for API requests')
     .option('--api-ssl-cert <certfile>', 'SSL certificate to use, if any, for API requests')
     .option('--default-target <host>', 'Default proxy target (proto://host[:port]')
+    .option('--redirect-port <redirect-port>', 'Redirect HTTP requests on this port to the server on HTTPS')
     // passthrough http-proxy options
     .option('--no-x-forward', "Don't add 'X-forward-' headers to proxied requests")
     .option('--no-prepend-path', "Avoid prepending target paths to proxied requests")
@@ -75,6 +76,13 @@ if (args.apiSslKey || args.apiSslCert) {
 options.default_target = args.defaultTarget;
 options.host_routing = args.hostRouting;
 options.auth_token = process.env.CONFIGPROXY_AUTH_TOKEN;
+options.redirectPort = args.redirectPort;
+
+// certs need to be provided for https redirection
+if (!options.ssl && options.redirectPort) {
+    log.error("HTTPS redirection specified but certificates not provided.");
+    process.exit(2);
+}
 
 // passthrough for http-proxy options
 if (args.insecure) options.secure = false;
@@ -89,7 +97,7 @@ if (!options.auth_token) {
 var proxy = new ConfigurableProxy(options);
 
 var listen = {};
-listen.port = args.port || 8000;
+listen.port = parseInt(args.port) || 8000;
 listen.ip = args.ip;
 listen.api_ip = args.apiIp || 'localhost';
 listen.api_port = args.apiPort || listen.port + 1;
@@ -107,3 +115,18 @@ log.info("Proxy API at %s://%s:%s/api/routes",
     (listen.api_ip || '*'),
     listen.api_port);
 
+// Redirect HTTP to HTTPS on the proxy's port
+if (options.redirectPort && listen.port !== 80) {
+  var http = require('http');
+
+  http.createServer(function (req, res) {
+    var host = req.headers['host'].split(':')[0];
+
+    // Make sure that when we redirect, it's to the port the proxy is running on
+    if (listen.port !== 443) {
+        host = host + ':' + listen.port;
+    }
+    res.writeHead(301, { "Location": "https://" + host + req.url });
+    res.end();
+  }).listen(options.redirectPort);
+}

package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.3.0",
+  "version": "0.4.0",
   "name": "configurable-http-proxy",
   "description": "A configurable-on-the-fly HTTP Proxy",
   "author": "Jupyter Developers",