[X2Go-Commits] python-x2go.git - twofactorauth (branch) updated: 0.1.1.4-72-g4a4167b

X2Go dev team git-admin at x2go.org
Sat Sep 14 15:57:08 CEST 2013


The branch, twofactorauth has been updated
       via  4a4167b67489560ffeebf8d3e490f67d937f58d9 (commit)
      from  d121b909e650b5c6fc2eee406f2bb138707fc627 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 x2go/backends/terminal/_stdout.py |   11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

The diff of changes is:
diff --git a/x2go/backends/terminal/_stdout.py b/x2go/backends/terminal/_stdout.py
index 97a3f30..27b4079 100644
--- a/x2go/backends/terminal/_stdout.py
+++ b/x2go/backends/terminal/_stdout.py
@@ -458,7 +458,7 @@ class X2goTerminalSessionSTDOUT(object):
 
         """
         if not self.control_session.is_folder_sharing_available():
-            raise x2go_exceptions.X2goUserException('remote user %s is not member of X2go server group fuse' % self.session_info.username)
+            raise x2go_exceptions.X2goUserException('Remote user %s is not allowed to share local folders with the server.' % self.session_info.username)
 
         # start reverse SSH tunnel for sshfs (folder sharing, printing)
         ssh_transport = self.control_session.get_transport()
@@ -506,8 +506,8 @@ class X2goTerminalSessionSTDOUT(object):
         Initialize X2go print spooling.
 
         """
-        if self.session_info.username not in self.control_session._x2go_remote_group('fuse'):
-            raise x2go_exceptions.X2goUserException('remote user %s is not member of X2go server group fuse' % self.session_info.username)
+        if not self.control_session.is_folder_sharing_available():
+            raise x2go_exceptions.X2goUserException('Remote user %s is not allowed to share local folders with the server.' % self.session_info.username)
 
         spool_dir = os.path.join(self.session_info.local_container, 'spool')
         if not os.path.exists(spool_dir):
@@ -552,6 +552,9 @@ class X2goTerminalSessionSTDOUT(object):
         Initialize X2go mimebox handling.
 
         """
+        if not self.control_session.is_folder_sharing_available():
+            raise x2go_exceptions.X2goUserException('Remote user %s is not allowed to share local folders with the server.' % self.session_info.username)
+
         mimebox_dir = os.path.join(self.session_info.local_container, 'mimebox')
         if not os.path.exists(mimebox_dir):
             os.mkdir(mimebox_dir)
@@ -605,7 +608,7 @@ class X2goTerminalSessionSTDOUT(object):
 
         """
         if not self.control_session.is_folder_sharing_available():
-            raise x2go_exceptions.X2goUserException('remote user %s is not member of X2go server group fuse' % self.session_info.username)
+            raise x2go_exceptions.X2goUserException('Remote user %s is not allowed to share local folders with the server.' % self.session_info.username)
 
         if local_path is None:
             self.logger('no folder name given...', log.loglevel_WARN)


hooks/post-receive
-- 
python-x2go.git (Python X2Go Client API)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "python-x2go.git" (Python X2Go Client API).




More information about the x2go-commits mailing list