From 6f9d202f7012f424e527178a6d33b777a4ad3e36 Mon Sep 17 00:00:00 2001 From: Andrew Nichols Date: Thu, 16 Nov 2017 12:02:04 -0500 Subject: [PATCH 1/2] Change Oracle Java installer to target Java8 This fixes what was a breaking build of the Dockerfile. --- Setup/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Setup/Dockerfile b/Setup/Dockerfile index 6161dee9..0f2f2278 100644 --- a/Setup/Dockerfile +++ b/Setup/Dockerfile @@ -35,8 +35,8 @@ RUN apt-get install -y software-properties-common #grab oracle java (auto accept licence) RUN add-apt-repository -y ppa:webupd8team/java RUN apt-get update -RUN echo oracle-java7-installer shared/accepted-oracle-license-v1-1 select true | /usr/bin/debconf-set-selections -RUN apt-get install -y oracle-java7-installer +RUN echo oracle-java8-installer shared/accepted-oracle-license-v1-1 select true | /usr/bin/debconf-set-selections +RUN apt-get install -y oracle-java8-installer RUN apt-get install -y gobjc From 1ac90400be888fb929974a7b0bda9d319b38bb8f Mon Sep 17 00:00:00 2001 From: Andrew Nichols Date: Thu, 16 Nov 2017 12:04:29 -0500 Subject: [PATCH 2/2] Update express dependency Since newer version unbundle and reorganize the structure: * add an explicit dependency on body-parser * create a server via 'http' rather than express directly --- API/app.js | 13 +++++++++---- API/package.json | 5 +++-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/API/app.js b/API/app.js index eadb95b5..ad811fc0 100644 --- a/API/app.js +++ b/API/app.js @@ -6,11 +6,16 @@ */ + + var express = require('express'); +var http = require('http'); var arr = require('./compilers'); var sandBox = require('./DockerSandbox'); -var app = express.createServer(); -var port=80; +var bodyParser = require('body-parser'); +var app = express(); +var server = http.createServer(app); +var port=8080; var ExpressBrute = require('express-brute'); @@ -21,7 +26,7 @@ var bruteforce = new ExpressBrute(store,{ }); app.use(express.static(__dirname)); -app.use(express.bodyParser()); +app.use(bodyParser()); app.all('*', function(req, res, next) { @@ -71,4 +76,4 @@ app.get('/', function(req, res) }); console.log("Listening at "+port) -app.listen(port); +server.listen(port); diff --git a/API/package.json b/API/package.json index 7fe32c1d..e3c73345 100644 --- a/API/package.json +++ b/API/package.json @@ -3,10 +3,11 @@ "version": "1.0.0", "main": "app.js", "dependencies": { - "express": "2.5.11", + "express": "4.*", + "body-parser" : "*", "express-brute":"*", "exports": "*" }, "author": "Osman Ali", "license": "MIT" -} \ No newline at end of file +}