Merge pull request #1365 from CVEProject/no-tls-mongo-update

david-rocca · web-flow · commit 28a6f62e3952 · 2025-03-11T17:30:21.000Z
No tls mongo update
diff --git a/.github/workflows/test-integration.yml b/.github/workflows/test-integration.yml
@@ -17,7 +17,21 @@ jobs:
         docker compose --file docker/docker-compose.yml build
         docker compose --file docker/docker-compose.yml up -d
     - name: Sleep
-      run: bash -c "while ! docker compose --file docker/docker-compose.yml logs --tail=10 cveawg | grep -q 'Serving on port'; do sleep 1; done"
+      run: |
+        dockercompose="docker compose --file docker/docker-compose.yml"
+        attempts=60
+        while ! $dockercompose logs cveawg | grep -q 'Serving on port'; do
+          attempts=$(expr $attempts - 1)
+          if [ $($dockercompose ps --status running -q | wc -l) -eq 2 ] && [ $attempts -gt 0 ]; then
+            sleep 1
+            $dockercompose logs || true
+            continue
+          fi
+          $dockercompose ps || true
+          $dockercompose logs || true
+          echo "==== COULD NOT FIND 'Serving on port' in cveawg output OR one of the services died ====" 1>&2
+          exit 1
+        done
     - name: Run Tests
       run: docker compose -f docker/docker-compose.yml exec -T cveawg npm run test:integration
       continue-on-error: false
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -1,8 +1,7 @@
-version: '3'
 services:
   docdb:
     # use a mongo image that most closely matches the DocumentDB API
-    image: mongo:3.6.20-xenial
+    image: mongo:5.0
     container_name: mongo
     env_file: .docker-env
     networks: ["cve-services"]
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -27,9 +27,10 @@
         "standard": "^16.0.3"
     },
     "dependencies": {
+        "bson": "^6.10.1",
         "ajv": "^8.6.2",
         "ajv-formats": "^2.1.1",
-        "argon2": "^0.29",
+        "argon2": "^0.41.1",
         "config": "^3.3.6",
         "cors": "^2.8.5",
         "crypto-random-string": "^3.3.1",
@@ -45,7 +46,7 @@
         "lodash": "^4.17.21",
         "luxon": "^3.4.4",
         "mongo-cursor-pagination": "^8.1.3",
-        "mongoose": "^5.13.20",
+        "mongoose": "^8.8.3",
         "mongoose-aggregate-paginate-v2": "1.0.6",
         "morgan": "^1.9.1",
         "node-dev": "^7.4.3",
@@ -59,6 +60,7 @@
         "winston": "^3.2.1",
         "yamljs": "^0.3.0"
     },
+    "overrides": { "mongo-cursor-pagination": { "bson": "^6.10.1" } },
     "apidoc": {
         "name": "CVE-Services",
         "version": "0.0.0",
diff --git a/src/index.js b/src/index.js
@@ -49,10 +49,7 @@ app.use((req, res, next) => {
 // Connect to MongoDB database
 const dbConnectionStr = dbUtils.getMongoConnectionString()
 mongoose.connect(dbConnectionStr, {
-  useNewUrlParser: true,
-  useUnifiedTopology: true,
-  useFindAndModify: false,
-  useCreateIndex: true
+  tls: false
 })
 
 // database connection
diff --git a/src/scripts/populate-cve.js b/src/scripts/populate-cve.js
@@ -25,8 +25,7 @@ global.mongoose = mongoose
 const dbConnectionStr = dbUtils.getMongoConnectionString()
 mongoose.connect(dbConnectionStr, {
   useNewUrlParser: true,
-  useUnifiedTopology: false,
-  useFindAndModify: false
+  useUnifiedTopology: false
 })
 
 // database connection
diff --git a/src/scripts/populate.js b/src/scripts/populate.js
@@ -45,7 +45,6 @@ const dbConnectionStr = dbUtils.getMongoConnectionString()
 mongoose.connect(dbConnectionStr, {
   useNewUrlParser: true,
   useUnifiedTopology: false,
-  useFindAndModify: false,
   autoIndex: false
 })
 
diff --git a/src/scripts/templateScript.js b/src/scripts/templateScript.js
@@ -18,8 +18,7 @@ const error = new errors.IDRError()
 const dbConnectionStr = dbUtils.getMongoConnectionString()
 mongoose.connect(dbConnectionStr, {
   useNewUrlParser: true,
-  useUnifiedTopology: false,
-  useFindAndModify: false
+  useUnifiedTopology: false
 })
 
 const db = mongoose.connection
diff --git a/test-http/docker/docker-compose.yml b/test-http/docker/docker-compose.yml
@@ -1,4 +1,3 @@
-version: '3'
 services:
   demon:
     container_name: demon
diff --git a/test/integration-tests/cve/cursorPaginationTest.js b/test/integration-tests/cve/cursorPaginationTest.js
@@ -156,7 +156,7 @@ describe('Testing Get cve_cursor endpoint', () => {
       // Request page 2
       await requester.get('/api/cve_cursor?limit=2&next_page=' + next + '&time_modified.lt=' + currentDate)
         .set(constants.headers)
-        .then((res, err) => {
+        .then(async (res, err) => {
           expect(err).to.be.undefined
           expect(res).to.have.status(200)
 
diff --git a/test/integration-tests/org/postOrgUsersTest.js b/test/integration-tests/org/postOrgUsersTest.js
@@ -138,7 +138,8 @@ describe('Testing user post endpoint', () => {
           expect(err).to.be.undefined
         })
     })
-    it('Fails creation of user for trying to add the 101th user', async () => {
+    it('Fails creation of user for trying to add the 101th user', async function () {
+      this.timeout(7000)
       const numberOfUsers = await User.where({ org_UUID: orgUuid }).countDocuments().exec()
       for (let i = 0; i < (100 - numberOfUsers); i++) {
         const newUser = new User()
@@ -156,7 +157,6 @@ describe('Testing user post endpoint', () => {
             'ADMIN'
           ]
         }
-
         await User.findOneAndUpdate().byUserNameAndOrgUUID(newUser.userName, newUser.org_UUID).updateOne(newUser).setOptions({ upsert: true })
       }
 
diff --git a/test/unit-tests/org/orgGetIdQuotaTest.js b/test/unit-tests/org/orgGetIdQuotaTest.js
@@ -23,24 +23,29 @@ describe('Testing the GET /org/:shortname/id_quota endpoint in Org Controller',
   context('Negative Tests', () => {
     it('Org with a negative id_quota was not saved', (done) => {
       const org = new Org(orgFixtures.orgWithNegativeIdQuota)
-
-      org.validate((err) => {
-        const CONSTANTS = getConstants()
-
-        expect(err.errors['policies.id_quota'].message).to.equal(CONSTANTS.MONGOOSE_VALIDATION.Org_policies_id_quota_min_message)
-        done()
-      })
+      org.save()
+        .then(() => {
+          expect(false)
+        })
+        .catch((error) => {
+          const CONSTANTS = getConstants()
+          expect(error.errors['policies.id_quota'].message).to.equal(CONSTANTS.MONGOOSE_VALIDATION.Org_policies_id_quota_min_message)
+        })
+      done()
     })
 
     it('Org with an id_quota greater than the max was not saved', (done) => {
       const org = new Org(orgFixtures.orgExceedingMaxIdQuota)
 
-      org.validate((err) => {
-        const CONSTANTS = getConstants()
-
-        expect(err.errors['policies.id_quota'].message).to.equal(CONSTANTS.MONGOOSE_VALIDATION.Org_policies_id_quota_max_message)
-        done()
-      })
+      org.save()
+        .then(() => {
+          expect(false)
+        })
+        .catch((error) => {
+          const CONSTANTS = getConstants()
+          expect(error.errors['policies.id_quota'].message).to.equal(CONSTANTS.MONGOOSE_VALIDATION.Org_policies_id_quota_max_message)
+        })
+      done()
     })
 
     it('Requestor is not secretariat or a user of the same org', (done) => {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-version: '3'`
`2`	`1`	`services:`
`3`	`2`	`demon:`
`4`	`3`	`container_name: demon`