Add CORS support

netresearch · Oct 11, 2019 · d132be7 · d132be7
1 parent 07df285
commit d132be7
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 10 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -4,7 +4,7 @@ RUN mkdir -p /app && mkdir -p /app/public
 
 COPY *.js* /app/
 
-RUN cd /app && npm install
+RUN cd /app && npm ci
 
 EXPOSE 8080
 

diff --git a/README.rst b/README.rst
@@ -13,7 +13,7 @@ Usage
 
 You can expose a local directory which you want to have served via the `mini-webserver` by starting it with
 
-`docker run --name node-web -p 8080:8080 -v /path/to/local/folder:/app/public:ro -d netresearch/node-webserver`
+`docker run --name node-web -p 8080:8080 -v $PWD/test:/app/public:ro -d netresearch/node-webserver`
 
 In this example, the port on the docker host where the `node-webserver` is reachable is `8080`.
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -24,6 +24,7 @@
  },
  "homepage": "https://hub.docker.com/r/netresearch/node-webserver",
  "dependencies": {
+ "cors": "^2.8.5",
  "express": "^4.17.1",
  "morgan": "^1.9.1"
  }

diff --git a/server.js b/server.js
@@ -1,19 +1,33 @@
 const express = require('express'),
  app = express(),
- morgan = require('morgan'),
- customize = require('./customize');
+ cors = require('cors'),
+ customize = require('./customize'),
+ morgan = require('morgan')
 
-customize(app);
+customize(app)
 
-app.use(morgan('combined'));
-app.use(express.static(__dirname + '/public'));
+// Request logger
+app.use(morgan('combined'))
 
+// CORS cross origin request policy
+app.use(cors({
+ origin: process.env.CORS || 'https://*.autopilothq.com'
+}))
+if (process.env.CORS) {
+ console.info('CORS is set')
+}
+
+// Static files
+app.use(express.static(__dirname + '/public'))
+
+// Test webserver
 app.get('/status', function (req, res) {
- res.send('Hello from the Node Webserver!');
+ res.send('Hello from the Node Webserver!')
 });
 
+// Page not found
 app.use(function (req, res, next) {
- res.status(404).end();
+ res.status(404).end()
 });
 
-app.listen(process.env.PORT || 8080, '0.0.0.0');
+app.listen(process.env.PORT || 8080, '0.0.0.0')
diff --git a/tests/index.html b/tests/index.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="UTF-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <meta http-equiv="X-UA-Compatible" content="ie=edge">
+ <title>It works</title>
+</head>
+<body>
+ <h1>It works!</h1>
+</body>
+</html>