-
-
Notifications
You must be signed in to change notification settings - Fork 1.5k
fix : Only allow logins from whitelisted_emails (for self-hosting) #687
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
Closed
Closed
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
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
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
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 |
|---|---|---|
| @@ -1,8 +1,13 @@ | ||
| import type { Prisma, User } from "@trigger.dev/database"; | ||
| import type { GitHubProfile } from "remix-auth-github"; | ||
| import { prisma } from "~/db.server"; | ||
| import { env } from "~/env.server"; | ||
| import { authenticator } from "~/services/auth.server"; | ||
| import { addEmailLinkStrategy } from "~/services/emailAuth.server"; | ||
| export type { User } from "@trigger.dev/database"; | ||
|
|
||
| addEmailLinkStrategy(authenticator); | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why? We already do this elsewhere. |
||
|
|
||
| type FindOrCreateMagicLink = { | ||
| authenticationMethod: "MAGIC_LINK"; | ||
| email: string; | ||
|
|
@@ -22,7 +27,12 @@ type LoggedInUser = { | |
| isNewUser: boolean; | ||
| }; | ||
|
|
||
| class EmailWhitelistError extends Error {} | ||
|
|
||
| export async function findOrCreateUser(input: FindOrCreateUser): Promise<LoggedInUser> { | ||
| if (!isEmailWhitelisted(input.email, env.WHITELISTED_EMAILS)) { | ||
| throw new EmailWhitelistError("Access to this instance is restricted."); | ||
| } | ||
| switch (input.authenticationMethod) { | ||
| case "GITHUB": { | ||
| return findOrCreateGithubUser(input); | ||
|
|
@@ -178,3 +188,11 @@ export async function grantUserCloudAccess({ id, inviteCode }: { id: string; inv | |
| }, | ||
| }); | ||
| } | ||
|
|
||
| function isEmailWhitelisted(email: string, whitelist: string | undefined) { | ||
| if (whitelist) { | ||
| const regex = new RegExp(whitelist); | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. What happens if whitelist contains an invalid regular expression? |
||
| return regex.test(email); | ||
| } | ||
| return true; // No whitelist means all emails are allowed | ||
| } | ||
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
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.
Please have a look further up the file, the Optional Variables section already exists.
The
WHITELISTED_EMAILSline would have to be commented out as it's optional.The description is good, but would have to go above the env var, not below. You can also drop the
Description:prefix.