moul/sshportal
1
1
Fork 0
mirror of https://github.com/moul/sshportal.git synced 2025-03-10 06:17:23 +08:00
Code Issues Projects Releases Packages Wiki Activity

hotfix: repair invite system (broken in v1.7.0)

Browse source
This commit is contained in:
Manfred Touron 2018-01-02 23:20:03 +01:00
parent 695ddc91dd
commit 5efe250466
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -3,6 +3,7 @@
## master (unreleased) ## master (unreleased)
* Return non-null exit-code on authentication error * Return non-null exit-code on authentication error
* **hotfix**: repair invite system (broken in v1.7.0)
## v1.7.0 (2018-01-02) ## v1.7.0 (2018-01-02)

8
ssh.go
View file

@ -249,14 +249,14 @@ func publicKeyAuthHandler(db *gorm.DB, globalContext *cli.Context) ssh.PublicKey
db.Where("authorized_key = ?", string(gossh.MarshalAuthorizedKey(key))).First(&actx.userKey) db.Where("authorized_key = ?", string(gossh.MarshalAuthorizedKey(key))).First(&actx.userKey)
if actx.userKey.UserID > 0 { if actx.userKey.UserID > 0 {
db.Preload("Roles").Where("id = ?", actx.userKey.UserID).First(&actx.user) db.Preload("Roles").Where("id = ?", actx.userKey.UserID).First(&actx.user)
if actx.userType() == "invite" { if actx.userType() == UserTypeInvite {
actx.err = fmt.Errorf("invites are only supported for new SSH keys; your ssh key is already associated with the user %q", actx.user.Email) actx.err = fmt.Errorf("invites are only supported for new SSH keys; your ssh key is already associated with the user %q", actx.user.Email)
} }
return true return true
} }
// handle invite "links" // handle invite "links"
if actx.userType() == "invite" { if actx.userType() == UserTypeInvite {
inputToken := strings.Split(actx.inputUsername, ":")[1] inputToken := strings.Split(actx.inputUsername, ":")[1]
if len(inputToken) > 0 { if len(inputToken) > 0 {
db.Where("invite_token = ?", inputToken).First(&actx.user) db.Where("invite_token = ?", inputToken).First(&actx.user)
@ -268,11 +268,11 @@ func publicKeyAuthHandler(db *gorm.DB, globalContext *cli.Context) ssh.PublicKey
Comment: "created by sshportal", Comment: "created by sshportal",
AuthorizedKey: string(gossh.MarshalAuthorizedKey(key)), AuthorizedKey: string(gossh.MarshalAuthorizedKey(key)),
} }
db.Create(actx.userKey) db.Create(&actx.userKey)
// token is only usable once // token is only usable once
actx.user.InviteToken = "" actx.user.InviteToken = ""
db.Model(actx.user).Updates(actx.user) db.Model(&actx.user).Updates(&actx.user)
actx.message = fmt.Sprintf("Welcome %s!\n\nYour key is now associated with the user %q.\n", actx.user.Name, actx.user.Email) actx.message = fmt.Sprintf("Welcome %s!\n\nYour key is now associated with the user %q.\n", actx.user.Name, actx.user.Email)
} else { } else {