opendev/gerrit
Code Issues Proposed changes

When SSH is disabled, it should also be disabled on replica

Browse Source 
Bug: Issue 13349
Change-Id: I3342d3046f2fe768306a7c1c27309658a532736e
This commit is contained in:
Per Olausson
2020-08-31 16:07:21 +01:00
parent d53601d41a
commit bce59ad5b0
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
java/com/google/gerrit/sshd/commands/DefaultCommandModule.java
View File

@@ -82,6 +82,16 @@ public class DefaultCommandModule extends CommandModule {
command(git, "upload-pack").to(Upload.class); command(git, "upload-pack").to(Upload.class);
command("git-upload-archive").to(Commands.key(git, "upload-archive")); command("git-upload-archive").to(Commands.key(git, "upload-archive"));
command(git, "upload-archive").to(UploadArchive.class); command(git, "upload-archive").to(UploadArchive.class);
if (slaveMode) {
command("git-receive-pack").to(ReceiveSlaveMode.class);
command("gerrit-receive-pack").to(ReceiveSlaveMode.class);
command(git, "receive-pack").to(ReceiveSlaveMode.class);
} else {
command("git-receive-pack").to(Commands.key(git, "receive-pack"));
command("gerrit-receive-pack").to(Commands.key(git, "receive-pack"));
command(git, "receive-pack").to(Commands.key(gerrit, "receive-pack"));
command(gerrit, "test-submit").toProvider(new DispatchCommandProvider(testSubmit));
}
} }
command("suexec").to(SuExec.class); command("suexec").to(SuExec.class);
listener().to(ShowCaches.StartupListener.class); listener().to(ShowCaches.StartupListener.class);
@@ -91,18 +101,6 @@ public class DefaultCommandModule extends CommandModule {
command(gerrit, CreateProjectCommand.class); command(gerrit, CreateProjectCommand.class);
command(gerrit, SetHeadCommand.class); command(gerrit, SetHeadCommand.class);
if (slaveMode) {
command("git-receive-pack").to(ReceiveSlaveMode.class);
command("gerrit-receive-pack").to(ReceiveSlaveMode.class);
command(git, "receive-pack").to(ReceiveSlaveMode.class);
} else {
if (sshEnabled()) {
command("git-receive-pack").to(Commands.key(git, "receive-pack"));
command("gerrit-receive-pack").to(Commands.key(git, "receive-pack"));
command(git, "receive-pack").to(Commands.key(gerrit, "receive-pack"));
}
command(gerrit, "test-submit").toProvider(new DispatchCommandProvider(testSubmit));
}
command(gerrit, Receive.class); command(gerrit, Receive.class);
command(gerrit, RenameGroupCommand.class); command(gerrit, RenameGroupCommand.class);