Bump version to 3.4.19

Add package for extracted ipaddress format from convic
Merge branch 'dependabot/npm_and_yarn/convict-6.2.2' into master
2025-12-09 03:43:23 +00:00 · 2022-04-25 10:33:18 +02:00 · 2022-04-25 10:30:48 +02:00 · 2022-04-25 10:04:58 +02:00 · 2022-04-20 21:04:28 +00:00 · 2022-04-07 14:10:40 +02:00
4 changed files with 27063 additions and 6928 deletions
--- a/28
+++ b/28
@@ -4,41 +4,57 @@
 # License https://gitlab.com/timvisee/send/blob/master/LICENSE
 ##

-
 # Build project
 FROM node:16.13-alpine3.13 AS builder
+
+RUN set -x \
+  # Change node uid/gid
+  && apk --no-cache add shadow \
+  && groupmod -g 1001 node \
+  && usermod -u 1001 -g 1001 node
+
 RUN set -x \
    # Add user
-    && addgroup --gid 10001 app \
+    && addgroup --gid 1000 app \
    && adduser --disabled-password \
        --gecos '' \
        --ingroup app \
        --home /app \
-        --uid 10001 \
+        --uid 1000 \
        app
+
 COPY --chown=app:app . /app
+
 USER app
 WORKDIR /app
+
 RUN set -x \
    # Build
    && PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true npm ci \
    && npm run build

-
 # Main image
 FROM node:16.13-alpine3.13
+
+RUN set -x \
+  # Change node uid/gid
+  && apk --no-cache add shadow \
+  && groupmod -g 1001 node \
+  && usermod -u 1001 -g 1001 node
+
 RUN set -x \
    # Add user
-    && addgroup --gid 10001 app \
+    && addgroup --gid 1000 app \
    && adduser --disabled-password \
        --gecos '' \
        --ingroup app \
        --home /app \
-        --uid 10001 \
+        --uid 1000 \
        app

 USER app
 WORKDIR /app
+
 COPY --chown=app:app package*.json ./
 COPY --chown=app:app app app
 COPY --chown=app:app common common
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
  "name": "send",
  "description": "File Sharing Experiment",
-  "version": "3.4.17",
+  "version": "3.4.19",
  "author": "Mozilla (https://mozilla.org)",
  "contributors": [
    "Tim Visee <3a4fb3964f@sinenomine.email> (https://timvisee.com)"
@@ -62,7 +62,7 @@
    "node": "^16.13.0"
  },
  "devDependencies": {
-    "@babel/core": "^7.16.12",
+    "@babel/core": "^7.17.9",
    "@babel/plugin-proposal-class-properties": "^7.16.7",
    "@babel/plugin-syntax-dynamic-import": "^7.2.0",
    "@babel/preset-env": "^7.16.11",
@@ -71,12 +71,12 @@
    "@mattiasbuelens/web-streams-polyfill": "0.2.1",
    "@sentry/browser": "^5.30.0",
    "asmcrypto.js": "^0.22.0",
-    "babel-loader": "^8.2.3",
+    "babel-loader": "^8.2.4",
    "babel-plugin-istanbul": "^5.2.0",
    "base64-js": "^1.5.1",
    "content-disposition": "^0.5.4",
    "copy-webpack-plugin": "^5.1.2",
-    "core-js": "^3.20.3",
+    "core-js": "^3.21.1",
    "crc": "^3.8.0",
    "cross-env": "^6.0.3",
    "css-loader": "^3.6.0",
@@ -106,7 +106,7 @@
    "npm-run-all": "^4.1.5",
    "nyc": "^14.1.1",
    "postcss-loader": "^3.0.0",
-    "postcss-preset-env": "^6.7.0",
+    "postcss-preset-env": "^6.7.1",
    "prettier": "^1.19.1",
    "proxyquire": "^2.1.3",
    "puppeteer": "^2.0.0",
@@ -133,18 +133,19 @@
    "@dannycoates/express-ws": "^5.0.3",
    "@fluent/bundle": "^0.13.0",
    "@fluent/langneg": "^0.3.0",
-    "@google-cloud/storage": "^5.18.0",
+    "@google-cloud/storage": "^5.19.0",
    "@sentry/node": "^5.30.0",
-    "aws-sdk": "^2.1062.0",
-    "body-parser": "^1.19.1",
+    "aws-sdk": "^2.1109.0",
+    "body-parser": "^1.20.0",
    "choo": "^7.0.0",
    "cldr-core": "^35.1.0",
    "configstore": "github:dannycoates/configstore#master",
-    "convict": "^5.2.1",
+    "convict": "^6.2.2",
+    "convict-format-with-validator": "^6.2.0",
    "double-ended-queue": "^2.1.0-0",
-    "express": "^4.17.2",
+    "express": "^4.17.3",
    "helmet": "^3.23.3",
-    "mkdirp": "^0.5.1",
+    "mkdirp": "^0.5.6",
    "mozlog": "^2.2.0",
    "node-fetch": "^2.6.7",
    "redis": "^3.1.1",
--- a/server/config.js
+++ b/server/config.js
@@ -1,8 +1,11 @@
 const convict = require('convict');
+const convict_format_with_validator = require('convict-format-with-validator');
 const { tmpdir } = require('os');
 const path = require('path');
 const { randomBytes } = require('crypto');

+convict.addFormats(convict_format_with_validator);
+
 convict.addFormat({
  name: 'positive-int-array',
  coerce: ints => {
Author	SHA1	Message	Date
timvisee	81741dcc76	Bump version to 3.4.19	2022-04-25 10:33:18 +02:00
timvisee	58a0800384	Add package for extracted ipaddress format from convic	2022-04-25 10:30:48 +02:00
timvisee	7323f584c1	Merge branch 'dependabot/npm_and_yarn/convict-6.2.2' into master See https://github.com/timvisee/send/pull/83	2022-04-25 10:04:58 +02:00
dependabot[bot]	c616412449	Bump convict from 5.2.1 to 6.2.2 Bumps [convict](https://github.com/mozilla/node-convict) from 5.2.1 to 6.2.2. - [Release notes](https://github.com/mozilla/node-convict/releases) - [Changelog](https://github.com/mozilla/node-convict/blob/master/CHANGELOG.md) - [Commits](https://github.com/mozilla/node-convict/compare/v5.2.1...v6.2.2) --- updated-dependencies: - dependency-name: convict dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>	2022-04-20 21:04:28 +00:00
timvisee	b9faece68e	Merge branch 'dependabot/npm_and_yarn/minimist-1.2.6' into master See https://github.com/timvisee/send/pull/80	2022-04-07 14:10:40 +02:00
dependabot[bot]	097bdf8853	Bump minimist from 1.2.5 to 1.2.6 Bumps [minimist](https://github.com/substack/minimist) from 1.2.5 to 1.2.6. - [Release notes](https://github.com/substack/minimist/releases) - [Commits](https://github.com/substack/minimist/compare/1.2.5...1.2.6) --- updated-dependencies: - dependency-name: minimist dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>	2022-04-07 11:27:32 +00:00
timvisee	e96e09f664	Update dependencies	2022-04-07 13:22:46 +02:00
timvisee	0ebea72b3e	Bump version to 3.4.18	2022-03-28 22:03:52 +02:00
timvisee	9cac202892	Update dependencies	2022-03-28 21:45:05 +02:00
Tim Visée	b41c8087f9	Merge branch 'improve-dockerfile' into 'master' Docker: Set app user gid/uid to 1000 See merge request timvisee/send!22	2022-03-28 19:41:20 +00:00
Lounès Ksouri	9fcc8e36b0	set app user gid/uid to 1000	2022-03-26 15:08:24 +00:00
timvisee	905ca545c7	Update dependencies	2022-03-21 16:13:07 +01:00
timvisee	742b5de7e1	Update dependencies	2022-03-07 14:39:38 +01:00