x2go-commits

x2go-commits@lists.x2go.org

1 participants
37903 discussions

python-x2go.git - master (branch) updated: 0.2.0.10-87-g1d46f7b
by git-admin＠x2go.org 22 Nov '12

22 Nov '12

The branch, master has been updated via 1d46f7b6adb1bf292e1e97b9ccb4ceeb46d6e1c7 (commit) from f7bffc7d1e9e8c64a3e01e3c79ec8a94ed7b4970 (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 1d46f7b6adb1bf292e1e97b9ccb4ceeb46d6e1c7 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Nov 22 15:01:42 2012 +0100 fix add_profile in X2goSessionProfilesFILE, thanks to Dick Kniep for noticing this issue ----------------------------------------------------------------------- Summary of changes: x2go/backends/profiles/_file.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/x2go/backends/profiles/_file.py b/x2go/backends/profiles/_file.py index 24c2912..eb21f61 100644 --- a/x2go/backends/profiles/_file.py +++ b/x2go/backends/profiles/_file.py @@ -386,7 +386,10 @@ class X2goSessionProfilesFILE(inifiles.X2goIniFile): @type value: any type, depends on the session profile option """ - profile_id = self.check_profile_id_or_name(section) + try: + profile_id = self.check_profile_id_or_name(section) + except X2goProfileException: + profile_id = section if key == 'name': profile_name = value current_profile_name = self.get_value(profile_id, key) 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).

1 0

x2gobroker.git - master (branch) updated: 57030875e10c269c360ac2b1c1623b9f427d6714
by git-admin＠x2go.org 21 Nov '12

21 Nov '12

The branch, master has been updated via 57030875e10c269c360ac2b1c1623b9f427d6714 (commit) via 00034ba69ecca2523dc6ad1b5b16f9952508683c (commit) via 14f559e001506c6aefb74a8c8c74470ab2dc3963 (commit) via 3acbb6d354fe3421197a568004bb135c7b6612bf (commit) via 241a6ba9de4baaa0fda547636ce29578c24ff5bd (commit) from 1f3029121c54e02b5db037f448dfa79435702b6b (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 57030875e10c269c360ac2b1c1623b9f427d6714 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Nov 21 17:02:54 2012 +0100 start serious work on the zeroconf broker commit 00034ba69ecca2523dc6ad1b5b16f9952508683c Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Nov 21 17:02:38 2012 +0100 Make sure libx2go-broker-perl of the same version gets installed with x2gobroker-common. Add dependencies: libauthen-pam-perl, libauthen-simple-pam-perl. commit 14f559e001506c6aefb74a8c8c74470ab2dc3963 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Nov 13 19:55:22 2012 +0100 fix x2gobroker-common.install commit 3acbb6d354fe3421197a568004bb135c7b6612bf Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Nov 13 19:53:27 2012 +0100 Using our own PAM service ,,x2gobroker''. commit 241a6ba9de4baaa0fda547636ce29578c24ff5bd Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Nov 13 19:51:33 2012 +0100 fix project name ----------------------------------------------------------------------- Summary of changes: X2Go/Broker/ZeroConf.pm | 50 ++++++++++++++++++++++---------------- cgi/x2gobroker.cgi | 14 +++++------ debian/changelog | 6 ++++- debian/control | 3 +++ debian/x2gobroker-common.install | 2 +- debian/x2gobroker.pam | 2 ++ lib/x2gobroker-agent.pl | 6 ++--- 7 files changed, 49 insertions(+), 34 deletions(-) create mode 100644 debian/x2gobroker.pam The diff of changes is: diff --git a/X2Go/Broker/ZeroConf.pm b/X2Go/Broker/ZeroConf.pm index 0655191..da4eb98 100644 --- a/X2Go/Broker/ZeroConf.pm +++ b/X2Go/Broker/ZeroConf.pm @@ -21,7 +21,7 @@ package X2Go::Broker::ZeroConf; use strict; -use Sys:Hostname; +use Sys::Hostname; use Authen::PAM; use Authen::Simple::PAM; use X2Go::Broker::Common; @@ -38,13 +38,16 @@ my $hostname = hostname; ### public functions, available to broker cgi ### +my $username; +my $password; + ### exported function ### sub CheckAccess { # zeroconf broker: use PAM to perform authentication against # the local PAM login module - my ($user,$pass)=@_; - my $pam = Authen::Simple::PAM->new(service => 'login'); + ($username, $password)=@_; + my $pam = Authen::Simple::PAM->new(service => 'x2gobroker'); if ( $pam->authenticate( $username, $password ) ) { # successfull authentication return 0 @@ -63,11 +66,11 @@ sub SetPass my ($username, $oldpassword, $newpassword)=@_; # zeroconf broker: use PAM to initiate a local passwd change - my $service = "passwd"; - ref($pamh = new Authen::PAM($service, $username, \&passwd_conv_func)) || - die "Error code $pamh during PAM init!"; - $state = 0; - $res = $pamh->pam_chauthtok; + my $service = "x2gobroker"; + my $pamh = new Authen::PAM($service, $username, \&passwd_conv_func) || + die "Error code \$pamh during PAM init!"; + my $state = 0; + my $res = $pamh->pam_chauthtok; die $pamh->pam_strerror($res) unless $res == PAM_SUCCESS(); print "\n CHANGING PASS OK \n"; @@ -76,16 +79,16 @@ sub SetPass ### exported function ### sub SelectSession { - my ($user, $sid)=@_; - my @words=split("\@",$sid); + my ($user, $session_id)=@_; + my @words=split("\@",$session_id); ### - ### FIXME: why the heck is the $sid format <host>@<session>, + ### FIXME: why the heck is the $session_id format <host>@<session>, ### <session>@<host> would make much more sense!!! (for ### the human eye...) ### - my $sess_id=@words[1]; + my $session_id=@words[1]; my $host=@words[0]; - check_and_start_session($user, $host, $sess_id); + check_and_start_session($user, $host, $session_id); } ### exported function ### @@ -93,15 +96,15 @@ sub ListSessions { # print Dumper($message->entries); print "START_USER_SESSIONS "; - my($status,$sessions)=CallBrokerAgent($hostname, $user, 'listsessions'); + my($status,$sessions)=CallBrokerAgent($hostname, $username, 'listsessions'); if ( $status ) { if($sessions) { my @sinfo = split("\\|",$sessions); my $session_status = @sinfo[4]; - my $sid = @sinfo[1]; - print " [$hostname\@$sid] "; + my $session_id = @sinfo[1]; + print " [$hostname\@$session_id] "; print "status=$session_status "; } else { print " [$hostname] "; @@ -121,6 +124,10 @@ sub passwd_conv_func { my $code = shift; my $msg = shift; my $ans = ""; + my $state; + + my $oldpassword; + my $newpassword; $ans = $username if ( $code == PAM_PROMPT_ECHO_ON() ); if ( $code == PAM_PROMPT_ECHO_OFF() ) { @@ -137,8 +144,9 @@ sub passwd_conv_func { sub check_and_start_session { - my ($uid, $host, $sid) = @_; - my ($status, $sessions)=ExecRemoteBroker($user, $hostname, 'listsessions'); + my ($username, $hostname, $session_id) = @_; + my $running; + my ($status, $sessions)=ExecRemoteBroker($username, $hostname, 'listsessions'); if ( ! $status ) { print "ERROR: X2Go server not available\n"; @@ -151,12 +159,12 @@ sub check_and_start_session my @sinfo = split("\\|",$sessions); my $session_status = @sinfo[4]; my $session_server = @sinfo[3]; - $sid=@sinfo[1]; + $session_id=@sinfo[1]; if( $session_status eq 'R' ) { $running = 1; my $str; - ($status, $str) = ExecRemoteBroker($uid, $hostname, "suspend $sid"); + ($status, $str) = ExecRemoteBroker($username, $hostname, "suspend $session_id"); $sessions =~ s/\|R\|/\|S\|/; } if( $session_status eq 'S' ) @@ -165,7 +173,7 @@ sub check_and_start_session } } - print "SERVER:$hostname:$port\n"; + print "SERVER:$hostname\n"; if($running) { # use first session in session list... diff --git a/cgi/x2gobroker.cgi b/cgi/x2gobroker.cgi index 06ed66b..3d44d52 100755 --- a/cgi/x2gobroker.cgi +++ b/cgi/x2gobroker.cgi @@ -24,15 +24,13 @@ use strict; use File::Basename qw(basename); my $cgi_name = basename($0); -my $broker_backend ~= s/x2gobroker-(.*)\.cgi/\1/ +my $broker_backend = $cgi_name; +$broker_backend =~ s/x2gobroker-(.*)\.cgi/\1/; -use lib "/usr/lib/x2go/"; -use lib "/usr/lib/x2go/broker/"; - -switch ( $broker_backend ) { - case 'zeroconf' { use X2Go::Broker::ZeroConf qw(CheckAccess SetPass SelectSession ListSessions) } - case 'simple' { use X2Go::Broker::Simple qw(CheckAccess SetPass SelectSession ListSessions) } - case 'ldap' { use X2Go::Broker::LDAP qw(CheckAccess SetPass SelectSession ListSessions) } +SWITCH: { + $broker_backend == "zeroconf" && do { use X2Go::Broker::ZeroConf qw(CheckAccess SetPass SelectSession ListSessions); last SWITCH; }; +# $broker_backend == "simple" && do { use X2Go::Broker::Simple qw(CheckAccess SetPass SelectSession ListSessions); last SWITCH; }; +# $broker_backend == "ldap" && do { use X2Go::Broker::LDAP qw(CheckAccess SetPass SelectSession ListSessions); last SWITCH; }; } use CGI; diff --git a/debian/changelog b/debian/changelog index ce356c8..42e3641 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,13 @@ x2gobroker (0.0.0.1-0~x2go1) UNRELEASED; urgency=low [ Mike Gabriel ] - * Setting up new public X2Go project: x2gohttpbroker. + * Setting up new public X2Go project: x2gobroker. + - Using our own PAM service ,,x2gobroker''. * /debian/control: + Add an initial dependency selection to the various Depends fields. + + Make sure libx2go-broker-perl of the same version gets installed + with x2gobroker-common. + + Add dependencies: libauthen-pam-perl, libauthen-simple-pam-perl. * Fix code indentations (spaces replaced by tabs, use proper indentation levels). diff --git a/debian/control b/debian/control index c58792f..3381442 100644 --- a/debian/control +++ b/debian/control @@ -43,6 +43,7 @@ Package: x2gobroker-common Architecture: all Depends: ${misc:Depends}, + libx2go-broker-perl (>= ${source:Version}), libx2go-broker-perl (<< ${source:Version}.1~), Description: X2Go http(s) based session broker (common files) X2Go is a serverbased computing environment with - session resuming @@ -133,6 +134,8 @@ Depends: apache2 | httpd, perl, x2gobroker-common (>= ${source:Version}), x2gobroker-common (<< ${source:Version}.1~), + libauthen-pam-perl, + libauthen-simple-pam-perl, Description: X2Go http(s) session broker (for demo purposes only) X2Go is a serverbased computing environment with - session resuming diff --git a/debian/x2gobroker-common.install b/debian/x2gobroker-common.install index 59f3588..e9793a9 100644 --- a/debian/x2gobroker-common.install +++ b/debian/x2gobroker-common.install @@ -1 +1 @@ -cgi/x2gobroker.cgi usr/lib/cgi-bin/ \ No newline at end of file +cgi/x2gobroker.cgi usr/lib/cgi-bin/ diff --git a/debian/x2gobroker.pam b/debian/x2gobroker.pam new file mode 100644 index 0000000..1eaad76 --- /dev/null +++ b/debian/x2gobroker.pam @@ -0,0 +1,2 @@ +@include common-auth +@include common-passwd diff --git a/lib/x2gobroker-agent.pl b/lib/x2gobroker-agent.pl index 02b6b04..0d5b559 100755 --- a/lib/x2gobroker-agent.pl +++ b/lib/x2gobroker-agent.pl @@ -95,7 +95,7 @@ if($mode eq 'listsessions') { InitX2GoUser($name, $uid, $gid, $home); print "OK\n"; - system "/bin/su", $name, "-c", "x2golistsessions --all-servers"; + system "/bin/su - ", $name, "-c", "x2golistsessions --all-servers"; } @@ -103,7 +103,7 @@ if($mode eq 'getservers') { InitX2GoUser($name, $uid, $gid, $home); print "OK\n"; - system "/bin/su", $name, "-c", "x2gogetservers"; + system "/bin/su - ", $name, "-c", "x2gogetservers"; } if($mode eq 'key') @@ -118,7 +118,7 @@ if($mode eq 'suspend') InitX2GoUser($name, $uid, $gid, $home); print "OK\n"; my $sid=shift; - system "/bin/su", $name, "-c", "x2gosuspend-session $sid"; + system "/bin/su - ", $name, "-c", "x2gosuspend-session $sid"; } if($mode eq 'ping') hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) 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 "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

python-x2go.git - master (branch) updated: 0.2.0.10-86-gf7bffc7
by git-admin＠x2go.org 21 Nov '12

21 Nov '12

The branch, master has been updated via f7bffc7d1e9e8c64a3e01e3c79ec8a94ed7b4970 (commit) from fc277361b4e764ef8f5a9b9c66fbd61b0c7cad40 (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 f7bffc7d1e9e8c64a3e01e3c79ec8a94ed7b4970 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Nov 21 10:33:29 2012 +0100 more work on the folder mounting code ----------------------------------------------------------------------- Summary of changes: x2go/session.py | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-) The diff of changes is: diff --git a/x2go/session.py b/x2go/session.py index a399514..752a5a7 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -623,7 +623,8 @@ class X2goSession(object): # retrieve an up-to-date list of sharable local folders from the client instance if self.client_instance: - self.share_local_folders = self.client_instance.get_profile_config(self.profile_name, 'export').keys() + _exports = self.client_instance.get_profile_config(self.profile_name, 'export') + self.share_local_folders = [ sf for sf in _exports.keys() if _exports[sf] ] i = 0 while i < max_wait: @@ -2450,25 +2451,32 @@ class X2goSession(object): # compat for Python-X2Go (<=0.1.1.6) if folder_name: local_path=folder_name + local_path = unicode(local_path) + retval = False if self.has_terminal_session(): if self.is_folder_sharing_available() and self.is_master_session(): # for the sake of non-blocking I/O: let's pretend the action has already been successful - if self.shared_folders.has_key(unicode(local_path)): - self.shared_folders[unicode(local_path)]['status'] = 'mounted' + if self.shared_folders.has_key(local_path): + self.shared_folders[local_path]['status'] = 'mounted' else: - self.shared_folders.update({ unicode(local_path): { 'status': 'new', 'mountpoint': '', }, }) + self.shared_folders.update({ local_path: { 'status': 'new', 'mountpoint': '', }, }) if self.terminal_session.share_local_folder(local_path=local_path): if update_exported_folders: self._update_restore_exported_folders() retval = True else: # remove local_path from folder again if the mounting process failed - if self.shared_folders[unicode(local_path)]['status'] == 'new': - del self.shared_folders[unicode(local_path)] + if self.shared_folders[local_path]['status'] == 'new': + del self.shared_folders[local_path] else: - self.shared_folders[unicode(local_path)]['status'] = 'unmounted' + self.shared_folders[local_path]['status'] = 'unmounted' + + # disable this local folder in session profile if restoring shared folders for following sessions is activated + if self.client_instance and self.restore_shared_local_folders: + if local_path in self._restore_exported_folders.keys(): + self._restore_exported_folders[local_path] = False else: raise x2go_exceptions.X2goSessionException('this X2goSession object does not have any associated terminal') @@ -2525,16 +2533,19 @@ class X2goSession(object): """ retval = False + + local_path = unicode(local_path) + if self.has_terminal_session(): if self.is_folder_sharing_available() and self.is_master_session() and local_path in self.shared_folders.keys(): # for the sake of non-blocking I/O: let's pretend the action has already been successful - self.shared_folders[unicode(local_path)]['status'] = 'unmounted' + self.shared_folders[local_path]['status'] = 'unmounted' if self.terminal_session.unshare_local_folder(local_path=local_path): retval = True else: # if unmounting failed restore the status with ,,mounted'', not sure if that works ok... - self.shared_folders[unicode(local_path)]['status'] = 'mounted' + self.shared_folders[local_path]['status'] = 'mounted' else: raise x2go_exceptions.X2goSessionException('this X2goSession object does not have any associated terminal') @@ -2621,14 +2632,15 @@ class X2goSession(object): break unshared_folders = False + for sf in self.shared_folders.keys(): m = self.shared_folders[sf]['mountpoint'] - if m not in _defacto_mounts: + if m and m not in _defacto_mounts: try: - if self.shared_folders[sf]['status'] != 'new': + if self.shared_folders[sf]['status'] == 'mounted': self.shared_folders[sf]['status'] = 'unmounted' + self.logger('Detected server-side unsharing of client-side folder for profile %s: %s:' % (self.get_profile_name(), sf), loglevel=log.loglevel_INFO) unshared_folders = True - self.logger('Detected server-side unsharing of client-side folder for profile %s: %s:' % (self.get_profile_name(), sf), loglevel=log.loglevel_INFO) except IndexError: pass 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).

1 0

python-x2go.git - master (branch) updated: 0.2.0.10-85-gfc27736
by git-admin＠x2go.org 20 Nov '12

20 Nov '12

The branch, master has been updated via fc277361b4e764ef8f5a9b9c66fbd61b0c7cad40 (commit) from 9818ac0840cc6df753e4c354a8461b31f89c6af9 (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 fc277361b4e764ef8f5a9b9c66fbd61b0c7cad40 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Nov 20 22:21:52 2012 +0100 Consolidating management of shared and unshared client-side folders. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 + x2go/session.py | 244 +++++++++++++++++++++++++++++------------------------- 2 files changed, 131 insertions(+), 115 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 50fa388..156035b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -53,6 +53,8 @@ python-x2go (0.2.1.0-0~x2go1) UNRELEASED; urgency=low - Catch exceptions where a user tries to resume a session that has just been removed from the session list on the server (race condition). + - Consolidating management of shared and unshared client-side + folders. * /debian/rules: + Allow package build on systems with missing dh_python2. * /debian/control: diff --git a/x2go/session.py b/x2go/session.py index 5027a64..a399514 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -317,7 +317,7 @@ class X2goSession(object): self.terminal_params = {} self.sshproxy_params = {} self.update_params(params) - self.shared_folders = [] + self.shared_folders = {} self.session_environment = {} self.server_features = [] @@ -371,6 +371,59 @@ class X2goSession(object): if self.client_instance and self.restore_shared_local_folders: self._restore_exported_folders = self.client_instance.get_profile_config(self.profile_name, 'export') + def __str__(self): + return self.__get_uuid() + + def __repr__(self): + result = 'X2goSession(' + for p in dir(self): + if '__' in p or not p in self.__dict__ or type(p) is types.InstanceType: continue + result += p + '=' + str(self.__dict__[p]) + ',' + result = result.strip(',') + return result + ')' + + def __call__(self): + return self.__get_uuid() + + def __del__(self): + """\ + Class destructor. + + """ + if self.has_control_session() and self.has_terminal_session(): + self.get_control_session().dissociate(self.get_terminal_session()) + + if self.has_control_session(): + if self.keep_controlsession_alive: + # regenerate this session instance for re-usage if this is the last session for a certain session profile + # and keep_controlsession_alive is set to True... + self.virgin = True + self.activated = False + self.connected = self.is_connected() + self.running = None + self.suspended = None + self.terminated = None + self._current_status = { + 'timestamp': time.time(), + 'server': self.server, + 'virgin': self.virgin, + 'connected': self.connected, + 'running': self.running, + 'suspended': self.suspended, + 'terminated': self.terminated, + 'faulty': self.faulty, + } + self._last_status = None + self.session_name = None + + else: + self.get_control_session().__del__() + self.control_session = None + + if self.has_terminal_session(): + self.get_terminal_session().__del__() + self.terminal_session = None + def get_client_instance(self): """\ Return parent L{X2goClient} instance if avaiable. @@ -649,59 +702,6 @@ class X2goSession(object): raise x2go_exceptions.X2goProfileException('Unknown session profile option: %s.' % option) __get_session_profile_option = get_session_profile_option - def __str__(self): - return self.__get_uuid() - - def __repr__(self): - result = 'X2goSession(' - for p in dir(self): - if '__' in p or not p in self.__dict__ or type(p) is types.InstanceType: continue - result += p + '=' + str(self.__dict__[p]) + ',' - result = result.strip(',') - return result + ')' - - def __call__(self): - return self.__get_uuid() - - def __del__(self): - """\ - Class destructor. - - """ - if self.has_control_session() and self.has_terminal_session(): - self.get_control_session().dissociate(self.get_terminal_session()) - - if self.has_control_session(): - if self.keep_controlsession_alive: - # regenerate this session instance for re-usage if this is the last session for a certain session profile - # and keep_controlsession_alive is set to True... - self.virgin = True - self.activated = False - self.connected = self.is_connected() - self.running = None - self.suspended = None - self.terminated = None - self._current_status = { - 'timestamp': time.time(), - 'server': self.server, - 'virgin': self.virgin, - 'connected': self.connected, - 'running': self.running, - 'suspended': self.suspended, - 'terminated': self.terminated, - 'faulty': self.faulty, - } - self._last_status = None - self.session_name = None - - else: - self.get_control_session().__del__() - self.control_session = None - - if self.has_terminal_session(): - self.get_terminal_session().__del__() - self.terminal_session = None - def update_params(self, params): """\ This method can be used to modify L{X2goSession} parameters after the @@ -2420,12 +2420,12 @@ class X2goSession(object): # remember exported folders for restoring them on session suspension/termination if self.client_instance and self.restore_shared_local_folders: - _exported_folders = self.client_instance.get_profile_config(self.profile_name, 'export') - for folder in self.shared_folders: + _exported_folders = copy.deepcopy(self._restore_exported_folders) + for folder in [ sf for sf in self.shared_folders.keys() if self.shared_folders[sf]['status'] in ('new', 'mounted') ]: _exported_folders.update({ unicode(folder): True }) for folder in _exported_folders.keys(): - if (folder not in self.shared_folders) and _exported_folders[folder]: - del _exported_folders[folder] + if folder in [ sf for sf in self.shared_folders.keys() if self.shared_folders[sf]['status'] == 'unmounted' ]: + del _exported_folders[unicode(folder)] self._restore_exported_folders = _exported_folders def share_local_folder(self, local_path=None, folder_name=None, update_exported_folders=True): @@ -2450,16 +2450,30 @@ class X2goSession(object): # compat for Python-X2Go (<=0.1.1.6) if folder_name: local_path=folder_name + retval = False if self.has_terminal_session(): if self.is_folder_sharing_available() and self.is_master_session(): + + # for the sake of non-blocking I/O: let's pretend the action has already been successful + if self.shared_folders.has_key(unicode(local_path)): + self.shared_folders[unicode(local_path)]['status'] = 'mounted' + else: + self.shared_folders.update({ unicode(local_path): { 'status': 'new', 'mountpoint': '', }, }) if self.terminal_session.share_local_folder(local_path=local_path): - self.shared_folders.append(local_path) if update_exported_folders: self._update_restore_exported_folders() - return True - return False + retval = True + else: + # remove local_path from folder again if the mounting process failed + if self.shared_folders[unicode(local_path)]['status'] == 'new': + del self.shared_folders[unicode(local_path)] + else: + self.shared_folders[unicode(local_path)]['status'] = 'unmounted' + else: raise x2go_exceptions.X2goSessionException('this X2goSession object does not have any associated terminal') + return retval + __share_local_folder = share_local_folder def share_all_local_folders(self, update_exported_folders=True): @@ -2487,19 +2501,19 @@ class X2goSession(object): self.logger('%s' % str(e), loglevel=log.loglevel_WARN) if update_exported_folders: self._update_restore_exported_folders() - else: self.HOOK_foldersharing_not_available() return retval __share_all_local_folders = share_all_local_folders - def unshare_all_local_folders(self, force_all=False, update_exported_folders=True): + def unshare_local_folder(self, local_path=None, update_exported_folders=True): """\ - Unshare all local folders mounted within this X2Go session. + Unshare a local folder that is mounted within this X2Go session. - @param force_all: Really unmount _all_ shared folders, including the print spool folder and - the MIME box spool dir (not recommended). - @type force_all: C{bool} + @param local_path: the full path to an existing folder on the local + file system that is mounted in this X2Go session and shall be + unmounted + @type local_path: C{str} @param update_exported_folders: do an update of the session profile option ,,export'' after the operation @type update_exported_folders: C{bool} @@ -2510,36 +2524,31 @@ class X2goSession(object): @raise X2goSessionException: if this L{X2goSession} does not have an associated terminal session """ + retval = False if self.has_terminal_session(): - if self.is_folder_sharing_available() and self.is_master_session(): - if force_all: - retval = self.terminal_session.unshare_all_local_folders() - if retval: - self.shared_folders = [] - return retval - else: + if self.is_folder_sharing_available() and self.is_master_session() and local_path in self.shared_folders.keys(): + + # for the sake of non-blocking I/O: let's pretend the action has already been successful + self.shared_folders[unicode(local_path)]['status'] = 'unmounted' + if self.terminal_session.unshare_local_folder(local_path=local_path): retval = True - for _shared_folder in self.shared_folders: - if self.terminal_session.unshare_local_folder(_shared_folder): - self.shared_folders.remove(_shared_folder) - else: - retval = False - if update_exported_folders: - self._update_restore_exported_folders() - return retval + else: + # if unmounting failed restore the status with ,,mounted'', not sure if that works ok... + self.shared_folders[unicode(local_path)]['status'] = 'mounted' + else: raise x2go_exceptions.X2goSessionException('this X2goSession object does not have any associated terminal') - return False - __unshare_all_local_folders = unshare_all_local_folders - def unshare_local_folder(self, local_path=None, update_exported_folders=True): + return retval + __unshare_local_folder = unshare_local_folder + + def unshare_all_local_folders(self, force_all=False, update_exported_folders=True): """\ - Unshare a local folder that is mounted within this X2Go session. + Unshare all local folders mounted within this X2Go session. - @param local_path: the full path to an existing folder on the local - file system that is mounted in this X2Go session and shall be - unmounted - @type local_path: C{str} + @param force_all: Really unmount _all_ shared folders, including the print spool folder and + the MIME box spool dir (not recommended). + @type force_all: C{bool} @param update_exported_folders: do an update of the session profile option ,,export'' after the operation @type update_exported_folders: C{bool} @@ -2550,19 +2559,25 @@ class X2goSession(object): @raise X2goSessionException: if this L{X2goSession} does not have an associated terminal session """ - retval = False if self.has_terminal_session(): - if self.is_folder_sharing_available() and self.is_master_session() and local_path in self.shared_folders: - if self.terminal_session.unshare_local_folder(local_path=local_path): - self.shared_folders.remove(local_path) + if self.is_folder_sharing_available() and self.is_master_session(): + if force_all: + retval = self.terminal_session.unshare_all_local_folders() + if retval: + self.shared_folders = {} + return retval + else: retval = True - if retval and update_exported_folders: - self._update_restore_exported_folders() + _shared_folders = copy.deepcopy(self.shared_folders) + for _folder in _shared_folders.keys(): + retval = self.unshare_local_folder(_folder, update_exported_folders=False) and retval + if update_exported_folders: + self._update_restore_exported_folders() + return retval else: raise x2go_exceptions.X2goSessionException('this X2goSession object does not have any associated terminal') - - return retval - __unshare_local_folder = unshare_local_folder + return False + __unshare_all_local_folders = unshare_all_local_folders def get_shared_folders(self, check_list_mounts=False, mounts=None): """\ @@ -2585,11 +2600,9 @@ class X2goSession(object): mounts = self.list_mounts() _defacto_mounts = [ unicode(m.split('|')[1].split('/')[-1]) for m in mounts ] - _expected_mounts = {} - for shared_folder in self.shared_folders: + for shared_folder in self.shared_folders.keys(): if _X2GOCLIENT_OS == 'Windows': - _driveletter, _path = os.path.splitdrive(shared_folder) _mount_point = '_windrive_%s%s' % (_driveletter[0], _path.replace('\\', '_')) _mount_point = _mount_point.replace(' ', '_') @@ -2598,30 +2611,31 @@ class X2goSession(object): _mount_point = shared_folder.replace('/', '_') _mount_point = _mount_point.replace(' ', '_') - _expected_mounts[unicode(_mount_point)] = shared_folder + self.shared_folders[shared_folder]['status'] = 'mounted' + self.shared_folders[shared_folder]['mountpoint'] = unicode(_mount_point) - ### such a feature as below would be nice but the mapping between a mountpoint and the related - ### local folder path is not bijective - # - # add any new found mount reported by the server - #for m in _defacto_mounts: - # if m not in _expected_mounts.keys(): - # self.shared_folders.append(_expected_mounts[m]) + for m in _defacto_mounts: + for sf in self.shared_folders.keys(): + if self.shared_folders[sf]['mountpoint'] == m: + self.shared_folders[sf]['status'] = 'mounted' + break unshared_folders = False - for m in _expected_mounts.keys(): + for sf in self.shared_folders.keys(): + m = self.shared_folders[sf]['mountpoint'] if m not in _defacto_mounts: try: - self.shared_folders.remove(_expected_mounts[m]) - unshared_folders = True - self.logger('Detected server-side unsharing of client-side folder for profile %s: %s:' % (self.get_profile_name(), _expected_mounts[m]), loglevel=log.loglevel_INFO) + if self.shared_folders[sf]['status'] != 'new': + self.shared_folders[sf]['status'] = 'unmounted' + unshared_folders = True + self.logger('Detected server-side unsharing of client-side folder for profile %s: %s:' % (self.get_profile_name(), sf), loglevel=log.loglevel_INFO) except IndexError: pass if unshared_folders: self._update_restore_exported_folders() - return [ unicode(s) for s in self.shared_folders ] + return [ unicode(sf) for sf in self.shared_folders if self.shared_folders[sf]['status'] in ('new', 'mounted') ] __get_shared_folders = get_shared_folders def is_locked(self): 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).

1 0

python-paramiko.git - x2go (branch) updated: e105d1bf6a99e9d36039708e10973d0bc42267d1
by git-admin＠x2go.org 20 Nov '12

20 Nov '12

The branch, x2go has been updated via e105d1bf6a99e9d36039708e10973d0bc42267d1 (commit) from e4601f783903ca327ab0bb1775149daedc1b7fe3 (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 e105d1bf6a99e9d36039708e10973d0bc42267d1 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Nov 20 16:36:50 2012 +0100 reduce Dependency of pycrypto for Ubuntu 10.04 ----------------------------------------------------------------------- Summary of changes: debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/debian/control b/debian/control index 854ed4d..45a05fa 100644 --- a/debian/control +++ b/debian/control @@ -20,7 +20,7 @@ Package: python-paramiko Architecture: all Depends: ${misc:Depends}, ${python:Depends}, - python-crypto (>= 2.1.0-2) + python-crypto (>= 2.0.1-0~) Provides: ${python:Provides} Description: Make ssh v2 connections with Python This is a library for making SSH2 connections (client or server). hooks/post-receive -- python-paramiko.git (Debian package python-paramiko) 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-paramiko.git" (Debian package python-paramiko).

1 0

python-x2go.git - master (branch) updated: 0.2.0.10-84-g9818ac0
by git-admin＠x2go.org 20 Nov '12

20 Nov '12

The branch, master has been updated via 9818ac0840cc6df753e4c354a8461b31f89c6af9 (commit) from 2e69094ec995acd4f217f0af6e9f2b24e673f555 (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 9818ac0840cc6df753e4c354a8461b31f89c6af9 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Nov 20 15:42:41 2012 +0100 Catch exceptions where a user tries to resume a session that has just been removed from the session list on the server (race condition). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 +++ x2go/backends/control/_stdout.py | 15 +++++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 871adcb..50fa388 100644 --- a/debian/changelog +++ b/debian/changelog @@ -50,6 +50,9 @@ python-x2go (0.2.1.0-0~x2go1) UNRELEASED; urgency=low - Add option to disable auto-registration of pubapp sessions. - Implement functionality for restoring mounted shares on session resumption / re-start. Sponsored by Dick Kniep, LinDix NL. + - Catch exceptions where a user tries to resume a session that has + just been removed from the session list on the server (race + condition). * /debian/rules: + Allow package build on systems with missing dh_python2. * /debian/control: diff --git a/x2go/backends/control/_stdout.py b/x2go/backends/control/_stdout.py index 85a347e..cb309ad 100644 --- a/x2go/backends/control/_stdout.py +++ b/x2go/backends/control/_stdout.py @@ -1221,13 +1221,16 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): if not self.is_x2gouser(self.get_transport().get_username()): raise x2go_exceptions.X2goUserException('remote user %s is not allowed to run X2Go commands' % self.get_transport().get_username()) - if session_name is not None: - if session_list: - session_info = session_list[session_name] + try: + if session_name is not None: + if session_list: + session_info = session_list[session_name] + else: + session_info = self.list_sessions()[session_name] else: - session_info = self.list_sessions()[session_name] - else: - session_info = None + session_info = None + except KeyError: + _success = False _terminal = self._terminal_backend(self, profile_name=self.profile_name, 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).

1 0

x2goserver.git - master (branch) updated: 3.1.1.3-91-g7901b02
by git-admin＠x2go.org 20 Nov '12

20 Nov '12

The branch, master has been updated via 7901b02cf5fb9e41283398844be19911c90671ec (commit) from d70e0e79e5dbea3d9c6818daaa0f45d83eba1ad2 (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 7901b02cf5fb9e41283398844be19911c90671ec Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Nov 20 15:05:45 2012 +0100 Fix failures of x2gogetagent that was related to faulty regexp in SQLite3 DB wrapper script. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ .../lib/libx2go-server-db-sqlite3-wrapper.pl | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 4733ea6..f99c57e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,8 @@ x2goserver (3.2.0.0-0~x2go1) UNRELEASED; urgency=low - Fix new SQLite3 wrapper for db_getmounts Perl call. - Fix list output in new SQLite3 wrapper. - Make session type label XFCE a valid session that starts xfce4-session. + - Fix failures of x2gogetagent that was related to faulty regexp in + SQLite3 DB wrapper script. * /debian/control: + Package X2Go::Log in separate package: libx2go-log-perl. + Package X2Go::Server::DB in separate package: libx2go-server-db-perl. diff --git a/libx2go-server-db-perl/lib/libx2go-server-db-sqlite3-wrapper.pl b/libx2go-server-db-perl/lib/libx2go-server-db-sqlite3-wrapper.pl index 980acb9..751aa69 100755 --- a/libx2go-server-db-perl/lib/libx2go-server-db-sqlite3-wrapper.pl +++ b/libx2go-server-db-perl/lib/libx2go-server-db-sqlite3-wrapper.pl @@ -30,7 +30,7 @@ use X2Go::Server::DB::SQLite3; sub print_result { my $retval = shift; - if ( $retval =~ /^(0|1)/ ) + if ( $retval =~ /^(0|1)$/ ) { if ( $retval ) { hooks/post-receive -- x2goserver.git (X2Go Server) 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 "x2goserver.git" (X2Go Server).

1 0

libev.git - master (branch) updated: aa81c3fb0bcbbc189a40c2fc812a6193dcd15ac9
by git-admin＠x2go.org 20 Nov '12

20 Nov '12

The branch, master has been updated via aa81c3fb0bcbbc189a40c2fc812a6193dcd15ac9 (commit) from e9efc149009ff5974e6a3ef8b423e4a6a0d1339e (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 aa81c3fb0bcbbc189a40c2fc812a6193dcd15ac9 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Nov 20 13:54:27 2012 +0100 backport to squeeze ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index a4de692..d482ae2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ -libev (1:4.11-1~bpo60) squeeze-backports; urgency=low +libev (1:4.11-0) lucid; urgency=low - * Backport to squeeze. + * Backport to lucid. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sat, 20 Oct 2012 08:17:51 +0200 hooks/post-receive -- libev.git (providing Launchpad import (for Ubuntu 10.04 backport), related to X2go project) 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 "libev.git" (providing Launchpad import (for Ubuntu 10.04 backport), related to X2go project).

1 0

pyhoca-gui.git - master (branch) updated: 0.2.0.4-103-g8df7c7a
by git-admin＠x2go.org 20 Nov '12

20 Nov '12

The branch, master has been updated via 8df7c7aae88494c4017543320352f55c5297e2e8 (commit) from 3390847c9d1458585dffb454e979441b5866285e (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 8df7c7aae88494c4017543320352f55c5297e2e8 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Nov 20 13:26:42 2012 +0100 Hide the file sharing submenu if the master session's submenu is currently disabled due to some current action and an expected session status change. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ pyhoca/wxgui/menus_taskbar.py | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index a01cba1..1acf521 100644 --- a/debian/changelog +++ b/debian/changelog @@ -47,6 +47,8 @@ pyhoca-gui (0.2.1.0-0~x2go1) UNRELEASED; urgency=low _init_pubapp_sessions() method. - Implement functionality for restoring mounted shares on session resumption / re-start. Sponsored by Dick Kniep, LinDix NL. + - Hide the file sharing submenu if the master session's submenu is currently + disabled due to some current action and an expected session status change. * /debian/control: + Maintainer change in package: X2Go Developers <x2go-dev(a)lists.berlios.de>. diff --git a/pyhoca/wxgui/menus_taskbar.py b/pyhoca/wxgui/menus_taskbar.py index f7dc1f8..97b56cd 100644 --- a/pyhoca/wxgui/menus_taskbar.py +++ b/pyhoca/wxgui/menus_taskbar.py @@ -745,7 +745,10 @@ class PyHocaGUI_Menu_TaskbarSessionProfile(wx.Menu): self._PyHocaGUI._eventid_profilenames_map[ID_SHARELOCALFOLDER] = \ self._PyHocaGUI._eventid_profilenames_map[ID_UNSHAREFOLDERS] = profile_name - if current_profile_config['useexports'] and self._PyHocaGUI._X2goClient__profile_is_folder_sharing_available(profile_name=profile_name): + if current_profile_config['useexports'] and \ + self._PyHocaGUI._X2goClient__profile_is_folder_sharing_available(profile_name=profile_name) and \ + self._PyHocaGUI.get_master_session(profile_name) is not None and \ + self._PyHocaGUI.is_session_name_enabled(profile_name, self._PyHocaGUI.get_master_session(profile_name).get_session_name()): if self._PyHocaGUI.restricted_trayicon: self.AppendSeparator() hooks/post-receive -- pyhoca-gui.git (Python X2Go Client (wxPython GUI)) 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 "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).

1 0

python-x2go.git - master (branch) updated: 0.2.0.10-83-g2e69094
by git-admin＠x2go.org 20 Nov '12

20 Nov '12

The branch, master has been updated via 2e69094ec995acd4f217f0af6e9f2b24e673f555 (commit) from 8d835dcdec07d7f620a25cbcd4aafd88a1a044c7 (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 2e69094ec995acd4f217f0af6e9f2b24e673f555 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Nov 20 13:25:03 2012 +0100 improve share local folders code ----------------------------------------------------------------------- Summary of changes: x2go/session.py | 123 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 62 insertions(+), 61 deletions(-) The diff of changes is: diff --git a/x2go/session.py b/x2go/session.py index 31d7aea..5027a64 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -568,6 +568,10 @@ class X2goSession(object): self.logger('Using session %s as master session for profile %s.' % (self.get_session_name(), self.get_profile_name()), loglevel=log.loglevel_NOTICE) self.master_session = True + # retrieve an up-to-date list of sharable local folders from the client instance + if self.client_instance: + self.share_local_folders = self.client_instance.get_profile_config(self.profile_name, 'export').keys() + i = 0 while i < max_wait: i += 1 @@ -2116,10 +2120,6 @@ class X2goSession(object): @raise X2goSessionException: if the session could not be suspended """ - _store_shared_folders = {} - for folder in self.shared_folders: - _store_shared_folders.update({ folder: True }) - self._lock.acquire() try: _retval = self._suspend() @@ -2452,14 +2452,11 @@ class X2goSession(object): if self.has_terminal_session(): if self.is_folder_sharing_available() and self.is_master_session(): - # append local_path to list of shared folders before mounting - self.shared_folders.append(local_path) if self.terminal_session.share_local_folder(local_path=local_path): + self.shared_folders.append(local_path) if update_exported_folders: self._update_restore_exported_folders() return True - # if we failed remove the local_path element again... - self.shared_folders.remove(local_path) return False else: raise x2go_exceptions.X2goSessionException('this X2goSession object does not have any associated terminal') @@ -2477,23 +2474,23 @@ class X2goSession(object): @rtype: C{bool} """ - _retval = False + retval = False if self.is_running() and not self.faulty and self._SUPPORTED_FOLDERSHARING and self.share_local_folders and self.allow_share_local_folders and self.has_terminal_session(): if self.is_master_session(): if self.is_folder_sharing_available(): - if self.control_session.get_transport().reverse_tunnels[self.terminal_session.get_session_name()]['sshfs'][1] is not None: - _retval = True - for _folder in self.share_local_folders: - try: - _retval = self.share_local_folder(_folder, update_exported_folders=False) and _retval - except x2go_exceptions.X2goUserException, e: - self.logger('%s' % str(e), loglevel=log.loglevel_WARN) - if update_exported_folders: - self._update_restore_exported_folders() + retval = True + for _folder in self.share_local_folders: + try: + retval = self.share_local_folder(_folder, update_exported_folders=False) and retval + except x2go_exceptions.X2goUserException, e: + retval = False + self.logger('%s' % str(e), loglevel=log.loglevel_WARN) + if update_exported_folders: + self._update_restore_exported_folders() else: self.HOOK_foldersharing_not_available() - return _retval + return retval __share_all_local_folders = share_all_local_folders def unshare_all_local_folders(self, force_all=False, update_exported_folders=True): @@ -2516,15 +2513,17 @@ class X2goSession(object): if self.has_terminal_session(): if self.is_folder_sharing_available() and self.is_master_session(): if force_all: - self.shared_folders = [] retval = self.terminal_session.unshare_all_local_folders() + if retval: + self.shared_folders = [] return retval else: - _shared_folders = copy.deepcopy(self.shared_folders) - self.shared_folders = [] - retval = 0 - for _shared_folder in _shared_folders: - retval = retval | self.terminal_session.unshare_local_folder(_shared_folder) + retval = True + for _shared_folder in self.shared_folders: + if self.terminal_session.unshare_local_folder(_shared_folder): + self.shared_folders.remove(_shared_folder) + else: + retval = False if update_exported_folders: self._update_restore_exported_folders() return retval @@ -2551,20 +2550,18 @@ class X2goSession(object): @raise X2goSessionException: if this L{X2goSession} does not have an associated terminal session """ + retval = False if self.has_terminal_session(): if self.is_folder_sharing_available() and self.is_master_session() and local_path in self.shared_folders: - # update shared_folders before(!) unmounting... - self.shared_folders.remove(local_path) - _retval = self.terminal_session.unshare_local_folder(local_path=local_path) - # unmounting failed? Re-add local_patch to shared_folders for now... - if not _retval: - self.shared_folders.append(local_path) - if _retval and update_exported_folders: + if self.terminal_session.unshare_local_folder(local_path=local_path): + self.shared_folders.remove(local_path) + retval = True + if retval and update_exported_folders: self._update_restore_exported_folders() else: raise x2go_exceptions.X2goSessionException('this X2goSession object does not have any associated terminal') - return _retval + return retval __unshare_local_folder = unshare_local_folder def get_shared_folders(self, check_list_mounts=False, mounts=None): @@ -2586,39 +2583,43 @@ class X2goSession(object): unshared_folders = [] if mounts is None: mounts = self.list_mounts() + _defacto_mounts = [ unicode(m.split('|')[1].split('/')[-1]) for m in mounts ] + _expected_mounts = {} for shared_folder in self.shared_folders: - _found = False - - for mount in mounts: - if _found: continue - mount = mount.split('|')[1] - if _X2GOCLIENT_OS == 'Windows': - - _driveletter, _path = os.path.splitdrive(shared_folder) - _mount_point = '_windrive_%s%s' % (_driveletter[0], _path.replace('\\', '_')) - _mount_point = _mount_point.replace(' ', '_') - - if mount.lower().endswith(_mount_point.lower()): - _found = True - - else: - _mount_point = shared_folder.replace('/', '_') - _mount_point = _mount_point.replace(' ', '_') - if mount.endswith(_mount_point): - _found = True + if _X2GOCLIENT_OS == 'Windows': - if not _found: - unshared_folders.append(shared_folder) + _driveletter, _path = os.path.splitdrive(shared_folder) + _mount_point = '_windrive_%s%s' % (_driveletter[0], _path.replace('\\', '_')) + _mount_point = _mount_point.replace(' ', '_') - for unshared_folder in unshared_folders: - try: - self.shared_folders.remove(unshared_folder) - self._update_restore_exported_folders() - self.logger('Detected server-side unsharing of client-side folder for profile %s: %s:' % (self.get_profile_name(), shared_folder), loglevel=log.loglevel_INFO) - except IndexError: - pass + else: + _mount_point = shared_folder.replace('/', '_') + _mount_point = _mount_point.replace(' ', '_') + + _expected_mounts[unicode(_mount_point)] = shared_folder + + ### such a feature as below would be nice but the mapping between a mountpoint and the related + ### local folder path is not bijective + # + # add any new found mount reported by the server + #for m in _defacto_mounts: + # if m not in _expected_mounts.keys(): + # self.shared_folders.append(_expected_mounts[m]) + + unshared_folders = False + for m in _expected_mounts.keys(): + if m not in _defacto_mounts: + try: + self.shared_folders.remove(_expected_mounts[m]) + unshared_folders = True + self.logger('Detected server-side unsharing of client-side folder for profile %s: %s:' % (self.get_profile_name(), _expected_mounts[m]), loglevel=log.loglevel_INFO) + except IndexError: + pass + + if unshared_folders: + self._update_restore_exported_folders() return [ unicode(s) for s in self.shared_folders ] __get_shared_folders = get_shared_folders 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).

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits