awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-10-02 18:25:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor MongoDB host validation using RE2 regex

Browse Source 
- Replaced string methods with RE2 regex for improved host validation in MongoDB connection functions.
- Updated the `mongodbCredentialsRotationFactory` and `validateMongoDBConnectionCredentials` to utilize regex for parsing connection strings.
- Enhanced code readability and maintainability by consolidating host normalization logic.
This commit is contained in:
Victor Santos
2025-11-17 22:36:46 -03:00
parent 51fc4a5e8c
commit 8b31eff9b1
2 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/src/ee/services/secret-rotation-v2/mongodb-credentials/mongodb-credentials-rotation-fns.ts
+9 -4
View File
@@ -1,5 +1,6 @@
/* eslint-disable no-await-in-loop */ /* eslint-disable no-await-in-loop */
import { MongoClient } from "mongodb"; import { MongoClient } from "mongodb";
import RE2 from "re2";
import { verifyHostInputValidity } from "@app/ee/services/dynamic-secret/dynamic-secret-fns"; import { verifyHostInputValidity } from "@app/ee/services/dynamic-secret/dynamic-secret-fns";
import { import {
@@ -49,11 +50,14 @@ export const mongodbCredentialsRotationFactory: TRotationFactory<
options?: { validateConnection?: boolean; requireTlsForSrv?: boolean } options?: { validateConnection?: boolean; requireTlsForSrv?: boolean }
): Promise<MongoClient> => { ): Promise<MongoClient> => {
let normalizedHost = connection.credentials.host.trim(); let normalizedHost = connection.credentials.host.trim();
const isSrvFromHost = normalizedHost.startsWith("mongodb+srv://"); const srvRegex = new RE2("^mongodb\\+srv:\\/\\/");
const protocolRegex = new RE2("^mongodb:\\/\\/");
const isSrvFromHost = srvRegex.test(normalizedHost);
if (isSrvFromHost) { if (isSrvFromHost) {
normalizedHost = normalizedHost.replace(/^mongodb\+srv:\/\//, ""); normalizedHost = normalizedHost.replace(srvRegex, "");
} else if (normalizedHost.startsWith("mongodb://")) { } else if (protocolRegex.test(normalizedHost)) {
normalizedHost = normalizedHost.replace(/^mongodb:\/\//, ""); normalizedHost = normalizedHost.replace(protocolRegex, "");
} }
const [hostIp] = await verifyHostInputValidity(normalizedHost); const [hostIp] = await verifyHostInputValidity(normalizedHost);
@@ -73,6 +77,7 @@ export const mongodbCredentialsRotationFactory: TRotationFactory<
username: authCredentials.username, username: authCredentials.username,
password: authCredentials.password password: authCredentials.password
}, },
authSource: connection.credentials.database,
directConnection: !isSrv directConnection: !isSrv
}; };
backend/src/services/app-connection/mongodb/mongodb-connection-fns.ts
+8 -4
View File
@@ -1,4 +1,5 @@
import { MongoClient } from "mongodb"; import { MongoClient } from "mongodb";
import RE2 from "re2";
import { verifyHostInputValidity } from "@app/ee/services/dynamic-secret/dynamic-secret-fns"; import { verifyHostInputValidity } from "@app/ee/services/dynamic-secret/dynamic-secret-fns";
import { BadRequestError } from "@app/lib/errors"; import { BadRequestError } from "@app/lib/errors";
@@ -17,12 +18,15 @@ export const getMongoDBConnectionListItem = () => {
}; };
export const validateMongoDBConnectionCredentials = async (config: TMongoDBConnectionConfig) => { export const validateMongoDBConnectionCredentials = async (config: TMongoDBConnectionConfig) => {
const srvRegex = new RE2("^mongodb\\+srv:\\/\\/");
const protocolRegex = new RE2("^mongodb:\\/\\/");
let normalizedHost = config.credentials.host.trim(); let normalizedHost = config.credentials.host.trim();
const isSrvFromHost = normalizedHost.startsWith("mongodb+srv://"); const isSrvFromHost = srvRegex.test(normalizedHost);
if (isSrvFromHost) { if (isSrvFromHost) {
normalizedHost = normalizedHost.replace(/^mongodb\+srv:\/\//, ""); normalizedHost = normalizedHost.replace(srvRegex, "");
} else if (normalizedHost.startsWith("mongodb://")) { } else if (protocolRegex.test(normalizedHost)) {
normalizedHost = normalizedHost.replace(/^mongodb:\/\//, ""); normalizedHost = normalizedHost.replace(protocolRegex, "");
} }
const [hostIp] = await verifyHostInputValidity(normalizedHost); const [hostIp] = await verifyHostInputValidity(normalizedHost);