]> source.dussan.org Git - gitblit.git/commitdiff
Merge AbstractSshCommand and BaseCommand into a single class
authorJames Moger <james.moger@gitblit.com>
Fri, 14 Mar 2014 19:17:00 +0000 (15:17 -0400)
committerJames Moger <james.moger@gitblit.com>
Thu, 10 Apr 2014 22:58:08 +0000 (18:58 -0400)
src/main/java/com/gitblit/transport/ssh/AbstractGitCommand.java [deleted file]
src/main/java/com/gitblit/transport/ssh/AbstractSshCommand.java [deleted file]
src/main/java/com/gitblit/transport/ssh/commands/AbstractGitCommand.java [new file with mode: 0644]
src/main/java/com/gitblit/transport/ssh/commands/BaseCommand.java
src/main/java/com/gitblit/transport/ssh/commands/DispatchCommand.java
src/main/java/com/gitblit/transport/ssh/commands/Receive.java
src/main/java/com/gitblit/transport/ssh/commands/SshCommand.java
src/main/java/com/gitblit/transport/ssh/commands/Upload.java

diff --git a/src/main/java/com/gitblit/transport/ssh/AbstractGitCommand.java b/src/main/java/com/gitblit/transport/ssh/AbstractGitCommand.java
deleted file mode 100644 (file)
index 188cb00..0000000
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright 2014 gitblit.com.
- *
- * 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.gitblit.transport.ssh;
-
-import java.io.IOException;
-
-import org.apache.sshd.server.Environment;
-import org.eclipse.jgit.lib.Repository;
-import org.eclipse.jgit.transport.resolver.ReceivePackFactory;
-import org.eclipse.jgit.transport.resolver.UploadPackFactory;
-import org.kohsuke.args4j.Argument;
-
-import com.gitblit.git.GitblitReceivePackFactory;
-import com.gitblit.git.GitblitUploadPackFactory;
-import com.gitblit.git.RepositoryResolver;
-import com.gitblit.transport.ssh.commands.BaseCommand;
-
-/**
- * @author Eric Myhre
- * 
- */
-public abstract class AbstractGitCommand extends BaseCommand {
-       @Argument(index = 0, metaVar = "PROJECT.git", required = true, usage = "project name")
-       protected String repository;
-
-       protected RepositoryResolver<SshDaemonClient> repositoryResolver;
-       protected ReceivePackFactory<SshDaemonClient> receivePackFactory;
-       protected UploadPackFactory<SshDaemonClient> uploadPackFactory;
-
-       protected Repository repo;
-
-       @Override
-       public void start(final Environment env) {
-               startThread(new RepositoryCommandRunnable() {
-                       @Override
-                       public void run() throws Exception {
-                               parseCommandLine();
-                               AbstractGitCommand.this.service();
-                       }
-
-                       @Override
-                       public String getRepository() {
-                               return repository;
-                       }
-               });
-       }
-
-       private void service() throws IOException, Failure {
-               try {
-                       repo = openRepository();
-                       runImpl();
-               } finally {
-                       if (repo != null) {
-                               repo.close();
-                       }
-               }
-       }
-
-       protected abstract void runImpl() throws IOException, Failure;
-
-       protected Repository openRepository() throws Failure {
-               // Assume any attempt to use \ was by a Windows client
-               // and correct to the more typical / used in Git URIs.
-               //
-               repository = repository.replace('\\', '/');
-               // ssh://git@thishost/path should always be name="/path" here
-               //
-               if (!repository.startsWith("/")) {
-                       throw new Failure(1, "fatal: '" + repository
-                                       + "': not starts with / character");
-               }
-               repository = repository.substring(1);
-               try {
-                       return repositoryResolver.open(ctx.getClient(), repository);
-               } catch (Exception e) {
-                       throw new Failure(1, "fatal: '" + repository
-                                       + "': not a git archive", e);
-               }
-       }
-
-       public void setRepositoryResolver(
-                       RepositoryResolver<SshDaemonClient> repositoryResolver) {
-               this.repositoryResolver = repositoryResolver;
-       }
-
-       public void setReceivePackFactory(
-                       GitblitReceivePackFactory<SshDaemonClient> receivePackFactory) {
-               this.receivePackFactory = receivePackFactory;
-       }
-
-       public void setUploadPackFactory(
-                       GitblitUploadPackFactory<SshDaemonClient> uploadPackFactory) {
-               this.uploadPackFactory = uploadPackFactory;
-       }
-}
\ No newline at end of file
diff --git a/src/main/java/com/gitblit/transport/ssh/AbstractSshCommand.java b/src/main/java/com/gitblit/transport/ssh/AbstractSshCommand.java
deleted file mode 100644 (file)
index a6681f5..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright 2014 gitblit.com.
- *
- * 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.gitblit.transport.ssh;
-
-import java.io.BufferedWriter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
-
-import org.apache.sshd.server.Command;
-import org.apache.sshd.server.Environment;
-import org.apache.sshd.server.ExitCallback;
-import org.apache.sshd.server.SessionAware;
-import org.apache.sshd.server.session.ServerSession;
-
-import com.google.common.base.Charsets;
-
-/**
- *
- * @author Eric Myrhe
- *
- */
-public abstract class AbstractSshCommand implements Command, SessionAware {
-
-       protected InputStream in;
-
-       protected OutputStream out;
-
-       protected OutputStream err;
-
-       protected ExitCallback exit;
-
-       protected ServerSession session;
-
-       @Override
-       public void setInputStream(InputStream in) {
-               this.in = in;
-       }
-
-       @Override
-       public void setOutputStream(OutputStream out) {
-               this.out = out;
-       }
-
-       @Override
-       public void setErrorStream(OutputStream err) {
-               this.err = err;
-       }
-
-       @Override
-       public void setExitCallback(ExitCallback exit) {
-               this.exit = exit;
-       }
-
-       @Override
-       public void setSession(final ServerSession session) {
-               this.session = session;
-       }
-
-       @Override
-       public void destroy() {}
-
-    protected static PrintWriter toPrintWriter(final OutputStream o) {
-        return new PrintWriter(new BufferedWriter(new OutputStreamWriter(o, Charsets.UTF_8)));
-    }
-
-       @Override
-       public abstract void start(Environment env) throws IOException;
-}
diff --git a/src/main/java/com/gitblit/transport/ssh/commands/AbstractGitCommand.java b/src/main/java/com/gitblit/transport/ssh/commands/AbstractGitCommand.java
new file mode 100644 (file)
index 0000000..f429b44
--- /dev/null
@@ -0,0 +1,103 @@
+/*
+ * Copyright 2014 gitblit.com.
+ *
+ * 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.gitblit.transport.ssh.commands;
+
+import java.io.IOException;
+
+import org.apache.sshd.server.Environment;
+import org.eclipse.jgit.lib.Repository;
+import org.eclipse.jgit.transport.resolver.ReceivePackFactory;
+import org.eclipse.jgit.transport.resolver.UploadPackFactory;
+import org.kohsuke.args4j.Argument;
+
+import com.gitblit.git.GitblitReceivePackFactory;
+import com.gitblit.git.GitblitUploadPackFactory;
+import com.gitblit.git.RepositoryResolver;
+import com.gitblit.transport.ssh.SshDaemonClient;
+
+/**
+ * @author Eric Myhre
+ *
+ */
+public abstract class AbstractGitCommand extends BaseCommand {
+       @Argument(index = 0, metaVar = "REPOSITORY", required = true, usage = "repository name")
+       protected String repository;
+
+       protected RepositoryResolver<SshDaemonClient> repositoryResolver;
+       protected ReceivePackFactory<SshDaemonClient> receivePackFactory;
+       protected UploadPackFactory<SshDaemonClient> uploadPackFactory;
+
+       protected Repository repo;
+
+       @Override
+       public void start(final Environment env) {
+               startThread(new RepositoryCommandRunnable() {
+                       @Override
+                       public void run() throws Exception {
+                               parseCommandLine();
+                               AbstractGitCommand.this.service();
+                       }
+
+                       @Override
+                       public String getRepository() {
+                               return repository;
+                       }
+               });
+       }
+
+       private void service() throws IOException, Failure {
+               try {
+                       repo = openRepository();
+                       runImpl();
+               } finally {
+                       if (repo != null) {
+                               repo.close();
+                       }
+               }
+       }
+
+       protected abstract void runImpl() throws IOException, Failure;
+
+       protected Repository openRepository() throws Failure {
+               // Assume any attempt to use \ was by a Windows client
+               // and correct to the more typical / used in Git URIs.
+               //
+               repository = repository.replace('\\', '/');
+               // ssh://git@thishost/path should always be name="/path" here
+               //
+               if (!repository.startsWith("/")) {
+                       throw new Failure(1, "fatal: '" + repository + "': not starts with / character");
+               }
+               repository = repository.substring(1);
+               try {
+                       return repositoryResolver.open(ctx.getClient(), repository);
+               } catch (Exception e) {
+                       throw new Failure(1, "fatal: '" + repository + "': not a git archive", e);
+               }
+       }
+
+       public void setRepositoryResolver(RepositoryResolver<SshDaemonClient> repositoryResolver) {
+               this.repositoryResolver = repositoryResolver;
+       }
+
+       public void setReceivePackFactory(GitblitReceivePackFactory<SshDaemonClient> receivePackFactory) {
+               this.receivePackFactory = receivePackFactory;
+       }
+
+       public void setUploadPackFactory(GitblitUploadPackFactory<SshDaemonClient> uploadPackFactory) {
+               this.uploadPackFactory = uploadPackFactory;
+       }
+}
\ No newline at end of file
index f7ef2aa30c068b46bb09134ef8956ed588c0e3d7..baa892cab486850b39750535d29e3bbdbb128bbe 100644 (file)
 
 package com.gitblit.transport.ssh.commands;
 
+import java.io.BufferedWriter;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InterruptedIOException;
 import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.util.concurrent.Future;
 import java.util.concurrent.atomic.AtomicReference;
@@ -26,13 +29,14 @@ import org.apache.sshd.common.SshException;
 import org.apache.sshd.server.Command;
 import org.apache.sshd.server.Environment;
 import org.apache.sshd.server.ExitCallback;
+import org.apache.sshd.server.SessionAware;
+import org.apache.sshd.server.session.ServerSession;
 import org.kohsuke.args4j.Argument;
 import org.kohsuke.args4j.CmdLineException;
 import org.kohsuke.args4j.Option;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.gitblit.transport.ssh.AbstractSshCommand;
 import com.gitblit.transport.ssh.SshCommandContext;
 import com.gitblit.utils.IdGenerator;
 import com.gitblit.utils.WorkQueue;
@@ -41,398 +45,439 @@ import com.gitblit.utils.cli.CmdLineParser;
 import com.google.common.base.Charsets;
 import com.google.common.util.concurrent.Atomics;
 
-public abstract class BaseCommand extends AbstractSshCommand {
-  private static final Logger log = LoggerFactory
-      .getLogger(BaseCommand.class);
-
-  /** Text of the command line which lead up to invoking this instance. */
-  private String commandName = "";
-
-  /** Unparsed command line options. */
-  private String[] argv;
-
-  /** Ssh context */
-  protected SshCommandContext ctx;
-
-  /** The task, as scheduled on a worker thread. */
-  private final AtomicReference<Future<?>> task;
-
-  private final WorkQueue.Executor executor;
-
-  public BaseCommand() {
-    task = Atomics.newReference();
-    IdGenerator gen = new IdGenerator();
-    WorkQueue w = new WorkQueue(gen);
-    this.executor = w.getDefaultQueue();
-  }
-
-  public void setContext(SshCommandContext ctx) {
-       this.ctx = ctx;
-  }
-
-  public void setInputStream(final InputStream in) {
-    this.in = in;
-  }
-
-  public void setOutputStream(final OutputStream out) {
-    this.out = out;
-  }
-
-  public void setErrorStream(final OutputStream err) {
-    this.err = err;
-  }
-
-  public void setExitCallback(final ExitCallback callback) {
-    this.exit = callback;
-  }
-
-  protected void provideBaseStateTo(final Command cmd) {
-    if (cmd instanceof BaseCommand) {
-         ((BaseCommand)cmd).setContext(ctx);
-    }
-    cmd.setInputStream(in);
-    cmd.setOutputStream(out);
-    cmd.setErrorStream(err);
-    cmd.setExitCallback(exit);
-  }
-
-  protected String getName() {
-    return commandName;
-  }
-
-  void setName(final String prefix) {
-    this.commandName = prefix;
-  }
-
-  public String[] getArguments() {
-    return argv;
-  }
-
-  public void setArguments(final String[] argv) {
-    this.argv = argv;
-  }
-
-  /**
-   * Parses the command line argument, injecting parsed values into fields.
-   * <p>
-   * This method must be explicitly invoked to cause a parse.
-   *
-   * @throws UnloggedFailure if the command line arguments were invalid.
-   * @see Option
-   * @see Argument
-   */
-  protected void parseCommandLine() throws UnloggedFailure {
-    parseCommandLine(this);
-  }
-
-  /**
-   * Parses the command line argument, injecting parsed values into fields.
-   * <p>
-   * This method must be explicitly invoked to cause a parse.
-   *
-   * @param options object whose fields declare Option and Argument annotations
-   *        to describe the parameters of the command. Usually {@code this}.
-   * @throws UnloggedFailure if the command line arguments were invalid.
-   * @see Option
-   * @see Argument
-   */
-  protected void parseCommandLine(Object options) throws UnloggedFailure {
-    final CmdLineParser clp = newCmdLineParser(options);
-    try {
-      clp.parseArgument(argv);
-    } catch (IllegalArgumentException err) {
-      if (!clp.wasHelpRequestedByOption()) {
-        throw new UnloggedFailure(1, "fatal: " + err.getMessage());
-      }
-    } catch (CmdLineException err) {
-      if (!clp.wasHelpRequestedByOption()) {
-        throw new UnloggedFailure(1, "fatal: " + err.getMessage());
-      }
-    }
-
-    if (clp.wasHelpRequestedByOption()) {
-      StringWriter msg = new StringWriter();
-      clp.printDetailedUsage(commandName, msg);
-      msg.write(usage());
-      throw new UnloggedFailure(1, msg.toString());
-    }
-  }
-
-  /** Construct a new parser for this command's received command line. */
-  protected CmdLineParser newCmdLineParser(Object options) {
-    return new CmdLineParser(options);
-  }
-
-  protected String usage() {
-    return "";
-  }
-
-  private final class TaskThunk implements CancelableRunnable {
-    private final CommandRunnable thunk;
-    private final String taskName;
-
-    private TaskThunk(final CommandRunnable thunk) {
-      this.thunk = thunk;
-
-      StringBuilder m = new StringBuilder();
-      m.append(ctx.getCommandLine());
-      this.taskName = m.toString();
-    }
-
-    @Override
-    public void cancel() {
-      synchronized (this) {
-        try {
-          //onExit(/*STATUS_CANCEL*/);
-        } finally {
-          ctx = null;
-        }
-      }
-    }
-
-    @Override
-    public void run() {
-      synchronized (this) {
-        final Thread thisThread = Thread.currentThread();
-        final String thisName = thisThread.getName();
-        int rc = 0;
-        try {
-          thisThread.setName("SSH " + taskName);
-          thunk.run();
-
-          out.flush();
-          err.flush();
-        } catch (Throwable e) {
-          try {
-            out.flush();
-          } catch (Throwable e2) {
-          }
-          try {
-            err.flush();
-          } catch (Throwable e2) {
-          }
-          rc = handleError(e);
-        } finally {
-          try {
-            onExit(rc);
-          } finally {
-            thisThread.setName(thisName);
-          }
-        }
-      }
-    }
-
-    @Override
-    public String toString() {
-      return taskName;
-    }
-  }
-
-  /** Runnable function which can throw an exception. */
-  public static interface CommandRunnable {
-    public void run() throws Exception;
-  }
-
-
-  /** Runnable function which can retrieve a project name related to the task */
-  public static interface RepositoryCommandRunnable extends CommandRunnable {
-       public String getRepository();
-  }
-
-  /**
-   * Spawn a function into its own thread.
-   * <p>
-   * Typically this should be invoked within {@link Command#start(Environment)},
-   * such as:
-   *
-   * <pre>
-   * startThread(new Runnable() {
-   *   public void run() {
-   *     runImp();
-   *   }
-   * });
-   * </pre>
-   *
-   * @param thunk the runnable to execute on the thread, performing the
-   *        command's logic.
-   */
-  protected void startThread(final Runnable thunk) {
-    startThread(new CommandRunnable() {
-      @Override
-      public void run() throws Exception {
-        thunk.run();
-      }
-    });
-  }
-
-  /**
-   * Terminate this command and return a result code to the remote client.
-   * <p>
-   * Commands should invoke this at most once. Once invoked, the command may
-   * lose access to request based resources as any callbacks previously
-   * registered with {@link RequestCleanup} will fire.
-   *
-   * @param rc exit code for the remote client.
-   */
-  protected void onExit(final int rc) {
-    exit.onExit(rc);
-//    if (cleanup != null) {
-//      cleanup.run();
-//    }
-  }
-
-  private int handleError(final Throwable e) {
-    if ((e.getClass() == IOException.class
-         && "Pipe closed".equals(e.getMessage()))
-        || //
-        (e.getClass() == SshException.class
-         && "Already closed".equals(e.getMessage()))
-        || //
-        e.getClass() == InterruptedIOException.class) {
-      // This is sshd telling us the client just dropped off while
-      // we were waiting for a read or a write to complete. Either
-      // way its not really a fatal error. Don't log it.
-      //
-      return 127;
-    }
-
-    if (e instanceof UnloggedFailure) {
-    } else {
-      final StringBuilder m = new StringBuilder();
-      m.append("Internal server error");
-//      if (userProvider.get().isIdentifiedUser()) {
-//        final IdentifiedUser u = (IdentifiedUser) userProvider.get();
-//        m.append(" (user ");
-//        m.append(u.getAccount().getUserName());
-//        m.append(" account ");
-//        m.append(u.getAccountId());
-//        m.append(")");
-//      }
-//      m.append(" during ");
-//      m.append(contextProvider.get().getCommandLine());
-      log.error(m.toString(), e);
-    }
-
-    if (e instanceof Failure) {
-      final Failure f = (Failure) e;
-      try {
-        err.write((f.getMessage() + "\n").getBytes(Charsets.UTF_8));
-        err.flush();
-      } catch (IOException e2) {
-      } catch (Throwable e2) {
-        log.warn("Cannot send failure message to client", e2);
-      }
-      return f.exitCode;
-
-    } else {
-      try {
-        err.write("fatal: internal server error\n".getBytes(Charsets.UTF_8));
-        err.flush();
-      } catch (IOException e2) {
-      } catch (Throwable e2) {
-        log.warn("Cannot send internal server error message to client", e2);
-      }
-      return 128;
-    }
-  }
-
-  /**
-   * Spawn a function into its own thread.
-   * <p>
-   * Typically this should be invoked within {@link Command#start(Environment)},
-   * such as:
-   *
-   * <pre>
-   * startThread(new CommandRunnable() {
-   *   public void run() throws Exception {
-   *     runImp();
-   *   }
-   * });
-   * </pre>
-   * <p>
-   * If the function throws an exception, it is translated to a simple message
-   * for the client, a non-zero exit code, and the stack trace is logged.
-   *
-   * @param thunk the runnable to execute on the thread, performing the
-   *        command's logic.
-   */
-  protected void startThread(final CommandRunnable thunk) {
-    final TaskThunk tt = new TaskThunk(thunk);
-      task.set(executor.submit(tt));
-  }
-
-  /** Thrown from {@link CommandRunnable#run()} with client message and code. */
-  public static class Failure extends Exception {
-    private static final long serialVersionUID = 1L;
-
-    final int exitCode;
-
-    /**
-     * Create a new failure.
-     *
-     * @param exitCode exit code to return the client, which indicates the
-     *        failure status of this command. Should be between 1 and 255,
-     *        inclusive.
-     * @param msg message to also send to the client's stderr.
-     */
-    public Failure(final int exitCode, final String msg) {
-      this(exitCode, msg, null);
-    }
-
-    /**
-     * Create a new failure.
-     *
-     * @param exitCode exit code to return the client, which indicates the
-     *        failure status of this command. Should be between 1 and 255,
-     *        inclusive.
-     * @param msg message to also send to the client's stderr.
-     * @param why stack trace to include in the server's log, but is not sent to
-     *        the client's stderr.
-     */
-    public Failure(final int exitCode, final String msg, final Throwable why) {
-      super(msg, why);
-      this.exitCode = exitCode;
-    }
-  }
-
-  /** Thrown from {@link CommandRunnable#run()} with client message and code. */
-  public static class UnloggedFailure extends Failure {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * Create a new failure.
-     *
-     * @param msg message to also send to the client's stderr.
-     */
-    public UnloggedFailure(final String msg) {
-      this(1, msg);
-    }
-
-    /**
-     * Create a new failure.
-     *
-     * @param exitCode exit code to return the client, which indicates the
-     *        failure status of this command. Should be between 1 and 255,
-     *        inclusive.
-     * @param msg message to also send to the client's stderr.
-     */
-    public UnloggedFailure(final int exitCode, final String msg) {
-      this(exitCode, msg, null);
-    }
-
-    /**
-     * Create a new failure.
-     *
-     * @param exitCode exit code to return the client, which indicates the
-     *        failure status of this command. Should be between 1 and 255,
-     *        inclusive.
-     * @param msg message to also send to the client's stderr.
-     * @param why stack trace to include in the server's log, but is not sent to
-     *        the client's stderr.
-     */
-    public UnloggedFailure(final int exitCode, final String msg,
-        final Throwable why) {
-      super(exitCode, msg, why);
-    }
-  }
+public abstract class BaseCommand implements Command, SessionAware {
+
+       private static final Logger log = LoggerFactory.getLogger(BaseCommand.class);
+
+       /** Ssh context */
+       protected SshCommandContext ctx;
+
+       protected InputStream in;
+
+       protected OutputStream out;
+
+       protected OutputStream err;
+
+       protected ExitCallback exit;
+
+       protected ServerSession session;
+
+       /** Text of the command line which lead up to invoking this instance. */
+       private String commandName = "";
+
+       /** Unparsed command line options. */
+       private String[] argv;
+
+       /** The task, as scheduled on a worker thread. */
+       private final AtomicReference<Future<?>> task;
+
+       private final WorkQueue.Executor executor;
+
+       public BaseCommand() {
+               task = Atomics.newReference();
+               IdGenerator gen = new IdGenerator();
+               WorkQueue w = new WorkQueue(gen);
+               this.executor = w.getDefaultQueue();
+       }
+
+       @Override
+       public void setSession(final ServerSession session) {
+               this.session = session;
+       }
+
+       @Override
+       public void destroy() {
+       }
+
+       protected static PrintWriter toPrintWriter(final OutputStream o) {
+               return new PrintWriter(new BufferedWriter(new OutputStreamWriter(o, Charsets.UTF_8)));
+       }
+
+       @Override
+       public abstract void start(Environment env) throws IOException;
+
+       public void setContext(SshCommandContext ctx) {
+               this.ctx = ctx;
+       }
+
+       @Override
+       public void setInputStream(final InputStream in) {
+               this.in = in;
+       }
+
+       @Override
+       public void setOutputStream(final OutputStream out) {
+               this.out = out;
+       }
+
+       @Override
+       public void setErrorStream(final OutputStream err) {
+               this.err = err;
+       }
+
+       @Override
+       public void setExitCallback(final ExitCallback callback) {
+               this.exit = callback;
+       }
+
+       protected void provideBaseStateTo(final Command cmd) {
+               if (cmd instanceof BaseCommand) {
+                       ((BaseCommand) cmd).setContext(ctx);
+               }
+               cmd.setInputStream(in);
+               cmd.setOutputStream(out);
+               cmd.setErrorStream(err);
+               cmd.setExitCallback(exit);
+       }
+
+       protected String getName() {
+               return commandName;
+       }
+
+       void setName(final String prefix) {
+               this.commandName = prefix;
+       }
+
+       public String[] getArguments() {
+               return argv;
+       }
+
+       public void setArguments(final String[] argv) {
+               this.argv = argv;
+       }
+
+       /**
+        * Parses the command line argument, injecting parsed values into fields.
+        * <p>
+        * This method must be explicitly invoked to cause a parse.
+        *
+        * @throws UnloggedFailure
+        *             if the command line arguments were invalid.
+        * @see Option
+        * @see Argument
+        */
+       protected void parseCommandLine() throws UnloggedFailure {
+               parseCommandLine(this);
+       }
+
+       /**
+        * Parses the command line argument, injecting parsed values into fields.
+        * <p>
+        * This method must be explicitly invoked to cause a parse.
+        *
+        * @param options
+        *            object whose fields declare Option and Argument annotations to
+        *            describe the parameters of the command. Usually {@code this}.
+        * @throws UnloggedFailure
+        *             if the command line arguments were invalid.
+        * @see Option
+        * @see Argument
+        */
+       protected void parseCommandLine(Object options) throws UnloggedFailure {
+               final CmdLineParser clp = newCmdLineParser(options);
+               try {
+                       clp.parseArgument(argv);
+               } catch (IllegalArgumentException err) {
+                       if (!clp.wasHelpRequestedByOption()) {
+                               throw new UnloggedFailure(1, "fatal: " + err.getMessage());
+                       }
+               } catch (CmdLineException err) {
+                       if (!clp.wasHelpRequestedByOption()) {
+                               throw new UnloggedFailure(1, "fatal: " + err.getMessage());
+                       }
+               }
+
+               if (clp.wasHelpRequestedByOption()) {
+                       StringWriter msg = new StringWriter();
+                       clp.printDetailedUsage(commandName, msg);
+                       msg.write(usage());
+                       throw new UnloggedFailure(1, msg.toString());
+               }
+       }
+
+       /** Construct a new parser for this command's received command line. */
+       protected CmdLineParser newCmdLineParser(Object options) {
+               return new CmdLineParser(options);
+       }
+
+       protected String usage() {
+               return "";
+       }
+
+       private final class TaskThunk implements CancelableRunnable {
+               private final CommandRunnable thunk;
+               private final String taskName;
+
+               private TaskThunk(final CommandRunnable thunk) {
+                       this.thunk = thunk;
+
+                       StringBuilder m = new StringBuilder();
+                       m.append(ctx.getCommandLine());
+                       this.taskName = m.toString();
+               }
+
+               @Override
+               public void cancel() {
+                       synchronized (this) {
+                               try {
+                                       // onExit(/*STATUS_CANCEL*/);
+                               } finally {
+                                       ctx = null;
+                               }
+                       }
+               }
+
+               @Override
+               public void run() {
+                       synchronized (this) {
+                               final Thread thisThread = Thread.currentThread();
+                               final String thisName = thisThread.getName();
+                               int rc = 0;
+                               try {
+                                       thisThread.setName("SSH " + taskName);
+                                       thunk.run();
+
+                                       out.flush();
+                                       err.flush();
+                               } catch (Throwable e) {
+                                       try {
+                                               out.flush();
+                                       } catch (Throwable e2) {
+                                       }
+                                       try {
+                                               err.flush();
+                                       } catch (Throwable e2) {
+                                       }
+                                       rc = handleError(e);
+                               } finally {
+                                       try {
+                                               onExit(rc);
+                                       } finally {
+                                               thisThread.setName(thisName);
+                                       }
+                               }
+                       }
+               }
+
+               @Override
+               public String toString() {
+                       return taskName;
+               }
+       }
+
+       /** Runnable function which can throw an exception. */
+       public static interface CommandRunnable {
+               public void run() throws Exception;
+       }
+
+       /** Runnable function which can retrieve a project name related to the task */
+       public static interface RepositoryCommandRunnable extends CommandRunnable {
+               public String getRepository();
+       }
+
+       /**
+        * Spawn a function into its own thread.
+        * <p>
+        * Typically this should be invoked within
+        * {@link Command#start(Environment)}, such as:
+        *
+        * <pre>
+        * startThread(new Runnable() {
+        *      public void run() {
+        *              runImp();
+        *      }
+        * });
+        * </pre>
+        *
+        * @param thunk
+        *            the runnable to execute on the thread, performing the
+        *            command's logic.
+        */
+       protected void startThread(final Runnable thunk) {
+               startThread(new CommandRunnable() {
+                       @Override
+                       public void run() throws Exception {
+                               thunk.run();
+                       }
+               });
+       }
+
+       /**
+        * Terminate this command and return a result code to the remote client.
+        * <p>
+        * Commands should invoke this at most once. Once invoked, the command may
+        * lose access to request based resources as any callbacks previously
+        * registered with {@link RequestCleanup} will fire.
+        *
+        * @param rc
+        *            exit code for the remote client.
+        */
+       protected void onExit(final int rc) {
+               exit.onExit(rc);
+               // if (cleanup != null) {
+               // cleanup.run();
+               // }
+       }
+
+       private int handleError(final Throwable e) {
+               if ((e.getClass() == IOException.class && "Pipe closed".equals(e.getMessage())) || //
+                               (e.getClass() == SshException.class && "Already closed".equals(e.getMessage())) || //
+                               e.getClass() == InterruptedIOException.class) {
+                       // This is sshd telling us the client just dropped off while
+                       // we were waiting for a read or a write to complete. Either
+                       // way its not really a fatal error. Don't log it.
+                       //
+                       return 127;
+               }
+
+               if (e instanceof UnloggedFailure) {
+               } else {
+                       final StringBuilder m = new StringBuilder();
+                       m.append("Internal server error");
+                       // if (userProvider.get().isIdentifiedUser()) {
+                       // final IdentifiedUser u = (IdentifiedUser) userProvider.get();
+                       // m.append(" (user ");
+                       // m.append(u.getAccount().getUserName());
+                       // m.append(" account ");
+                       // m.append(u.getAccountId());
+                       // m.append(")");
+                       // }
+                       // m.append(" during ");
+                       // m.append(contextProvider.get().getCommandLine());
+                       log.error(m.toString(), e);
+               }
+
+               if (e instanceof Failure) {
+                       final Failure f = (Failure) e;
+                       try {
+                               err.write((f.getMessage() + "\n").getBytes(Charsets.UTF_8));
+                               err.flush();
+                       } catch (IOException e2) {
+                       } catch (Throwable e2) {
+                               log.warn("Cannot send failure message to client", e2);
+                       }
+                       return f.exitCode;
+
+               } else {
+                       try {
+                               err.write("fatal: internal server error\n".getBytes(Charsets.UTF_8));
+                               err.flush();
+                       } catch (IOException e2) {
+                       } catch (Throwable e2) {
+                               log.warn("Cannot send internal server error message to client", e2);
+                       }
+                       return 128;
+               }
+       }
+
+       /**
+        * Spawn a function into its own thread.
+        * <p>
+        * Typically this should be invoked within
+        * {@link Command#start(Environment)}, such as:
+        *
+        * <pre>
+        * startThread(new CommandRunnable() {
+        *      public void run() throws Exception {
+        *              runImp();
+        *      }
+        * });
+        * </pre>
+        * <p>
+        * If the function throws an exception, it is translated to a simple message
+        * for the client, a non-zero exit code, and the stack trace is logged.
+        *
+        * @param thunk
+        *            the runnable to execute on the thread, performing the
+        *            command's logic.
+        */
+       protected void startThread(final CommandRunnable thunk) {
+               final TaskThunk tt = new TaskThunk(thunk);
+               task.set(executor.submit(tt));
+       }
+
+       /** Thrown from {@link CommandRunnable#run()} with client message and code. */
+       public static class Failure extends Exception {
+               private static final long serialVersionUID = 1L;
+
+               final int exitCode;
+
+               /**
+                * Create a new failure.
+                *
+                * @param exitCode
+                *            exit code to return the client, which indicates the
+                *            failure status of this command. Should be between 1 and
+                *            255, inclusive.
+                * @param msg
+                *            message to also send to the client's stderr.
+                */
+               public Failure(final int exitCode, final String msg) {
+                       this(exitCode, msg, null);
+               }
+
+               /**
+                * Create a new failure.
+                *
+                * @param exitCode
+                *            exit code to return the client, which indicates the
+                *            failure status of this command. Should be between 1 and
+                *            255, inclusive.
+                * @param msg
+                *            message to also send to the client's stderr.
+                * @param why
+                *            stack trace to include in the server's log, but is not
+                *            sent to the client's stderr.
+                */
+               public Failure(final int exitCode, final String msg, final Throwable why) {
+                       super(msg, why);
+                       this.exitCode = exitCode;
+               }
+       }
+
+       /** Thrown from {@link CommandRunnable#run()} with client message and code. */
+       public static class UnloggedFailure extends Failure {
+               private static final long serialVersionUID = 1L;
+
+               /**
+                * Create a new failure.
+                *
+                * @param msg
+                *            message to also send to the client's stderr.
+                */
+               public UnloggedFailure(final String msg) {
+                       this(1, msg);
+               }
+
+               /**
+                * Create a new failure.
+                *
+                * @param exitCode
+                *            exit code to return the client, which indicates the
+                *            failure status of this command. Should be between 1 and
+                *            255, inclusive.
+                * @param msg
+                *            message to also send to the client's stderr.
+                */
+               public UnloggedFailure(final int exitCode, final String msg) {
+                       this(exitCode, msg, null);
+               }
+
+               /**
+                * Create a new failure.
+                *
+                * @param exitCode
+                *            exit code to return the client, which indicates the
+                *            failure status of this command. Should be between 1 and
+                *            255, inclusive.
+                * @param msg
+                *            message to also send to the client's stderr.
+                * @param why
+                *            stack trace to include in the server's log, but is not
+                *            sent to the client's stderr.
+                */
+               public UnloggedFailure(final int exitCode, final String msg, final Throwable why) {
+                       super(exitCode, msg, why);
+               }
+       }
 }
index 7cd1b045bf1788dcee8ebc9a1ba3d1fc45ee4b25..4ace09b3cb740e9b7e121e30405a6b0c3f10d6f5 100644 (file)
@@ -30,7 +30,6 @@ import org.kohsuke.args4j.Argument;
 import com.gitblit.git.GitblitReceivePackFactory;
 import com.gitblit.git.GitblitUploadPackFactory;
 import com.gitblit.git.RepositoryResolver;
-import com.gitblit.transport.ssh.AbstractGitCommand;
 import com.gitblit.transport.ssh.CommandMetaData;
 import com.gitblit.transport.ssh.PublicKeyAuthenticator;
 import com.gitblit.transport.ssh.SshDaemonClient;
index f8c1334c2453e4191cfafb824c8cf141d331022d..5c92a699841da57da14624cd65b2de1bd7150686 100644 (file)
@@ -17,7 +17,6 @@ package com.gitblit.transport.ssh.commands;
 
 import org.eclipse.jgit.transport.ReceivePack;
 
-import com.gitblit.transport.ssh.AbstractGitCommand;
 import com.gitblit.transport.ssh.CommandMetaData;
 
 @CommandMetaData(name = "git-receive-pack", description = "Receive pack")
index 44618f3b27286feb08082425a693463943bdc58e..ee464e7c9c09dda3529a3a068643d5814f05492d 100644 (file)
@@ -20,26 +20,26 @@ import java.io.PrintWriter;
 import org.apache.sshd.server.Environment;
 
 public abstract class SshCommand extends BaseCommand {
-  protected PrintWriter stdout;
-  protected PrintWriter stderr;
+       protected PrintWriter stdout;
+       protected PrintWriter stderr;
 
-  @Override
-  public void start(Environment env) throws IOException {
-    startThread(new CommandRunnable() {
-      @Override
-      public void run() throws Exception {
-        parseCommandLine();
-        stdout = toPrintWriter(out);
-        stderr = toPrintWriter(err);
-        try {
-          SshCommand.this.run();
-        } finally {
-          stdout.flush();
-          stderr.flush();
-        }
-      }
-    });
-  }
+       @Override
+       public void start(Environment env) throws IOException {
+               startThread(new CommandRunnable() {
+                       @Override
+                       public void run() throws Exception {
+                               parseCommandLine();
+                               stdout = toPrintWriter(out);
+                               stderr = toPrintWriter(err);
+                               try {
+                                       SshCommand.this.run();
+                               } finally {
+                                       stdout.flush();
+                                       stderr.flush();
+                               }
+                       }
+               });
+       }
 
-  protected abstract void run() throws UnloggedFailure, Failure, Exception;
+       protected abstract void run() throws UnloggedFailure, Failure, Exception;
 }
index d1566596c093cc30eb0d931212483b9759343f50..1607aa6adf45cebdbbaf29927cd7eda77887d2c6 100644 (file)
@@ -17,7 +17,6 @@ package com.gitblit.transport.ssh.commands;
 
 import org.eclipse.jgit.transport.UploadPack;
 
-import com.gitblit.transport.ssh.AbstractGitCommand;
 import com.gitblit.transport.ssh.CommandMetaData;
 
 @CommandMetaData(name = "git-upload-pack", description = "Upload pack")