Adding domain whitelist #2

as-ideas · Sep 7, 2017 · c03fd49 · c03fd49
1 parent 6b11bbb
commit c03fd49
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 5 deletions.
diff --git a/http_server.js b/http_server.js
@@ -16,10 +16,7 @@ let CACHE_DURATION = '10m';
 let DOCUMENT_ROOT = __dirname + '/dist';
 
 let domainWhitelist = function (req, res, next) {
-
   let host = req.header("host") || req.header("Host");
-  console.info("Host", host, isHostInWhitelist(host));
-
   if (isHostInWhitelist(host)) {
     next();
   } else {
@@ -34,8 +31,9 @@ function isHostInWhitelist(host) {
   let length = split.length;
   if (length >= 2) {
     let domainNameWithEnding = split[length - 2] + '.' + split[length - 1];
-    console.info("domainNameWithEnding", domainNameWithEnding);
     return whitelist.whitelist.includes(domainNameWithEnding);
+  } else if (host.startsWith("localhost")) {
+    return true;
   }
   return false;
 }

diff --git a/test/node/http.server.spec.js b/test/node/http.server.spec.js
@@ -32,6 +32,26 @@ describe('nodejs http server', () => {
       }, 1000);
   });
 
+  it('should work with whitelisted hosts and ignore header case', function (done) {
+    request(app)
+      .get('/end2end-tests/complete-integration-site-a.html')
+      .set({"Host": "finanzen.net"})
+      .end(function (error, response) {
+        expect(response.statusCode).to.equal(200);
+        done();
+      }, 1000);
+  });
+
+  it('should work with localhost', function (done) {
+    request(app)
+      .get('/end2end-tests/complete-integration-site-a.html')
+      .set({"host": "localhost:8080"})
+      .end(function (error, response) {
+        expect(response.statusCode).to.equal(200);
+        done();
+      }, 1000);
+  });
+
   it('should return 403 with not whitelisted hosts', function (done) {
     request(app)
       .get('/end2end-tests/complete-integration-site-a.html')

diff --git a/test/performance/src/test/scala/HerokuPerformanceSimulation.scala b/test/performance/src/test/scala/HerokuPerformanceSimulation.scala
@@ -17,5 +17,5 @@ class HerokuPerformanceSimulation extends Simulation {
 
   // 30_000 Request in 60s (= 500req/s) with 10x dynos
 //  setUp(myScenario.inject(rampUsers(30000) over (60 seconds)).protocols(httpConf))
-  setUp(myScenario.inject(rampUsers(60000) over (120 seconds)).protocols(httpConf))
+  setUp(myScenario.inject(rampUsers(30) over (30 seconds)).protocols(httpConf))
 }