Merge branch 'master' into update-smpp-node-dep

CHANGES_NEXT_RELEASE

@@ -1 +1,5 @@
-- Upgrade smpp dep from 0.3.1 to 0.5.1
+- Upgrade smpp dep from 0.3.1 to 0.5.1
+- Fix: deprecated mongo warnings about save and remove methods (#806)
+- Fix: remove unnecessary env vars (PERSEO_MONGO_HOST and PERSEO_CORE_URL) from Dockerfile (#810)
+- Upgrade express from 4.19.2 to 4.21.2
+- Upgrade body-parser dep from 1.18.2 to 1.20.3

Changelog

@@ -1,3 +1,5 @@
+- Upgrade: nanoid dependency from 3.3.4 to 3.3.8 (solving vulnerability CVE-2024-55565)
+
 1.34.0 (July 30th, 2024)
 
 - Fix: smtpConfig after error in emailAction rule (#798)

docker/Dockerfile

@@ -137,8 +137,6 @@ COPY --from=builder /opt/perseo-fe /opt/perseo-fe
 RUN npm install [email protected] -g --no-package-lock --no-optional
 
 USER node
-ENV PERSEO_MONGO_HOST=mongodb
-ENV PERSEO_CORE_URL=http://corehost:8080
 ENV NODE_ENV=production
 
 # Expose 9090 for HTTP PORT
@@ -181,8 +179,6 @@ COPY --from=anon-user /etc/passwd /etc/shadow /etc/group /etc/
 WORKDIR /opt/perseo-fe
 
 USER nobody
-ENV PERSEO_MONGO_HOST=mongodb
-ENV PERSEO_CORE_URL=http://corehost:8080
 ENV NODE_ENV=production
 
 # Expose 9090 for HTTP PORT
@@ -223,8 +219,6 @@ RUN \
 	rm -rf /var/lib/apt/lists/* 
 
 USER node
-ENV PERSEO_MONGO_HOST=mongodb
-ENV PERSEO_CORE_URL=http://corehost:8080
 ENV NODE_ENV=production
 
 # Expose 9090 for HTTP PORT

docs/requirements.txt

@@ -1,4 +1,4 @@
 mkdocs==1.2.4
 Pygments==2.15.0
 Markdown==3.3.4
-jinja2==3.1.4
+jinja2==3.1.5

lib/models/rulesStore.js

@@ -155,7 +155,7 @@ module.exports = {
             [
                 db.collection.bind(db, rulesCollectionName, { strict: true }),
                 function(col, cb) {
-                    col.remove({ name: rule.name, subservice: rule.subservice, service: rule.service }, cb);
+                    col.deleteOne({ name: rule.name, subservice: rule.subservice, service: rule.service }, cb);
                 }
             ],
             function(err, result) {
@@ -172,7 +172,7 @@ module.exports = {
             [
                 db.collection.bind(db, rulesCollectionName, { strict: true }),
                 function(col, cb) {
-                    col.save(r, cb);
+                    col.insertOne(r, cb);
                 }
             ],
             function(err, result) {

package.json

@@ -61,14 +61,14 @@
   "dependencies": {
     "async": "2.6.4",
     "body-parser": "~1.20.3",
-    "express": "4.20.0",
+    "express": "4.21.2",
     "logops": "2.1.2",
     "mongodb": "3.6.12",
     "ngsijs": "1.4.1",
     "nodemailer": "6.9.13",
     "nodemailer-smtp-transport": "~2.7.2",
     "request": "2.88.2",
-    "nanoid": "3.3.4",
+    "nanoid": "3.3.8",
     "smpp": "0.5.1",
     "swagger-jsdoc": "~3.4.0",
     "swagger-ui-express": "~4.1.1",