awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-10-15 15:41:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

improvements: add ssl options to sql connections and update ui/docs

Browse Source
This commit is contained in:
Scott Wilson
2025-04-04 17:51:05 -07:00
parent 46e72e9fba
commit 0ee1b425df
25 changed files with 320 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/src/services/app-connection/mssql/mssql-connection-schemas.ts
+3 -1
View File
@@ -29,7 +29,9 @@ export const SanitizedMsSqlConnectionSchema = z.discriminatedUnion("method", [
host: true,
database: true,
port: true,
username: true
username: true,
sslEnabled: true,
sslRejectUnauthorized: true
})
})
]);
backend/src/services/app-connection/postgres/postgres-connection-schemas.ts
+3 -1
View File
@@ -27,7 +27,9 @@ export const SanitizedPostgresConnectionSchema = z.discriminatedUnion("method",
host: true,
database: true,
port: true,
username: true
username: true,
sslEnabled: true,
sslRejectUnauthorized: true
})
})
]);
backend/src/services/app-connection/shared/sql/sql-connection-fns.ts
+6 -9
View File
@@ -5,7 +5,6 @@ import {
TSqlCredentialsRotationGeneratedCredentials,
TSqlCredentialsRotationWithConnection
} from "@app/ee/services/secret-rotation-v2/shared/sql-credentials/sql-credentials-rotation-types";
import { getConfig } from "@app/lib/config/env";
import { BadRequestError, DatabaseError } from "@app/lib/errors";
import { alphaNumericNanoId } from "@app/lib/nanoid";
import { AppConnection } from "@app/services/app-connection/app-connection-enums";
@@ -21,16 +20,14 @@ const SQL_CONNECTION_CLIENT_MAP = {
const getConnectionConfig = ({
app,
credentials: { sslCertificate, host }
credentials: { host, sslCertificate, sslEnabled, sslRejectUnauthorized }
}: Pick<TSqlConnection, "credentials" | "app">) => {
const appCfg = getConfig();
switch (app) {
case AppConnection.Postgres: {
return {
ssl: appCfg.DB_SSL_REQUIRED
ssl: sslEnabled
? {
rejectUnauthorized: appCfg.DB_SSL_REJECT_UNAUTHORIZED,
rejectUnauthorized: sslRejectUnauthorized,
ca: sslCertificate,
servername: host
}
@@ -39,13 +36,13 @@ const getConnectionConfig = ({
}
case AppConnection.MsSql: {
return {
options: appCfg.DB_SSL_REQUIRED
options: sslEnabled
? {
trustServerCertificate: !appCfg.DB_SSL_REJECT_UNAUTHORIZED,
trustServerCertificate: !sslRejectUnauthorized,
encrypt: true,
cryptoCredentialsDetails: sslCertificate ? { ca: sslCertificate } : {}
}
: undefined
: { encrypt: false }
};
}
default:
backend/src/services/app-connection/shared/sql/sql-connection-schemas.ts
+8 -1
View File
@@ -8,5 +8,12 @@ export const BaseSqlUsernameAndPasswordConnectionSchema = z.object({
database: z.string().trim().min(1, "Database required").describe(AppConnections.CREDENTIALS.SQL_CONNECTION.database),
username: z.string().trim().min(1, "Username required").describe(AppConnections.CREDENTIALS.SQL_CONNECTION.username),
password: z.string().trim().min(1, "Password required").describe(AppConnections.CREDENTIALS.SQL_CONNECTION.password),
sslCertificate: z.string().trim().optional().describe(AppConnections.CREDENTIALS.SQL_CONNECTION.sslCertificate)
sslEnabled: z.boolean().describe(AppConnections.CREDENTIALS.SQL_CONNECTION.sslEnabled),
sslRejectUnauthorized: z.boolean().describe(AppConnections.CREDENTIALS.SQL_CONNECTION.sslRejectUnauthorized),
sslCertificate: z
.string()
.trim()
.transform((value) => value || undefined)
.optional()
.describe(AppConnections.CREDENTIALS.SQL_CONNECTION.sslCertificate)
});