The branch, master has been updated
via 7ee07a96063a3266bd79ce109924a88c8eaa4ab5 (commit)
from 561847d996f48a482bb85d98b28f1f282bf56edc (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 7ee07a96063a3266bd79ce109924a88c8eaa4ab5
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de…
[View More]>
Date: Thu Jun 27 21:38:30 2013 +0200
TCE creation: install the TCE from the nightly builds while this project is not yet released. (Fixes: #251).
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 2 ++
.../etc/x2gothinclient_settings | 3 ++-
2 files changed, 4 insertions(+), 1 deletion(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 2494e04..6cc8c51 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -68,6 +68,8 @@ x2gothinclient (1.0.99.1-0~x2go1) UNRELEASED; urgency=low
- Fix shutdown button failures.
- TCE management: Do an apt-get clean after TCE creation/upgrade.
- TCE creation: fix installation path of FreeRDP's known_hosts file.
+ - TCE creation: install the TCE from the nightly builds while this
+ project is not yet released. (Fixes: #251).
* /debian/control:
+ Maintainer change in package: X2Go Developers <x2go-dev(a)lists.berlios.de>.
+ Priority: optional.
diff --git a/x2gothinclientmanagement/etc/x2gothinclient_settings b/x2gothinclientmanagement/etc/x2gothinclient_settings
index b443f0c..b071ce9 100644
--- a/x2gothinclientmanagement/etc/x2gothinclient_settings
+++ b/x2gothinclientmanagement/etc/x2gothinclient_settings
@@ -42,7 +42,8 @@ TC_DEBMIRROR_URL="http://ftp.debian.org/debian"
TC_DISTRO_CODENAME="squeeze"
# Retrieve X2Go packages from this URL
-TC_X2GO_DEBURL="deb http://packages.x2go.org/debian $TC_DISTRO_CODENAME main"
+### FIXME: once we release this project, we have to remove the heuler area from the deburl below!!!! ###
+TC_X2GO_DEBURL="deb http://packages.x2go.org/debian $TC_DISTRO_CODENAME main heuler"
# Use a http/ftp proxy during debootstrap (leave empty if direct connections to http/ftp are allowed)
#TC_HTTP_PROXY="http://webcache.intern:3128"
hooks/post-receive
--
x2gothinclient.git (X2Go Thin Client Environment)
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 "x2gothinclient.git" (X2Go Thin Client Environment).
[View Less]
The branch, master has been updated
via c6124a24321183f804faa14574e436aa0fc7aca0 (commit)
from a3e48a692cb9a727f8913df02b8e99f0e5f41c39 (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 c6124a24321183f804faa14574e436aa0fc7aca0
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de…
[View More]>
Date: Wed Jun 26 00:15:46 2013 +0200
Update host key mismatch message.
-----------------------------------------------------------------------
Summary of changes:
pyhoca/wxgui/frontend.py | 5 ++---
pyhoca/wxgui/logon.py | 5 ++---
2 files changed, 4 insertions(+), 6 deletions(-)
The diff of changes is:
diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py
index dbcdcfb..dd2bff6 100644
--- a/pyhoca/wxgui/frontend.py
+++ b/pyhoca/wxgui/frontend.py
@@ -640,11 +640,10 @@ class PyHocaGUI(wx.App, x2go.X2GoClient):
self._logon_windows[profile_name] = _logon_window
except x2go.SSHException, e:
if str(e).startswith('Host key for server ') and str(e).endswith(' does not match!'):
- host = str(e).replace('Host key for server ','').replace(' does not match!', '')
- errmsg = _('Host key for X2Go server %s does not match') % host
+ errmsg = _('Host key verification failed. The X2Go server may have been compromised.\n\nIt is also possible that the host key has just been changed.\n\nHowever, for security reasons the connection will not be established!!!')
else:
errmsg = str(e)
- self.notifier.send(_(u'%s - SSH error') % profile_name, u'%s!' % errmsg, icon='auth_error', timeout=4000)
+ self.notifier.send(_(u'%s - SSH error') % profile_name, u'%s!' % errmsg, icon='auth_error', timeout=10000)
try:
self._temp_disabled_profile_names.remove(profile_name)
except ValueError:
diff --git a/pyhoca/wxgui/logon.py b/pyhoca/wxgui/logon.py
index 21d8617..f50bc97 100644
--- a/pyhoca/wxgui/logon.py
+++ b/pyhoca/wxgui/logon.py
@@ -413,8 +413,7 @@ class PyHocaGUI_DialogBoxPassword(wx.Dialog):
except x2go.SSHException, e:
if str(e).startswith('Host key for server ') and str(e).endswith(' does not match!'):
- host = str(e).replace('Host key for server ','').replace(' does not match!', '')
- errmsg = _('Host key for X2Go server %s does not match') % host
+ errmsg = _('Host key verification failed. The X2Go server may have been compromised.\n\nIt is also possible that the host key has just been changed.\n\nHowever, for security reasons the connection will not be established!!!')
else:
errmsg = str(e)
@@ -422,7 +421,7 @@ class PyHocaGUI_DialogBoxPassword(wx.Dialog):
title=_(u'%s - SSH error') % self.current_profile_name,
text='%s' % errmsg,
icon='auth_error',
- timeout=4000)
+ timeout=10000)
connect_failed = True
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)).
[View Less]
The branch, master has been updated
via e089adced12ab9596a8c0b6f58ed8ce6f2bd2d3a (commit)
from e10c24cf8733bec511fb7be8182bd0bb21394826 (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 e089adced12ab9596a8c0b6f58ed8ce6f2bd2d3a
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de…
[View More]>
Date: Tue Jun 25 22:49:47 2013 +0200
Catch SSH Exception for mismatching host keys and make it translatable. (Fixes: #166).
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 2 ++
pyhoca/wxgui/frontend.py | 7 ++++++-
pyhoca/wxgui/logon.py | 11 ++++++++++-
3 files changed, 18 insertions(+), 2 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 50ca626..4f1b0b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ pyhoca-gui (0.4.0.3-0~x2go1) UNRELEASED; urgency=low
- On selecting »Unshare All Local Folders« purge all shares from the
»export« session profile parameter if »restoreexports« is set to true
in the session profile.
+ - Catch SSH Exception for mismatching host keys and make it translatable.
+ (Fixes: #166).
-- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sun, 21 Apr 2013 23:09:12 +0200
diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py
index f845672..dbcdcfb 100644
--- a/pyhoca/wxgui/frontend.py
+++ b/pyhoca/wxgui/frontend.py
@@ -639,7 +639,12 @@ class PyHocaGUI(wx.App, x2go.X2GoClient):
_logon_window = logon.PyHocaGUI_DialogBoxPassword(self, profile_name, caller=self, sshproxy_auth=True, )
self._logon_windows[profile_name] = _logon_window
except x2go.SSHException, e:
- self.notifier.send(_(u'%s - SSH error') % profile_name, u'%s!' % str(e), icon='auth_error', timeout=4000)
+ if str(e).startswith('Host key for server ') and str(e).endswith(' does not match!'):
+ host = str(e).replace('Host key for server ','').replace(' does not match!', '')
+ errmsg = _('Host key for X2Go server %s does not match') % host
+ else:
+ errmsg = str(e)
+ self.notifier.send(_(u'%s - SSH error') % profile_name, u'%s!' % errmsg, icon='auth_error', timeout=4000)
try:
self._temp_disabled_profile_names.remove(profile_name)
except ValueError:
diff --git a/pyhoca/wxgui/logon.py b/pyhoca/wxgui/logon.py
index 9a99ac0..21d8617 100644
--- a/pyhoca/wxgui/logon.py
+++ b/pyhoca/wxgui/logon.py
@@ -411,11 +411,20 @@ class PyHocaGUI_DialogBoxPassword(wx.Dialog):
connect_failed = True
except x2go.SSHException, e:
+
+ if str(e).startswith('Host key for server ') and str(e).endswith(' does not match!'):
+ host = str(e).replace('Host key for server ','').replace(' does not match!', '')
+ errmsg = _('Host key for X2Go server %s does not match') % host
+ else:
+ errmsg = str(e)
+
self._PyHocaGUI.notifier.prepare('AUTH_%s' % self.current_profile_name,
title=_(u'%s - SSH error') % self.current_profile_name,
- text='%s!' % str(e),
+ text='%s' % errmsg,
icon='auth_error',
timeout=4000)
+
+
connect_failed = True
except:
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)).
[View Less]
The branch, master has been updated
via 501a5bd5efc4f91ae8f5d27148cd587ba858b06b (commit)
from 7c131c82ddb09a70600b6b2e0b08f09fbf540194 (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 501a5bd5efc4f91ae8f5d27148cd587ba858b06b
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de…
[View More]>
Date: Tue Jun 25 22:26:36 2013 +0200
Paramiko monkey patch: Hostnames with the default SSH_PORT are stored in hostname-only format to the known_hosts file. Fixes redundant requests for confirming the remote host's fingerprint if port 22 is used.
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 5 ++++-
x2go/_paramiko.py | 7 +++++++
2 files changed, 11 insertions(+), 1 deletion(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index fe3c4aa..76b4db6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
python-x2go (0.4.0.5-0~x2go1) UNRELEASED; urgency=low
- * Continue development...
+ * New upstream version (0.4.0.5):
+ - Paramiko monkey patch: Hostnames with the default SSH_PORT are stored
+ in hostname-only format to the known_hosts file. Fixes redundant requests
+ for confirming the remote host's fingerprint if port 22 is used.
-- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 18 Jun 2013 20:29:14 +0200
diff --git a/x2go/_paramiko.py b/x2go/_paramiko.py
index dd83bd0..a7663f3 100644
--- a/x2go/_paramiko.py
+++ b/x2go/_paramiko.py
@@ -23,6 +23,8 @@ Monkey Patch and feature map for Python Paramiko
"""
import paramiko
+import re
+from paramiko.config import SSH_PORT
import platform
from utils import compare_versions
@@ -117,6 +119,11 @@ def _HostKeys_add(self, hostname, keytype, key, hash_hostname=True):
@type key: L{PKey}
"""
+ # IPv4 and IPv6 addresses using the SSH default port need to be stripped off the port number
+ if re.match('^\[.*\]\:'+str(SSH_PORT)+'$', hostname):
+ # so stripping off the port and the square brackets here...
+ hostname = hostname.split(':')[-2].lstrip('[').rstrip(']')
+
for e in self._entries:
if (hostname in e.hostnames) and (e.key.get_name() == keytype):
e.key = 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).
[View Less]
The branch, master has been updated
via daca6ae5e260aef889cef8bc707ae89819b67c01 (commit)
from 7d200b91029590cd77d6f011c9f04dddde64ea52 (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 daca6ae5e260aef889cef8bc707ae89819b67c01
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de…
[View More]>
Date: Sat Jun 22 14:57:06 2013 +0200
Make x2goumount-session tolerant towards usernames that contain spaces (Fixes: #202).
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 8 ++++++++
x2goserver/bin/x2goumount-session | 8 ++++----
2 files changed, 12 insertions(+), 4 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index cef9d99..48a874b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -86,6 +86,14 @@ x2goserver (4.0.1.0-0~x2go1) unstable; urgency=low
-- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 07 Jun 2013 23:07:40 +0200
+x2goserver (4.0.0.5-0~x2go1) UNRELEASED; urgency=low
+
+ * New upstream version (4.0.0.5):
+ - Make x2goumount-session tolerant towards usernames that contain spaces
+ (Fixes: #202).
+
+ -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 13 Jun 2013 14:56:28 +0200
+
x2goserver (4.0.0.4-0~x2go1) unstable; urgency=low
[ Jan Engelhardt ]
diff --git a/x2goserver/bin/x2goumount-session b/x2goserver/bin/x2goumount-session
index 9112b5e..da2ddb9 100755
--- a/x2goserver/bin/x2goumount-session
+++ b/x2goserver/bin/x2goumount-session
@@ -38,7 +38,7 @@ my $tmp_dir = '/tmp';
my $session=shift;
my $only_path=shift;
-my $uname=$ENV{'USER'};
+my $uname="$ENV{'USER'}";
my $serv=hostname;
my $mdir="$tmp_dir/.x2go-$ENV{'USER'}/media";
@@ -136,15 +136,15 @@ for ($i=0;$i<@outp;$i++)
break:
if ($found)
{
- if (system( "cd $tmp_dir && fusermount -u @line[1] && cd - >/dev/null" ) == 0)
+ if (system( "cd $tmp_dir && fusermount -u \"@line[1]\" && cd - >/dev/null" ) == 0)
{
- syslog('notice', "successfully unmounted @line[1]");
+ syslog('notice', "successfully unmounted \"@line[1]\"");
$found=0;
}
else
{
$ENV{'DISPLAY'}=":$display";
- syslog('err', "ERROR: failed to unmount @line[1]");
+ syslog('err', "ERROR: failed to unmount \"@line[1]\"");
if ($use_zenity == 0)
{
system("which kdialog &>/dev/null && kdialog --error \"ERROR (X2Go): Failed to unmount @line[1]\"&");
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).
[View Less]
The branch, release/4.0.1.x has been updated
via 74f823a903ad9d83b9ed9ea49d8125c4dff45d1c (commit)
from 5e95a3c5c1462eb10f226505ebcc26c8197df306 (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 74f823a903ad9d83b9ed9ea49d8125c4dff45d1c
Author: Mike Gabriel <mike.gabriel(a)das-…
[View More]netzwerkteam.de>
Date: Sat Jun 22 14:57:06 2013 +0200
Make x2goumount-session tolerant towards usernames that contain spaces (Fixes: #202).
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 8 ++++++++
x2goserver/bin/x2goumount-session | 8 ++++----
2 files changed, 12 insertions(+), 4 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index df7c8f2..97ab7b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -33,6 +33,14 @@ x2goserver (4.0.1.0-0~x2go1) unstable; urgency=low
-- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 07 Jun 2013 23:07:40 +0200
+x2goserver (4.0.0.5-0~x2go1) UNRELEASED; urgency=low
+
+ * New upstream version (4.0.0.5):
+ - Make x2goumount-session tolerant towards usernames that contain spaces
+ (Fixes: #202).
+
+ -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 13 Jun 2013 14:56:28 +0200
+
x2goserver (4.0.0.4-0~x2go1) unstable; urgency=low
[ Jan Engelhardt ]
diff --git a/x2goserver/bin/x2goumount-session b/x2goserver/bin/x2goumount-session
index 35d5642..a502090 100755
--- a/x2goserver/bin/x2goumount-session
+++ b/x2goserver/bin/x2goumount-session
@@ -62,7 +62,7 @@ my $tmp_dir = '/tmp';
my $session=shift;
my $only_path=shift;
-my $uname=$ENV{'USER'};
+my $uname="$ENV{'USER'}";
my $serv=hostname;
my $mdir="$tmp_dir/.x2go-$ENV{'USER'}/media";
@@ -160,15 +160,15 @@ for ($i=0;$i<@outp;$i++)
break:
if ($found)
{
- if (system( "cd $tmp_dir && fusermount -u @line[1] && cd - >/dev/null" ) == 0)
+ if (system( "cd $tmp_dir && fusermount -u \"@line[1]\" && cd - >/dev/null" ) == 0)
{
- syslog('notice', "successfully unmounted @line[1]");
+ syslog('notice', "successfully unmounted \"@line[1]\"");
$found=0;
}
else
{
$ENV{'DISPLAY'}=":$display";
- syslog('err', "ERROR: failed to unmount @line[1]");
+ syslog('err', "ERROR: failed to unmount \"@line[1]\"");
if ($use_zenity == 0)
{
system("which kdialog &>/dev/null && kdialog --error \"ERROR (X2Go): Failed to unmount @line[1]\"&");
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).
[View Less]
The branch, release/4.0.0.x has been updated
via 1c1bc4d2fb367f6de135d37f1040f11c66ccf5d3 (commit)
from bc1f6e55a56ca81c64a1236690a05ae1ec2d6c64 (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 1c1bc4d2fb367f6de135d37f1040f11c66ccf5d3
Author: Mike Gabriel <mike.gabriel(a)das-…
[View More]netzwerkteam.de>
Date: Sat Jun 22 14:57:06 2013 +0200
Make x2goumount-session tolerant towards usernames that contain spaces (Fixes: #202).
Conflicts (resolved by Mike Gabriel):
debian/changelog
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 8 ++++++++
x2goserver/bin/x2goumount-session | 8 ++++----
2 files changed, 12 insertions(+), 4 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index b2655c9..cd382e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+x2goserver (4.0.0.5-0~x2go1) UNRELEASED; urgency=low
+
+ * New upstream version (4.0.0.5):
+ - Make x2goumount-session tolerant towards usernames that contain spaces
+ (Fixes: #202).
+
+ -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 13 Jun 2013 14:56:28 +0200
+
x2goserver (4.0.0.4-0~x2go1) unstable; urgency=low
[ Jan Engelhardt ]
diff --git a/x2goserver/bin/x2goumount-session b/x2goserver/bin/x2goumount-session
index 2d10c26..65d841a 100755
--- a/x2goserver/bin/x2goumount-session
+++ b/x2goserver/bin/x2goumount-session
@@ -62,7 +62,7 @@ my $tmp_dir = '/tmp';
my $session=shift;
my $only_path=shift;
-my $uname=$ENV{'USER'};
+my $uname="$ENV{'USER'}";
my $serv=hostname;
my $mdir="$tmp_dir/.x2go-$ENV{'USER'}/media";
@@ -154,15 +154,15 @@ for ($i=0;$i<@outp;$i++)
break:
if ($found)
{
- if (system( "cd $tmp_dir && fusermount -u @line[1] && cd - >/dev/null" ) == 0)
+ if (system( "cd $tmp_dir && fusermount -u \"@line[1]\" && cd - >/dev/null" ) == 0)
{
- syslog('notice', "successfully unmounted @line[1]");
+ syslog('notice', "successfully unmounted \"@line[1]\"");
$found=0;
}
else
{
$ENV{'DISPLAY'}=":$display";
- syslog('err', "ERROR: failed to unmount @line[1]");
+ syslog('err', "ERROR: failed to unmount \"@line[1]\"");
if ($use_zenity == 0)
{
system("which kdialog &>/dev/null && kdialog --error \"ERROR (X2Go): Failed to unmount @line[1]\"&");
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).
[View Less]
The branch, build-main has been updated
via 5e95a3c5c1462eb10f226505ebcc26c8197df306 (commit)
from 666e84841eb39f7961ea0731fe29b05fca4c07cb (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:
debian/…
[View More]changelog | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index a1e4b4b..df7c8f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-x2goserver (4.0.1.3-0~x2go1) UNRELEASED; urgency=low
+x2goserver (4.0.1.3-0~x2go1) unstable; urgency=low
* New upstream version (4.0.1.3):
- Improve session status management in x2gocleansessions.
- -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sat, 22 Jun 2013 14:30:46 +0200
+ -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sat, 22 Jun 2013 14:32:41 +0200
x2goserver (4.0.1.2-0~x2go1) unstable; urgency=low
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).
[View Less]