[X2Go-Commits] [python-x2go] 01/01: Don't check for "fuse" group membership to decide if a user can use sshfs. The "fuse" group has been dropped from Debian jessie and beyond. Furthermore, some openSUSE versions use the "trusted" group for granting (and never used a group named fuse).
git-admin at x2go.org
git-admin at x2go.org
Wed Jul 22 00:16:20 CEST 2015
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository python-x2go.
commit 4ca968ce2c57e0228fd9b5cecf76c790b054f71c
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Wed Jul 22 00:16:05 2015 +0200
Don't check for "fuse" group membership to decide if a user can use sshfs. The "fuse" group has been dropped from Debian jessie and beyond. Furthermore, some openSUSE versions use the "trusted" group for granting (and never used a group named fuse).
---
debian/changelog | 4 ++++
x2go/backends/control/plain.py | 7 ++++---
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index ae68e5b..ae74b07 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,10 @@ python-x2go (0.5.0.4-0x2go1) UNRELEASED; urgency=medium
- No such constant loglevel_WARNING, must be logolevel_WARN.
- End session gracefully if we fail setting up the SSH agent forwarding
socket.
+ - Don't check for "fuse" group membership to decide if a user can use sshfs.
+ The "fuse" group has been dropped from Debian jessie and beyond.
+ Furthermore, some openSUSE versions use the "trusted" group for granting
+ (and never used a group named fuse).
* debian/control:
+ Allow qvd-nxproxy as an alternative to nxproxy. Allows co-installation
of PyHoca-CLI+GUI and the TheQVD client.
diff --git a/x2go/backends/control/plain.py b/x2go/backends/control/plain.py
index 0cf2d2a..8ecc09d 100644
--- a/x2go/backends/control/plain.py
+++ b/x2go/backends/control/plain.py
@@ -670,9 +670,10 @@ class X2GoControlSession(paramiko.SSHClient):
@rtype: C{bool}
"""
- if self.remote_username() in self._x2go_remote_group('fuse'):
- return True
- return False
+ (stdin, stdout, stderr) = self._x2go_exec_command('which fusermount')
+
+ # if which returns the full path of fusermount, the current use is allowed to execute it
+ return bool(stdout.read())
def remote_username(self):
"""\
--
Alioth's /srv/git/code.x2go.org/python-x2go.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/python-x2go.git
More information about the x2go-commits
mailing list