From 68768e256bec137a47db335f8c4bfeae1390e516 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 24 May 2024 03:51:33 +0000
Subject: [PATCH] close #853 by fixing openssl regex/dep updates

---
 Caddy.Dockerfile                       | 2 +-
 Dockerfile                             | 2 +-
 README.md                              | 2 +-
 backend/internal/certificate.js        | 2 +-
 backend/package.json                   | 6 +++---
 frontend/package.json                  | 4 ++--
 rootfs/usr/local/nginx/conf/nginx.conf | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Caddy.Dockerfile b/Caddy.Dockerfile
index 4c2ccb651..2065efe97 100644
--- a/Caddy.Dockerfile
+++ b/Caddy.Dockerfile
@@ -1,4 +1,4 @@
-FROM caddy:2.7.6 as caddy
+FROM caddy:2.8.1 as caddy
 
 FROM alpine:3.20.0
 RUN apk add --no-cache ca-certificates tzdata
diff --git a/Dockerfile b/Dockerfile
index 76f8e3c71..25953a142 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -62,7 +62,7 @@ RUN apk upgrade --no-cache -a && \
 FROM zoeyvid/nginx-quic:287-python
 SHELL ["/bin/ash", "-eo", "pipefail", "-c"]
 
-ARG CRS_VER=v4.2.0
+ARG CRS_VER=v4.3.0
 
 COPY rootfs /
 COPY --from=zoeyvid/certbot-docker:35 /usr/local          /usr/local
diff --git a/README.md b/README.md
index 846c91a54..cd86c9b88 100644
--- a/README.md
+++ b/README.md
@@ -205,7 +205,7 @@ Immediately after logging in with this default user you will be asked to modify
 ### prerun scripts (EXPERT option) - if you don't know what this is, ignore it
 run order: entrypoint.sh (prerun scripts) => start.sh => launch.sh <br>
 if you need to run scripts before NPMplus launches put them under: `/opt/npm/etc/prerun/*.sh` (please add `#!/bin/sh` / `#!/bin/bash` to the top of the script) <br>
-you need to create this folder yourself - **NOTE:** I won't help you creating thoose patches/scripts if you need them you also need to know how to create them
+you need to create this folder yourself - **NOTE:** I won't help you creating those patches/scripts if you need them you also need to know how to create them
 
 ## Contributing
 All are welcome to create pull requests for this project, against the `develop` branch.
diff --git a/backend/internal/certificate.js b/backend/internal/certificate.js
index 97829cd4f..4ad0fe449 100644
--- a/backend/internal/certificate.js
+++ b/backend/internal/certificate.js
@@ -681,7 +681,7 @@ const internalCertificate = {
 			.exec('openssl x509 -in ' + certificate_file + ' -subject -noout')
 			.then((result) => {
 				// subject=CN = something.example.com
-				const regex = /(?:subject=)?[^=]+=\s+(\S+)/gim;
+				const regex = /(?:subject=)?[^=]+=\s*(\S+)/gim;
 				const match = regex.exec(result);
 
 				if (typeof match[1] === 'undefined') {
diff --git a/backend/package.json b/backend/package.json
index 86bfa7178..5961de941 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.13.0",
+    "liquidjs": "10.13.1",
     "lodash": "4.17.21",
     "moment": "2.30.1",
     "mysql": "2.18.1",
@@ -29,8 +29,8 @@
   "author": "Jamie Curnow <jc@jc21.com> and ZoeyVid <zoeyvid@zvcdn.de>",
   "license": "MIT",
   "devDependencies": {
-    "@eslint/js": "9.3.0",
-    "eslint": "9.3.0",
+    "@eslint/js": "9.4.0",
+    "eslint": "9.4.0",
     "eslint-config-prettier": "9.1.0",
     "eslint-plugin-prettier": "5.1.3",
     "globals": "15.3.0",
diff --git a/frontend/package.json b/frontend/package.json
index f27a80ff7..90d5df05d 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.5",
+    "@babel/core": "7.24.6",
     "babel-core": "6.26.3",
     "babel-loader": "8.3.0",
     "babel-preset-env": "1.7.0",
@@ -28,7 +28,7 @@
     "mini-css-extract-plugin": "1.6.2",
     "moment": "2.30.1",
     "node-sass": "7.0.3",
-    "nodemon": "3.1.0",
+    "nodemon": "3.1.2",
     "numeral": "2.0.6",
     "sass-loader": "10.5.2",
     "style-loader": "4.0.0",
diff --git a/rootfs/usr/local/nginx/conf/nginx.conf b/rootfs/usr/local/nginx/conf/nginx.conf
index a50944566..f85ea76ba 100644
--- a/rootfs/usr/local/nginx/conf/nginx.conf
+++ b/rootfs/usr/local/nginx/conf/nginx.conf
@@ -57,7 +57,7 @@ http {
 
     resolver local=on valid=10s ipv6=on;
     fastcgi_index index.php;
-    index index.php index.html;
+    index index.html index.php;
 
     error_page 404 =307 $scheme://$host:$server_port;
     error_page 497 =301 https://$host:$server_port$request_uri;