[X2Go-Commits] [x2gobroker] 02/03: fix for 7b98c0514eaae794ce5880f86bab12f3a2bf9766
git-admin at x2go.org
git-admin at x2go.org
Wed Apr 1 14:17:44 CEST 2015
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository x2gobroker.
commit 125c6ecc28f3caee61daf4311068c57e0588c358
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Wed Apr 1 10:42:10 2015 +0200
fix for 7b98c0514eaae794ce5880f86bab12f3a2bf9766
---
lib/x2gobroker-agent.pl | 6 ++++++
x2gobroker/web/extras.py | 4 ++--
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/lib/x2gobroker-agent.pl b/lib/x2gobroker-agent.pl
index 2256f8c..b408b3b 100755
--- a/lib/x2gobroker-agent.pl
+++ b/lib/x2gobroker-agent.pl
@@ -25,6 +25,12 @@ use File::Basename;
use File::Which;
use POSIX;
+# are we running via SSH's ForceCommand?
+if ($ENV{"SSH_ORIGINAL_COMMAND"} =~ m/\/usr\/.*\/x2go\/x2gobroker-agent\ .*/ ) {
+ @ARGV = split / /, $ENV{'SSH_ORIGINAL_COMMAND'};
+ @ARGV = @ARGV[1..$#ARGV];
+}
+
my @available_tasks = (
"availabletasks",
"addauthkey",
diff --git a/x2gobroker/web/extras.py b/x2gobroker/web/extras.py
index d4e091f..fe63492 100644
--- a/x2gobroker/web/extras.py
+++ b/x2gobroker/web/extras.py
@@ -73,10 +73,10 @@ class X2GoBrokerPubKeyService(_RequestHandler):
if os.path.exists('{home}/.ssh/id_rsa.pub'.format(home=broker_home)):
pubkey = paramiko.RSAKey(filename='{home}/.ssh/id_rsa'.format(home=broker_home))
- output += 'command=/usr/lib/x2go/x2gobroker-agent,no-port-forwarding,no-X11-forwarding,no-agent-forwarding,no-pty ssh-rsa {pubkey} {user}@{hostname}\n'.format(pubkey=str(pubkey.get_base64()), user=x2gobroker.defaults.X2GOBROKER_DAEMON_USER, hostname=x2gobroker.defaults.X2GOBROKER_HOSTNAME)
+ output += 'command="/usr/lib/x2go/x2gobroker-agent",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,no-pty ssh-rsa {pubkey} {user}@{hostname}\n'.format(pubkey=str(pubkey.get_base64()), user=x2gobroker.defaults.X2GOBROKER_DAEMON_USER, hostname=x2gobroker.defaults.X2GOBROKER_HOSTNAME)
if os.path.exists('{home}/.ssh/id_dsa.pub'.format(home=broker_home)):
pubkey = paramiko.DSSKey(filename='{home}/.ssh/id_dsa'.format(home=broker_home))
- output += 'command=/usr/lib/x2go/x2gobroker-agent,no-port-forwarding,no-X11-forwarding,no-agent-forwarding,no-pty ssh-dss {pubkey} {user}@{hostname}\n'.format(pubkey=str(pubkey.get_base64()), user=x2gobroker.defaults.X2GOBROKER_DAEMON_USER, hostname=x2gobroker.defaults.X2GOBROKER_HOSTNAME)
+ output += 'command="/usr/lib/x2go/x2gobroker-agent",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,no-pty ssh-dss {pubkey} {user}@{hostname}\n'.format(pubkey=str(pubkey.get_base64()), user=x2gobroker.defaults.X2GOBROKER_DAEMON_USER, hostname=x2gobroker.defaults.X2GOBROKER_HOSTNAME)
self.write(output)
--
Alioth's /srv/git/code.x2go.org/x2gobroker.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git
More information about the x2go-commits
mailing list