proxy now works, needs more tests

nicola · nicola · commit c7a4fdedaf3f · 2015-08-03T22:53:49.000+02:00
diff --git a/bin/ldnode.js b/bin/ldnode.js
@@ -54,6 +54,11 @@ var argv = require('nomnom')
     help: 'HTTP Session secret key (e.g. "your secret phrase")',
     abbr: 's'
   })
+  .option('xssProxy', {
+    full: 'xss-proxy',
+    help: 'Use a proxy on example.tld/xssProxyPath',
+    abbr: 'P'
+  })
   .option('noLive', {
     full: 'no-live',
     help: 'Disable live support through WebSockets',
diff --git a/index.js b/index.js
@@ -46,14 +46,14 @@ function ldnode (argv) {
         resave: false
     }));
 
-    // Setting up routes
-    app.use('/', routes());
-
     // Adding proxy
     if (ldp.xssProxy) {
         proxy(app, ldp.proxyFilter);
     }
 
+    // Setting up routes
+    app.use('/', routes());
+
     // Setup Express app
     if (ldp.live) {
         ws(app);
diff --git a/test/http.js b/test/http.js
@@ -43,11 +43,18 @@ describe('HTTP APIs', function() {
   var address = 'http://localhost:3457';
   var ldp = ldnode.createServer({
     root: __dirname + '/resources',
+    xssProxy: '/proxy'
   });
   ldp.listen(3457);
 
   var server = supertest(address);
 
+  describe('Proxy', function() {
+    it('should return the website in ?uri', function(done) {
+      server.get('/proxy?uri=http://google.com')
+        .expect(200, done);
+    });
+  });
 
   describe('GET Root container', function() {
       it('should have Access-Control-Allow-Origin as the req.Origin', function(done) {
