Updates from upstream

.github/stale.yml

@@ -0,0 +1,3 @@
+# see available options / defaults at https://github.com/probot/stale/#usage
+daysUntilStale: 60
+daysUntilClose: 7

.travis.yml

@@ -0,0 +1,18 @@
+sudo: false
+language: node_js
+cache:
+  directories:
+    - node_modules
+notifications:
+  email: false
+node_js:
+  - '6'
+before_install:
+  - npm i -g npm@^3.0.0
+  - export DISPLAY=:99.0
+  - sh -e /etc/init.d/xvfb start
+script: TEST_CLIENT=selenium:firefox npm test
+before_script:
+  - npm prune
+after_success:
+  - npm run semantic-release

Dockerfile

@@ -0,0 +1,9 @@
+FROM node:8
+
+RUN npm install -g corsproxy
+
+EXPOSE 1337
+
+ENV CORSPROXY_HOST 0.0.0.0
+
+ENTRYPOINT ["corsproxy"]

README.md

@@ -1,49 +1,48 @@
-## Installation
+# corsproxy
 
-As a standalone tool:
+> standalone CORS proxy
 
-    $ npm install -g corsproxy
+[![Build Status](https://travis-ci.org/gr2m/CORS-Proxy.svg?branch=master)](https://travis-ci.org/gr2m/CORS-Proxy)
+[![Dependency Status](https://david-dm.org/gr2m/CORS-Proxy.svg)](https://david-dm.org/gr2m/CORS-Proxy)
+[![devDependency Status](https://david-dm.org/gr2m/CORS-Proxy/dev-status.svg)](https://david-dm.org/gr2m/CORS-Proxy#info=devDependencies)
 
-As a dependency:
+[![NPM](https://nodei.co/npm/corsproxy.png?downloads=true&downloadRank=true&stars=true)](https://nodei.co/npm/corsproxy/)
 
-    $ npm install corsproxy
 
+## Setup
 
-## Running
+```
+npm install -g corsproxy
+corsproxy
+# with custom port: CORSPROXY_PORT=1234 corsproxy
+# with custom host: CORSPROXY_HOST=localhost corsproxy
+# with debug server: DEBUG=1 corsproxy
+# with custom payload max bytes set to 10MB (1MB by default): CORSPROXY_MAX_PAYLOAD=10485760 corsproxy
+```
 
-Standalone:
+### Docker
 
-    $ corsproxy
-    CORS Proxy started on localhost:9292
+It is also possible to run the cors proxy in a docker container:
 
-Standalone with custom host/port:
+```
+# Build image
+docker build -t corsproxy .
 
-    $ corsproxy 0.0.0.0 1234
-    CORS Proxy started on 0.0.0.0:1234
+# Run container
+docker run -p 1337:1337 --name corsproxy -d corsproxy
+```
 
-As a dependency:
-
-    var cors_proxy = require("corsproxy");
-    var http_proxy = require("http-proxy");
-    http_proxy.createServer(cors_proxy).listen(1234);
-
-With custom target:
+## Usage
 
-    var cors_proxy = require("corsproxy");
-    var http_proxy = require("http-proxy");
-    cors_proxy.options = {
-        target: {
-            host:"0.0.0.0",
-            port:5984
-        }
-    };
-    http_proxy.createServer(cors_proxy).listen(1234);
+The cors proxy will start at http://localhost:1337.
+To access another domain, use the domain name (including port) as the first folder, e.g.
 
+- http://localhost:1337/localhost:3000/sign_in
+- http://localhost:1337/my.domain.com/path/to/resource
+- etc etc
 
-## Usage
+By default the cors proxy will only answer requests sent to localhost. To use another domain (e.g. machine name) set an enviroment variable CORSPROXY_HOST to the required value before launching.
 
-The cors proxy will start at http://localhost:9292. To access another domain, use the domain name (including port) as the first folder, e.g.
+## License
 
-    http://localhost:9292/localhost:3000/sign_in
-    http://localhost:9292/my.domain.com/path/to/resource
-    etc etc
+MIT

bin/corsproxy

@@ -0,0 +1,120 @@
+#!/usr/bin/env node
+
+var Hapi = require('hapi')
+var plugin = require('../index')
+var good = require('good')
+var loggerOptions = require('../lib/logger-options')
+
+var server = new Hapi.Server({})
+var port = parseInt(process.env.CORSPROXY_PORT || process.env.PORT || 1337, 10)
+var host = (process.env.CORSPROXY_HOST || 'localhost');
+var maxPayload = parseInt(process.env.CORSPROXY_MAX_PAYLOAD || 1048576, 10)
+var proxy = server.connection({ port: port, labels: ['proxy'], host: host})
+
+server.register(require('inert'), function () {})
+server.register(require('h2o2'), function () {})
+
+// cors plugin
+server.register(plugin, {
+  select: ['proxy']
+}, function (error) {
+  if (error) server.log('error', error)
+})
+
+// logger plugin
+server.register({
+  register: good,
+  options: loggerOptions
+}, function (error) {
+  if (error) server.log('error', error)
+})
+
+// proxy route
+proxy.route({
+  method: '*',
+  path: '/{host}/{path*}',
+  handler: {
+    proxy: {
+      passThrough: true,
+      mapUri: function (request, callback) {
+        request.host = request.params.host
+        request.path = request.path.substr(request.params.host.length + 1)
+        request.headers['host'] = request.host
+        var query = request.url.search ? request.url.search : ''
+        console.log('proxy to http://' + request.host + request.path)
+        callback(null, 'http://' + request.host + request.path + query, request.headers)
+      }
+    }
+  },
+  config: {
+    payload: {
+      maxBytes: maxPayload
+    }
+  }
+})
+
+// default route
+proxy.route({
+  method: 'GET',
+  path: '/',
+  handler: {
+    file: 'public/index.html'
+  }
+})
+proxy.route({
+  method: 'GET',
+  path: '/favicon.ico',
+  handler: {
+    file: 'public/favicon.ico'
+  }
+})
+
+if (process.env.DEBUG) {
+  var testport = port + 1
+  var test = server.connection({ port: testport, labels: ['test'], host: host })
+
+  server.register(require('vision'), function (error) {
+    if (error) {
+      throw error
+    }
+
+    server.views({
+      engines: { ejs: require('ejs') },
+      path: 'public/test'
+    })
+  })
+
+  test.route({
+    method: 'GET',
+    path: '/favicon.ico',
+    handler: {
+      file: 'public/favicon.ico'
+    }
+  })
+  test.route({
+    method: 'GET',
+    path: '/test.json',
+    handler: {
+      file: 'public/test/test.json'
+    }
+  })
+
+  test.route({
+    method: 'GET',
+    path: '/',
+    handler: function (request, reply) {
+      reply.view('index', {
+        proxyPort: proxy.info.port,
+        testPort: test.info.port
+      })
+    }
+  })
+
+  server.log('info', 'Debug server starting at: ' + test.info.uri)
+}
+
+server.start(function (error) {
+  if (error) server.log('error', error)
+
+  server.log('info', 'CORS Proxy running at: ' + proxy.info.uri)
+})

bin/test-background

@@ -0,0 +1,48 @@
+#!/bin/bash
+
+set -e
+
+function cleanup {
+  set +e
+
+  npm run kill_selenium
+
+  echo "\nYou can safely ignore errors below, if you see any"
+
+  # kill chrome driver
+  CHROMEDRIVER_PID=`ps -ef | grep chromedriver | grep -v grep | awk '{print $2}'`
+  if [ "$CHROMEDRIVER_PID" ] ; then
+    kill -9 $CHROMEDRIVER_PID
+  fi
+  # kill test app
+  APP_PID=`ps -ef | grep 'corsproxy' | grep -v grep | awk '{print $2}'`
+  if [ "$APP_PID" ] ; then
+    kill -9 $APP_PID
+  fi
+}
+
+# always kill selenium, no matter if tests pass or exit
+trap cleanup EXIT
+
+if [ ! -d "/tmp/sv-selenium" ]; then
+  echo 'Selenium not yet installed, downloading & installing ...'
+  npm run install_selenium_and_chromedriver
+fi
+
+npm run start_selenium_with_chromedriver &
+DEBUG=1 npm start &
+
+COUNTER=0
+until $(curl --output /dev/null --silent --head --fail http://localhost:1338); do
+    let COUNTER=COUNTER+1
+    echo "Waiting for app ... $COUNTER / 60"
+    sleep 1
+    if [[ COUNTER -eq 60 ]] ; then
+      echo ""
+      echo "App start timeout"
+      exit 1
+    fi
+done
+echo 'App started :)'
+
+npm run test:mocha

index.js

@@ -0,0 +1,12 @@
+var addCorsHeaders = require('hapi-cors-headers')
+var pkg = require('./package.json')
+
+function corsPlugin (server, options, next) {
+  server.ext('onPreResponse', addCorsHeaders)
+  next()
+}
+
+corsPlugin.attributes = {
+  pkg: pkg
+}
+module.exports = corsPlugin