-
-
Notifications
You must be signed in to change notification settings - Fork 24.7k
fix(postgres): honor user-supplied ssl config in vector store connection #6596
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
gaurav0107
wants to merge
1
commit into
FlowiseAI:main
Choose a base branch
from
gaurav0107:bugfix/5292-postgres-vectorstore-ssl-config
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+62
−1
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
30 changes: 30 additions & 0 deletions
30
packages/components/nodes/vectorstores/Postgres/sslConfig.test.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| import { resolvePostgresSSL } from './sslConfig' | ||
|
|
||
| describe('resolvePostgresSSL', () => { | ||
| it('falls back to the boolean toggle when Additional Configuration has no ssl', () => { | ||
| expect(resolvePostgresSSL({}, true)).toBe(true) | ||
| expect(resolvePostgresSSL({}, false)).toBe(false) | ||
| expect(resolvePostgresSSL({ connectTimeout: 5000 }, true)).toBe(true) | ||
| }) | ||
|
|
||
| it('falls back to the boolean toggle when Additional Configuration is undefined', () => { | ||
| expect(resolvePostgresSSL(undefined, true)).toBe(true) | ||
| expect(resolvePostgresSSL(undefined, false)).toBe(false) | ||
| }) | ||
|
|
||
| it('prefers a user-supplied ssl object over the boolean toggle', () => { | ||
| const ssl = { rejectUnauthorized: true, ca: 'CERT' } | ||
| // custom CA must win even when the toggle is off (AWS RDS / corporate CA case) | ||
| expect(resolvePostgresSSL({ ssl }, false)).toBe(ssl) | ||
| expect(resolvePostgresSSL({ ssl }, true)).toBe(ssl) | ||
| }) | ||
|
|
||
| it('respects an explicit ssl:false in Additional Configuration', () => { | ||
| expect(resolvePostgresSSL({ ssl: false }, true)).toBe(false) | ||
| }) | ||
|
|
||
| it('respects rejectUnauthorized:false for self-signed certificates', () => { | ||
| const ssl = { rejectUnauthorized: false } | ||
| expect(resolvePostgresSSL({ ssl }, false)).toBe(ssl) | ||
| }) | ||
| }) |
27 changes: 27 additions & 0 deletions
27
packages/components/nodes/vectorstores/Postgres/sslConfig.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| /** | ||
| * SSL configuration resolution for the Postgres vector store connection. | ||
| * | ||
| * Kept as a dependency-free leaf module (no barrel import) so it can be unit | ||
| * tested in isolation, mirroring `src/sanitizeDataSourceOptions.ts`. | ||
| */ | ||
|
|
||
| /** | ||
| * Resolves the SSL option used to open the Postgres connection. | ||
| * | ||
| * The node exposes a boolean "SSL" toggle, but the "Additional Configuration" | ||
| * field also documents `ssl` as a supported TypeORM connection option. When an | ||
| * operator needs a custom CA (AWS RDS, an internal corporate CA) or has to relax | ||
| * verification for a self-signed certificate, they supply a richer value there, | ||
| * e.g. `{ "ssl": { "ca": "<pem>" } }` or `{ "ssl": { "rejectUnauthorized": false } }`. | ||
| * That value must take precedence over the boolean toggle instead of being | ||
| * clobbered by it, otherwise operators are pushed onto the global | ||
| * `NODE_TLS_REJECT_UNAUTHORIZED=0` escape hatch, which disables TLS verification | ||
| * process-wide. Falls back to the boolean toggle when Additional Configuration | ||
| * does not specify `ssl`, preserving the existing default behaviour. | ||
| */ | ||
| export function resolvePostgresSSL(additionalConfig: Record<string, any> | undefined, sslToggle: boolean): boolean | Record<string, any> { | ||
| if (additionalConfig != null && Object.prototype.hasOwnProperty.call(additionalConfig, 'ssl')) { | ||
| return additionalConfig.ssl | ||
| } | ||
| return sslToggle | ||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
To align with the repository's general rules, use loose equality (
!= null) for nullish checks instead of combining truthiness andtypeofchecks. This simplifies the condition while remaining safe, asObject.prototype.hasOwnProperty.callhandles primitive values gracefully without throwing errors.References
== null) as a standard idiom for a 'nullish' check that covers bothnullandundefined.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Addressed in 06c2dbd — switched to the
!= nullnullish check. Thanks for the review.