The branch, master has been updated via 4f182b4c734045250681ecea9c3f3ed5397f91be (commit) from a8385b05635aee010fa8d9704b928556ff5d52c9 (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 ----------------------------------------------------------------- commit 4f182b4c734045250681ecea9c3f3ed5397f91be Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Feb 23 23:55:21 2012 +0100 fine-tune new hook methods ----------------------------------------------------------------------- Summary of changes: x2go/backends/control/_stdout.py | 2 +- x2go/backends/terminal/_stdout.py | 14 +++++++------- x2go/session.py | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) The diff of changes is: diff --git a/x2go/backends/control/_stdout.py b/x2go/backends/control/_stdout.py index 0dbe1da..6353f69 100644 --- a/x2go/backends/control/_stdout.py +++ b/x2go/backends/control/_stdout.py @@ -269,7 +269,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): #return username in self._x2go_remote_group('x2gousers') return True - def is_folder_sharing_available(self): + def is_sshfs_available(self): if self.remote_username() in self._x2go_remote_group('fuse'): return True return False diff --git a/x2go/backends/terminal/_stdout.py b/x2go/backends/terminal/_stdout.py index a2a5157..08b8de5 100644 --- a/x2go/backends/terminal/_stdout.py +++ b/x2go/backends/terminal/_stdout.py @@ -451,8 +451,8 @@ class X2goTerminalSessionSTDOUT(object): Initialize Paramiko/SSH reverse forwarding tunnel for X2Go folder sharing. """ - 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) + if not self.control_session.is_sshfs_available(): + raise x2go_exceptions.X2goUserException('Remote user %s is not allowed to share SSHFS resources with the server.' % self.session_info.username) # start reverse SSH tunnel for sshfs (folder sharing, printing) ssh_transport = self.control_session.get_transport() @@ -499,8 +499,8 @@ class X2goTerminalSessionSTDOUT(object): Initialize X2Go print spooling. """ - 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) + if not self.control_session.is_sshfs_available(): + raise x2go_exceptions.X2goUserException('Remote user %s is not allowed to use client-side printing.' % self.session_info.username) spool_dir = os.path.join(self.session_info.local_container, 'spool') if not os.path.exists(spool_dir): @@ -545,8 +545,8 @@ 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) + if not self.control_session.is_sshfs_available(): + raise x2go_exceptions.X2goUserException('Remote user %s is not allowed to use the MIME box.' % self.session_info.username) mimebox_dir = os.path.join(self.session_info.local_container, 'mimebox') if not os.path.exists(mimebox_dir): @@ -601,7 +601,7 @@ class X2goTerminalSessionSTDOUT(object): @rtype: bool """ - if not self.control_session.is_folder_sharing_available(): + if not self.control_session.is_sshfs_available(): 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: diff --git a/x2go/session.py b/x2go/session.py index 8c12410..704de7e 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -358,7 +358,7 @@ class X2goSession(object): """ if self.client_instance: - self.client_instance.HOOK_foldersharing_not_available(profile_name=self.profile_name, session_name=self.session_name) + self.client_instance.HOOK_sshfs_not_available(profile_name=self.profile_name, session_name=self.session_name) else: self.logger('HOOK_sshfs_not_available: the remote X2Go server (%s) denies SSHFS access for session %s. This will result in client-side folder sharing, printing and the MIME box feature being unavailable' % (self.profile_name, self.session_name), loglevel=log.loglevel_WARN) @@ -1208,7 +1208,7 @@ class X2goSession(object): self._SUPPORTED_FOLDERSHARING = False try: - if SUPPORTED_PRINTING and self.printing: + if self._SUPPORTED_PRINTING and self.printing: self.terminal_session and not self.faulty and self.terminal_session.start_printing() self.terminal_session and not self.faulty and self.session_environment.update({'X2GO_SPOOLDIR': self.terminal_session.get_printing_spooldir(), }) except x2go_exceptions.X2goUserException, e: @@ -1226,7 +1226,7 @@ class X2goSession(object): self._SUPPORTED_MIMEBOX = False try: - if self.share_local_folders and self.terminal_session and not self.faulty and self.is_folder_sharing_available(): + if self._SUPPORTED_FOLDERSHARING and self.share_local_folders and self.terminal_session and not self.faulty and self.is_folder_sharing_available(): if _control.get_transport().reverse_tunnels[self.terminal_session.get_session_name()]['sshfs'][1] is not None: for _folder in self.share_local_folders: self.share_local_folder(_folder) 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).