opendev/gerrit
Code Issues Proposed changes

SSH: Don't use providers in commands

Browse Source 
SSH commands are created in request scope. That why it's not needed to
use providers for current user and review db, that are also provided in
the same scope. Providers are needed when data is used across scope
boundaries, e.g. PatchSetParser that is bound in singleton scope must
use providers to access current user and review db.

Change-Id: I53b5d1c4004cd0fbbc6b5f6cdb798b2201e2a9be
This commit is contained in:
David Ostrovsky
2016-04-17 19:05:25 +02:00
committed by David Ostrovsky
parent 29a1f982bb
commit e3d68ae823
17 changed files with 63 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gerrit-server/src/main/java/com/google/gerrit/server/account/CapabilityUtils.java
View File

@@ -32,6 +32,11 @@ public class CapabilityUtils {
.getLogger(CapabilityUtils.class); .getLogger(CapabilityUtils.class);
public static void checkRequiresCapability(Provider<CurrentUser> userProvider, public static void checkRequiresCapability(Provider<CurrentUser> userProvider,
String pluginName, Class<?> clazz) throws AuthException {
checkRequiresCapability(userProvider.get(), pluginName, clazz);
}
public static void checkRequiresCapability(CurrentUser user,
String pluginName, Class<?> clazz) String pluginName, Class<?> clazz)
throws AuthException { throws AuthException {
RequiresCapability rc = getClassAnnotation(clazz, RequiresCapability.class); RequiresCapability rc = getClassAnnotation(clazz, RequiresCapability.class);
@@ -45,7 +50,6 @@ public class CapabilityUtils {
RequiresAnyCapability.class.getSimpleName())); RequiresAnyCapability.class.getSimpleName()));
throw new AuthException("cannot check capability"); throw new AuthException("cannot check capability");
} }
CurrentUser user = userProvider.get();
CapabilityControl ctl = user.getCapabilities(); CapabilityControl ctl = user.getCapabilities();
if (ctl.canAdministrateServer()) { if (ctl.canAdministrateServer()) {
return; return;

7
gerrit-server/src/main/java/com/google/gerrit/server/group/ListGroups.java
View File

@@ -66,7 +66,7 @@ public class ListGroups implements RestReadView<TopLevelResource> {
private final GroupControl.GenericFactory genericGroupControlFactory; private final GroupControl.GenericFactory genericGroupControlFactory;
private final Provider<IdentifiedUser> identifiedUser; private final Provider<IdentifiedUser> identifiedUser;
private final IdentifiedUser.GenericFactory userFactory; private final IdentifiedUser.GenericFactory userFactory;
private final Provider<GetGroups> accountGetGroups; private final GetGroups accountGetGroups;
private final GroupJson json; private final GroupJson json;
private final GroupBackend groupBackend; private final GroupBackend groupBackend;
@@ -149,7 +149,8 @@ public class ListGroups implements RestReadView<TopLevelResource> {
final GroupControl.GenericFactory genericGroupControlFactory, final GroupControl.GenericFactory genericGroupControlFactory,
final Provider<IdentifiedUser> identifiedUser, final Provider<IdentifiedUser> identifiedUser,
final IdentifiedUser.GenericFactory userFactory, final IdentifiedUser.GenericFactory userFactory,
final Provider<GetGroups> accountGetGroups, GroupJson json, final GetGroups accountGetGroups,
GroupJson json,
GroupBackend groupBackend) { GroupBackend groupBackend) {
this.groupCache = groupCache; this.groupCache = groupCache;
this.groupControlFactory = groupControlFactory; this.groupControlFactory = groupControlFactory;
@@ -197,7 +198,7 @@ public class ListGroups implements RestReadView<TopLevelResource> {
} }
if (user != null) { if (user != null) {
return accountGetGroups.get().apply( return accountGetGroups.apply(
new AccountResource(userFactory.create(user))); new AccountResource(userFactory.create(user)));
} }

15
gerrit-server/src/main/java/com/google/gerrit/server/query/change/OutputStreamQuery.java
View File

@@ -35,7 +35,6 @@ import com.google.gerrit.server.query.QueryParseException;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.google.gwtorm.server.OrmException; import com.google.gwtorm.server.OrmException;
import com.google.inject.Inject; import com.google.inject.Inject;
import com.google.inject.Provider;
import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.revwalk.RevWalk; import org.eclipse.jgit.revwalk.RevWalk;
@@ -73,7 +72,7 @@ public class OutputStreamQuery {
TEXT, JSON TEXT, JSON
} }
private final Provider<ReviewDb> db; private final ReviewDb db;
private final GitRepositoryManager repoManager; private final GitRepositoryManager repoManager;
private final ChangeQueryBuilder queryBuilder; private final ChangeQueryBuilder queryBuilder;
private final QueryProcessor queryProcessor; private final QueryProcessor queryProcessor;
@@ -97,7 +96,7 @@ public class OutputStreamQuery {
@Inject @Inject
OutputStreamQuery( OutputStreamQuery(
Provider<ReviewDb> db, ReviewDb db,
GitRepositoryManager repoManager, GitRepositoryManager repoManager,
ChangeQueryBuilder queryBuilder, ChangeQueryBuilder queryBuilder,
QueryProcessor queryProcessor, QueryProcessor queryProcessor,
@@ -239,7 +238,7 @@ public class OutputStreamQuery {
ChangeControl cc = d.changeControl().forUser(user); ChangeControl cc = d.changeControl().forUser(user);
LabelTypes labelTypes = cc.getLabelTypes(); LabelTypes labelTypes = cc.getLabelTypes();
ChangeAttribute c = eventFactory.asChangeAttribute(db.get(), d.change()); ChangeAttribute c = eventFactory.asChangeAttribute(db, d.change());
eventFactory.extend(c, d.change()); eventFactory.extend(c, d.change());
if (!trackingFooters.isEmpty()) { if (!trackingFooters.isEmpty()) {
@@ -248,7 +247,7 @@ public class OutputStreamQuery {
} }
if (includeAllReviewers) { if (includeAllReviewers) {
eventFactory.addAllReviewers(db.get(), c, d.notes()); eventFactory.addAllReviewers(db, c, d.notes());
} }
if (includeSubmitRecords) { if (includeSubmitRecords) {
@@ -276,7 +275,7 @@ public class OutputStreamQuery {
} }
if (includePatchSets) { if (includePatchSets) {
eventFactory.addPatchSets(db.get(), rw, c, d.patchSets(), eventFactory.addPatchSets(db, rw, c, d.patchSets(),
includeApprovals ? d.approvals().asMap() : null, includeApprovals ? d.approvals().asMap() : null,
includeFiles, d.change(), labelTypes); includeFiles, d.change(), labelTypes);
} }
@@ -285,7 +284,7 @@ public class OutputStreamQuery {
PatchSet current = d.currentPatchSet(); PatchSet current = d.currentPatchSet();
if (current != null) { if (current != null) {
c.currentPatchSet = c.currentPatchSet =
eventFactory.asPatchSetAttribute(db.get(), rw, d.change(), current); eventFactory.asPatchSetAttribute(db, rw, d.change(), current);
eventFactory.addApprovals(c.currentPatchSet, eventFactory.addApprovals(c.currentPatchSet,
d.currentApprovals(), labelTypes); d.currentApprovals(), labelTypes);
@@ -303,7 +302,7 @@ public class OutputStreamQuery {
if (includeComments) { if (includeComments) {
eventFactory.addComments(c, d.messages()); eventFactory.addComments(c, d.messages());
if (includePatchSets) { if (includePatchSets) {
eventFactory.addPatchSets(db.get(), rw, c, d.patchSets(), eventFactory.addPatchSets(db, rw, c, d.patchSets(),
includeApprovals ? d.approvals().asMap() : null, includeApprovals ? d.approvals().asMap() : null,
includeFiles, d.change(), labelTypes); includeFiles, d.change(), labelTypes);
for (PatchSetAttribute attribute : c.patchSets) { for (PatchSetAttribute attribute : c.patchSets) {

10
gerrit-sshd/src/main/java/com/google/gerrit/sshd/AliasCommand.java
View File

@@ -20,7 +20,6 @@ import com.google.common.util.concurrent.Atomics;
import com.google.gerrit.extensions.annotations.RequiresCapability; import com.google.gerrit.extensions.annotations.RequiresCapability;
import com.google.gerrit.server.CurrentUser; import com.google.gerrit.server.CurrentUser;
import com.google.gerrit.server.account.CapabilityControl; import com.google.gerrit.server.account.CapabilityControl;
import com.google.inject.Provider;
import org.apache.sshd.server.Command; import org.apache.sshd.server.Command;
import org.apache.sshd.server.Environment; import org.apache.sshd.server.Environment;
@@ -33,12 +32,12 @@ import java.util.concurrent.atomic.AtomicReference;
/** Command that executes some other command. */ /** Command that executes some other command. */
public class AliasCommand extends BaseCommand { public class AliasCommand extends BaseCommand {
private final DispatchCommandProvider root; private final DispatchCommandProvider root;
private final Provider<CurrentUser> currentUser; private final CurrentUser currentUser;
private final CommandName command; private final CommandName command;
private final AtomicReference<Command> atomicCmd; private final AtomicReference<Command> atomicCmd;
AliasCommand(@CommandName(Commands.ROOT) DispatchCommandProvider root, AliasCommand(@CommandName(Commands.ROOT) DispatchCommandProvider root,
Provider<CurrentUser> currentUser, CommandName command) { CurrentUser currentUser, CommandName command) {
this.root = root; this.root = root;
this.currentUser = currentUser; this.currentUser = currentUser;
this.command = command; this.command = command;
@@ -108,12 +107,11 @@ public class AliasCommand extends BaseCommand {
private void checkRequiresCapability(Command cmd) throws UnloggedFailure { private void checkRequiresCapability(Command cmd) throws UnloggedFailure {
RequiresCapability rc = cmd.getClass().getAnnotation(RequiresCapability.class); RequiresCapability rc = cmd.getClass().getAnnotation(RequiresCapability.class);
if (rc != null) { if (rc != null) {
CurrentUser user = currentUser.get(); CapabilityControl ctl = currentUser.getCapabilities();
CapabilityControl ctl = user.getCapabilities();
if (!ctl.canPerform(rc.value()) && !ctl.canAdministrateServer()) { if (!ctl.canPerform(rc.value()) && !ctl.canAdministrateServer()) {
String msg = String.format( String msg = String.format(
"fatal: %s does not have \"%s\" capability.", "fatal: %s does not have \"%s\" capability.",
user.getUserName(), rc.value()); currentUser.getUserName(), rc.value());
throw new UnloggedFailure(BaseCommand.STATUS_NOT_ADMIN, msg); throw new UnloggedFailure(BaseCommand.STATUS_NOT_ADMIN, msg);
} }
} }

2
gerrit-sshd/src/main/java/com/google/gerrit/sshd/AliasCommandProvider.java
View File

@@ -29,7 +29,7 @@ public class AliasCommandProvider implements Provider<Command> {
private DispatchCommandProvider root; private DispatchCommandProvider root;
@Inject @Inject
private Provider<CurrentUser> currentUser; private CurrentUser currentUser;
public AliasCommandProvider(CommandName command) { public AliasCommandProvider(CommandName command) {
this.command = command; this.command = command;

19
gerrit-sshd/src/main/java/com/google/gerrit/sshd/BaseCommand.java
View File

@@ -33,7 +33,6 @@ import com.google.gerrit.sshd.SshScope.Context;
import com.google.gerrit.util.cli.CmdLineParser; import com.google.gerrit.util.cli.CmdLineParser;
import com.google.gerrit.util.cli.EndOfOptionsHandler; import com.google.gerrit.util.cli.EndOfOptionsHandler;
import com.google.inject.Inject; import com.google.inject.Inject;
import com.google.inject.Provider;
import org.apache.sshd.common.SshException; import org.apache.sshd.common.SshException;
import org.apache.sshd.server.Command; import org.apache.sshd.server.Command;
@@ -89,10 +88,10 @@ public abstract class BaseCommand implements Command {
private WorkQueue.Executor executor; private WorkQueue.Executor executor;
@Inject @Inject
private Provider<CurrentUser> user; private CurrentUser user;
@Inject @Inject
private Provider<SshScope.Context> contextProvider; private SshScope.Context context;
/** Commands declared by a plugin can be scoped by the plugin name. */ /** Commands declared by a plugin can be scoped by the plugin name. */
@Inject(optional = true) @Inject(optional = true)
@@ -278,7 +277,7 @@ public abstract class BaseCommand implements Command {
final TaskThunk tt = new TaskThunk(thunk); final TaskThunk tt = new TaskThunk(thunk);
if (isAdminHighPriorityCommand() if (isAdminHighPriorityCommand()
&& user.get().getCapabilities().canAdministrateServer()) { && user.getCapabilities().canAdministrateServer()) {
// Admin commands should not block the main work threads (there // Admin commands should not block the main work threads (there
// might be an interactive shell there), nor should they wait // might be an interactive shell there), nor should they wait
// for the main work threads. // for the main work threads.
@@ -332,8 +331,8 @@ public abstract class BaseCommand implements Command {
if (!(e instanceof UnloggedFailure)) { if (!(e instanceof UnloggedFailure)) {
final StringBuilder m = new StringBuilder(); final StringBuilder m = new StringBuilder();
m.append("Internal server error"); m.append("Internal server error");
if (user.get().isIdentifiedUser()) { if (user.isIdentifiedUser()) {
final IdentifiedUser u = user.get().asIdentifiedUser(); final IdentifiedUser u = user.asIdentifiedUser();
m.append(" (user "); m.append(" (user ");
m.append(u.getAccount().getUserName()); m.append(u.getAccount().getUserName());
m.append(" account "); m.append(" account ");
@@ -341,7 +340,7 @@ public abstract class BaseCommand implements Command {
m.append(")"); m.append(")");
} }
m.append(" during "); m.append(" during ");
m.append(contextProvider.get().getCommandLine()); m.append(context.getCommandLine());
log.error(m.toString(), e); log.error(m.toString(), e);
} }
@@ -388,18 +387,16 @@ public abstract class BaseCommand implements Command {
private final class TaskThunk implements CancelableRunnable, ProjectRunnable { private final class TaskThunk implements CancelableRunnable, ProjectRunnable {
private final CommandRunnable thunk; private final CommandRunnable thunk;
private final Context context;
private final String taskName; private final String taskName;
private Project.NameKey projectName; private Project.NameKey projectName;
private TaskThunk(final CommandRunnable thunk) { private TaskThunk(final CommandRunnable thunk) {
this.thunk = thunk; this.thunk = thunk;
this.context = contextProvider.get();
StringBuilder m = new StringBuilder(); StringBuilder m = new StringBuilder();
m.append(context.getCommandLine()); m.append(context.getCommandLine());
if (user.get().isIdentifiedUser()) { if (user.isIdentifiedUser()) {
IdentifiedUser u = user.get().asIdentifiedUser(); IdentifiedUser u = user.asIdentifiedUser();
m.append(" (").append(u.getAccount().getUserName()).append(")"); m.append(" (").append(u.getAccount().getUserName()).append(")");
} }
this.taskName = m.toString(); this.taskName = m.toString();

5
gerrit-sshd/src/main/java/com/google/gerrit/sshd/DispatchCommand.java
View File

@@ -23,7 +23,6 @@ import com.google.gerrit.server.CurrentUser;
import com.google.gerrit.server.account.CapabilityUtils; import com.google.gerrit.server.account.CapabilityUtils;
import com.google.gerrit.server.args4j.SubcommandHandler; import com.google.gerrit.server.args4j.SubcommandHandler;
import com.google.inject.Inject; import com.google.inject.Inject;
import com.google.inject.Provider;
import com.google.inject.assistedinject.Assisted; import com.google.inject.assistedinject.Assisted;
import org.apache.sshd.server.Command; import org.apache.sshd.server.Command;
@@ -45,7 +44,7 @@ final class DispatchCommand extends BaseCommand {
DispatchCommand create(Map<String, CommandProvider> map); DispatchCommand create(Map<String, CommandProvider> map);
} }
private final Provider<CurrentUser> currentUser; private final CurrentUser currentUser;
private final Map<String, CommandProvider> commands; private final Map<String, CommandProvider> commands;
private final AtomicReference<Command> atomicCmd; private final AtomicReference<Command> atomicCmd;
@@ -56,7 +55,7 @@ final class DispatchCommand extends BaseCommand {
private List<String> args = new ArrayList<>(); private List<String> args = new ArrayList<>();
@Inject @Inject
DispatchCommand(final Provider<CurrentUser> cu, DispatchCommand(CurrentUser cu,
@Assisted final Map<String, CommandProvider> all) { @Assisted final Map<String, CommandProvider> all) {
currentUser = cu; currentUser = cu;
commands = all; commands = all;

23
gerrit-sshd/src/main/java/com/google/gerrit/sshd/SuExec.java
View File

@@ -25,7 +25,6 @@ import com.google.gerrit.server.PeerDaemonUser;
import com.google.gerrit.server.config.AuthConfig; import com.google.gerrit.server.config.AuthConfig;
import com.google.gerrit.sshd.SshScope.Context; 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.Command; import org.apache.sshd.server.Command;
import org.apache.sshd.server.Environment; import org.apache.sshd.server.Environment;
@@ -50,8 +49,8 @@ public final class SuExec extends BaseCommand {
private final DispatchCommandProvider dispatcher; private final DispatchCommandProvider dispatcher;
private boolean enableRunAs; private boolean enableRunAs;
private Provider<CurrentUser> caller; private CurrentUser caller;
private Provider<SshSession> session; private SshSession session;
private IdentifiedUser.GenericFactory userFactory; private IdentifiedUser.GenericFactory userFactory;
private SshScope.Context callingContext; private SshScope.Context callingContext;
@@ -69,7 +68,8 @@ public final class SuExec extends BaseCommand {
@Inject @Inject
SuExec(final SshScope sshScope, SuExec(final SshScope sshScope,
@CommandName(Commands.ROOT) final DispatchCommandProvider dispatcher, @CommandName(Commands.ROOT) final DispatchCommandProvider dispatcher,
final Provider<CurrentUser> caller, final Provider<SshSession> session, final CurrentUser caller,
final SshSession session,
final IdentifiedUser.GenericFactory userFactory, final IdentifiedUser.GenericFactory userFactory,
final SshScope.Context callingContext, final SshScope.Context callingContext,
AuthConfig config) { AuthConfig config) {
@@ -112,12 +112,12 @@ public final class SuExec extends BaseCommand {
} }
private void checkCanRunAs() throws UnloggedFailure { private void checkCanRunAs() throws UnloggedFailure {
if (caller.get() instanceof PeerDaemonUser) { if (caller instanceof PeerDaemonUser) {
// OK. // OK.
} else if (!enableRunAs) { } else if (!enableRunAs) {
throw new UnloggedFailure(1, throw new UnloggedFailure(1,
"fatal: suexec disabled by auth.enableRunAs = false"); "fatal: suexec disabled by auth.enableRunAs = false");
} else if (!caller.get().getCapabilities().canRunAs()) { } else if (!caller.getCapabilities().canRunAs()) {
throw new UnloggedFailure(1, "fatal: suexec not permitted"); throw new UnloggedFailure(1, "fatal: suexec not permitted");
} }
} }
@@ -125,16 +125,15 @@ public final class SuExec extends BaseCommand {
private SshSession newSession() { private SshSession newSession() {
final SocketAddress peer; final SocketAddress peer;
if (peerAddress == null) { if (peerAddress == null) {
peer = session.get().getRemoteAddress(); peer = session.getRemoteAddress();
} else { } else {
peer = peerAddress; peer = peerAddress;
} }
CurrentUser self = caller.get(); if (caller instanceof PeerDaemonUser) {
if (self instanceof PeerDaemonUser) { caller = null;
self = null;
} }
return new SshSession(session.get(), peer, return new SshSession(session, peer,
userFactory.runAs(peer, accountId, self)); userFactory.runAs(peer, accountId, caller));
} }
private static String join(List<String> args) { private static String join(List<String> args) {

5
gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/AdminSetParent.java
View File

@@ -33,7 +33,6 @@ import com.google.gerrit.server.project.ProjectState;
import com.google.gerrit.sshd.CommandMetaData; import com.google.gerrit.sshd.CommandMetaData;
import com.google.gerrit.sshd.SshCommand; import com.google.gerrit.sshd.SshCommand;
import com.google.inject.Inject; import com.google.inject.Inject;
import com.google.inject.Provider;
import org.eclipse.jgit.errors.ConfigInvalidException; import org.eclipse.jgit.errors.ConfigInvalidException;
import org.eclipse.jgit.errors.RepositoryNotFoundException; import org.eclipse.jgit.errors.RepositoryNotFoundException;
@@ -79,7 +78,7 @@ final class AdminSetParent extends SshCommand {
private AllProjectsName allProjectsName; private AllProjectsName allProjectsName;
@Inject @Inject
private Provider<ListChildProjects> listChildProjects; private ListChildProjects listChildProjects;
private Project.NameKey newParentKey; private Project.NameKey newParentKey;
@@ -187,7 +186,7 @@ final class AdminSetParent extends SshCommand {
if (newParentKey != null) { if (newParentKey != null) {
automaticallyExcluded.addAll(getAllParents(newParentKey)); automaticallyExcluded.addAll(getAllParents(newParentKey));
} }
for (final ProjectInfo child : listChildProjects.get().apply( for (final ProjectInfo child : listChildProjects.apply(
new ProjectResource(parent))) { new ProjectResource(parent))) {
final Project.NameKey childName = new Project.NameKey(child.name); final Project.NameKey childName = new Project.NameKey(child.name);
if (!excluded.contains(childName)) { if (!excluded.contains(childName)) {

5
gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/FlushCaches.java
View File

@@ -29,7 +29,6 @@ import com.google.gerrit.server.config.PostCaches;
import com.google.gerrit.sshd.CommandMetaData; import com.google.gerrit.sshd.CommandMetaData;
import com.google.gerrit.sshd.SshCommand; import com.google.gerrit.sshd.SshCommand;
import com.google.inject.Inject; import com.google.inject.Inject;
import com.google.inject.Provider;
import org.kohsuke.args4j.Option; import org.kohsuke.args4j.Option;
@@ -51,7 +50,7 @@ final class FlushCaches extends SshCommand {
private boolean list; private boolean list;
@Inject @Inject
private Provider<ListCaches> listCaches; private ListCaches listCaches;
@Inject @Inject
private PostCaches postCaches; private PostCaches postCaches;
@@ -94,7 +93,7 @@ final class FlushCaches extends SshCommand {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
private void doList() { private void doList() {
for (String name : (List<String>) listCaches.get() for (String name : (List<String>) listCaches
.setFormat(OutputFormat.LIST).apply(new ConfigResource())) { .setFormat(OutputFormat.LIST).apply(new ConfigResource())) {
stderr.print(name); stderr.print(name);
stderr.print('\n'); stderr.print('\n');

2
gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ListGroupsCommand.java
View File

@@ -72,7 +72,7 @@ public class ListGroupsCommand extends SshCommand {
final GroupControl.GenericFactory genericGroupControlFactory, final GroupControl.GenericFactory genericGroupControlFactory,
final Provider<IdentifiedUser> identifiedUser, final Provider<IdentifiedUser> identifiedUser,
final IdentifiedUser.GenericFactory userFactory, final IdentifiedUser.GenericFactory userFactory,
final Provider<GetGroups> accountGetGroups, final GetGroups accountGetGroups,
final GroupJson json, final GroupJson json,
GroupBackend groupBackend) { GroupBackend groupBackend) {
super(groupCache, groupControlFactory, genericGroupControlFactory, super(groupCache, groupControlFactory, genericGroupControlFactory,

6
gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/SetReviewersCommand.java
View File

@@ -33,7 +33,6 @@ import com.google.gerrit.sshd.CommandMetaData;
import com.google.gerrit.sshd.SshCommand; import com.google.gerrit.sshd.SshCommand;
import com.google.gwtorm.server.OrmException; import com.google.gwtorm.server.OrmException;
import com.google.inject.Inject; import com.google.inject.Inject;
import com.google.inject.Provider;
import org.kohsuke.args4j.Argument; import org.kohsuke.args4j.Argument;
import org.kohsuke.args4j.Option; import org.kohsuke.args4j.Option;
@@ -88,7 +87,7 @@ public class SetReviewersCommand extends SshCommand {
private DeleteReviewer deleteReviewer; private DeleteReviewer deleteReviewer;
@Inject @Inject
private Provider<CurrentUser> userProvider; private CurrentUser currentUser;
@Inject @Inject
private ChangesCollection changesCollection; private ChangesCollection changesCollection;
@@ -162,8 +161,7 @@ public class SetReviewersCommand extends SshCommand {
} }
private void addChangeImpl(String id) throws UnloggedFailure, OrmException { private void addChangeImpl(String id) throws UnloggedFailure, OrmException {
List<ChangeControl> matched = List<ChangeControl> matched = changeFinder.find(id, currentUser);
changeFinder.find(id, userProvider.get());
List<ChangeControl> toAdd = new ArrayList<>(changes.size()); List<ChangeControl> toAdd = new ArrayList<>(changes.size());
for (ChangeControl ctl : matched) { for (ChangeControl ctl : matched) {
if (!changes.containsKey(ctl.getId()) && inProject(ctl.getProject()) if (!changes.containsKey(ctl.getId()) && inProject(ctl.getProject())

13
gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ShowCaches.java
View File

@@ -38,7 +38,6 @@ import com.google.gerrit.sshd.CommandMetaData;
import com.google.gerrit.sshd.SshCommand; import com.google.gerrit.sshd.SshCommand;
import com.google.gerrit.sshd.SshDaemon; import com.google.gerrit.sshd.SshDaemon;
import com.google.inject.Inject; import com.google.inject.Inject;
import com.google.inject.Provider;
import org.apache.sshd.common.io.IoAcceptor; import org.apache.sshd.common.io.IoAcceptor;
import org.apache.sshd.common.io.IoSession; import org.apache.sshd.common.io.IoSession;
@@ -84,13 +83,13 @@ final class ShowCaches extends SshCommand {
private SshDaemon daemon; private SshDaemon daemon;
@Inject @Inject
private Provider<ListCaches> listCaches; private ListCaches listCaches;
@Inject @Inject
private Provider<GetSummary> getSummary; private GetSummary getSummary;
@Inject @Inject
private Provider<CurrentUser> self; private CurrentUser self;
@Option(name = "--width", aliases = {"-w"}, metaVar = "COLS", usage = "width of output table") @Option(name = "--width", aliases = {"-w"}, metaVar = "COLS", usage = "width of output table")
private int columns = 80; private int columns = 80;
@@ -155,11 +154,11 @@ final class ShowCaches extends SshCommand {
printDiskCaches(caches); printDiskCaches(caches);
stdout.print('\n'); stdout.print('\n');
if (self.get().getCapabilities().canMaintainServer()) { if (self.getCapabilities().canMaintainServer()) {
sshSummary(); sshSummary();
SummaryInfo summary = SummaryInfo summary =
getSummary.get().setGc(gc).setJvm(showJVM).apply(new ConfigResource()); getSummary.setGc(gc).setJvm(showJVM).apply(new ConfigResource());
taskSummary(summary.taskSummary); taskSummary(summary.taskSummary);
memSummary(summary.memSummary); memSummary(summary.memSummary);
threadSummary(summary.threadSummary); threadSummary(summary.threadSummary);
@@ -175,7 +174,7 @@ final class ShowCaches extends SshCommand {
private Collection<CacheInfo> getCaches() { private Collection<CacheInfo> getCaches() {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
Map<String, CacheInfo> caches = Map<String, CacheInfo> caches =
(Map<String, CacheInfo>) listCaches.get().apply(new ConfigResource()); (Map<String, CacheInfo>) listCaches.apply(new ConfigResource());
for (Map.Entry<String, CacheInfo> entry : caches.entrySet()) { for (Map.Entry<String, CacheInfo> entry : caches.entrySet()) {
CacheInfo cache = entry.getValue(); CacheInfo cache = entry.getValue();
cache.name = entry.getKey(); cache.name = entry.getKey();

5
gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/TestSubmitRuleCommand.java
View File

@@ -20,16 +20,15 @@ import com.google.gerrit.server.change.RevisionResource;
import com.google.gerrit.server.change.TestSubmitRule; import com.google.gerrit.server.change.TestSubmitRule;
import com.google.gerrit.sshd.CommandMetaData; import com.google.gerrit.sshd.CommandMetaData;
import com.google.inject.Inject; import com.google.inject.Inject;
import com.google.inject.Provider;
/** Command that allows testing of prolog submit-rules in a live instance. */ /** Command that allows testing of prolog submit-rules in a live instance. */
@CommandMetaData(name = "rule", description = "Test prolog submit rules") @CommandMetaData(name = "rule", description = "Test prolog submit rules")
final class TestSubmitRuleCommand extends BaseTestPrologCommand { final class TestSubmitRuleCommand extends BaseTestPrologCommand {
@Inject @Inject
private Provider<TestSubmitRule> view; private TestSubmitRule view;
@Override @Override
protected RestModifyView<RevisionResource, TestSubmitRuleInput> createView() { protected RestModifyView<RevisionResource, TestSubmitRuleInput> createView() {
return view.get(); return view;
} }
} }

5
gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/TestSubmitTypeCommand.java
View File

@@ -21,15 +21,14 @@ import com.google.gerrit.server.change.RevisionResource;
import com.google.gerrit.server.change.TestSubmitType; import com.google.gerrit.server.change.TestSubmitType;
import com.google.gerrit.sshd.CommandMetaData; import com.google.gerrit.sshd.CommandMetaData;
import com.google.inject.Inject; import com.google.inject.Inject;
import com.google.inject.Provider;
@CommandMetaData(name = "type", description = "Test prolog submit type") @CommandMetaData(name = "type", description = "Test prolog submit type")
final class TestSubmitTypeCommand extends BaseTestPrologCommand { final class TestSubmitTypeCommand extends BaseTestPrologCommand {
@Inject @Inject
private Provider<TestSubmitType> view; private TestSubmitType view;
@Override @Override
protected RestModifyView<RevisionResource, TestSubmitRuleInput> createView() { protected RestModifyView<RevisionResource, TestSubmitRuleInput> createView() {
return view.get(); return view;
} }
} }

5
gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/Upload.java
View File

@@ -27,7 +27,6 @@ import com.google.gerrit.server.git.validators.UploadValidators;
import com.google.gerrit.sshd.AbstractGitCommand; import com.google.gerrit.sshd.AbstractGitCommand;
import com.google.gerrit.sshd.SshSession; import com.google.gerrit.sshd.SshSession;
import com.google.inject.Inject; import com.google.inject.Inject;
import com.google.inject.Provider;
import org.eclipse.jgit.transport.PreUploadHook; import org.eclipse.jgit.transport.PreUploadHook;
import org.eclipse.jgit.transport.PreUploadHookChain; import org.eclipse.jgit.transport.PreUploadHookChain;
@@ -39,7 +38,7 @@ import java.util.List;
/** Publishes Git repositories over SSH using the Git upload-pack protocol. */ /** Publishes Git repositories over SSH using the Git upload-pack protocol. */
final class Upload extends AbstractGitCommand { final class Upload extends AbstractGitCommand {
@Inject @Inject
private Provider<ReviewDb> db; private ReviewDb db;
@Inject @Inject
private TransferConfig config; private TransferConfig config;
@@ -71,7 +70,7 @@ final class Upload extends AbstractGitCommand {
final UploadPack up = new UploadPack(repo); final UploadPack up = new UploadPack(repo);
if (!projectControl.allRefsAreVisible()) { if (!projectControl.allRefsAreVisible()) {
up.setAdvertiseRefsHook(new VisibleRefFilter(tagCache, changeCache, repo, up.setAdvertiseRefsHook(new VisibleRefFilter(tagCache, changeCache, repo,
projectControl, db.get(), true)); projectControl, db, true));
} }
up.setPackConfig(config.getPackConfig()); up.setPackConfig(config.getPackConfig());
up.setTimeout(config.getTimeout()); up.setTimeout(config.getTimeout());

5
gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/UploadArchive.java
View File

@@ -23,7 +23,6 @@ import com.google.gerrit.server.change.ArchiveFormat;
import com.google.gerrit.server.change.GetArchive; import com.google.gerrit.server.change.GetArchive;
import com.google.gerrit.sshd.AbstractGitCommand; import com.google.gerrit.sshd.AbstractGitCommand;
import com.google.inject.Inject; import com.google.inject.Inject;
import com.google.inject.Provider;
import org.eclipse.jgit.api.ArchiveCommand; import org.eclipse.jgit.api.ArchiveCommand;
import org.eclipse.jgit.api.errors.GitAPIException; import org.eclipse.jgit.api.errors.GitAPIException;
@@ -104,7 +103,7 @@ public class UploadArchive extends AbstractGitCommand {
@Inject @Inject
private GetArchive.AllowedFormats allowedFormats; private GetArchive.AllowedFormats allowedFormats;
@Inject @Inject
private Provider<ReviewDb> db; private ReviewDb db;
private Options options = new Options(); private Options options = new Options();
/** /**
@@ -218,7 +217,7 @@ public class UploadArchive extends AbstractGitCommand {
private boolean canRead(ObjectId revId) throws IOException { private boolean canRead(ObjectId revId) throws IOException {
try (RevWalk rw = new RevWalk(repo)) { try (RevWalk rw = new RevWalk(repo)) {
RevCommit commit = rw.parseCommit(revId); RevCommit commit = rw.parseCommit(revId);
return projectControl.canReadCommit(db.get(), rw, commit); return projectControl.canReadCommit(db, rw, commit);
} }
} }
} }