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

Fix issue where ecdsa and other key types are not synced from LDAP (#5092) #5094

Merged
merged 12 commits into from
Oct 31, 2018
Merged

Fix issue where ecdsa and other key types are not synced from LDAP (#5092) #5094

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
da2ff25
Fix issue where ecdsa and other key types are not synced from LDAP au…
xor-gate Oct 17, 2018
2e5c3d0
Merge branch 'master' into feature/issue-5092
xor-gate Oct 18, 2018
83f6eec
Merge branch 'master' into feature/issue-5092
xor-gate Oct 21, 2018
2a57643
Merge branch 'master' into feature/issue-5092
xor-gate Oct 22, 2018
53c0181
Merge branch 'master' into feature/issue-5092
techknowlogick Oct 23, 2018
e2292c7
Merge branch 'master' into feature/issue-5092
xor-gate Oct 25, 2018
e4cca7e
Merge branch 'master' into feature/issue-5092
techknowlogick Oct 29, 2018
c3321ed
Merge branch 'master' into feature/issue-5092
xor-gate Oct 30, 2018
ea384de
Merge branch 'master' into feature/issue-5092
lafriks Oct 30, 2018
2eae1b1
Merge branch 'master' into feature/issue-5092
xor-gate Oct 30, 2018
44fdf1f
integrations/auth_ldap_test.go: Add Hermes Conrad new ecdsa-sha2-nist…
xor-gate Oct 30, 2018
b7fadfd
integrations/auth_ldap_test.go: Use ssh-keygen -lf <filename> -E sha256
xor-gate Oct 30, 2018
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
1 change: 1 addition & 0 deletions integrations/auth_ldap_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ var gitLDAPUsers = []ldapUser{
SSHKeys: []string{
"SHA256:qLY06smKfHoW/92yXySpnxFR10QFrLdRjf/GNPvwcW8",
"SHA256:QlVTuM5OssDatqidn2ffY+Lc4YA5Fs78U+0KOHI51jQ",
"SHA256:DXdeUKYOJCSSmClZuwrb60hUq7367j4fA+udNC3FdRI",
},
IsAdmin: true,
},
Expand Down
4 changes: 3 additions & 1 deletion models/user.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import (
"github.com/go-xorm/xorm"
"github.com/nfnt/resize"
"golang.org/x/crypto/pbkdf2"
"golang.org/x/crypto/ssh"

"code.gitea.io/git"
api "code.gitea.io/sdk/gitea"
Expand Down Expand Up @@ -1454,7 +1455,8 @@ func deleteKeysMarkedForDeletion(keys []string) (bool, error) {
func addLdapSSHPublicKeys(s *LoginSource, usr *User, SSHPublicKeys []string) bool {
var sshKeysNeedUpdate bool
for _, sshKey := range SSHPublicKeys {
if strings.HasPrefix(strings.ToLower(sshKey), "ssh") {
_, _, _, _, err := ssh.ParseAuthorizedKey([]byte(sshKey))
if err == nil {
sshKeyName := fmt.Sprintf("%s-%s", s.Name, sshKey[0:40])
if _, err := AddPublicKey(usr.ID, sshKeyName, sshKey, s.ID); err != nil {
log.Error(4, "addLdapSSHPublicKeys[%s]: Error adding LDAP Public SSH Key for user %s: %v", s.Name, usr.Name, err)
Expand Down