opendev/gerrit
Code Issues Proposed changes

Merge "Slave mode: Pass error message about disabled SSH receive command to client"

Browse Source
This commit is contained in:
Edwin Kempin
2018-02-06 13:07:12 +00:00
committed by Gerrit Code Review
parent 46c1a6a4e4 783c5a5516
commit 804082c5ae
3 changed files with 38 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -92,9 +92,9 @@ public class DefaultCommandModule extends CommandModule {
command(gerrit, AdminQueryShell.class);
if (slaveMode) {
command("git-receive-pack").to(NotSupportedInSlaveModeFailureCommand.class);
command("gerrit-receive-pack").to(NotSupportedInSlaveModeFailureCommand.class);
command(git, "receive-pack").to(NotSupportedInSlaveModeFailureCommand.class);
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"));

25
java/com/google/gerrit/sshd/commands/NotSupportedInSlaveModeFailureCommand.java
View File

@@ -1,25 +0,0 @@
// Copyright (C) 2015 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package com.google.gerrit.sshd.commands;
import com.google.gerrit.sshd.SshCommand;
/* Failure command, that produces verbose failure message in slave mode */
public class NotSupportedInSlaveModeFailureCommand extends SshCommand {
@Override
protected void run() throws UnloggedFailure {
throw die(getName() + ": is not supported in slave mode");
}
}

35
java/com/google/gerrit/sshd/commands/ReceiveSlaveMode.java Normal file
View File

@@ -0,0 +1,35 @@
// Copyright (C) 2018 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package com.google.gerrit.sshd.commands;
import com.google.gerrit.sshd.AbstractGitCommand;
import java.io.IOException;
import org.eclipse.jgit.transport.PacketLineOut;
import org.eclipse.jgit.transport.resolver.ServiceNotEnabledException;
/* Receive command when running in slave mode. */
public class ReceiveSlaveMode extends AbstractGitCommand {
@Override
protected void runImpl() throws UnloggedFailure, IOException {
ServiceNotEnabledException ex = new ServiceNotEnabledException();
PacketLineOut packetOut = new PacketLineOut(out);
packetOut.setFlushOnEnd(true);
packetOut.writeString("ERR " + ex.getMessage());
packetOut.end();
throw die(ex);
}
}