Skip to content
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

Create a session on ReverseProxy and ensure that ReverseProxy users cannot change username #15304

Merged
merged 12 commits into from
May 15, 2021
Merged

Create a session on ReverseProxy and ensure that ReverseProxy users cannot change username #15304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
ffb3f41
Create a session on ReverseProxy and ensure that ReverseProxy users c…
zeripath Apr 6, 2021
73f78a7
Merge branch 'master' into reverse-proxy-should-create-session
zeripath Apr 6, 2021
79d5c3a
Update modules/auth/sso/reverseproxy.go
zeripath Apr 6, 2021
c3491b4
Merge branch 'master' into reverse-proxy-should-create-session
zeripath Apr 6, 2021
9361617
Update modules/auth/sso/reverseproxy.go
zeripath Apr 11, 2021
0aef940
Merge branch 'master' into reverse-proxy-should-create-session
zeripath Apr 11, 2021
774ed5c
Merge branch 'master' into reverse-proxy-should-create-session
zeripath May 2, 2021
7d8737a
add testcase
zeripath May 4, 2021
8110c6b
Merge remote-tracking branch 'origin/main' into reverse-proxy-should-…
zeripath May 4, 2021
475226d
add test
zeripath May 4, 2021
0781559
Merge remote-tracking branch 'origin/main' into reverse-proxy-should-…
zeripath May 9, 2021
5ecf3e1
Merge branch 'main' into reverse-proxy-should-create-session
6543 May 15, 2021
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
19 changes: 14 additions & 5 deletions modules/auth/sso/reverseproxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (
"code.gitea.io/gitea/models"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/web/middleware"

gouuid "github.com/google/uuid"
)
Expand Down Expand Up @@ -69,13 +70,21 @@ func (r *ReverseProxy) VerifyAuthData(req *http.Request, w http.ResponseWriter,

user, err := models.GetUserByName(username)
if err != nil {
if models.IsErrUserNotExist(err) && r.isAutoRegisterAllowed() {
return r.newUser(req)
if !models.IsErrUserNotExist(err) || !r.isAutoRegisterAllowed() {
log.Error("GetUserByName: %v", err)
return nil
}
log.Error("GetUserByName: %v", err)
return nil
user = r.newUser(req)
}

// Make sure requests to API paths, attachment downloads, git and LFS do not create a new session
if !middleware.IsAPIPath(req) && !isAttachmentDownload(req) && !isGitOrLFSPath(req) {
if sess.Get("uid").(int64) != user.ID {
handleSignIn(w, req, sess, user)
}
}
store.GetData()["IsReverseProxy"] = true

log.Trace("ReverseProxy Authorization: Logged in user %-v", user)
return user
}
Expand Down Expand Up @@ -104,13 +113,13 @@ func (r *ReverseProxy) newUser(req *http.Request) *models.User {
user := &models.User{
Name: username,
Email: email,
Passwd: username,
IsActive: true,
}
if err := models.CreateUser(user); err != nil {
// FIXME: should I create a system notice?
log.Error("CreateUser: %v", err)
return nil
}

return user
}
4 changes: 2 additions & 2 deletions templates/user/settings/profile.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
<span class="text red hide" id="name-change-prompt"> {{.i18n.Tr "settings.change_username_prompt"}}</span>
<span class="text red hide" id="name-change-redirect-prompt"> {{.i18n.Tr "settings.change_username_redirect_prompt"}}</span>
</label>
<input id="username" name="name" value="{{.SignedUser.Name}}" data-name="{{.SignedUser.Name}}" autofocus required {{if not .SignedUser.IsLocal}}disabled{{end}}>
{{if not .SignedUser.IsLocal}}
<input id="username" name="name" value="{{.SignedUser.Name}}" data-name="{{.SignedUser.Name}}" autofocus required {{if or (not .SignedUser.IsLocal) .IsReverseProxy}}disabled{{end}}>
{{if or (not .SignedUser.IsLocal) .IsReverseProxy}}
<p class="help text blue">{{$.i18n.Tr "settings.password_username_disabled"}}</p>
{{end}}
</div>
Expand Down