synced/coder
1
0
Fork 0
mirror of https://github.com/coder/coder.git synced 2025-07-03 16:13:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: transform underscores to hyphens for github login (#13384)

Browse Source 
Fixes #13339.
This commit is contained in:
Kyle Carberry
2024-06-11 09:34:05 -04:00
committed by GitHub
parent 7958c52918
commit c9cca9d56e
2 changed files with 54 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
coderd/userauth.go
View File

@ -644,7 +644,15 @@ func (api *API) userOAuth2Github(rw http.ResponseWriter, r *http.Request) {
if user.ID == uuid.Nil {
aReq.Action = database.AuditActionRegister
}
// See: https://github.com/coder/coder/discussions/13340
// In GitHub Enterprise, admins are permitted to have `_`
// in their usernames. This is janky, but much better
// than changing the username format globally.
username := ghUser.GetLogin()
if strings.Contains(username, "_") {
api.Logger.Warn(ctx, "login associates a github username that contains underscores. underscores are not permitted in usernames, replacing with `-`", slog.F("username", username))
username = strings.ReplaceAll(username, "_", "-")
}
params := (&oauthLoginParams{
User: user,
Link: link,
@ -653,7 +661,7 @@ func (api *API) userOAuth2Github(rw http.ResponseWriter, r *http.Request) {
LoginType: database.LoginTypeGithub,
AllowSignups: api.GithubOAuth2Config.AllowSignups,
Email: verifiedEmail.GetEmail(),
Username: ghUser.GetLogin(),
Username: username,
AvatarURL: ghUser.GetAvatarURL(),
Name: normName,
DebugContext: OauthDebugContext{},