Merge pull request #257 from linkeddata/fix-proxy-issues

Fixing issues with proxy headers

Author: Andrei

.travis.yml

@@ -1,12 +1,13 @@
 sudo: false
 language: node_js
 node_js:
-  - "0.12"
+  - "4.0"
+  - "5.0"
 cache:
   directories:
     - node_modules
 addons:
   hosts:
     - nic.localhost
     - tim.localhost
-    - nicola.localhost
+    - nicola.localhost

lib/handlers/proxy.js

@@ -5,6 +5,7 @@ var cors = require('cors')
 var http = require('http')
 var https = require('https')
 var debug = require('../debug')
+var url = require('url')
 
 function addProxy (app, path) {
   debug.settings('XSS Proxy listening to ' + path)
@@ -13,7 +14,6 @@ function addProxy (app, path) {
     cors({
       methods: ['GET'],
       exposedHeaders: 'User, Location, Link, Vary, Last-Modified, Content-Length',
-      credentials: true,
       maxAge: 1728000,
       origin: true
     }),
@@ -37,11 +37,28 @@ function addProxy (app, path) {
         return res.send(400)
       }
 
-      var _req = request(uri, function (_res) {
+      // Set the headers and uri of the proxied request
+      var opts = url.parse(uri)
+      opts.headers = req.headers
+      // See https://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html
+      delete opts.headers.connection
+      delete opts.headers.host
+
+      var _req = request(opts, function (_res) {
         res.status(_res.statusCode)
+        // Set the response with the same header of proxied response
+        Object.keys(_res.headers).forEach(function (header) {
+          if (!res.get(header)) {
+            res.setHeader(header.trim(), _res.headers[header])
+          }
+        })
         _res.pipe(res)
       })
 
+      _req.on('error', function (e) {
+        res.send(500, 'Cannot proxy')
+      })
+
       _req.end()
     })
 }

test/params.js

@@ -25,6 +25,30 @@ describe('LDNODE params', function () {
         .expect(200, done)
     })
 
+    it('should return the same headers of proxied request', function (done) {
+      nock('https://amazingwebsite.tld')
+        .get('/')
+        .reply(function (uri, req) {
+          if (this.req.headers['accept'] !== 'text/turtle') {
+            throw Error('Accept is received on the header')
+          }
+          if (this.req.headers['test'] && this.req.headers['test'] === 'test1') {
+            return [200, 'YES']
+          } else {
+            return [500, 'empty']
+          }
+        })
+
+      server.get('/proxy?uri=https://amazingwebsite.tld/')
+        .set('test', 'test1')
+        .set('accept', 'text/turtle')
+        .expect(200)
+        .end(function (err, data) {
+          if (err) return done(err)
+          done(err)
+        })
+    })
+
     it('should also work on /proxy/ ?uri', function (done) {
       nock('https://amazingwebsite.tld').get('/').reply(200)
       server.get('/proxy/?uri=https://amazingwebsite.tld/')