Merge pull request santthosh#49 from fdexfinancing/master

Fix basic http auth

Author: santthosh

Dockerfile

@@ -5,10 +5,9 @@ WORKDIR /app
 RUN useradd -ms /bin/bash aws-es-kibana
 RUN chown aws-es-kibana:aws-es-kibana /app
 
-ADD index.js /app
-ADD package.json /app
-
+COPY package.json /app
 RUN npm install
+COPY index.js /app
 
 EXPOSE 9200
 

index.js

@@ -7,7 +7,7 @@ var express = require('express');
 var bodyParser = require('body-parser');
 var stream = require('stream');
 var figlet = require('figlet');
-var basicAuth = require('basic-auth-connect');
+var basicAuth = require('express-basic-auth');
 var compress = require('compression');
 const fs = require('fs');
 const homedir = require('os').homedir();
@@ -129,10 +129,6 @@ var options = {
     secure: true
 };
 
-if (argv.u && argv.a) {
-  options['auth'] = argv.u + ':' + argv.a;
-}
-
 var proxy = httpProxy.createProxyServer(options);
 
 var app = express();
@@ -148,7 +144,17 @@ if (argv.H) {
 }
 
 if (argv.u && argv.a) {
-  app.use(basicAuth(argv.u, argv.a));
+
+  var users = {};
+  var user = process.env.USER || process.env.AUTH_USER;
+  var pass = process.env.PASSWORD || process.env.AUTH_PASSWORD;
+
+  users[user] = pass;
+
+  app.use(basicAuth({
+    users: users,
+    challenge: true
+  }));
 }
 
 app.use(async function (req, res) {

package-lock.json

@@ -33,10 +33,10 @@
   },
   "dependencies": {
     "aws-sdk": "^2.48.0",
-    "basic-auth-connect": "^1.0.0",
     "body-parser": "^1.15.2",
     "compression": "^1.6.2",
     "express": "^4.14.0",
+    "express-basic-auth": "^1.1.5",
     "figlet": "^1.1.2",
     "http-proxy": "^1.14.0",
     "yargs": "^4.8.1"