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

Jump to bottom

Accept multiple SSH keys in single LDAP SSHPublicKey attribute #13989

Merged
merged 11 commits into from
Dec 18, 2020
Merged

Accept multiple SSH keys in single LDAP SSHPublicKey attribute #13989

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
d868283
Accept multiple SSH keys in single LDAP SSHPublicKey attribute
zeripath Dec 14, 2020
55935c8
Update models/user.go
zeripath Dec 14, 2020
b222099
Merge branch 'master' into fix-13984-multiple-keys-per-input
6543 Dec 15, 2020
f3be383
bugfix
zeripath Dec 15, 2020
328faed
fixup2
zeripath Dec 15, 2020
b5b1018
Merge branch 'master' into fix-13984-multiple-keys-per-input
zeripath Dec 16, 2020
40928bd
fix tests
zeripath Dec 16, 2020
e8a6632
remove additional logging
zeripath Dec 16, 2020
70893d6
Merge branch 'master' into fix-13984-multiple-keys-per-input
zeripath Dec 16, 2020
5fe2816
Add simple test
zeripath Dec 17, 2020
9a1f91d
Merge branch 'master' into fix-13984-multiple-keys-per-input
lunny Dec 18, 2020
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
23 changes: 19 additions & 4 deletions models/user.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1588,9 +1588,23 @@ func deleteKeysMarkedForDeletion(keys []string) (bool, error) {
func addLdapSSHPublicKeys(usr *User, s *LoginSource, sshPublicKeys []string) bool {
var sshKeysNeedUpdate bool
for _, sshKey := range sshPublicKeys {
_, _, _, _, err := ssh.ParseAuthorizedKey([]byte(sshKey))
if err == nil {
sshKeyName := fmt.Sprintf("%s-%s", s.Name, sshKey[0:40])
var err error
found := false
keys := []byte(sshKey)
loop:
for len(sshKey) > 0 && err == nil {
var out ssh.PublicKey
var comment string
// We ignore options as they are not relevant to Gitea
out, comment, _, keys, err = ssh.ParseAuthorizedKey(keys)
if err != nil {
break loop
}
found = true
marshalled := out.Marshal()
sshKeyName := fmt.Sprintf("%s-%s", s.Name, marshalled[0:40])

marshalled = append(marshalled, []byte(" "+comment)...)
if _, err := AddPublicKey(usr.ID, sshKeyName, sshKey, s.ID); err != nil {
zeripath marked this conversation as resolved.
Show resolved Hide resolved
if IsErrKeyAlreadyExist(err) {
log.Trace("addLdapSSHPublicKeys[%s]: LDAP Public SSH Key %s already exists for user", s.Name, usr.Name)
Expand All @@ -1601,7 +1615,8 @@ func addLdapSSHPublicKeys(usr *User, s *LoginSource, sshPublicKeys []string) boo
log.Trace("addLdapSSHPublicKeys[%s]: Added LDAP Public SSH Key for user %s", s.Name, usr.Name)
sshKeysNeedUpdate = true
}
} else {
}
if !found && err != nil {
log.Warn("addLdapSSHPublicKeys[%s]: Skipping invalid LDAP Public SSH Key for user %s: %v", s.Name, usr.Name, sshKey)
}
}
Expand Down