diff --git a/package-lock.json b/package-lock.json index a961629cfa..3ea431db1b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -60,7 +60,7 @@ "glob": "^10.3.12", "husky": "^9.0.11", "mocha": "^10.2.0", - "mongodb": "^6.13.0", + "mongodb": "^6.14.2", "mongodb-runner": "^5.7.1", "node-gyp": "^9.0.0 || ^10.2.0", "nyc": "^15.1.0", @@ -21339,12 +21339,13 @@ } }, "node_modules/mongodb": { - "version": "6.13.0", - "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.13.0.tgz", - "integrity": "sha512-KeESYR5TEaFxOuwRqkOm3XOsMqCSkdeDMjaW5u2nuKfX7rqaofp7JQGoi7sVqQcNJTKuveNbzZtWMstb8ABP6Q==", + "version": "6.14.2", + "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.14.2.tgz", + "integrity": "sha512-kMEHNo0F3P6QKDq17zcDuPeaywK/YaJVCEQRzPF3TOM/Bl9MFg64YE5Tu7ifj37qZJMhwU1tl2Ioivws5gRG5Q==", + "license": "Apache-2.0", "dependencies": { "@mongodb-js/saslprep": "^1.1.9", - "bson": "^6.10.1", + "bson": "^6.10.3", "mongodb-connection-string-url": "^3.0.0" }, "engines": { @@ -21391,15 +21392,14 @@ } }, "node_modules/mongodb-client-encryption": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/mongodb-client-encryption/-/mongodb-client-encryption-6.1.1.tgz", - "integrity": "sha512-hqy68WWNZmkoqldFlpw8TQNaJUOor4YCM/FuxETZTeTZpGEbQwkTwdrQlgiV14qyOizPw8abbAxGi3zX+raA9w==", + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/mongodb-client-encryption/-/mongodb-client-encryption-6.3.0.tgz", + "integrity": "sha512-OaOg02vglPxxrfY01alC0ER0W4WMuNO2ZJR3ehAUcuGYreJaJ+aX+rUQiQkdQHiXvnVPDUx/4QDr2CR1/FvpcQ==", "hasInstallScript": true, - "license": "Apache-2.0", "optional": true, "dependencies": { "node-addon-api": "^4.3.0", - "prebuild-install": "^7.1.2" + "prebuild-install": "^7.1.3" }, "engines": { "node": ">=16.20.1" @@ -23873,8 +23873,9 @@ } }, "node_modules/prebuild-install": { - "version": "7.1.2", - "license": "MIT", + "version": "7.1.3", + "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.3.tgz", + "integrity": "sha512-8Mf2cbV7x1cXPUILADGI3wuhfqWvtiLA1iclTDbFRZkgRQS0NqsPZphna9V+HyTEadheuPmjaJMsbzKQFOzLug==", "optional": true, "dependencies": { "detect-libc": "^2.0.0", @@ -23882,7 +23883,7 @@ "github-from-package": "0.0.0", "minimist": "^1.2.3", "mkdirp-classic": "^0.5.3", - "napi-build-utils": "^1.0.1", + "napi-build-utils": "^2.0.0", "node-abi": "^3.3.0", "pump": "^3.0.0", "rc": "^1.2.7", @@ -23897,6 +23898,12 @@ "node": ">=10" } }, + "node_modules/prebuild-install/node_modules/napi-build-utils": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-2.0.0.tgz", + "integrity": "sha512-GEbrYkbfF7MoNaoh2iGG84Mnf/WZfB0GdGEsM8wz7Expx/LlWf5U8t9nvJKXSp3qr5IsEbK04cBGhol/KwOsWA==", + "optional": true + }, "node_modules/prelude-ls": { "version": "1.2.1", "license": "MIT", @@ -28803,7 +28810,7 @@ "@mongodb-js/tsconfig-mongosh": "^1.0.0", "depcheck": "^1.4.7", "eslint": "^7.25.0", - "mongodb": "^6.13.0", + "mongodb": "^6.14.2", "prettier": "^2.8.8" }, "engines": { @@ -28908,7 +28915,7 @@ "karma-typescript": "^5.5.4", "karma-webpack": "^5.0.0", "lodash": "^4.17.21", - "mongodb": "^6.13.0", + "mongodb": "^6.14.2", "path-browserify": "^1.0.1", "prettier": "^2.8.8", "prop-types": "^15.7.2", @@ -29312,7 +29319,7 @@ "chai-as-promised": "^7.1.1", "depcheck": "^1.4.7", "eslint": "^7.25.0", - "mongodb": "^6.13.0", + "mongodb": "^6.14.2", "mongodb-crypt-library-dummy": "^1.0.2", "prettier": "^2.8.8", "webpack-merge": "^5.8.0" @@ -29386,7 +29393,7 @@ "eslint": "^7.25.0", "lodash": "^4.17.21", "moment": "^2.29.1", - "mongodb": "^6.13.0", + "mongodb": "^6.14.2", "mongodb-log-writer": "^2.3.1", "node-fetch": "^3.3.2", "prettier": "^2.8.8", @@ -29806,7 +29813,7 @@ "@aws-sdk/credential-providers": "^3.525.0", "@mongosh/errors": "2.4.0", "bson": "^6.10.3", - "mongodb": "^6.13.0", + "mongodb": "^6.14.2", "mongodb-build-info": "^1.7.2", "mongodb-connection-string-url": "^3.0.1" }, @@ -29822,7 +29829,7 @@ "node": ">=14.15.1" }, "optionalDependencies": { - "mongodb-client-encryption": "^6.1.1" + "mongodb-client-encryption": "^6.3.0" } }, "packages/service-provider-node-driver": { @@ -29836,7 +29843,7 @@ "@mongosh/service-provider-core": "3.0.5", "@mongosh/types": "3.5.0", "aws4": "^1.12.0", - "mongodb": "^6.13.0", + "mongodb": "^6.14.2", "mongodb-connection-string-url": "^3.0.1", "socks": "^2.8.3" }, @@ -29921,7 +29928,7 @@ "bson": "^6.10.3", "depcheck": "^1.4.7", "eslint": "^7.25.0", - "mongodb": "^6.13.0", + "mongodb": "^6.14.2", "prettier": "^2.8.8", "semver": "^7.5.3" }, @@ -30011,7 +30018,7 @@ "@mongodb-js/tsconfig-mongosh": "^1.0.0", "depcheck": "^1.4.7", "eslint": "^7.25.0", - "mongodb": "^6.13.0", + "mongodb": "^6.14.2", "prettier": "^2.8.8" }, "engines": { diff --git a/package.json b/package.json index 73329cef21..6be7341574 100644 --- a/package.json +++ b/package.json @@ -117,7 +117,7 @@ "glob": "^10.3.12", "husky": "^9.0.11", "mocha": "^10.2.0", - "mongodb": "^6.13.0", + "mongodb": "^6.14.2", "mongodb-runner": "^5.7.1", "node-gyp": "^9.0.0 || ^10.2.0", "nyc": "^15.1.0", diff --git a/packages/arg-parser/package.json b/packages/arg-parser/package.json index 6200944605..696651f4ee 100644 --- a/packages/arg-parser/package.json +++ b/packages/arg-parser/package.json @@ -46,7 +46,7 @@ "@mongodb-js/tsconfig-mongosh": "^1.0.0", "depcheck": "^1.4.7", "eslint": "^7.25.0", - "mongodb": "^6.13.0", + "mongodb": "^6.14.2", "prettier": "^2.8.8" } } diff --git a/packages/browser-repl/package.json b/packages/browser-repl/package.json index dc0596edc8..c07f324b2c 100644 --- a/packages/browser-repl/package.json +++ b/packages/browser-repl/package.json @@ -70,7 +70,7 @@ "@babel/plugin-proposal-class-properties": "^7.8.3", "@babel/preset-react": "^7.18.6", "@babel/preset-typescript": "^7.18.6", - "mongodb": "^6.13.0", + "mongodb": "^6.14.2", "@mongodb-js/compass-components": "*", "@mongodb-js/compass-editor": "*", "@mongodb-js/eslint-config-mongosh": "^1.0.0", diff --git a/packages/cli-repl/package.json b/packages/cli-repl/package.json index d822b191a5..a59db24d0e 100644 --- a/packages/cli-repl/package.json +++ b/packages/cli-repl/package.json @@ -95,7 +95,7 @@ "glibc-version": "^1.0.0" }, "devDependencies": { - "mongodb": "^6.13.0", + "mongodb": "^6.14.2", "@mongodb-js/eslint-config-mongosh": "^1.0.0", "@mongodb-js/prettier-config-devtools": "^1.0.1", "@mongodb-js/sbom-tools": "^0.7.0", diff --git a/packages/e2e-tests/package.json b/packages/e2e-tests/package.json index 65da862b95..b1ec2d647e 100644 --- a/packages/e2e-tests/package.json +++ b/packages/e2e-tests/package.json @@ -47,7 +47,7 @@ "eslint": "^7.25.0", "lodash": "^4.17.21", "moment": "^2.29.1", - "mongodb": "^6.13.0", + "mongodb": "^6.14.2", "node-fetch": "^3.3.2", "prettier": "^2.8.8", "rimraf": "^3.0.2" diff --git a/packages/service-provider-core/package.json b/packages/service-provider-core/package.json index 3ba9118641..1a5bbde322 100644 --- a/packages/service-provider-core/package.json +++ b/packages/service-provider-core/package.json @@ -46,13 +46,12 @@ "@aws-sdk/credential-providers": "^3.525.0", "@mongosh/errors": "2.4.0", "bson": "^6.10.3", - "mongodb": "^6.13.0", + "mongodb": "^6.14.2", "mongodb-build-info": "^1.7.2", - "mongodb-connection-string-url": "^3.0.1", - "mongodb-client-encryption": "^6.1.1" + "mongodb-connection-string-url": "^3.0.1" }, "optionalDependencies": { - "mongodb-client-encryption": "^6.1.1" + "mongodb-client-encryption": "^6.3.0" }, "devDependencies": { "@mongodb-js/eslint-config-mongosh": "^1.0.0", diff --git a/packages/service-provider-node-driver/package.json b/packages/service-provider-node-driver/package.json index dd9849d9d3..17f04106ac 100644 --- a/packages/service-provider-node-driver/package.json +++ b/packages/service-provider-node-driver/package.json @@ -53,11 +53,9 @@ "@mongosh/service-provider-core": "3.0.5", "@mongosh/types": "3.5.0", "aws4": "^1.12.0", - "mongodb": "^6.13.0", + "mongodb": "^6.14.2", "mongodb-connection-string-url": "^3.0.1", - "socks": "^2.8.3", - "mongodb-client-encryption": "^6.1.1", - "kerberos": "2.1.0" + "socks": "^2.8.3" }, "optionalDependencies": { "kerberos": "2.1.0", diff --git a/packages/service-provider-node-driver/src/node-driver-service-provider.spec.ts b/packages/service-provider-node-driver/src/node-driver-service-provider.spec.ts index 0d73b44997..44981e187b 100644 --- a/packages/service-provider-node-driver/src/node-driver-service-provider.spec.ts +++ b/packages/service-provider-node-driver/src/node-driver-service-provider.spec.ts @@ -422,7 +422,13 @@ describe('NodeDriverServiceProvider', function () { describe('#replaceOne', function () { const filter = { name: 'Aphex Twin' }; const replacement = { name: 'Richard James' }; - const commandResult = { result: { n: 1, ok: 1 } }; + const commandResult = { + acknowledged: true, + matchedCount: 1, + modifiedCount: 1, + upsertedCount: 0, + upsertedId: null, + }; beforeEach(function () { collectionStub = stubInterface(); diff --git a/packages/shell-api/package.json b/packages/shell-api/package.json index 8039519198..a063a4792d 100644 --- a/packages/shell-api/package.json +++ b/packages/shell-api/package.json @@ -55,7 +55,7 @@ "bson": "^6.10.3", "depcheck": "^1.4.7", "eslint": "^7.25.0", - "mongodb": "^6.13.0", + "mongodb": "^6.14.2", "prettier": "^2.8.8", "semver": "^7.5.3" } diff --git a/packages/types/package.json b/packages/types/package.json index 06dd4fca5a..04256afe88 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -46,7 +46,7 @@ "@mongodb-js/tsconfig-mongosh": "^1.0.0", "depcheck": "^1.4.7", "eslint": "^7.25.0", - "mongodb": "^6.13.0", + "mongodb": "^6.14.2", "prettier": "^2.8.8" } } diff --git a/testing/fake-kms.ts b/testing/fake-kms.ts index 429a22f12e..669b9df552 100644 --- a/testing/fake-kms.ts +++ b/testing/fake-kms.ts @@ -21,12 +21,9 @@ export function makeFakeHTTPConnection(handlerList: HandlerList): Duplex & { req type FakeHTTPServer = http.Server & { requests: http.IncomingMessage[] }; export function makeFakeHTTPServer(handlerList: HandlerList): FakeHTTPServer { - // Using an version of the Node.js HTTP parser with relaxed security guarantees - // here since Node.js 16.16.0+ require CRLF header delimiting in requests, - // and reject LF header delimiting. - // MONGOCRYPT-457 has been filed to potentially address this on the libmongocrypt - // side. - const server = http.createServer({ insecureHTTPParser: true }, (req, res) => { + // NB: We previously set `insecureHTTPParser: true` here because of MONGOCRYPT-457 + // and can do so again if libmongocrypt regresses at some point. + const server = http.createServer((req, res) => { (server as FakeHTTPServer).requests.push(req); let foundHandler: HandlerFunction | undefined; const host = req.headers['host'];