Execute Git commands with AccessPath.GIT
Since 53b0e7ffb5
("Require branch deletion permission for pushes
over HTTP") branch deletion or creation over ssh:// by Git push
failed, because the AccessPath was specified wrong. We need to
force a temporary change for the current command to AccessPath.GIT,
rather than the default of AccessPath.SSH_COMMAND.
Doing this is a bit ugly, as we have to build up a temporary
SshSession, and also a temporary SshScope.Context to point to that
temporary session. Installing the temporary context before we call
the startThread method will ensure the background worker properly
inherits our context object, and therefore our identity as a Git
based command.
Change-Id: I6cfc91966fffa2c5054ae6d65f6ac57dc751a4fc
Signed-off-by: Shawn O. Pearce <sop@google.com>
This commit is contained in:
@@ -12,13 +12,16 @@
|
|||||||
// See the License for the specific language governing permissions and
|
// See the License for the specific language governing permissions and
|
||||||
// limitations under the License.
|
// limitations under the License.
|
||||||
|
|
||||||
package com.google.gerrit.sshd.commands;
|
package com.google.gerrit.sshd;
|
||||||
|
|
||||||
import com.google.gerrit.reviewdb.Project;
|
import com.google.gerrit.reviewdb.Project;
|
||||||
|
import com.google.gerrit.server.AccessPath;
|
||||||
|
import com.google.gerrit.server.IdentifiedUser;
|
||||||
import com.google.gerrit.server.git.GitRepositoryManager;
|
import com.google.gerrit.server.git.GitRepositoryManager;
|
||||||
import com.google.gerrit.server.project.ProjectControl;
|
import com.google.gerrit.server.project.ProjectControl;
|
||||||
import com.google.gerrit.sshd.BaseCommand;
|
import com.google.gerrit.sshd.SshScope.Context;
|
||||||
import com.google.inject.Inject;
|
import com.google.inject.Inject;
|
||||||
|
import com.google.inject.Provider;
|
||||||
|
|
||||||
import org.apache.sshd.server.Environment;
|
import org.apache.sshd.server.Environment;
|
||||||
import org.eclipse.jgit.errors.RepositoryNotFoundException;
|
import org.eclipse.jgit.errors.RepositoryNotFoundException;
|
||||||
@@ -26,26 +29,55 @@ import org.eclipse.jgit.lib.Repository;
|
|||||||
import org.kohsuke.args4j.Argument;
|
import org.kohsuke.args4j.Argument;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
import java.net.SocketAddress;
|
||||||
|
|
||||||
abstract class AbstractGitCommand extends BaseCommand {
|
public abstract class AbstractGitCommand extends BaseCommand {
|
||||||
@Argument(index = 0, metaVar = "PROJECT.git", required = true, usage = "project name")
|
@Argument(index = 0, metaVar = "PROJECT.git", required = true, usage = "project name")
|
||||||
protected ProjectControl projectControl;
|
protected ProjectControl projectControl;
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
protected GitRepositoryManager repoManager;
|
private GitRepositoryManager repoManager;
|
||||||
|
|
||||||
|
@Inject
|
||||||
|
private SshSession session;
|
||||||
|
|
||||||
|
@Inject
|
||||||
|
private SshScope.Context context;
|
||||||
|
|
||||||
|
@Inject
|
||||||
|
private IdentifiedUser user;
|
||||||
|
|
||||||
|
@Inject
|
||||||
|
private IdentifiedUser.GenericFactory userFactory;
|
||||||
|
|
||||||
protected Repository repo;
|
protected Repository repo;
|
||||||
protected Project project;
|
protected Project project;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void start(final Environment env) {
|
public void start(final Environment env) {
|
||||||
startThread(new CommandRunnable() {
|
final Context ctx = new Context(newSession(), context.getCommandLine());
|
||||||
@Override
|
final Context old = SshScope.set(ctx);
|
||||||
public void run() throws Exception {
|
try {
|
||||||
parseCommandLine();
|
startThread(new CommandRunnable() {
|
||||||
AbstractGitCommand.this.service();
|
@Override
|
||||||
}
|
public void run() throws Exception {
|
||||||
});
|
parseCommandLine();
|
||||||
|
AbstractGitCommand.this.service();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
} finally {
|
||||||
|
SshScope.set(old);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private SshSession newSession() {
|
||||||
|
return new SshSession(session, session.getRemoteAddress(), userFactory
|
||||||
|
.create(AccessPath.GIT, new Provider<SocketAddress>() {
|
||||||
|
@Override
|
||||||
|
public SocketAddress get() {
|
||||||
|
return session.getRemoteAddress();
|
||||||
|
}
|
||||||
|
}, user.getAccountId()));
|
||||||
}
|
}
|
||||||
|
|
||||||
private void service() throws IOException, Failure {
|
private void service() throws IOException, Failure {
|
@@ -20,6 +20,7 @@ import com.google.gerrit.server.IdentifiedUser;
|
|||||||
import com.google.gerrit.server.config.CanonicalWebUrl;
|
import com.google.gerrit.server.config.CanonicalWebUrl;
|
||||||
import com.google.gerrit.server.git.ReceiveCommits;
|
import com.google.gerrit.server.git.ReceiveCommits;
|
||||||
import com.google.gerrit.server.git.ReceiveCommits.MessageListener;
|
import com.google.gerrit.server.git.ReceiveCommits.MessageListener;
|
||||||
|
import com.google.gerrit.sshd.AbstractGitCommand;
|
||||||
import com.google.inject.Inject;
|
import com.google.inject.Inject;
|
||||||
|
|
||||||
import org.eclipse.jgit.transport.ReceivePack;
|
import org.eclipse.jgit.transport.ReceivePack;
|
||||||
|
@@ -14,6 +14,8 @@
|
|||||||
|
|
||||||
package com.google.gerrit.sshd.commands;
|
package com.google.gerrit.sshd.commands;
|
||||||
|
|
||||||
|
import com.google.gerrit.sshd.AbstractGitCommand;
|
||||||
|
|
||||||
import org.eclipse.jgit.transport.UploadPack;
|
import org.eclipse.jgit.transport.UploadPack;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
Reference in New Issue
Block a user