only parse out sslmode if it's equal to verify-ca, verify-full, or

require
This commit is contained in:
x032205
2025-10-09 00:47:04 -04:00
parent 86fb8a665d
commit bb274c2d08
+9 -6
View File
@@ -32,11 +32,12 @@ export const initDbConnection = ({
return selectedReplica; return selectedReplica;
}); });
// Parse out ?sslmode=... from the connection URI if its not equal to "disable" and dbRootCert is defined // Parse out ?sslmode=... from the connection URI if its equal to "verify-ca", "verify-full", or "require" and dbRootCert is defined
let modifiedDbConnectionUri = dbConnectionUri; let modifiedDbConnectionUri = dbConnectionUri;
if (dbRootCert) { if (dbRootCert) {
const url = new URL(dbConnectionUri); const url = new URL(dbConnectionUri);
if (url.searchParams.has("sslmode") && url.searchParams.get("sslmode") !== "disable") { const sslMode = url.searchParams.get("sslmode");
if (url.searchParams.has("sslmode") && sslMode && ["verify-ca", "verify-full", "require"].includes(sslMode)) {
url.searchParams.delete("sslmode"); url.searchParams.delete("sslmode");
modifiedDbConnectionUri = url.toString(); modifiedDbConnectionUri = url.toString();
} }
@@ -70,11 +71,12 @@ export const initDbConnection = ({
readReplicaDbs = readReplicas.map((el) => { readReplicaDbs = readReplicas.map((el) => {
const replicaDbCertificate = el.dbRootCert || dbRootCert; const replicaDbCertificate = el.dbRootCert || dbRootCert;
// Parse out ?sslmode=... from the connection URI if its not equal to "disable" and dbRootCert is defined // Parse out ?sslmode=... from the connection URI if its equal to "verify-ca", "verify-full", or "require" and dbRootCert is defined
let modifiedReadReplicaDbConnectionUri = el.dbConnectionUri; let modifiedReadReplicaDbConnectionUri = el.dbConnectionUri;
if (replicaDbCertificate) { if (replicaDbCertificate) {
const url = new URL(el.dbConnectionUri); const url = new URL(el.dbConnectionUri);
if (url.searchParams.has("sslmode") && url.searchParams.get("sslmode") !== "disable") { const sslMode = url.searchParams.get("sslmode");
if (url.searchParams.has("sslmode") && sslMode && ["verify-ca", "verify-full", "require"].includes(sslMode)) {
url.searchParams.delete("sslmode"); url.searchParams.delete("sslmode");
modifiedReadReplicaDbConnectionUri = url.toString(); modifiedReadReplicaDbConnectionUri = url.toString();
} }
@@ -108,11 +110,12 @@ export const initAuditLogDbConnection = ({
dbConnectionUri: string; dbConnectionUri: string;
dbRootCert?: string; dbRootCert?: string;
}) => { }) => {
// Parse out ?sslmode=... from the connection URI if its not equal to "disable" and dbRootCert is defined // Parse out ?sslmode=... from the connection URI if its equal to "verify-ca", "verify-full", or "require" and dbRootCert is defined
let modifiedDbConnectionUri = dbConnectionUri; let modifiedDbConnectionUri = dbConnectionUri;
if (dbRootCert) { if (dbRootCert) {
const url = new URL(dbConnectionUri); const url = new URL(dbConnectionUri);
if (url.searchParams.has("sslmode") && url.searchParams.get("sslmode") !== "disable") { const sslMode = url.searchParams.get("sslmode");
if (url.searchParams.has("sslmode") && sslMode && ["verify-ca", "verify-full", "require"].includes(sslMode)) {
url.searchParams.delete("sslmode"); url.searchParams.delete("sslmode");
modifiedDbConnectionUri = url.toString(); modifiedDbConnectionUri = url.toString();
} }