From 821eb4bbe1a4fac8d17b4df96ab6441985df58d7 Mon Sep 17 00:00:00 2001
From: David Ostrovsky <david@ostrovsky.org>
Date: Thu, 10 Apr 2014 18:58:09 -0400
Subject: [PATCH] Expose SSH command as plugin extension point
---
src/main/java/com/gitblit/transport/ssh/commands/PluginDispatchCommand.java | 11 +++++++++++
src/main/java/com/gitblit/transport/ssh/commands/RootDispatcher.java | 13 ++++++++++++-
src/main/java/com/gitblit/transport/ssh/commands/SshCommand.java | 4 +++-
3 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/gitblit/transport/ssh/commands/PluginDispatchCommand.java b/src/main/java/com/gitblit/transport/ssh/commands/PluginDispatchCommand.java
new file mode 100644
index 0000000..27d437f
--- /dev/null
+++ b/src/main/java/com/gitblit/transport/ssh/commands/PluginDispatchCommand.java
@@ -0,0 +1,11 @@
+package com.gitblit.transport.ssh.commands;
+
+import com.gitblit.models.UserModel;
+
+public class PluginDispatchCommand extends DispatchCommand {
+
+ @Override
+ protected void registerCommands(UserModel user) {
+ // no op
+ }
+}
diff --git a/src/main/java/com/gitblit/transport/ssh/commands/RootDispatcher.java b/src/main/java/com/gitblit/transport/ssh/commands/RootDispatcher.java
index 5d9eb19..38fbd2c 100644
--- a/src/main/java/com/gitblit/transport/ssh/commands/RootDispatcher.java
+++ b/src/main/java/com/gitblit/transport/ssh/commands/RootDispatcher.java
@@ -15,6 +15,10 @@
*/
package com.gitblit.transport.ssh.commands;
+import java.util.List;
+
+import ro.fortsoft.pf4j.PluginWrapper;
+
import com.gitblit.manager.IGitblit;
import com.gitblit.models.UserModel;
import com.gitblit.transport.ssh.SshDaemonClient;
@@ -36,7 +40,14 @@
registerDispatcher(user, GitblitDispatcher.class);
registerDispatcher(user, GitDispatcher.class);
- // TODO register plugin dispatchers here
+ List<SshCommand> exts = gitblit.getExtensions(SshCommand.class);
+ for (SshCommand sshCommand : exts) {
+ PluginDispatchCommand pluginCmd = new PluginDispatchCommand();
+ PluginWrapper wrapper = gitblit.whichPlugin(sshCommand.getClass());
+ pluginCmd.registerCommand(user, sshCommand.getClass());
+ // TODO(davido): add dispatcher registration per plugin name
+ //registerDispatcher(wrapper.getDescriptor().getPluginId(), pluginCmd);
+ }
}
@Override
diff --git a/src/main/java/com/gitblit/transport/ssh/commands/SshCommand.java b/src/main/java/com/gitblit/transport/ssh/commands/SshCommand.java
index ee464e7..3d2c68b 100644
--- a/src/main/java/com/gitblit/transport/ssh/commands/SshCommand.java
+++ b/src/main/java/com/gitblit/transport/ssh/commands/SshCommand.java
@@ -19,7 +19,9 @@
import org.apache.sshd.server.Environment;
-public abstract class SshCommand extends BaseCommand {
+import ro.fortsoft.pf4j.ExtensionPoint;
+
+public abstract class SshCommand extends BaseCommand implements ExtensionPoint {
protected PrintWriter stdout;
protected PrintWriter stderr;
--
Gitblit v1.9.1