Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion apps/api/prisma/client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,11 @@ function getSslConfig(url: string): PoolConfig['ssl'] {

function createPrismaClient(): PrismaClient {
const url = process.env.DATABASE_URL!;
const adapter = new PrismaPg({ connectionString: url, ssl: getSslConfig(url) });
const ssl = getSslConfig(url);
// Strip sslmode from connection string — pg parses it independently and
// can override our explicit ssl config. We handle SSL entirely via the ssl option.
const cleanUrl = url.replace(/[?&]sslmode=\w[\w-]*/g, '').replace(/\?&/, '?').replace(/\?$/, '');
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Regex produces malformed URL when sslmode is first parameter

High Severity

When sslmode is the first query parameter and other parameters follow (e.g. ?sslmode=require&pool_timeout=10), the first .replace() consumes the ? along with sslmode=..., leaving &pool_timeout=10 with no leading ?. The second .replace(/\?&/, '?') is meant to fix this, but it can never match because the ? was already removed. The result is a malformed connection string (e.g. host/db&pool_timeout=10), which will cause database connection failures in any environment where DATABASE_URL has sslmode as the first query parameter followed by other parameters. This affects all six files with this identical logic.

Additional Locations (2)
Fix in Cursor Fix in Web

const adapter = new PrismaPg({ connectionString: cleanUrl, ssl });
return new PrismaClient({ adapter });
}

Expand Down
4 changes: 3 additions & 1 deletion apps/app/prisma/client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@ function getSslConfig(url: string): PoolConfig['ssl'] {

function createPrismaClient(): PrismaClient {
const url = process.env.DATABASE_URL!;
const adapter = new PrismaPg({ connectionString: url, ssl: getSslConfig(url) });
const ssl = getSslConfig(url);
const cleanUrl = url.replace(/[?&]sslmode=\w[\w-]*/g, '').replace(/\?&/, '?').replace(/\?$/, '');
const adapter = new PrismaPg({ connectionString: cleanUrl, ssl });
return new PrismaClient({ adapter });
}

Expand Down
4 changes: 3 additions & 1 deletion apps/framework-editor/prisma/client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@ function getSslConfig(url: string): PoolConfig['ssl'] {

function createPrismaClient(): PrismaClient {
const url = process.env.DATABASE_URL!;
const adapter = new PrismaPg({ connectionString: url, ssl: getSslConfig(url) });
const ssl = getSslConfig(url);
const cleanUrl = url.replace(/[?&]sslmode=\w[\w-]*/g, '').replace(/\?&/, '?').replace(/\?$/, '');
const adapter = new PrismaPg({ connectionString: cleanUrl, ssl });
return new PrismaClient({ adapter });
}

Expand Down
4 changes: 3 additions & 1 deletion apps/portal/prisma/client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@ function getSslConfig(url: string): PoolConfig['ssl'] {

function createPrismaClient(): PrismaClient {
const url = process.env.DATABASE_URL!;
const adapter = new PrismaPg({ connectionString: url, ssl: getSslConfig(url) });
const ssl = getSslConfig(url);
const cleanUrl = url.replace(/[?&]sslmode=\w[\w-]*/g, '').replace(/\?&/, '?').replace(/\?$/, '');
const adapter = new PrismaPg({ connectionString: cleanUrl, ssl });
return new PrismaClient({ adapter });
}

Expand Down
4 changes: 3 additions & 1 deletion packages/db/scripts/combine-schemas.js
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,9 @@ function getSslConfig(url: string) {

function createPrismaClient(): PrismaClient {
const url = process.env.DATABASE_URL!;
const adapter = new PrismaPg({ connectionString: url, ssl: getSslConfig(url) });
const ssl = getSslConfig(url);
const cleanUrl = url.replace(/[?&]sslmode=\\w[\\w-]*/g, '').replace(/\\?&/, '?').replace(/\\?$/, '');
const adapter = new PrismaPg({ connectionString: cleanUrl, ssl });
return new PrismaClient({ adapter });
}

Expand Down
4 changes: 3 additions & 1 deletion packages/db/src/client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@ function getSslConfig(url: string): PoolConfig['ssl'] {

function createPrismaClient(): PrismaClient {
const url = process.env.DATABASE_URL!;
const adapter = new PrismaPg({ connectionString: url, ssl: getSslConfig(url) });
const ssl = getSslConfig(url);
const cleanUrl = url.replace(/[?&]sslmode=\w[\w-]*/g, '').replace(/\?&/, '?').replace(/\?$/, '');
const adapter = new PrismaPg({ connectionString: cleanUrl, ssl });
return new PrismaClient({ adapter });
}

Expand Down
Loading