updated typeorm calls and added datasource needed to operate db calls.

Author: skewled

bulwark_base/Dockerfile

@@ -2,40 +2,40 @@
 # Maintained by Bill Jones
 
 # Start from Alpine Linux for smaller footprint
-FROM alpine:3.12.0
+FROM alpine:latest
 
 # Environmental Items
-ENV NODE_VERSION=14.17.0 \
-    TYPESCRIPT_VERSION=4.0.2 \
-    PUPPETEER_VERSION=5.2.1 \
+ENV NODE_VERSION=20.14.0 \
+    TYPESCRIPT_VERSION=10.9.2 \
+    PUPPETEER_VERSION=23.2.0 \
     PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true \
     PUPPETEER_EXECUTABLE_PATH=/usr/bin/chromium-browser
 
 # View template at https://github.com/nodejs/docker-node/blob/master/Dockerfile-alpine.template
 # Setup Bulwark Container User
-RUN addgroup -S bulwark && adduser -S bulwark -G bulwark
+RUN addgroup -S bulwark && adduser -S bulwark -G bulwark -s /bin/sh -D bulwark
 
 # Update Image
 RUN apk upgrade --no-cache -U
 
 # Install Required Packages to Build NodeJS and Puppeter Items
-RUN apk add --no-cache curl make gcc g++ python3 linux-headers binutils-gold gnupg libstdc++ chromium \
+RUN apk add --no-cache --virtual .build-deps-full curl make gcc g++ python3 linux-headers binutils-gold gnupg libstdc++ chromium \
  fontconfig udev ttf-freefont fontconfig pango-dev libxcursor libxdamage cups-libs dbus-libs libxrandr \
- libxscrnsaver libc6-compat nss freetype freetype-dev harfbuzz ca-certificates
+ libxscrnsaver libc6-compat nss freetype freetype-dev harfbuzz ca-certificates libgcc py-setuptools
 
 # Ingest the GPG Keys from https://github.com/nodejs/node#release-keys
-RUN for server in pool.sks-keyservers.net keyserver.pgp.com ha.pool.sks-keyservers.net; do \
+RUN for server in keys.openpgp.org pool.sks-keyservers.net keyserver.pgp.com ha.pool.sks-keyservers.net; do \
     gpg --keyserver $server --recv-keys \
       4ED778F539E3634C779C87C6D7062848A1AB005C \
-      94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
-      71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
+      141F07595B7B3FFE74309A937405533BE57C7D57 \
+      74F12602B6F1C4E913FAA37AD3A89613643B6201 \
+      DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \
+      CC68F5A3106FF448322E48ED27F5E38D5B0A215F \
       8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
-      C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
+      890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \
       C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \
-      DD8F2338BAE7501E3DD5AC78C273792F7D83545D \
-      A48C2BEE680E841632CD4E44F07496B3EB3C1762 \
       108F52B48DB57BB0CC439B2997B01419BD92F80A \
-      B9E2F5981AA6E0CD28160D9FF13993A75599653C && break; \
+      A363A499291CBBC940DD62E41F10027AF002F8B0 && break; \
   done
 
 # Perform nodejs installation
@@ -50,16 +50,15 @@ RUN curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE
  && ./configure \
  && make -j$(getconf _NPROCESSORS_ONLN) V= \
  && make install \
+ && apk del .build-deps-full \
  && cd .. \
  && rm -Rf "node-v$NODE_VERSION" \
- && rm "node-v$NODE_VERSION.tar.gz" SHASUMS256.txt.sig SHASUMS256.txt 
-
+ && rm "node-v$NODE_VERSION.tar.gz" SHASUMS256.txt.sig SHASUMS256.txt \
 # Cleanup
 RUN rm -f "node-v$NODE_VERSION" \
   # smoke tests
   && node --version \
-  && npm --version
-
+  && npm --version \
 # Setup for launch control of Bulwark
 WORKDIR /
 COPY bulwark-entrypoint /usr/local/bin/

docker-compose.yml

@@ -46,7 +46,7 @@ services:
       && npm run start"
 
   bulwark-db:
-    image: mysql:5.7.31
+    image: mysql:9.0.1  # 7.7.31
     container_name: bulwark_db
     environment:
       MYSQL_DATABASE: '${DB_NAME}'

package-lock.json

@@ -1,10 +1,10 @@
 {
   "name": "bulwark",
-  "version": "7.3.0",
+  "version": "8.0.0",
   "description": "An organizational asset and vulnerability management tool",
   "main": "index.js",
   "scripts": {
-    "test:node": "node_modules/.bin/jest --config=jest.config.js --collectCoverage --runInBand",
+    "test:node": "node_modules/.bin/jest --config=jest.config.js --collectCoverage",
     "test:front": "cd frontend && npm run-script test",
     "test": "npm run-script test:node && npm run-script test:front",
     "start": "node dist/app.js",
@@ -17,11 +17,11 @@
     "postinstall": "rimraf dist && tsc && npm run config && npm run build:prod",
     "typeorm": "ts-node -r tsconfig-paths/register ./node_modules/typeorm/cli.js",
     "docker:check": "node dist/init/docker-run-exec.js",
-    "migration:run": "typeorm migration:run",
-    "migration:init": "typeorm migration:generate -n CreateDatabase && rimraf dist && tsc",
-    "migration:generate": "typeorm migration:generate -n Refactor && rimraf dist && tsc",
-    "migration:create": "typeorm migration:create -n newInit && rimraf dist && tsc",
-    "migration:revert": "typeorm migration:revert",
+    "migration:run": "typeorm migration:run -d src/data-source.ts",
+    "migration:init": "typeorm migration:generate -d src/data-source.ts CreateDatabase && rimraf dist && tsc",
+    "migration:generate": "typeorm migration:generate -d src/data-source.ts Refactor && rimraf dist && tsc",
+    "migration:create": "typeorm migration:create -d src/data-source.ts newInit && rimraf dist && tsc",
+    "migration:revert": "typeorm migration:revert -d src/data-source.ts",
     "tsc": "rimraf dist && tsc",
     "lint": "tslint --project . && cd frontend && npm run-script lint",
     "lint:fix": "tslint --fix --project . && cd frontend && npm run-script lint --fix=true",
@@ -97,9 +97,9 @@
     "jira2md": "^3.0.1",
     "jsonwebtoken": "^9.0.2",
     "mime-types": "^2.1.35",
-    "multer": "^1.4.4",
+    "multer": "^1.4.5-lts.1",
     "mysql": "^2.18.1",
-    "node-fetch": "^2.7.0",
+    "node-fetch": "^2.6.7",
     "nodemailer": "^6.9.14",
     "password-validator": "^5.3.0",
     "prod": "^1.0.1",

package.json

@@ -1,26 +1,9 @@
 import * as express from 'express';
 import * as path from 'path';
-const fs = require('fs');
-const dotenv = require('dotenv');
-
-if (fs.existsSync(path.join(__dirname, '../.env'))) {
-  const envPath = fs.readFileSync(path.join(__dirname, '../.env'));
-  // tslint:disable-next-line: no-console
-  console.log('A .env file has been found and will now be parsed.');
-  // https://github.com/motdotla/dotenv#what-happens-to-environment-variables-that-were-already-set
-  const envConfig = dotenv.parse(envPath);
-  if (envConfig) {
-    for (const key in envConfig) {
-      if (envConfig.hasOwnProperty(key)) {
-        process.env[key] = envConfig[key];
-      }
-    }
-    // tslint:disable-next-line: no-console
-    console.log('The provided .env file has been parsed successfully.');
-  }
-}
+import * as fs from 'fs';
+import * as dotenv from 'dotenv';
 import * as bodyParser from 'body-parser';
-import { createConnection } from 'typeorm';
+import { AppDataSource } from './data-source';
 const authController = require('./routes/authentication.controller');
 import * as userController from './routes/user.controller';
 const fileUploadController = require('./routes/file-upload.controller');
@@ -35,6 +18,9 @@ import * as teamController from './routes/team.controller';
 import * as apiKeyController from './routes/api-key.controller';
 const helmet = require('helmet');
 const cors = require('cors');
+
+// Environment variables are loaded from .env file in data-source.ts
+
 const app = express();
 app.use(cors());
 app.use(
@@ -64,16 +50,12 @@ const serverIpAddress = process.env.SERVER_ADDRESS || '127.0.0.1';
 app.set('port', serverPort);
 app.set('serverIpAddress', serverIpAddress);
 // tslint:disable-next-line: no-console
-app.listen(serverPort, () =>
-  console.info(`Server running on ${serverIpAddress}:${serverPort}`)
-);
-// create typeorm connection
-createConnection().then((_) => {
-  // tslint:disable-next-line: no-console
-  console.info(`Database connection successful`);
-  // Check for initial configuration and user
-  // If none exist, insert
-  configController.initialInsert();
+
+// Initialize TypeORM connection
+AppDataSource.initialize()
+  .then(async () => {
+    console.info(`Database connection successful`);
+    await configController.initialInsert();
 
   // Protected Global Routes
   app.post(
@@ -364,4 +346,14 @@ createConnection().then((_) => {
     [jwtMiddleware.checkToken, jwtMiddleware.isAdmin],
     apiKeyController.deleteApiKeyAsAdmin
   );
+    
+  // Start the server
+  app.listen(serverPort, () =>
+    console.info(`Server running on ${serverIpAddress}:${serverPort}`)
+  );
+})
+.catch((error) => {
+  console.error('Error during Data Source initialization:', error);
 });
+
+export { app };