Skip to content

The Unified and Autonomous Development Platform

Add ldap ssh key retrieval

Michael Weimann2700ed7d19f3
diff --git a/server-core/src/main/java/io/onedev/server/model/User.java b/server-core/src/main/java/io/onedev/server/model/User.java
index 90537292d7..3f29589b8b 100644
--- a/server-core/src/main/java/io/onedev/server/model/User.java
+++ b/server-core/src/main/java/io/onedev/server/model/User.java
@@ -376,6 +376,10 @@ public class User extends AbstractEntity implements AuthenticationInfo {
public void setPassword(String password) {
this.password = password;
}
+
+ public Boolean isExternalManaged() {
+ return this.getPassword().equals(EXTERNAL_MANAGED);
+ }
@Editable(order=200)
public String getFullName() {
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/authenticator/Authenticated.java b/server-core/src/main/java/io/onedev/server/model/support/administration/authenticator/Authenticated.java
index c4d9420488..c56d3198b1 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/administration/authenticator/Authenticated.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/authenticator/Authenticated.java
@@ -4,6 +4,8 @@ import java.util.Collection;
import javax.annotation.Nullable;
+import io.onedev.server.model.SshKey;
+
public class Authenticated {
private final String fullName;
@@ -12,12 +14,22 @@ public class Authenticated {
private final Collection<String> groupNames;
+ private final Collection<SshKey> sshPublicKeys;
+
public Authenticated(String email, @Nullable String fullName, Collection<String> groupNames) {
+ this(email, fullName, groupNames, null);
+ }
+
+ public Authenticated(
+ String email, @Nullable String fullName,
+ Collection<String> groupNames, @Nullable Collection<SshKey> sshPublicKeys
+ ) {
this.email = email;
this.fullName = fullName;
this.groupNames = groupNames;
+ this.sshPublicKeys = sshPublicKeys;
}
-
+
@Nullable
public String getFullName() {
return fullName;
@@ -30,5 +42,10 @@ public class Authenticated {
public Collection<String> getGroupNames() {
return groupNames;
}
-
+
+ @Nullable
+ public Collection<SshKey> getSSHPublicKeys() {
+ return sshPublicKeys;
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/authenticator/ldap/LdapAuthenticator.java b/server-core/src/main/java/io/onedev/server/model/support/administration/authenticator/ldap/LdapAuthenticator.java
index 753821e518..4261168ecc 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/administration/authenticator/ldap/LdapAuthenticator.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/authenticator/ldap/LdapAuthenticator.java
@@ -1,5 +1,8 @@
package io.onedev.server.model.support.administration.authenticator.ldap;
+import java.io.IOException;
+import java.security.GeneralSecurityException;
+import java.security.PublicKey;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
@@ -25,11 +28,14 @@ import javax.validation.constraints.NotNull;
import org.apache.shiro.authc.AccountException;
import org.apache.shiro.authc.UnknownAccountException;
import org.apache.shiro.authc.UsernamePasswordToken;
+import org.apache.sshd.common.config.keys.KeyUtils;
import org.hibernate.validator.constraints.NotEmpty;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import io.onedev.commons.utils.StringUtils;
+import io.onedev.server.git.ssh.SshKeyUtils;
+import io.onedev.server.model.SshKey;
import io.onedev.server.model.support.administration.authenticator.Authenticated;
import io.onedev.server.model.support.administration.authenticator.Authenticator;
import io.onedev.server.web.editable.annotation.Editable;
@@ -188,7 +194,14 @@ public class LdapAuthenticator extends Authenticator {
List<String> attributeNames = new ArrayList<String>();
if (getUserFullNameAttribute() != null)
attributeNames.add(getUserFullNameAttribute());
+
+ String userSSHPublicKey = getUserSSHPublicKey();
+
+ if (userSSHPublicKey != null)
+ attributeNames.add(userSSHPublicKey);
+
attributeNames.add(getUserEmailAttribute());
+
if (getGroupRetrieval() instanceof GetGroupsUsingAttribute) {
GetGroupsUsingAttribute groupRetrieval = (GetGroupsUsingAttribute)getGroupRetrieval();
attributeNames.add(groupRetrieval.getUserGroupsAttribute());
@@ -312,6 +325,20 @@ public class LdapAuthenticator extends Authenticator {
}
}
}
+
+ Collection<SshKey> sshKeys;
+
+ if (userSSHPublicKey != null) {
+ try {
+ sshKeys = retrieveSSHPublicKeys(searchResultAttributes);
+ } catch (Exception err) {
+ logger.warn("Error retrieving SSH public keys", err);
+ sshKeys = null;
+ }
+
+ } else {
+ sshKeys = null;
+ }
if (getGroupRetrieval() instanceof SearchGroupsUsingFilter) {
SearchGroupsUsingFilter groupRetrieval = (SearchGroupsUsingFilter) getGroupRetrieval();
@@ -350,7 +377,7 @@ public class LdapAuthenticator extends Authenticator {
if (StringUtils.isBlank(email))
throw new AccountException("Email is required but not available in ldap directory");
else
- return new Authenticated(email, fullName, groupNames);
+ return new Authenticated(email, fullName, groupNames, sshKeys);
} catch (NamingException e) {
throw new RuntimeException(e);
} finally {
@@ -369,4 +396,49 @@ public class LdapAuthenticator extends Authenticator {
}
}
+ private Collection<SshKey> retrieveSSHPublicKeys(Attributes searchResultAttributes) throws NamingException, IOException, GeneralSecurityException {
+ Collection<SshKey> sshKeys = new ArrayList<SshKey>();
+
+ Attribute attributeValue = searchResultAttributes.get(getUserSSHPublicKey());
+ NamingEnumeration<?> ldapValues = attributeValue.getAll();
+
+ while (ldapValues.hasMore()) {
+ Object value = ldapValues.next();
+
+ if (value instanceof String) {
+ String content = (String) value;
+
+ try {
+ SshKey sshKey = parseSSHPublicKey(content);
+ sshKeys.add(sshKey);
+ } catch (Exception err) {
+ logger.warn("Error parsing SSH public key", err);
+ }
+
+ } else {
+ logger.warn("SSH public key from ldap not a String");
+ }
+ }
+
+ return sshKeys;
+ }
+
+ private SshKey parseSSHPublicKey(String content) throws IOException, GeneralSecurityException {
+ PublicKey pubEntry = SshKeyUtils.decodeSshPublicKey(content);
+ String fingerPrint = KeyUtils.getFingerPrint(SshKeyUtils.MD5_DIGESTER, pubEntry);
+
+ SshKey sshKey = new SshKey();
+ sshKey.setDigest(fingerPrint);
+ sshKey.setContent(content);
+
+ String[] parts = content.split(" ");
+ if (parts.length > 2) {
+ sshKey.setName(parts[2]);
+ } else {
+ sshKey.setName(fingerPrint);
+ }
+
+ return sshKey;
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/security/OneAuthorizingRealm.java b/server-core/src/main/java/io/onedev/server/security/OneAuthorizingRealm.java
index 0a5cc05125..938daf8a96 100644
--- a/server-core/src/main/java/io/onedev/server/security/OneAuthorizingRealm.java
+++ b/server-core/src/main/java/io/onedev/server/security/OneAuthorizingRealm.java
@@ -1,10 +1,12 @@
package io.onedev.server.security;
+import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
+import java.util.List;
import java.util.Map;
import java.util.concurrent.Callable;
@@ -27,6 +29,8 @@ import org.apache.wicket.request.cycle.RequestCycle;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.google.common.collect.MapDifference;
+import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import io.onedev.commons.launcher.loader.AppLoader;
@@ -36,12 +40,14 @@ import io.onedev.server.entitymanager.GroupManager;
import io.onedev.server.entitymanager.MembershipManager;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.entitymanager.SettingManager;
+import io.onedev.server.entitymanager.SshKeyManager;
import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.issue.fieldspec.FieldSpec;
import io.onedev.server.model.Group;
import io.onedev.server.model.GroupAuthorization;
import io.onedev.server.model.Membership;
import io.onedev.server.model.Project;
+import io.onedev.server.model.SshKey;
import io.onedev.server.model.User;
import io.onedev.server.model.UserAuthorization;
import io.onedev.server.model.support.administration.authenticator.Authenticated;
@@ -266,6 +272,14 @@ public class OneAuthorizingRealm extends AuthorizingRealm {
}
}
}
+
+ if (authenticated.getSSHPublicKeys() != null) {
+ try {
+ setUserSSHPublicKeys(user, authenticated.getSSHPublicKeys());
+ } catch (Exception err) {
+ logger.warn("Error setting user SSH public keys provided by authentication", err);
+ }
+ }
}
return user;
@@ -273,5 +287,35 @@ public class OneAuthorizingRealm extends AuthorizingRealm {
});
}
-
+
+ private void setUserSSHPublicKeys(User user, Collection<SshKey> authKeys) {
+ SshKeyManager sshKeyManager = OneDev.getInstance(SshKeyManager.class);
+ List<SshKey> currentKeys = sshKeyManager.loadUserKeys(user);
+
+ Map<String, SshKey> currentKeysMap = sshPublicKeysToMap(currentKeys);
+ Map<String, SshKey> authKeysMap = sshPublicKeysToMap(authKeys);
+ MapDifference<String, SshKey> diff = Maps.difference(currentKeysMap, authKeysMap);
+
+ // remove keys not delivered by authentication
+ diff.entriesOnlyOnLeft().values().forEach((key) -> sshKeyManager.delete(key));
+
+ // add keys from authorization
+ diff.entriesOnlyOnRight().values().forEach((key) -> {
+
+ if (!sshKeyManager.isKeyAlreadyInUse(key.getDigest())) {
+ key.setTimestamp(LocalDateTime.now());
+ key.setOwner(user);
+ sshKeyManager.save(key);
+ } else {
+ logger.warn("SSH public key provided by auth is already in use", key.getDigest());
+ }
+
+ });
+ }
+
+ private Map<String, SshKey> sshPublicKeysToMap(Collection<SshKey> keys) {
+ Map<String, SshKey> keysMap = new HashMap<String, SshKey>();
+ keys.forEach((key) -> keysMap.put(key.getDigest(), key));
+ return keysMap;
+ }
}