fix(core): Improve the security on OAuth callback endpoints #11593
Conversation
This file contains 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
netroy
changed the title
netroy
changed the title
n8n-assistant
bot
added
core
netroy
force-pushed
the
SEC-163-secure-oauth-callback
branch
2 times, most recently
from
80fb12e to
51453bc
Compare
Codecov ReportAll modified and coverable lines are covered by tests ✅ 📢 Thoughts on this report? Let us know! |
netroy
force-pushed
the
SEC-163-secure-oauth-callback
branch
from
51453bc to
54808e6
Compare
…g the oauth flow can complete the flow
netroy
force-pushed
the
SEC-163-secure-oauth-callback
branch
from
54808e6 to
e4eb7d0
Compare
netroy
force-pushed
the
SEC-163-secure-oauth-callback
branch
from
e4eb7d0 to
a49f61d
Compare
ivov
previously approved these changes
Nov 13, 2024
packages/cli/src/controllers/oauth/abstract-oauth.controller.ts
Outdated
Show resolved
Hide resolved
packages/cli/src/controllers/oauth/abstract-oauth.controller.ts
Outdated
Show resolved
Hide resolved
packages/cli/src/controllers/oauth/abstract-oauth.controller.ts
Outdated
Show resolved
Hide resolved
|
|
||
| const additionalData = await this.getAdditionalData(); | ||
| const decryptedDataOriginal = await this.getDecryptedData(credential, additionalData); | ||
| const oauthCredentials = this.applyDefaultsAndOverwrites<T>( |
There was a problem hiding this comment.
Looks like we should set a default for this generic.
packages/cli/src/controllers/oauth/oauth1-credential.controller.ts
Outdated
Show resolved
Hide resolved
packages/cli/src/controllers/oauth/__tests__/oauth1-credential.controller.test.ts
Outdated
Show resolved
Hide resolved
|
✅ All Cypress E2E specs passed |
n8n
|
||||||||||||||||||||||||||||
| Project |
n8n
|
| Branch Review |
SEC-163-secure-oauth-callback
|
| Run status |
|
| Run duration | 04m 40s |
| Commit |
|
| Committer | कारतोफ्फेलस्क्रिप्ट™ |
| View all properties for this run ↗︎ | |
| Test results | |
|---|---|
Failures
|
0
|
Flaky
|
3
|
Pending
|
0
|
Skipped
|
0
|
Passing
|
477
|
| View all changes introduced in this branch ↗︎ | |
ivov
previously approved these changes
Nov 15, 2024
packages/cli/src/controllers/oauth/abstract-oauth.controller.ts
Outdated
Show resolved
Hide resolved
packages/cli/src/controllers/oauth/oauth1-credential.controller.ts
Outdated
Show resolved
Hide resolved
|
|
||
| // TODO: Flip this flag in v2 | ||
| // https://linear.app/n8n/issue/CAT-329 | ||
| export const skipAuthOnOAuthCallback = process.env.N8N_SKIP_AUTH_ON_OAUTH_CALLBACK !== 'true'; |
There was a problem hiding this comment.
Why do we want this as an "unofficial" env? (i.e. excluded from config object and from docs)
There was a problem hiding this comment.
we don't want to document this because we really don't want anyone using it unless they have no other option, like some embed customers.
Once we have those customers migrated, we'll just remove this, and make auth always mandatory on callback.
|
|
ivov
approved these changes
Nov 19, 2024
|
✅ All Cypress E2E specs passed |
Merged
|
Got released with |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Summary
This PR updates our oauth endpoints to
userIdof the person starting the oauth flow, in the CSRFstate, and ensure that only that user can handle the callback urlcreatedAtto CSRF state, and use that to expire oauth flows if not finished under 5 minutesAuth on the callback endpoint is disabled for now for backward compatibility, but will be enabled by default in the next major release.
Related Linear tickets, Github issues, and Community forum posts
SEC-163
Review / Merge checklist
release/backport(if the PR is an urgent fix that needs to be backported)