diff --git a/Dockerfile b/Dockerfile index 8bbac51b..db4af42f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,12 +24,12 @@ ARG NODE_ENV=production \ TARGETARCH WORKDIR /build/backend RUN apk upgrade --no-cache -a && \ - apk add --no-cache ca-certificates nodejs-current yarn && \ + apk add --no-cache ca-certificates nodejs yarn && \ yarn global add clean-modules && \ if [ "$TARGETARCH" = "amd64" ]; then \ - npm_config_target_platform=linux npm_config_target_arch=x64 yarn install --no-lockfile; \ + npm_config_target_platform=linux npm_config_target_arch=x64 yarn install --no-lockfile; \ elif [ "$TARGETARCH" = "arm64" ]; then \ - npm_config_target_platform=linux npm_config_target_arch=arm64 yarn install --no-lockfile; \ + npm_config_target_platform=linux npm_config_target_arch=arm64 yarn install --no-lockfile; \ fi && \ clean-modules --yes && \ yarn cache clean --all @@ -58,7 +58,7 @@ RUN apk upgrade --no-cache -a && \ echo "APPSEC_FAILURE_ACTION=deny" | tee -a /src/crowdsec-nginx-bouncer/lua-mod/config_example.conf && \ sed -i "s|BOUNCING_ON_TYPE=all|BOUNCING_ON_TYPE=ban|g" /src/crowdsec-nginx-bouncer/lua-mod/config_example.conf -FROM zoeyvid/nginx-quic:python-275 +FROM zoeyvid/nginx-quic:281-python SHELL ["/bin/ash", "-eo", "pipefail", "-c"] ARG CRS_VER=v4.2.0 @@ -69,8 +69,8 @@ COPY --from=zoeyvid/curl-quic:380 /usr/local/bin/curl /usr/local/bin/curl RUN apk upgrade --no-cache -a && \ apk add --no-cache ca-certificates tzdata tini \ + nodejs \ bash nano \ - nodejs-current \ openssl apache2-utils \ lua5.1-lzlib lua5.1-socket \ coreutils grep findutils jq shadow su-exec \ diff --git a/backend/internal/host.js b/backend/internal/host.js index 6ca5895d..b858955b 100644 --- a/backend/internal/host.js +++ b/backend/internal/host.js @@ -6,8 +6,7 @@ const deadHostModel = require('../models/dead_host'); const internalHost = { /** * Makes sure that the ssl_* and hsts_* fields play nicely together. - * ie: if there is no cert, then force_ssl is off. - * if force_ssl is off, then hsts_enabled is definitely off. + * ie: if force_ssl is off, then hsts_enabled is definitely off. * * @param {object} data * @param {object} [existing_data] @@ -18,11 +17,6 @@ const internalHost = { const combined_data = _.assign({}, existing_data, data); - if (!combined_data.certificate_id) { - combined_data.ssl_forced = false; - combined_data.hsts_subdomains = false; - } - if (!combined_data.ssl_forced) { combined_data.hsts_enabled = false; } diff --git a/backend/models/redirection_host.js b/backend/models/redirection_host.js index 5c42acfb..5018eb2a 100644 --- a/backend/models/redirection_host.js +++ b/backend/models/redirection_host.js @@ -23,8 +23,6 @@ class RedirectionHost extends Model { if (typeof this.meta === 'undefined') { this.meta = {}; } - - this.domain_names.sort(); } $beforeUpdate() { diff --git a/backend/package.json b/backend/package.json index 6dd3e39a..fa0dea15 100644 --- a/backend/package.json +++ b/backend/package.json @@ -16,7 +16,7 @@ "gravatar": "1.8.2", "jsonwebtoken": "9.0.2", "knex": "3.1.0", - "liquidjs": "10.11.1", + "liquidjs": "10.12.0", "lodash": "4.17.21", "moment": "2.30.1", "mysql": "2.18.1", @@ -33,7 +33,7 @@ "eslint": "9.1.1", "eslint-config-prettier": "9.1.0", "eslint-plugin-prettier": "5.1.3", - "globals": "15.0.0", + "globals": "15.1.0", "prettier": "3.2.5" } } diff --git a/frontend/package.json b/frontend/package.json index 60fa8bd9..f27a80ff 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -4,7 +4,7 @@ "description": "A beautiful interface for creating Nginx endpoints", "main": "js/index.js", "dependencies": { - "@babel/core": "7.24.4", + "@babel/core": "7.24.5", "babel-core": "6.26.3", "babel-loader": "8.3.0", "babel-preset-env": "1.7.0",