Merge branch 'develop' into angular17

# Conflicts:
#	frontend/package.json

Author: bkimminich

package.json

@@ -114,47 +114,47 @@
   },
   "dependencies": {
     "body-parser": "^1.20.2",
-    "check-dependencies": "^1.1.0",
+    "check-dependencies": "^1.1.1",
     "check-internet-connected": "^2.0.6",
-    "clarinet": "^0.12.5",
+    "clarinet": "^0.12.6",
     "colors": "1.4.0",
     "compression": "^1.7.4",
     "concurrently": "^5.3.0",
-    "config": "^3.3.9",
-    "cookie-parser": "^1.4.5",
+    "config": "^3.3.12",
+    "cookie-parser": "^1.4.6",
     "cors": "^2.8.5",
-    "dottie": "^2.0.2",
+    "dottie": "^2.0.6",
     "download": "^8.0.0",
     "errorhandler": "^1.5.1",
-    "ethers": "^6.7.0",
+    "ethers": "^6.13.2",
     "exif": "^0.6.0",
-    "express": "^4.17.1",
-    "express-ipfilter": "^1.2.0",
+    "express": "^4.21.0",
+    "express-ipfilter": "^1.3.2",
     "express-jwt": "0.1.3",
-    "express-rate-limit": "^5.3.0",
+    "express-rate-limit": "^5.5.1",
     "express-robots-txt": "^0.4.1",
     "express-security.txt": "^2.0.0",
     "feature-policy": "^0.5.0",
     "file-stream-rotator": "^0.5.7",
-    "file-type": "^16.1.0",
+    "file-type": "^16.5.4",
     "filesniffer": "^1.0.3",
-    "finale-rest": "^1.1.1",
-    "fs-extra": "^9.0.1",
-    "fuzzball": "^1.3.0",
-    "glob": "^10.3.10",
-    "graceful-fs": "^4.2.6",
-    "grunt": "^1.2.1",
+    "finale-rest": "^1.2.2",
+    "fs-extra": "^9.1.0",
+    "fuzzball": "^1.4.0",
+    "glob": "^10.4.5",
+    "graceful-fs": "^4.2.11",
+    "grunt": "^1.6.1",
     "grunt-contrib-compress": "^1.6.0",
     "grunt-replace-json": "^0.1.0",
-    "hashids": "^2.2.1",
-    "hbs": "^4.0.4",
-    "helmet": "^4.0.0",
-    "html-entities": "^1.3.1",
+    "hashids": "^2.3.0",
+    "hbs": "^4.2.0",
+    "helmet": "^4.6.0",
+    "html-entities": "^1.4.0",
     "i18n": "^0.11.1",
     "js-yaml": "^3.14.0",
     "jsonwebtoken": "0.4.0",
-    "jssha": "^3.1.1",
-    "juicy-chat-bot": "~0.8.0",
+    "jssha": "^3.3.1",
+    "juicy-chat-bot": "^0.8.0",
     "libxmljs": "^1.0.11",
     "marsdb": "^0.6.11",
     "median": "^0.0.2",
@@ -166,101 +166,101 @@
     "otplib": "^12.0.1",
     "pdfkit": "^0.11.0",
     "portscanner": "^2.2.0",
-    "prom-client": "^14.1.0",
-    "pug": "^3.0.0",
-    "replace": "^1.2.0",
+    "prom-client": "^14.2.0",
+    "pug": "^3.0.3",
+    "replace": "^1.2.2",
     "request": "^2.88.2",
     "sanitize-filename": "^1.6.3",
     "sanitize-html": "1.4.2",
-    "semver": "^7.3.2",
-    "sequelize": "^6.15.1",
+    "semver": "^7.6.3",
+    "sequelize": "^6.37.3",
     "serve-index": "^1.9.1",
-    "socket.io": "^3.1.0",
-    "sqlite3": "^5.0.8",
+    "socket.io": "^3.1.2",
+    "sqlite3": "^5.1.7",
     "svg-captcha": "^1.4.0",
-    "swagger-ui-express": "^5.0.0",
-    "ts-node-dev": "^1.1.6",
+    "swagger-ui-express": "^5.0.1",
+    "ts-node-dev": "^1.1.8",
     "unzipper": "0.9.15",
-    "web3": "^4.0.3",
-    "winston": "^3.3.3",
-    "yaml-schema-validator": "^1.2.2",
+    "web3": "^4.13.0",
+    "winston": "^3.14.2",
+    "yaml-schema-validator": "^1.2.3",
     "z85": "^0.0.2"
   },
   "devDependencies": {
-    "@cyclonedx/cyclonedx-npm": "^1.12.0",
-    "@istanbuljs/nyc-config-typescript": "^1.0.1",
-    "@types/chai": "^4.2.14",
-    "@types/chai-as-promised": "^7.1.3",
-    "@types/clarinet": "^0.12.1",
-    "@types/compression": "^1.7.0",
-    "@types/config": "^3.3.3",
-    "@types/cookie-parser": "^1.4.2",
-    "@types/cors": "^2.8.9",
-    "@types/cross-spawn": "^6.0.2",
+    "@cyclonedx/cyclonedx-npm": "^1.19.3",
+    "@istanbuljs/nyc-config-typescript": "^1.0.2",
+    "@types/chai": "^4.3.20",
+    "@types/chai-as-promised": "^7.1.8",
+    "@types/clarinet": "^0.12.3",
+    "@types/compression": "^1.7.5",
+    "@types/config": "^3.3.5",
+    "@types/cookie-parser": "^1.4.7",
+    "@types/cors": "^2.8.17",
+    "@types/cross-spawn": "^6.0.6",
     "@types/cypress": "^1.1.3",
     "@types/download": "^8.0.5",
-    "@types/errorhandler": "^1.5.0",
-    "@types/exif": "^0.6.3",
-    "@types/express": "^4.17.11",
-    "@types/express-jwt": "^6.0.0",
-    "@types/frisby": "^2.0.10",
-    "@types/fs-extra": "^9.0.6",
-    "@types/glob": "^7.1.6",
-    "@types/graceful-fs": "^4.1.5",
+    "@types/errorhandler": "^1.5.3",
+    "@types/exif": "^0.6.5",
+    "@types/express": "^4.17.21",
+    "@types/express-jwt": "^6.0.4",
+    "@types/frisby": "^2.0.17",
+    "@types/fs-extra": "^9.0.13",
+    "@types/glob": "^7.2.0",
+    "@types/graceful-fs": "^4.1.9",
     "@types/i18n": "^0.12.0",
     "@types/jasmine": "~3.9.1",
-    "@types/jest": "^26.0.20",
-    "@types/js-yaml": "^3.12.6",
-    "@types/jsonwebtoken": "^8.5.0",
-    "@types/jws": "^3.2.5",
-    "@types/mocha": "^8.1.1",
-    "@types/morgan": "^1.9.2",
-    "@types/multer": "^1.4.5",
-    "@types/node": "^17.0.36",
-    "@types/on-finished": "^2.3.1",
+    "@types/jest": "^26.0.24",
+    "@types/js-yaml": "^3.12.10",
+    "@types/jsonwebtoken": "^8.5.9",
+    "@types/jws": "^3.2.10",
+    "@types/mocha": "^8.2.3",
+    "@types/morgan": "^1.9.9",
+    "@types/multer": "^1.4.12",
+    "@types/node": "^17.0.45",
+    "@types/on-finished": "^2.3.4",
     "@types/pdfkit": "^0.10.6",
-    "@types/portscanner": "^2.1.0",
-    "@types/pug": "^2.0.4",
-    "@types/request": "^2.48.5",
-    "@types/sanitize-html": "^1.27.0",
-    "@types/semver": "^7.3.4",
-    "@types/sequelize": "^4.28.11",
-    "@types/serve-index": "^1.7.30",
-    "@types/sinon": "^10.0.4",
-    "@types/sinon-chai": "^3.2.5",
+    "@types/portscanner": "^2.1.4",
+    "@types/pug": "^2.0.10",
+    "@types/request": "^2.48.12",
+    "@types/sanitize-html": "^1.27.2",
+    "@types/semver": "^7.5.8",
+    "@types/sequelize": "^4.28.20",
+    "@types/serve-index": "^1.9.4",
+    "@types/sinon": "^10.0.20",
+    "@types/sinon-chai": "^3.2.12",
     "@types/socket.io": "^2.1.13",
-    "@types/socket.io-client": "^1.4.35",
-    "@types/swagger-ui-express": "^4.1.2",
-    "@types/unzipper": "^0.10.3",
-    "@types/validator": "^13.1.3",
+    "@types/socket.io-client": "^1.4.36",
+    "@types/swagger-ui-express": "^4.1.6",
+    "@types/unzipper": "^0.10.10",
+    "@types/validator": "^13.12.2",
     "@typescript-eslint/eslint-plugin": "6.18.1",
     "@typescript-eslint/parser": "6.18.1",
-    "chai": "^4.2.0",
-    "chai-as-promised": "^7.1.1",
+    "chai": "^4.5.0",
+    "chai-as-promised": "^7.1.2",
     "cross-spawn": "^7.0.3",
-    "cypress": "^13.6.1",
-    "eslint": "^8.49.0",
-    "eslint-config-standard-with-typescript": "^39.0.0",
-    "eslint-plugin-import": "^2.28.1",
+    "cypress": "^13.15.0",
+    "eslint": "^8.57.1",
+    "eslint-config-standard-with-typescript": "^39.1.1",
+    "eslint-plugin-import": "^2.30.0",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-promise": "^6.1.1",
-    "frisby": "https://github.com/bkimminich/frisby.git",
-    "grunt-cli": "^1.3.2",
+    "eslint-plugin-promise": "^6.6.0",
+    "frisby": "github:bkimminich/frisby",
+    "grunt-cli": "^1.5.0",
     "http-server": "^0.12.3",
-    "jasmine": "^3.9.0",
+    "jasmine": "^3.99.0",
     "jasmine-core": "~3.9.0",
-    "jasmine-reporters": "^2.5.0",
+    "jasmine-reporters": "^2.5.2",
     "jest": "^26.6.3",
-    "mocha": "^8.1.1",
-    "node-fetch": "^2.6.13",
+    "mocha": "^8.4.0",
+    "node-fetch": "^2.7.0",
     "nyc": "^15.1.0",
-    "shelljs": "^0.8.4",
+    "shelljs": "^0.8.5",
     "sinon": "^11.1.2",
     "sinon-chai": "^3.7.0",
-    "socket.io-client": "^3.1.0",
-    "source-map-support": "^0.5.19",
-    "ts-jest": "^26.5.0",
-    "ts-node": "^10.8.0",
+    "socket.io-client": "^3.1.3",
+    "source-map-support": "^0.5.21",
+    "ts-jest": "^26.5.6",
+    "ts-node": "^10.9.2",
     "typescript": "~4.6.0"
   },
   "engines": {

routes/verify.ts

@@ -174,7 +174,7 @@ function changeProductChallenge (osaft: Product) {
     }
     if (urlForProductTamperingChallenge) {
       if (!utils.contains(osaft.description, `${urlForProductTamperingChallenge}`)) {
-        if (utils.contains(osaft.description, `<a href="${config.get<string>('challenges.overwriteUrlForProductTamperingChallenge')}" target="_blank">More...</a>`)) {
+        if (utils.contains(osaft.description, `<a href="${config.get<string>('challenges.overwriteUrlForProductTamperingChallenge')}" target="_blank">`)) {
           challengeUtils.solve(challenges.changeProductChallenge)
         }
       }