[X2Go-Commits] pyhoca-gui.git - twofactorauth (branch) updated: 0.2.0.4-19-g77b0b0f

[X2Go dev team]

The branch, twofactorauth has been updated
       via  77b0b0f9deb978ccabd99a0c4cc346c4f488c0ae (commit)
      from  9d891f82dd2fee56ecb5f8774315340fdd0a19ce (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/changelog               |    1 +
 pyhoca/wxgui/profilemanager.py |   17 +++++++++++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index d736196..100acad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,7 @@ pyhoca-gui (0.2.0.5-0~x2go1) UNRELEASED; urgency=low
       in.
     - Do not offer DirectRDP sessions in profile manager while connected to a real
       X2Go server via SSH.
+    - Configure SSH proxy port in a separate session profile option (sshproxyport).
   * /debian/control:
     + Add Oleksandr Shneyder to Uploaders.
     + Depend on python-x2go (>=0.2.0.10-0~).
diff --git a/pyhoca/wxgui/profilemanager.py b/pyhoca/wxgui/profilemanager.py
index 2e9449b..95566cc 100644
--- a/pyhoca/wxgui/profilemanager.py
+++ b/pyhoca/wxgui/profilemanager.py
@@ -834,7 +834,14 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
         self.UseSSHProxy.SetValue(self.profile_config['usesshproxy'])
 
         _ssh_proxy = self.profile_config['usesshproxy']
-        self.SSHProxyHost.SetValue(self.profile_config['sshproxyhost'])
+        _ssh_proxy_host = self.profile_config['sshproxyhost']
+        _ssh_proxy_port = 22
+        if ":" in _ssh_proxy_host:
+            _ssh_proxy_port = _ssh_proxy_host.split(":")[1]
+            _ssh_proxy_host = _ssh_proxy_host.split(":")[0]
+        if self.profile_config['sshproxyport']:
+            _ssh_proxy_port = int(self.profile_config['sshproxyport'])
+        self.SSHProxyHost.SetValue("%s:%s" % (_ssh_proxy_host, _ssh_proxy_port))
         self.SSHProxyUser.SetValue(self.profile_config['sshproxyuser'])
         self.SSHProxyKeyFile.SetValue(self.profile_config['sshproxykeyfile'])
 
@@ -1201,7 +1208,13 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
             self.profile_config['host'] = self.Host.GetValue()
             if _session_type != 'DirectRDP':
                 self.profile_config['sshport'] = self.SSHPort.GetValue()
-        self.profile_config['sshproxyhost'] = self.SSHProxyHost.GetValue()
+        _ssh_proxy_host = self.SSHProxyHost.GetValue()
+        _ssh_proxy_port = 22
+        if ":" in _ssh_proxy_host:
+            _ssh_proxy_port = _ssh_proxy_host.split(":")[1]
+            _ssh_proxy_host = _ssh_proxy_host.split(":")[0]
+        self.profile_config['sshproxyhost'] = _ssh_proxy_host
+        self.profile_config['sshproxyport'] = _ssh_proxy_port
         self.profile_config['sshproxyuser'] = self.SSHProxyUser.GetValue()
         self.profile_config['sshproxytunnel'] = '%s:%s:%s:%s' % (self.SSHProxyTunnelFromHost.GetValue(),
                                                                  self.SSHProxyTunnelFromPort.GetValue(),


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)).