Skip to content

fix: redirect unauthorized git users to login screen #10995

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Dec 7, 2023
Merged

fix: redirect unauthorized git users to login screen #10995

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a272e30
fix: redirect to login screen if unauthorized git user
Kira-Pilot Dec 1, 2023
ecdb59e
consolidated language
Kira-Pilot Dec 1, 2023
d31f554
fix redirect
Kira-Pilot Dec 5, 2023
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
5 changes: 2 additions & 3 deletions coderd/userauth.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"fmt"
"net/http"
"net/mail"
"net/url"
"regexp"
"sort"
"strconv"
Expand Down Expand Up @@ -535,9 +536,7 @@ func (api *API) userOAuth2Github(rw http.ResponseWriter, r *http.Request) {
}
}
if len(selectedMemberships) == 0 {
httpapi.Write(ctx, rw, http.StatusUnauthorized, codersdk.Response{
Message: "You aren't a member of the authorized Github organizations!",
})
httpmw.RedirectToLogin(rw, r, &url.URL{Path: "/login"}, "You aren't a member of the authorized Github organizations!")
Copy link
Member Author

Choose a reason for hiding this comment

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

if we're ok with this pattern, I can redirect similarly on the other oauth errors.

Copy link
Member

Choose a reason for hiding this comment

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

One issue with this function is that it sets ?redirect=${currentPath}, which we don't want to do. If you could change the httpmw.RedirectToLogin function to accept a nil *http.Request and avoid adding the redirect query param then it should solve the problem

Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
httpmw.RedirectToLogin(rw, r, &url.URL{Path: "/login"}, "You aren't a member of the authorized Github organizations!")
httpmw.RedirectToLogin(rw, r, nil, "You aren't a member of the authorized Github organizations!")

dashboardURL defaults to /login if nil

return
}
}
Expand Down
5 changes: 3 additions & 2 deletions site/src/pages/LoginPage/LoginPageView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ export const LoginPageView: FC<LoginPageViewProps> = ({
const redirectTo = retrieveRedirect(location.search);
// This allows messages to be displayed at the top of the sign in form.
// Helpful for any redirects that want to inform the user of something.
const info = new URLSearchParams(location.search).get("info") || undefined;
const message =
new URLSearchParams(location.search).get("message") || undefined;
Copy link
Member

Choose a reason for hiding this comment

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

...then you wouldn't need this || undefined!

const applicationName = getApplicationName();
const logoURL = getLogoURL();
const applicationLogo = logoURL ? (
Expand Down Expand Up @@ -52,7 +53,7 @@ export const LoginPageView: FC<LoginPageViewProps> = ({
redirectTo={redirectTo}
isSigningIn={isSigningIn}
error={error}
info={info}
message={message}
onSubmit={onSignIn}
/>
<footer css={styles.footer}>
Expand Down
8 changes: 4 additions & 4 deletions site/src/pages/LoginPage/SignInForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ export interface SignInFormProps {
isSigningIn: boolean;
redirectTo: string;
error?: unknown;
info?: string;
message?: string;
Copy link
Member

Choose a reason for hiding this comment

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

if this was message?: ReactNode;...

authMethods?: AuthMethods;
onSubmit: (credentials: { email: string; password: string }) => void;
}
Expand All @@ -73,7 +73,7 @@ export const SignInForm: FC<React.PropsWithChildren<SignInFormProps>> = ({
redirectTo,
isSigningIn,
error,
info,
message,
onSubmit,
}) => {
const oAuthEnabled = Boolean(
Expand All @@ -91,9 +91,9 @@ export const SignInForm: FC<React.PropsWithChildren<SignInFormProps>> = ({
</div>
)}

{Boolean(info) && Boolean(error) && (
{Boolean(message) && (
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
{Boolean(message) && (
{message && (

nit: technically this cast is superfluous

<div css={styles.alert}>
<Alert severity="info">{info}</Alert>
<Alert severity="info">{message}</Alert>
</div>
)}

Expand Down
2 changes: 1 addition & 1 deletion site/src/pages/UserSettingsPage/SecurityPage/SingleSignOnSection.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ export const useSingleSignOnSection = () => {
// The redirect on success should be back to the login page with a nice message.
// The user should be logged out if this worked.
encodeURIComponent(
`/login?info=Login type has been changed to ${loginTypeMsg}. Log in again using the new method.`,
`/login?message=Login type has been changed to ${loginTypeMsg}. Log in again using the new method.`,
Copy link
Member

Choose a reason for hiding this comment

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

this'll evaluate to "%2Flogin%3Fmessage%3DLogin%20type%20...", which I'm guessing is what we want but this diff doesn't give much context. if it was fine before though it's probably ok!

),
);
},
Expand Down