Protocol/host rewrite

bin/configurable-http-proxy

@@ -42,6 +42,8 @@ args
     .option('--no-x-forward', "Don't add 'X-forward-' headers to proxied requests")
     .option('--no-prepend-path', "Avoid prepending target paths to proxied requests")
     .option('--no-include-prefix', "Don't include the routing prefix in proxied requests")
+    .option('--auto-rewrite', "Rewrite the Location header host/port in redirect responses")
+    .option('--protocol-rewrite <proto>', "Rewrite the Location header protocol in redirect responses to the specified protocol")
     .option('--insecure', "Disable SSL cert verification")
     .option('--host-routing', "Use host routing (host as first level of path)")
     .option('--statsd-host <host>', 'Host to send statsd statistics to')
@@ -181,6 +183,15 @@ if (args.insecure) options.secure = false;
 options.xfwd = args.xForward ? false : true;
 options.prependPath = args.prependPath;
 options.includePrefix = args.includePrefix;
+if (args.autoRewrite) {
+    options.autoRewrite = true;
+    log.info("AutoRewrite of Location headers enabled.");
+}
+
+if (args.protocolRewrite) {
+    options.protocolRewrite = args.protocolRewrite;
+    log.info("ProtocolRewrite enabled. Rewriting to "+options.protocolRewrite);
+}
 
 if (!options.auth_token) {
     log.warn("REST API is not authenticated.");

lib/testutil.js

@@ -44,6 +44,25 @@ var add_target = exports.add_target = function (proxy, path, port, websocket, ta
     proxy.add_route(path, {target: target});
 };
 
+var add_target_redirecting = exports.add_target_redirecting = function (proxy, path, port, target_path, redirect_to) {
+    // Like the above, but the server returns a redirect response with a Location header.
+    // Cannot use default arguments as they are apparently not supported.
+    var target = 'http://127.0.0.1:' + port;
+    if (target_path) {
+        target = target + target_path;
+    }
+    var server;
+    server = http.createServer(function (req, res) {
+        res.setHeader("Location", redirect_to);
+        res.statusCode = 301;
+        res.write('');
+        res.end();
+    });
+    server.listen(port);
+    servers.push(server);
+    proxy.add_route(path, {target: target});
+};
+
 exports.setup_proxy = function (port, callback, options, paths) {
     options = options || {};
     options.auth_token = 'secret';

test/proxy_spec.js

@@ -18,6 +18,7 @@ describe("Proxy Tests", function () {
     var r = request.defaults({
         method: 'GET',
         url: proxy_url,
+        followRedirect: false,
     });
 
     beforeEach(function (callback) {
@@ -258,4 +259,42 @@ describe("Proxy Tests", function () {
             });
         });
     });
+
+    it("Redirect location untouched without rewrite options", function (done) {
+        var redirect_to = 'http://foo.com:12345/whatever';
+        util.add_target_redirecting(proxy, '/external/urlpath/', test_port, '/internal/urlpath/', redirect_to);
+        r(proxy_url + '/external/urlpath/rest/of/it', function (error, res, body) {
+            expect(error).toBe(null);
+            expect(res.statusCode).toEqual(301);
+            expect(res.headers.location).toEqual(redirect_to); 
+            done();
+        });
+    });
+
+    it("Redirect location with rewriting", function (done) {
+        var proxy_port = 55555;
+        var options = {
+            protocolRewrite: "https",
+            autoRewrite: true,
+        };
+
+        // where the backend server redirects us.
+        // Note that http-proxy requires (logically) the redirection to be to the same (internal) host.
+        var redirect_to = "http://127.0.0.1:"+test_port+"/whatever";
+
+        var validation_callback = function (proxy) {
+            util.add_target_redirecting(proxy, '/external/urlpath/', test_port, '/internal/urlpath/', redirect_to);
+            var url = 'http://127.0.0.1:' + proxy_port;
+
+            r(url + '/external/urlpath/', function (error, res, body) {
+                expect(error).toBe(null);
+                expect(res.statusCode).toEqual(301);
+                expect(res.headers.location).toEqual("https://127.0.0.1:"+proxy_port+"/whatever");
+                done();
+            });
+        };
+
+        var proxy = util.setup_proxy(proxy_port, validation_callback, options, []);
+    });
+
 });