diff --git a/src/middleware/proxy-middleware.js b/src/middleware/proxy-middleware.js index 0a145e182..63e66327a 100644 --- a/src/middleware/proxy-middleware.js +++ b/src/middleware/proxy-middleware.js @@ -2,7 +2,6 @@ // MIT license // contains https://github.com/gonzalocasas/node-proxy-middleware/pull/59 -var os = require('os'); var http = require('http'); var https = require('https'); var owns = {}.hasOwnProperty; @@ -17,8 +16,6 @@ module.exports = function proxyMiddleware(options) { var request = httpLib.request; options = options || {}; - options.hostname = options.hostname; - options.port = options.port; options.pathname = options.pathname || '/'; return function (req, resp, next) { @@ -50,8 +47,6 @@ module.exports = function proxyMiddleware(options) { opts.method = req.method; opts.headers = options.headers ? merge(req.headers, options.headers) : req.headers; - applyViaHeader(req.headers, opts, opts.headers); - if (!options.preserveHost) { // Forwarding the host breaks dotcloud delete opts.headers.host; @@ -66,8 +61,6 @@ module.exports = function proxyMiddleware(options) { // absoulte path headers.location = location.replace(options.href, slashJoin('/', slashJoin((options.route || ''), ''))); } - applyViaHeader(myRes.headers, opts, myRes.headers); - rewriteCookieHosts(myRes.headers, opts, myRes.headers, req); resp.writeHead(myRes.statusCode, myRes.headers); myRes.on('error', function (err) { next(err); @@ -88,43 +81,6 @@ module.exports = function proxyMiddleware(options) { }; }; -function applyViaHeader(existingHeaders, opts, applyTo) { - if (!opts.via) return; - - var viaName = (true === opts.via) ? os.hostname() : opts.via; - var viaHeader = '1.1 ' + viaName; - if(existingHeaders.via) { - viaHeader = existingHeaders.via + ', ' + viaHeader; - } - - applyTo.via = viaHeader; -} - -function rewriteCookieHosts(existingHeaders, opts, applyTo, req) { - if (!opts.cookieRewrite || !owns.call(existingHeaders, 'set-cookie')) { - return; - } - - var existingCookies = existingHeaders['set-cookie'], - rewrittenCookies = [], - rewriteHostname = (true === opts.cookieRewrite) ? os.hostname() : opts.cookieRewrite; - - if (!Array.isArray(existingCookies)) { - existingCookies = [ existingCookies ]; - } - - for (var i = 0; i < existingCookies.length; i++) { - var rewrittenCookie = existingCookies[i].replace(/(Domain)=[a-z\.-_]*?(;|$)/gi, '$1=' + rewriteHostname + '$2'); - - if (!req.connection.encrypted) { - rewrittenCookie = rewrittenCookie.replace(/;\s*?(Secure)/i, ''); - } - rewrittenCookies.push(rewrittenCookie); - } - - applyTo['set-cookie'] = rewrittenCookies; -} - function slashJoin(p1, p2) { var trailing_slash = false; @@ -146,4 +102,3 @@ function merge(src1, src2) { extend(merged, src2); return merged; } -