Skip to content

Commit ff362bf

Browse files
authored
Merge pull request #517 from idaholab/fix/vulns
Fix/vulns
2 parents 9fc4218 + 7897f22 commit ff362bf

File tree

11 files changed

+1170
-794
lines changed

11 files changed

+1170
-794
lines changed

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM rust:alpine as build
1+
FROM rust:alpine:latest as build
22

33
ENV RUSTFLAGS="-C target-feature=-crt-static"
44
ENV RUN_MODE="build"
@@ -46,7 +46,7 @@ WORKDIR /srv/deeplynx/server
4646
RUN yarn install;
4747
RUN yarn run build;
4848

49-
FROM node:alpine as production
49+
FROM node:alpine:latest as production
5050
ENV DEVELOPMENT_MODE=false
5151

5252
RUN apk update && apk add --no-cache supervisor openssl

Dockerfile.dev

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM rust:alpine as build
1+
FROM rust:alpine:latest as build
22

33
ENV RUSTFLAGS="-C target-feature=-crt-static"
44
ENV RUN_MODE="build"
@@ -52,7 +52,7 @@ WORKDIR /srv/deeplynx/server
5252
RUN yarn install;
5353
RUN yarn run build;
5454

55-
FROM node:alpine as production
55+
FROM node:alpine:latest as production
5656
ENV DEVELOPMENT_MODE=false
5757

5858
# Add missing packages

server/NodeLibraries/deeplynx/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "deeplynx",
3-
"version": "1.7.5",
3+
"version": "1.7.6",
44
"main": "index.js",
55
"types": "index.d.ts",
66
"napi": {

server/package-lock.json

Lines changed: 196 additions & 180 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

server/package.json

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "deep-lynx",
3-
"version": "1.7.5",
3+
"version": "1.7.6",
44
"description": "DeepLynx allows for an integrated platform during design and operations of mega projects.",
55
"main": "./dist/main.js",
66
"author": "John Darrington and Christopher Ritter",
@@ -44,7 +44,7 @@
4444
"@types/express-session": "^1.18.0",
4545
"@types/faker": "^4.1.12",
4646
"@types/gremlin": "^3.6.7",
47-
"@types/helmet": "0.0.43",
47+
"@types/helmet": "^0.0.48",
4848
"@types/ioredis": "^4.28.10",
4949
"@types/jsonwebtoken": "^9.0.6",
5050
"@types/mocha": "^10.0.7",
@@ -132,7 +132,7 @@
132132
"csv-stringify": "^6.5.1",
133133
"csvtojson": "^2.0.10",
134134
"date-fns": "^2.30.0",
135-
"deeplynx": "^1.7.5",
135+
"deeplynx": "^1.7.6",
136136
"dev-null": "^0.1.1",
137137
"digest-stream": "^2.0.0",
138138
"dot-prop": "^5.3.0",
@@ -159,8 +159,10 @@
159159
"minimist": "^1.2.8",
160160
"minio": "^7.1.3",
161161
"ms": "^2.1.3",
162+
"nanoid": "^3.3.8",
162163
"node-cache": "^5.1.2",
163164
"nodemailer": "^6.9.14",
165+
"on-headers": "^1.1.0",
164166
"p-all": "^3.0.0",
165167
"p-limit": "^3.1.0",
166168
"p-map": "^4.0.0",
@@ -178,7 +180,7 @@
178180
"pg-format": "^1.0.4",
179181
"pg-large-object": "^2.0.0",
180182
"pg-query-stream": "^4.6.0",
181-
"postcss": "^8.4.41",
183+
"postcss": "^8.5.6",
182184
"reflect-metadata": "^0.1.14",
183185
"semver": "^7.6.3",
184186
"short-uuid": "^4.2.2",
@@ -198,5 +200,14 @@
198200
"*.js": "eslint --cache --fix",
199201
"*.{js,css,md}": "prettier --write"
200202
},
201-
"packageManager": "[email protected]"
203+
"packageManager": "[email protected]",
204+
"resolutions": {
205+
"lodash": "^4.17.12",
206+
"postcss": "^8.4.31",
207+
"webpack-dev-server": "^5.2.1",
208+
"dompurify": "^3.2.4",
209+
"cookie": "^0.7.0",
210+
"serialize-javascript": "^6.0.2",
211+
"on-headers": "^1.1.0"
212+
}
202213
}

0 commit comments

Comments
 (0)