Skip to content

The open-source agent harness - the runtime layer that turns an LLM into a working agent.

feat: Add POSTGRES_SSL_MODE support for Postgres connection (#554)

Sujai Kumar Guptac65b81382808
diff --git a/.changeset/postgres-ssl.md b/.changeset/postgres-ssl.md
new file mode 100644
index 000000000..dd45b0498
--- /dev/null
+++ b/.changeset/postgres-ssl.md
@@ -0,0 +1,5 @@
+---
+"@truefoundry/trueforge": patch
+---
+
+Apply `POSTGRES_SSL_MODE` as `sslmode` on the Postgres connection URL.
diff --git a/charts/trueforge/templates/_helpers.tpl b/charts/trueforge/templates/_helpers.tpl
index 19c86df5f..eee2de050 100644
--- a/charts/trueforge/templates/_helpers.tpl
+++ b/charts/trueforge/templates/_helpers.tpl
@@ -206,6 +206,9 @@ fields, wires bundled Postgres/Redis, optional OIDC, then server.extraEnv.
{{- $env = append $env (dict "name" "POSTGRES_PASSWORD" "valueFrom" (dict "secretKeyRef" (dict "name" (include "trueforge.postgres.secretName" .) "key" "password"))) -}}
{{- else -}}
{{- $env = append $env (include "trueforge.env.fromStringOrValueFrom" (dict "name" "POSTGRES_PASSWORD" "field" "externalPostgres.password" "value" .Values.externalPostgres.password) | fromJson) -}}
+{{- if .Values.externalPostgres.sslMode -}}
+{{- $env = append $env (dict "name" "POSTGRES_SSL_MODE" "value" .Values.externalPostgres.sslMode) -}}
+{{- end -}}
{{- end -}}
{{- if .Values.configs.oidc.enabled -}}
diff --git a/charts/trueforge/values.yaml b/charts/trueforge/values.yaml
index c0acd56ff..74c4d061d 100644
--- a/charts/trueforge/values.yaml
+++ b/charts/trueforge/values.yaml
@@ -178,6 +178,9 @@ externalPostgres:
# secretKeyRef:
# name: my-postgres-secret
# key: password
+ # Optional TLS for the app → Postgres pool (`POSTGRES_SSL_MODE`). Empty = unset (no TLS).
+ # Modes: disable | prefer | require | verify-ca | verify-full | no-verify.
+ sslMode: ""
externalRedis:
# Full connection URL, e.g. redis://:[email protected]:6379.
# string, or { valueFrom: { secretKeyRef: { name, key } } }. Prefer valueFrom in prod.
diff --git a/packages/trueforge/.env.example b/packages/trueforge/.env.example
index 8aaa335d9..3f832bd19 100644
--- a/packages/trueforge/.env.example
+++ b/packages/trueforge/.env.example
@@ -155,6 +155,9 @@ POSTGRES_PORT=5432
## Shared by the app pool and migrations. Optional, defaults to 60000 each.
# POSTGRES_STATEMENT_TIMEOUT_MS=60000
# POSTGRES_IDLE_IN_TRANSACTION_SESSION_TIMEOUT_MS=60000
+## Appended as `sslmode` on DATABASE_URL / the built postgres:// URL.
+## disable | prefer | require | verify-ca | verify-full | no-verify.
+# POSTGRES_SSL_MODE=require
## ---------------------------------------------------------------------------
## OIDC (used when STANDALONE=false). All three must be set together, or all
diff --git a/packages/trueforge/src/config.ts b/packages/trueforge/src/config.ts
index 5d7a8f1a7..88de79e30 100644
--- a/packages/trueforge/src/config.ts
+++ b/packages/trueforge/src/config.ts
@@ -141,6 +141,31 @@ function parseBoolean(options: { envKey: string; raw: string | undefined; defaul
throw new Error(`Environment variable ${envKey} must be "true" or "false", got "${raw}"`);
}
+/** Parses `POSTGRES_SSL_MODE`. Unset/blank → `''`. Unknown values throw. */
+function parsePostgresSslMode(raw: string | undefined): string {
+ if (!raw) {
+ return '';
+ }
+ const mode = raw.trim();
+ if (mode === '') {
+ return '';
+ }
+ switch (mode) {
+ case 'disable':
+ case 'prefer':
+ case 'require':
+ case 'verify-ca':
+ case 'verify-full':
+ case 'no-verify':
+ return mode;
+ default:
+ throw new Error(
+ 'Environment variable POSTGRES_SSL_MODE must be one of disable, prefer, require, verify-ca, ' +
+ `verify-full, no-verify; got "${mode}"`,
+ );
+ }
+}
+
/**
* Prefer `dist/_frontend` shipped in the npm tarball (npx / `pnpm start`).
* Fall back to the monorepo sibling `../frontend/dist` (host-dev before a copy).
@@ -210,6 +235,7 @@ function resolvePostgresDatabaseUrl(): string {
if (databaseUrl !== undefined && databaseUrl.trim() !== '') {
return databaseUrl.trim();
}
+
const postgresUser = getEnv('POSTGRES_USER', { defaultValue: DEFAULT_POSTGRES_USER }) ?? DEFAULT_POSTGRES_USER;
const postgresPassword =
getEnv('POSTGRES_PASSWORD', { defaultValue: DEFAULT_POSTGRES_PASSWORD }) ?? DEFAULT_POSTGRES_PASSWORD;
@@ -220,6 +246,7 @@ function resolvePostgresDatabaseUrl(): string {
raw: getEnv('POSTGRES_PORT'),
defaultValue: DEFAULT_POSTGRES_PORT,
});
+ const postgresSslMode = parsePostgresSslMode(getEnv('POSTGRES_SSL_MODE'));
if (
postgresUser.trim() === '' ||
postgresPassword.trim() === '' ||
@@ -230,12 +257,14 @@ function resolvePostgresDatabaseUrl(): string {
'Set DATABASE_URL, or set non-empty POSTGRES_USER, POSTGRES_PASSWORD, POSTGRES_DB, and POSTGRES_HOST when STANDALONE=false.',
);
}
+
return buildPostgresConnectionString({
user: postgresUser,
password: postgresPassword,
host: postgresHost,
port: postgresPort,
database: postgresDb,
+ sslMode: postgresSslMode,
});
}
@@ -246,8 +275,13 @@ function buildPostgresConnectionString(parts: {
host: string;
port: number;
database: string;
+ sslMode: string;
}): string {
- return `postgres://${encodeURIComponent(parts.user)}:${encodeURIComponent(parts.password)}@${parts.host}:${String(parts.port)}/${encodeURIComponent(parts.database)}`;
+ let connectionString = `postgres://${encodeURIComponent(parts.user)}:${encodeURIComponent(parts.password)}@${parts.host}:${String(parts.port)}/${encodeURIComponent(parts.database)}`;
+ if (parts.sslMode !== '') {
+ connectionString += `?sslmode=${encodeURIComponent(parts.sslMode)}`;
+ }
+ return connectionString;
}
function resolveOIDCConfig(): OIDCConfig | undefined {
@@ -500,7 +534,8 @@ export type DistributedServerConfiguration = SharedServerConfiguration & {
*/
STANDALONE: false;
/**
- * Postgres connection string. Env: `DATABASE_URL` when set; otherwise built from `POSTGRES_*`.
+ * Postgres connection string. Env: `DATABASE_URL` when set; otherwise built from `POSTGRES_*`
+ * (including optional `POSTGRES_SSL_MODE` as `sslmode`).
* Form: `postgres://USER:PASSWORD@HOST:PORT/DB` (or `postgresql://…`) with user/password URL-encoded.
*/
DATABASE_URL: string;