@mongodb-js/connection-form 1.87.2 → 1.89.0

package/dist/utils/validation.js

@@ -10,9 +10,10 @@ exports.errorMessageByFieldNameAndIndex = errorMessageByFieldNameAndIndex;
 exports.validateConnectionOptionsErrors = validateConnectionOptionsErrors;
 exports.isSecure = isSecure;
 exports.validateConnectionOptionsWarnings = validateConnectionOptionsWarnings;
-const mongodb_build_info_1 = require("mongodb-build-info");
+const mongodb_build_info_1 = require("@mongodb-js/mongodb-build-info");
 const mongodb_connection_string_url_1 = __importDefault(require("mongodb-connection-string-url"));
 const csfle_handler_1 = require("../utils/csfle-handler");
+const read_preference_handler_1 = require("./read-preference-handler");
 function errorsByFieldTab(errors, tabId) {
     return errors.filter((error) => error.fieldTab === tabId);
 }
@@ -25,17 +26,60 @@ function fieldNameHasError(errors, fieldName) {
 function errorMessageByFieldNameAndIndex(errors, fieldName, fieldIndex) {
     return (errors || []).find((err) => err.fieldName === fieldName && err.fieldIndex === fieldIndex)?.message;
 }
-function validateConnectionOptionsErrors(connectionOptions, parsingOptions) {
+function validateConnectionOptionsErrors(connectionOptions, parsingOptions, { isAtlas = false } = {}) {
     const connectionString = new mongodb_connection_string_url_1.default(connectionOptions.connectionString, { looseValidation: true, ...parsingOptions });
     return [
-        ...validateAuthMechanismErrors(connectionString),
+        ...validateAuthMechanismErrors(connectionString, { isAtlas }),
         ...validateCSFLEErrors(connectionOptions.fleOptions?.autoEncryption ?? {}),
         ...(connectionOptions.sshTunnel
             ? validateSSHTunnelErrors(connectionOptions.sshTunnel)
             : validateSocksProxyErrors(connectionString)),
+        ...validateReadPreferenceErrors(connectionString),
     ];
 }
-function validateAuthMechanismErrors(connectionString) {
+// https://www.mongodb.com/docs/manual/core/read-preference-staleness/
+const MIN_MAX_STALENESS_SECONDS = 90;
+const TAG_SET_PATTERN = /^[^:,]+:[^:,]*(,[^:,]+:[^:,]*)*$/;
+function validateReadPreferenceErrors(connectionString) {
+    const searchParams = connectionString.typedSearchParams();
+    const mode = searchParams.get('readPreference');
+    const tagSets = searchParams.getAll('readPreferenceTags');
+    const maxStalenessSeconds = searchParams.get('maxStalenessSeconds');
+    if (!(0, read_preference_handler_1.supportsReadPreferenceOptions)(mode)) {
+        return tagSets.length > 0 || maxStalenessSeconds
+            ? [
+                {
+                    message: 'Read preference tags and max staleness can only be used with a read preference other than primary.',
+                },
+            ]
+            : [];
+    }
+    const errors = [];
+    tagSets.forEach((tagSet, index) => {
+        if (tagSet !== '' && !TAG_SET_PATTERN.test(tagSet)) {
+            errors.push({
+                fieldTab: 'advanced',
+                fieldName: 'readPreferenceTags',
+                fieldIndex: index,
+                message: 'Tag sets must be in the format key0:value0,key1:value1.',
+            });
+        }
+    });
+    if (maxStalenessSeconds) {
+        const value = Number(maxStalenessSeconds);
+        // -1 is the driver's way of explicitly saying "no maximum".
+        if (!Number.isInteger(value) ||
+            (value !== -1 && value < MIN_MAX_STALENESS_SECONDS)) {
+            errors.push({
+                fieldTab: 'advanced',
+                fieldName: 'maxStalenessSeconds',
+                message: `Max staleness must be at least ${MIN_MAX_STALENESS_SECONDS} seconds.`,
+            });
+        }
+    }
+    return errors;
+}
+function validateAuthMechanismErrors(connectionString, { isAtlas }) {
     const authMechanism = connectionString
         .typedSearchParams()
         .get('authMechanism');
@@ -43,7 +87,7 @@ function validateAuthMechanismErrors(connectionString) {
         case '':
             return validateDefaultAuthMechanismErrors(connectionString);
         case 'MONGODB-X509':
-            return validateX509Errors(connectionString);
+            return validateX509Errors(connectionString, { isAtlas });
         case 'GSSAPI':
             return validateKerberosErrors(connectionString);
         case 'PLAIN':
@@ -84,7 +128,7 @@ function validateUsernameAndPasswordErrors(connectionString) {
     }
     return errors;
 }
-function validateX509Errors(connectionString) {
+function validateX509Errors(connectionString, { isAtlas }) {
     const errors = [];
     if (!isSecure(connectionString)) {
         errors.push({
@@ -93,7 +137,9 @@ function validateX509Errors(connectionString) {
             message: 'TLS must be enabled in order to use x509 authentication.',
         });
     }
-    if (!connectionString.searchParams.has('tlsCertificateKeyFile')) {
+    // Connection info from Atlas always uses X.509 but never includes a
+    // certificate, so requiring one would block every Data Explorer connection.
+    if (!isAtlas && !connectionString.searchParams.has('tlsCertificateKeyFile')) {
         errors.push({
             fieldTab: 'tls',
             fieldName: 'tlsCertificateKeyFile',

package/package.json

@@ -13,7 +13,7 @@
     "email": "compass@mongodb.com"
   },
   "homepage": "https://github.com/mongodb-js/compass",
-  "version": "1.87.2",
+  "version": "1.89.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/mongodb-js/compass.git"
@@ -48,24 +48,23 @@
     "reformat": "npm run eslint . -- --fix && npm run prettier -- --write ."
   },
   "dependencies": {
-    "@mongodb-js/compass-components": "^1.70.2",
-    "@mongodb-js/compass-editor": "^0.72.2",
-    "@mongodb-js/connection-info": "^0.29.3",
-    "@mongodb-js/shell-bson-parser": "^1.6.3",
+    "@mongodb-js/compass-components": "^1.71.0",
+    "@mongodb-js/compass-editor": "^0.73.0",
+    "@mongodb-js/connection-info": "^0.29.5",
+    "@mongodb-js/mongodb-build-info": "^1.9.19",
+    "@mongodb-js/shell-bson-parser": "^2.0.0",
     "lodash": "^4.18.1",
     "mongodb": "^7.5.0",
-    "mongodb-build-info": "^1.8.1",
     "mongodb-connection-string-url": "^7.0.2",
-    "mongodb-data-service": "^22.41.3",
-    "mongodb-query-parser": "^5.1.3",
+    "mongodb-data-service": "^22.41.5",
     "react": "^18.3.1"
   },
   "devDependencies": {
-    "@mongodb-js/eslint-config-compass": "^1.4.29",
-    "@mongodb-js/mocha-config-compass": "^1.8.1",
-    "@mongodb-js/prettier-config-compass": "^1.2.9",
-    "@mongodb-js/testing-library-compass": "^1.7.3",
-    "@mongodb-js/tsconfig-compass": "^1.3.1",
+    "@mongodb-js/eslint-config-compass": "^1.4.31",
+    "@mongodb-js/mocha-config-compass": "^1.9.0",
+    "@mongodb-js/prettier-config-compass": "^1.2.10",
+    "@mongodb-js/testing-library-compass": "^1.7.5",
+    "@mongodb-js/tsconfig-compass": "^1.3.2",
     "@types/chai": "^4.2.21",
     "@types/chai-dom": "^0.0.10",
     "@types/mocha": "^9.0.0",
@@ -80,5 +79,5 @@
     "sinon": "^9.2.3",
     "xvfb-maybe": "^0.2.1"
   },
-  "gitHead": "096d1a160ed2d8c6140c602f9f9794637a20a100"
+  "gitHead": "ffed0669174748402f0d54164e9aaed0949eb888"
 }