The Unified and Autonomous Development Platform
Move user ssh key sync to key manager
Michael Weimannf23267d3e79a
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/SshKeyManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/SshKeyManager.javaindex e46ecf62a6..0524f98124 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/SshKeyManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/SshKeyManager.java@@ -1,5 +1,6 @@package io.onedev.server.entitymanager;+import java.util.Collection;import java.util.List;import io.onedev.server.model.SshKey;import io.onedev.server.model.User;@@ -13,4 +14,5 @@ public interface SshKeyManager extends EntityManager<SshKey> {boolean isKeyAlreadyInUse(String keyDigest);+ void syncUserKeys(User user, Collection<SshKey> keys);}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSshKeyManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSshKeyManager.javaindex 7e541a7fc0..88d1763f1c 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSshKeyManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSshKeyManager.java@@ -1,10 +1,22 @@package io.onedev.server.entitymanager.impl;+import java.time.LocalDateTime;+import java.util.Collection;+import java.util.HashMap;import java.util.List;+import java.util.Map;+import javax.inject.Inject;import javax.inject.Singleton;import org.hibernate.criterion.Restrictions;import org.hibernate.criterion.SimpleExpression;+import org.slf4j.Logger;+import org.slf4j.LoggerFactory;++import com.google.common.collect.MapDifference;+import com.google.common.collect.Maps;++import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SshKeyManager;import io.onedev.server.model.SshKey;import io.onedev.server.model.User;@@ -12,10 +24,13 @@ import io.onedev.server.persistence.annotation.Sessional;import io.onedev.server.persistence.dao.AbstractEntityManager;import io.onedev.server.persistence.dao.Dao;import io.onedev.server.persistence.dao.EntityCriteria;+import io.onedev.server.security.OneAuthorizingRealm;@Singletonpublic class DefaultSshKeyManager extends AbstractEntityManager<SshKey> implements SshKeyManager {+ private static final Logger logger = LoggerFactory.getLogger(OneAuthorizingRealm.class);+@Injectpublic DefaultSshKeyManager(Dao dao) {super(dao);@@ -49,4 +64,36 @@ public class DefaultSshKeyManager extends AbstractEntityManager<SshKey> implemenreturn keys.size() > 0;}++ @Override+ public void syncUserKeys(User user, Collection<SshKey> keys) {+ SshKeyManager sshKeyManager = OneDev.getInstance(SshKeyManager.class);+ List<SshKey> currentKeys = sshKeyManager.loadUserKeys(user);++ Map<String, SshKey> currentKeysMap = sshPublicKeysToMap(currentKeys);+ Map<String, SshKey> authKeysMap = sshPublicKeysToMap(keys);+ 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;+ }}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.javaindex 938daf8a96..951b275c0b 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,12 +1,10 @@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;@@ -29,8 +27,6 @@ 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;@@ -47,7 +43,6 @@ 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;@@ -274,8 +269,9 @@ public class OneAuthorizingRealm extends AuthorizingRealm {}if (authenticated.getSSHPublicKeys() != null) {+ SshKeyManager sshKeyManager = OneDev.getInstance(SshKeyManager.class);try {- setUserSSHPublicKeys(user, authenticated.getSSHPublicKeys());+ sshKeyManager.syncUserKeys(user, authenticated.getSSHPublicKeys());} catch (Exception err) {logger.warn("Error setting user SSH public keys provided by authentication", err);}@@ -287,35 +283,4 @@ 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;- }}