pyhoca-gui.git - master (branch) updated: 0.2.0.4-71-g6451998 - x2go-commits

14 Nov 2012

The branch, master has been updated
       via  64519987d9eccbd1cd6d0c6908fa0163e3b0bbfc (commit)
      from  87a48d6179b56a29e0368816394cbfd30c10b405 (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 64519987d9eccbd1cd6d0c6908fa0163e3b0bbfc
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date:   Wed Nov 14 21:11:34 2012 +0100

    Disable SSH agent forwarding for Windows. Code in Python Paramiko is no executable on MS Windows, currently.

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog               |    2 ++
 pyhoca/wxgui/profilemanager.py |   41 +++++++++++++++++++++++++++-------------
 2 files changed, 30 insertions(+), 13 deletions(-)

The diff of changes is:

diff --git a/debian/changelog b/debian/changelog
index 369ae91..78c4adf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -41,6 +41,8 @@ pyhoca-gui (0.2.1.0-0~x2go1) UNRELEASED; urgency=low
       a slightly larger window).
     - Profile manager: apply text field height to keyboard configuration radio
       buttons.
+    - Disable SSH agent forwarding for Windows. Code in Python Paramiko is no
+      executable on MS Windows, currently.
   * /debian/control:
     + Maintainer change in package: X2Go Developers
       <x2go-dev@lists.berlios.de>.
diff --git a/pyhoca/wxgui/profilemanager.py b/pyhoca/wxgui/profilemanager.py
index c9baaa6..2251c4c 100644
--- a/pyhoca/wxgui/profilemanager.py
+++ b/pyhoca/wxgui/profilemanager.py
@@ -251,7 +251,8 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
         self.SSHKeyFile = wx.TextCtrl(self.tab_Connection, -1, style=wx.TE_PROCESS_ENTER)
         self.SSHKeyFileBrowseButton = wx.BitmapButton(self.tab_Connection, -1, wx.Bitmap('%s/PyHoca/16x16/system-search.png' % _icons_location, wx.BITMAP_TYPE_ANY), size=wx.Size(self._textfield_height,self._textfield_height), )
         self.SSHAutoLogin = wx.CheckBox(self.tab_Connection, -1, _(u"Discover SSH keys or use SSH agent for X2Go authentication"))
-        self.SSHForwardAuthAgent = wx.CheckBox(self.tab_Connection, -1, _(u"Enable forwarding of SSH authentication agent connections"))
+        if X2GOCLIENT_OS != "Windows":
+            self.SSHForwardAuthAgent = wx.CheckBox(self.tab_Connection, -1, _(u"Enable forwarding of SSH authentication agent connections"))
         self.UseSSHProxy = wx.CheckBox(self.tab_Connection, -1, _(u"Server behind SSH proxy"))
         self.SSHProxyUserLabel = wx.StaticText(self.tab_Connection, -1, _(u"User")+": ")
         self.SSHProxyUser = wx.TextCtrl(self.tab_Connection, -1, "", size=wx.Size(80,20))
@@ -583,7 +584,8 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
         sizer_3_1_1.Add(self.SSHPortLabel, pos=(1,3), flag=wx.ALIGN_CENTRE_VERTICAL)
         sizer_3_1_1.Add(self.SSHPort, pos=(1,4), span=(1,2))
         sizer_3_1_1.Add(self.SSHAutoLogin, pos=(2,0), span=(1,6), flag=wx.ALIGN_CENTRE_VERTICAL)
-        sizer_3_1_1.Add(self.SSHForwardAuthAgent, pos=(3,0), span=(1,6), flag=wx.ALIGN_CENTRE_VERTICAL)
+        if X2GOCLIENT_OS != "Windows":
+            sizer_3_1_1.Add(self.SSHForwardAuthAgent, pos=(3,0), span=(1,6), flag=wx.ALIGN_CENTRE_VERTICAL)
         sizer_3_1_1.Add(self.UseSSHProxy, pos=(4,0), span=(1,6), flag=wx.ALIGN_CENTRE_VERTICAL)
         sizer_3_1.Add(sizer_3_1_1, flag=wx.EXPAND|wx.ALL, border=7)
 
@@ -849,7 +851,8 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
         self.UserName.SetValue(self.profile_config['user'])
         self.SSHPort.SetValue(self.profile_config['sshport'])
         self.SSHAutoLogin.SetValue(self.profile_config['autologin'])
-        self.SSHForwardAuthAgent.SetValue(self.profile_config['forwardsshagent'])
+        if X2GOCLIENT_OS != "Windows":
+            self.SSHForwardAuthAgent.SetValue(self.profile_config['forwardsshagent'])
         self.SSHKeyFile.SetValue(self.profile_config['key'])
         if self.profile_config['autologin']:
             self.SSHKeyFileLabel.Enable(False)
@@ -1038,7 +1041,8 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
                 self._toggle_DefaultSoundPort()
                 self.SSHPort.SetValue(self.profile_config['rdpport'])
                 self.SSHAutoLogin.SetValue(False)
-                self.SSHForwardAuthAgent.SetValue(False)
+                if X2GOCLIENT_OS != "Windows":
+                    self.SSHForwardAuthAgent.SetValue(False)
                 self.RDPOptions.SetValue(self.profile_config['directrdpsettings'])
                 self.RDPServerLabel.Enable(True)
                 self.RDPServer.Enable(False)
@@ -1227,7 +1231,8 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
             self.SSHKeyFileLabel.Enable(False)
             self.SSHKeyFile.Enable(False)
             self.SSHAutoLogin.Enable(False)
-            self.SSHForwardAuthAgent.Enable(False)
+            if X2GOCLIENT_OS != "Windows":
+                self.SSHForwardAuthAgent.Enable(False)
             self.UseSSHProxy.Enable(False)
             self.staticbox_Proxy.Enable(False)
             self.SSHProxyUserLabel.Enable(False)
@@ -1265,7 +1270,10 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
         self.profile_config['autostart'] = self.AutoStartSession.GetValue()
         self.profile_config['autoconnect'] = self.AutoConnectSessionProfile.GetValue()
         self.profile_config['autologin'] = self.SSHAutoLogin.GetValue()
-        self.profile_config['forwardsshagent'] = self.SSHForwardAuthAgent.GetValue()
+        if X2GOCLIENT_OS != "Windows":
+            self.profile_config['forwardsshagent'] = self.SSHForwardAuthAgent.GetValue()
+        else:
+            self.profile_config['forwardsshagent'] = False
         self.profile_config['published'] = self.UsePublishedApplications.GetValue()
         if not self.default_icon:
             self.profile_config['icon'] = self.IconPath
@@ -1497,7 +1505,8 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
         self.SSHKeyFile.Enable(False)
         self.SSHKeyFileBrowseButton.Enable(False)
         self.SSHAutoLogin.Enable(False)
-        self.SSHForwardAuthAgent.Enable(False)
+        if X2GOCLIENT_OS != "Windows":
+            self.SSHForwardAuthAgent.Enable(False)
         self.UseSSHProxy.Enable(False)
         self.staticbox_LinkSpeed.Enable(False)
         self.staticbox_Proxy.Enable(False)
@@ -1566,9 +1575,11 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
         else:
             self.SSHPort.SetValue(self.SSHProxyTunnelFromPort.GetValue())
         self.SSHAutoLogin.Enable(True)
-        self.SSHForwardAuthAgent.Enable(True)
+        if X2GOCLIENT_OS != "Windows":
+            self.SSHForwardAuthAgent.Enable(True)
         self.SSHAutoLogin.SetValue(self.profile_config_bak['autologin'])
-        self.SSHForwardAuthAgent.SetValue(self.profile_config_bak['forwardsshagent'])
+        if X2GOCLIENT_OS != "Windows":
+            self.SSHForwardAuthAgent.SetValue(self.profile_config_bak['forwardsshagent'])
         if not self.SSHAutoLogin.GetValue():
             self.SSHKeyFileLabel.Enable(True)
             self.SSHKeyFile.Enable(True)
@@ -1664,10 +1675,12 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
             self.profile_config_bak['soundsystem'] = self._get_SoundSystem()
             self.profile_config_bak['usesshproxy'] = self.UseSSHProxy.GetValue()
             self.profile_config_bak['autologin'] = self.SSHAutoLogin.GetValue()
-            self.profile_config_bak['forwardsshagent'] = self.SSHForwardAuthAgent.GetValue()
+            if X2GOCLIENT_OS != "Windows":
+                self.profile_config_bak['forwardsshagent'] = self.SSHForwardAuthAgent.GetValue()
             self.UseSSHProxy.SetValue(False)
             self.SSHAutoLogin.SetValue(False)
-            self.SSHForwardAuthAgent.SetValue(False)
+            if X2GOCLIENT_OS != "Windows":
+                self.SSHForwardAuthAgent.SetValue(False)
             self.PulseAudio.SetValue(True)
             self.Arts.SetValue(False)
             self.Esd.SetValue(False)
@@ -1693,7 +1706,8 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
             self._set_SoundSystem(self.profile_config_bak['soundsystem'])
             self._toggle_DefaultSoundPort()
             self.SSHAutoLogin.SetValue(self.profile_config_bak['autologin'])
-            self.SSHForwardAuthAgent.SetValue(self.profile_config_bak['forwardsshagent'])
+            if X2GOCLIENT_OS != "Windows":
+                self.SSHForwardAuthAgent.SetValue(self.profile_config_bak['forwardsshagent'])
             self.RDPServerLabel.Enable(True)
             self.RDPServer.Enable(True)
             self.RDPOptionsLabel.Enable(True)
@@ -1711,7 +1725,8 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
             self.disable_DirectRDP()
             self._toggle_SetKeyboard()
             self.SSHAutoLogin.SetValue(self.profile_config_bak['autologin'])
-            self.SSHForwardAuthAgent.SetValue(self.profile_config_bak['forwardsshagent'])
+            if X2GOCLIENT_OS != "Windows":
+                self.SSHForwardAuthAgent.SetValue(self.profile_config_bak['forwardsshagent'])
             self.UseSSHProxy.SetValue(self.profile_config_bak['usesshproxy'])
             self._toggle_SSHProxy()
             self._set_SoundSystem(self.profile_config_bak['soundsystem'])


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

    