Skip to content

The Unified and Autonomous Development Platform

Added user authorizations check (ReadCode/WriteCode) when using ssh.

Andrea Del Bene5d11a8a4b079
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/ProjectManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/ProjectManager.java
index 12323fc57b..6021b0927a 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/ProjectManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/ProjectManager.java
@@ -2,12 +2,9 @@ package io.onedev.server.entitymanager;
import java.util.Collection;
import java.util.List;
-
import javax.annotation.Nullable;
-
import org.apache.shiro.authz.Permission;
import org.eclipse.jgit.lib.Repository;
-
import io.onedev.server.model.Project;
import io.onedev.server.persistence.dao.EntityManager;
import io.onedev.server.search.entity.EntityCriteria;
@@ -48,6 +45,8 @@ public interface ProjectManager extends EntityManager<Project> {
Collection<Project> getPermittedProjects(Permission permission);
+ boolean isUserAuthorized(Project project, Long userId, Permission permission);
+
List<Project> query(EntityQuery<Project> projecQuery, int firstResult, int maxResults);
int count(EntityCriteria<Project> projectCriteria);
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java
index 70331e2031..ed1494f00d 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java
@@ -11,16 +11,15 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.Optional;
import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Collectors;
-
import javax.inject.Inject;
import javax.inject.Singleton;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
-
import org.apache.commons.io.IOUtils;
import org.apache.shiro.authz.Permission;
import org.eclipse.jgit.api.Git;
@@ -38,9 +37,7 @@ import org.quartz.ScheduleBuilder;
import org.quartz.SimpleScheduleBuilder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
import com.google.common.base.Preconditions;
-
import io.onedev.commons.launcher.loader.Listen;
import io.onedev.commons.launcher.loader.ListenerRegistry;
import io.onedev.commons.utils.ExceptionUtils;
@@ -584,5 +581,14 @@ public class DefaultProjectManager extends AbstractEntityManager<Project>
public ScheduleBuilder<?> getScheduleBuilder() {
return SimpleScheduleBuilder.repeatMinutelyForever();
}
+
+ @Sessional
+ @Override
+ public boolean isUserAuthorized(Project project, Long userId, Permission permission) {
+ Collection<User> allowedUsers = SecurityUtils.getAuthorizedUsers(project, permission);
+ Optional<User> userOpt = allowedUsers.stream()
+ .filter(user -> user.getId().equals(userId)).findAny();
+ return userOpt.isPresent();
+ }
}
diff --git a/server-core/src/main/java/io/onedev/server/git/ssh/SimpleGitSshServer.java b/server-core/src/main/java/io/onedev/server/git/ssh/SimpleGitSshServer.java
index 025be7e669..4b59891936 100644
--- a/server-core/src/main/java/io/onedev/server/git/ssh/SimpleGitSshServer.java
+++ b/server-core/src/main/java/io/onedev/server/git/ssh/SimpleGitSshServer.java
@@ -4,24 +4,28 @@ import java.io.IOException;
import java.security.PublicKey;
import java.text.MessageFormat;
import java.util.Collections;
-
import javax.inject.Inject;
import javax.inject.Singleton;
-
import org.apache.sshd.common.config.keys.KeyUtils;
import org.apache.sshd.common.keyprovider.KeyPairProvider;
import org.apache.sshd.server.Environment;
import org.apache.sshd.server.SshServer;
+import org.apache.sshd.server.session.ServerSession;
import org.apache.sshd.server.shell.UnknownCommand;
import org.eclipse.jgit.transport.ReceivePack;
import org.eclipse.jgit.transport.RemoteConfig;
import org.eclipse.jgit.transport.UploadPack;
-
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.entitymanager.SshKeyManager;
import io.onedev.server.git.ssh.command.AbstractProjectAwareGitCommand;
+import io.onedev.server.git.ssh.util.SshServerUtils;
import io.onedev.server.model.Project;
+import io.onedev.server.model.SshKey;
+import io.onedev.server.model.User;
+import io.onedev.server.persistence.SessionManager;
import io.onedev.server.persistence.dao.Dao;
+import io.onedev.server.security.permission.ReadCode;
+import io.onedev.server.security.permission.WriteCode;
import io.onedev.server.util.ServerConfig;
import io.onedev.server.util.work.WorkExecutor;
@@ -30,16 +34,12 @@ public class SimpleGitSshServer {
private final SshServer server;
-// private final Dao dao;
-
private final ProjectManager projectManager;
-// private final ServerConfig serverConfig;
-
-// private final WorkExecutor workExecutor;
-
private final SshKeyManager sshKeyManager;
+ private final SessionManager sessionManager;
+
@Inject
public SimpleGitSshServer(
Dao dao,
@@ -47,12 +47,11 @@ public class SimpleGitSshServer {
KeyPairProvider keyPairProvider,
ServerConfig serverConfig,
WorkExecutor workExecutor,
- SshKeyManager sshKeyManager) {
-// this.dao = dao;
+ SshKeyManager sshKeyManager,
+ SessionManager sessionManager) {
this.projectManager = projectManager;
-// this.serverConfig = serverConfig;
-// this.workExecutor = workExecutor;
this.sshKeyManager = sshKeyManager;
+ this.sessionManager = sessionManager;
this.server = SshServer.setUpDefaultServer();
this.server.setKeyPairProvider(keyPairProvider);
@@ -61,9 +60,9 @@ public class SimpleGitSshServer {
configureAuthentication();
this.server.setCommandFactory(command -> {
if (command.startsWith(RemoteConfig.DEFAULT_UPLOAD_PACK)) {
- return new GitUploadPackCommand(command, workExecutor);
+ return new GitUploadPackCommand(command, workExecutor, projectManager);
} else if (command.startsWith(RemoteConfig.DEFAULT_RECEIVE_PACK)) {
- return new GitReceivePackCommand(command, workExecutor);
+ return new GitReceivePackCommand(command, workExecutor, projectManager);
}
return new UnknownCommand(command);
});
@@ -71,7 +70,7 @@ public class SimpleGitSshServer {
private void configureAuthentication() {
server.setPublickeyAuthenticator((userName, publicKey, session) -> {
- return checkUserKeys(userName, publicKey);
+ return checkUserKeys(userName, publicKey, session);
});
server.setShellFactory(new WelcomeGitShell());
@@ -83,14 +82,24 @@ public class SimpleGitSshServer {
}
/**
- * Just check that public key is present inside OneDev
+ * Check that public key is present inside OneDev and retrieve the owner user
* @param userName
* @param publicKey
+ * @param session
* @return
*/
- private boolean checkUserKeys(String userName, PublicKey publicKey) {
+ private boolean checkUserKeys(String userName, PublicKey publicKey, ServerSession session) {
String fingerPrint = KeyUtils.getFingerPrint(SshKeyUtils.MD5_DIGESTER, publicKey);
- return sshKeyManager.loadKeyByDigest(fingerPrint) != null;
+ SshKey sshKey = sshKeyManager.loadKeyByDigest(fingerPrint);
+
+ if (sshKey == null) {
+ return false;
+ }
+
+ User owner = sshKey.getOwner();
+ session.setAttribute(SshServerUtils.SESSION_USER_ID, owner.getId());
+
+ return true;
}
public int start() {
@@ -109,18 +118,29 @@ public class SimpleGitSshServer {
private class GitUploadPackCommand extends AbstractProjectAwareGitCommand {
- public GitUploadPackCommand(String command, WorkExecutor workExecutor) {
- super(command, workExecutor);
+ public GitUploadPackCommand(String command, WorkExecutor workExecutor, ProjectManager projectManager) {
+ super(command, workExecutor, projectManager);
}
@Override
protected void execute(Environment env) {
String projectName = getGitProjectName();
- Project project = projectManager.find(projectName);
- if (project == null) {
- onExit(-1, "Project not found!");
- return;
+ sessionManager.openSession();
+
+ Project project = projectManager.find(projectName);
+ try {
+ if (project == null) {
+ onExit(-1, "Project not found!");
+ return;
+ }
+
+ if (!isUserAllowed(project, new ReadCode())) {
+ onExit(-1, "User is not allowed to use this project!");
+ return;
+ }
+ } finally {
+ sessionManager.closeSession();
}
UploadPack uploadPack = new UploadPack(project.getRepository());
@@ -146,18 +166,29 @@ public class SimpleGitSshServer {
private class GitReceivePackCommand extends AbstractProjectAwareGitCommand {
- public GitReceivePackCommand(String command, WorkExecutor workExecutor) {
- super(command, workExecutor);
+ public GitReceivePackCommand(String command, WorkExecutor workExecutor, ProjectManager projectManager) {
+ super(command, workExecutor, projectManager);
}
@Override
protected void execute(Environment env) {
String projectName = getGitProjectName();
- Project project = projectManager.find(projectName);
- if (project == null) {
- onExit(-1, "Project not found!");
- return;
+ sessionManager.openSession();
+
+ Project project = projectManager.find(projectName);
+ try {
+ if (project == null) {
+ onExit(-1, "Project not found!");
+ return;
+ }
+
+ if (!isUserAllowed(project, new WriteCode())) {
+ onExit(-1, "User is not allowed to use this project!");
+ return;
+ }
+ } finally {
+ sessionManager.closeSession();
}
try {
diff --git a/server-core/src/main/java/io/onedev/server/git/ssh/command/AbstractProjectAwareGitCommand.java b/server-core/src/main/java/io/onedev/server/git/ssh/command/AbstractProjectAwareGitCommand.java
index 310dff65c3..992ed244e3 100644
--- a/server-core/src/main/java/io/onedev/server/git/ssh/command/AbstractProjectAwareGitCommand.java
+++ b/server-core/src/main/java/io/onedev/server/git/ssh/command/AbstractProjectAwareGitCommand.java
@@ -5,6 +5,7 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
+import org.apache.shiro.authz.Permission;
import org.apache.sshd.common.session.Session;
import org.apache.sshd.common.session.SessionHolder;
import org.apache.sshd.server.Environment;
@@ -15,12 +16,14 @@ import org.apache.sshd.server.session.ServerSession;
import org.apache.sshd.server.session.ServerSessionHolder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import io.onedev.server.entitymanager.ProjectManager;
+import io.onedev.server.git.ssh.util.SshServerUtils;
+import io.onedev.server.model.Project;
import io.onedev.server.util.concurrent.PrioritizedRunnable;
import io.onedev.server.util.work.WorkExecutor;
public abstract class AbstractProjectAwareGitCommand
implements Command, SessionAware, SessionHolder<Session>, ServerSessionHolder {
-
protected final Logger log;
private static final int PRIORITY = 2;
@@ -34,10 +37,13 @@ public abstract class AbstractProjectAwareGitCommand
private final ExecutorService executor = Executors.newSingleThreadExecutor();
private ServerSession session;
+ private ProjectManager projectManager;
+
- public AbstractProjectAwareGitCommand(String command, WorkExecutor workExecutor) {
+ public AbstractProjectAwareGitCommand(String command, WorkExecutor workExecutor, ProjectManager projectManager) {
this.command = command;
this.workExecutor = workExecutor;
+ this.projectManager = projectManager;
this.log = LoggerFactory.getLogger(getClass());
}
@@ -130,4 +136,11 @@ public abstract class AbstractProjectAwareGitCommand
public void setSession(ServerSession session) {
this.session = session;
}
+
+ protected boolean isUserAllowed(Project project, Permission permission) {
+ ServerSession session = getServerSession();
+ Long userId = session.getAttribute(SshServerUtils.SESSION_USER_ID);
+
+ return projectManager.isUserAuthorized(project, userId, permission);
+ }
}
diff --git a/server-core/src/main/java/io/onedev/server/git/ssh/util/SshServerUtils.java b/server-core/src/main/java/io/onedev/server/git/ssh/util/SshServerUtils.java
new file mode 100644
index 0000000000..1b2c44c95e
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/git/ssh/util/SshServerUtils.java
@@ -0,0 +1,9 @@
+package io.onedev.server.git.ssh.util;
+
+import org.apache.sshd.common.AttributeStore.AttributeKey;
+
+public class SshServerUtils {
+
+ public static final AttributeKey<Long> SESSION_USER_ID = new AttributeKey<>();
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/model/SshKey.java b/server-core/src/main/java/io/onedev/server/model/SshKey.java
index 382ea07968..616a91a248 100644
--- a/server-core/src/main/java/io/onedev/server/model/SshKey.java
+++ b/server-core/src/main/java/io/onedev/server/model/SshKey.java
@@ -1,7 +1,6 @@
package io.onedev.server.model;
import java.time.LocalDateTime;
-
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.FetchType;