From a2f8b38d756a974f68caa8a7f4ecc96ca16a01d3 Mon Sep 17 00:00:00 2001 From: Brian Bolt Date: Sun, 6 Dec 2020 12:36:12 -0800 Subject: [PATCH] Node upgrade, package json upgrades --- .env | 2 +- Dockerfile | 31 ++------- app_api_template.coffee | 4 +- app_template.coffee | 13 +++- package.json | 136 +++++++++++++++++++--------------------- 5 files changed, 83 insertions(+), 103 deletions(-) diff --git a/.env b/.env index d1785277b..6f4c40061 100644 --- a/.env +++ b/.env @@ -1 +1 @@ -ACAS_TAG=latest +ACAS_TAG=release-1.13.5 diff --git a/Dockerfile b/Dockerfile index 7cd1892da..7cf27e470 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,36 +10,13 @@ RUN \ dnf clean all # node -RUN set -ex \ - && for key in \ - 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \ - FD3A5288F042B6850C66B31F09FE44734EB7990E \ - 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \ - DD8F2338BAE7501E3DD5AC78C273792F7D83545D \ - C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ - B9AE9905FFD7803F25714661B63B535A4C206CA9 \ - 56730D5401028683275BD23C23EFEFE93C4CFFFE \ - 77984A986EBC2AA786BC0F66B01FBB92821C587A \ - 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ - ; do \ - gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" || \ - gpg --keyserver pgp.mit.edu --recv-keys "$key" || \ - gpg --keyserver keyserver.pgp.com --recv-keys "$key" || \ - gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys "$key" || \ - gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 "$key" || \ - gpg --keyserver pgp.mit.edu "$key"; \ - done ENV NPM_CONFIG_LOGLEVEL warn -ENV NODE_VERSION 6.9.3 +ENV NODE_VERSION 14.15.1 -RUN curl -SLO "http://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-x64.tar.gz" \ - && curl -SLO "http://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ - && gpg --verify SHASUMS256.txt.asc \ - && grep " node-v$NODE_VERSION-linux-x64.tar.gz\$" SHASUMS256.txt.asc | sha256sum -c - \ +RUN curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-x64.tar.gz" \ && tar -xzf "node-v$NODE_VERSION-linux-x64.tar.gz" -C /usr/local --strip-components=1 \ - && rm -f "node-v$NODE_VERSION-linux-x64.tar.gz" SHASUMS256.txt.asc \ - && npm cache clear + && rm -f "node-v$NODE_VERSION-linux-x64.tar.gz" # ACAS RUN useradd -u 1000 -ms /bin/bash runner @@ -49,7 +26,7 @@ ENV ACAS_BASE /home/runner/acas ENV ACAS_CUSTOM /home/runner/acas_custom ENV ACAS_SHARED /home/runner/acas_shared ENV APACHE Redhat -RUN npm install -g gulp@4.0.0 forever nodemon mocha coffeescript +RUN npm install -g gulp@4.0.2 forever@3.0.4 coffeescript@2.5.1 COPY package.json $ACAS_BASE/package.json RUN chown -R runner:runner $ACAS_BASE USER runner diff --git a/app_api_template.coffee b/app_api_template.coffee index 90fccc74e..f770f5630 100644 --- a/app_api_template.coffee +++ b/app_api_template.coffee @@ -15,7 +15,7 @@ startApp = -> methodOverride = require('method-override') session = require('express-session') bodyParser = require('body-parser') - multer = require('multer') + # multer = require('multer') errorHandler = require('errorhandler') cookieParser = require('cookie-parser') @@ -40,7 +40,7 @@ startApp = -> app.use(bodyParser.json({limit: '100mb'})) app.use(bodyParser.urlencoded({limit: '100mb', extended: true,parameterLimit: 1000000})) - app.use(multer()) + # app.use(multer()) app.use express.static path.join(__dirname, 'public') diff --git a/app_template.coffee b/app_template.coffee index 9b38496f6..ae919f224 100644 --- a/app_template.coffee +++ b/app_template.coffee @@ -16,7 +16,7 @@ startApp = -> methodOverride = require('method-override') session = require('express-session') bodyParser = require('body-parser') - multer = require('multer') + # multer = require('multer') errorHandler = require('errorhandler') cookieParser = require('cookie-parser') @@ -52,7 +52,12 @@ startApp = -> passport.deserializeUser (user, done) -> done null, user - passport.use new LocalStrategy csUtilities.loginStrategy + if csUtilities.loginStrategy.length > 3 + passport.use new LocalStrategy {passReqToCallback: true}, csUtilities.loginStrategy + else + passport.use new LocalStrategy csUtilities.loginStrategy + + # passport.use new LocalStrategy csUtilities.loginStrategy # passport.isAdmin = (req, resp, next) -> # if req.isAuthenticated() and csUtilities.isUserAdmin(req.user) # next() @@ -86,7 +91,7 @@ startApp = -> # app.use express.bodyParser() app.use(bodyParser.json({limit: '100mb'})) app.use(bodyParser.urlencoded({limit: '100mb', extended: true,parameterLimit: 1000000})) - app.use(multer()) + # app.use(multer()) app.use(express.static(path.join(__dirname, 'public'))) loginRoutes.setupRoutes(app, passport) @@ -115,6 +120,8 @@ startApp = -> #TODO hack to prevent bug: https://github.com/mikeal/request/issues/418 process.env.NODE_TLS_REJECT_UNAUTHORIZED = "0" + ###TO_BE_REPLACED_BY_PREPAREMODULEINCLUDES### + options = if stubsMode then ["stubsMode"] else [] options.push ['--color'] forever = require("forever-monitor") diff --git a/package.json b/package.json index 33b1dfd0c..f8c7c4238 100644 --- a/package.json +++ b/package.json @@ -15,89 +15,85 @@ "clean": "gulp clean" }, "dependencies": { - "archiver": "2.0.0", - "assert": "~1.1.1", - "async": "^0.9.0", - "asyncblock": "2.2.11", - "backbone": "^1.2.3", + "archiver": "5.1.0", + "assert": "~2.0.0", + "async": "^3.2.0", + "backbone": "^1.4.0", "backbone-validation": "^0.11.5", - "bluebird": "3.5.0", - "bootstrap": "3.3.7", - "body-parser": "^1.17.1", - "chai": "^3.5.0", - "connect-flash": "~0.1.0", - "cookie-parser": "^1.4.3", - "cron": "1.3.0", - "csv-parse": "^1.1.1", - "each": "0.6.1", - "errorhandler": "^1.5.0", - "express": "^4.15.2", - "express-session": "^1.15.1", + "bluebird": "3.7.2", + "body-parser": "^1.19.0", + "bootstrap": "4.5.3", + "chai": "^4.2.0", + "connect-flash": "~0.1.1", + "cookie-parser": "^1.4.5", + "cron": "1.8.2", + "csv-parse": "^4.14.1", + "each": "1.2.2", + "errorhandler": "^1.5.1", + "express": "^4.17.1", + "express-session": "^1.17.1", "extract-text-webpack-plugin": "3.0.0", - "file-loader": "0.11.2", - "flat": "4.0.0", - "forever-monitor": "1.7.1", - "glob": "7.1.2", + "file-loader": "6.2.0", + "flat": "5.0.2", + "forever-monitor": "3.0.3", + "glob": "7.1.6", "jade": "0.35.0", - "jasmine-core": "^2.4.1", + "jasmine-core": "^3.6.0", "jasmine-jquery": "^2.1.1", - "jquery": "^2.2.0", - "jquery-file-upload-middleware": "https://github.com/mcneilco/jquery-file-upload-middleware.git", - "json2csv": "^3.9.1", - "jszip": "3.1.4", - "less": "^2.6.0", - "lodash": "^4.0.0", - "marked": "0.3.6", - "method-override": "^2.3.7", - "mocha": "3.5.3", - "mochawesome": "^2.0.2", - "mongojs": "2.4.1", - "morgan": "^1.8.1", - "multer": "^0.1.8", + "jquery": "^3.5.1", + "jquery-file-upload-middleware": "git+https://github.com/mcneilco/jquery-file-upload-middleware.git", + "json2csv": "^5.0.5", + "jszip": "3.5.0", + "less": "^3.12.2", + "lodash": "^4.17.20", + "marked": "1.2.5", + "method-override": "^3.0.0", + "mkdirp": "1.0.4", + "mocha": "8.2.1", + "mochawesome": "^6.2.1", + "mongojs": "3.1.0", + "morgan": "^1.10.0", + "multer": "^1.4.2", "ncp": "2.0.0", - "open-graph": "0.2.3", - "passport": ">= 0.0.0", - "passport-local": ">= 0.0.0", + "passport": ">=0.4.1", + "passport-local": ">=1.0.0", + "passport.socketio": "^3.7.0", + "promise": "8.1.0", "properties": "1.2.1", "properties-parser": "0.3.1", - "serve-favicon": "^2.4.1", "request": "2.34.0", "request-promise": "4.2.1", - "shelljs": "0.6.0", - "socket.io": "^1.7.3", - "passport.socketio": "^3.7.0", - "phantomjs-prebuilt": "^2.1.16", - "promise": "7.1.1", - "style-loader": "0.18.2", - "temporary": "0.0.8", - "underscore": "1.8.3", + "serve-favicon": "^2.5.0", + "shelljs": "0.8.4", + "socket.io": "^3.0.3", + "style-loader": "2.0.0", + "temporary": "1.1.0", + "underscore": "1.12.0", "underscore-deep-extend": "1.1.5", - "url-loader": "0.5.9", - "webshot": "0.18.0", - "winston": "2.3.1", - "winston-mongodb": "2.0.10", - "yamljs": "0.3.0", - "mkdirp": "0.5.1" + "url-loader": "4.1.1", + "winston": "3.3.3", + "winston-mongodb": "5.0.5", + "yamljs": "0.3.0" }, "devDependencies": { - "coffee-script": "2.5.1", - "del": "^2.2.2", - "gulp": "^4.0.0", - "gulp-coffee": "^2.3.3", - "gulp-coffeeify": "^0.1.8", - "gulp-copy": "^1.0.0", - "gulp-exec": "^2.1.3", - "gulp-flatten": "^0.3.1", - "gulp-if": "^2.0.2", - "gulp-json-editor": "^2.2.1", - "gulp-notify": "^3.0.0", - "gulp-plumber": "^1.1.0", - "gulp-rename": "^1.2.2", - "gulp-replace": "^0.5.4", + "coffeescript": "2.5.1", + "del": "^6.0.0", + "gulp": "^4.0.2", + "gulp-coffee": "^3.0.3", + "gulp-coffeeify": "0.1.8", + "gulp-copy": "^4.0.1", + "gulp-exec": "^5.0.0", + "gulp-flatten": "^0.4.0", + "gulp-if": "^3.0.0", + "gulp-json-editor": "^2.5.4", + "gulp-notify": "^3.2.0", + "gulp-plumber": "^1.2.1", + "gulp-rename": "^2.0.0", + "gulp-replace": "^1.0.0", "gulp-run": "^1.7.1", - "gulp-watch": "^4.3.11", + "gulp-watch": "^5.0.1", "gutil": "^1.6.4", - "through2": "^2.0.3", - "yargs": "^7.0.2" + "through2": "^4.0.2", + "yargs": "^16.1.1" } }