[Pybridge-commits] SF.net SVN: pybridge: [426] trunk/pybridge/pybridge/ui

[<umg...@us...>]

Revision: 426
          http://svn.sourceforge.net/pybridge/?rev=426&view=rev
Author:   umgangee
Date:     2007-06-18 04:56:47 -0700 (Mon, 18 Jun 2007)

Log Message:
-----------
Switch to ConfigObj configuration management.

Modified Paths:
--------------
    trunk/pybridge/pybridge/ui/__init__.py
    trunk/pybridge/pybridge/ui/dialog_connection.py

Modified: trunk/pybridge/pybridge/ui/__init__.py
===================================================================
--- trunk/pybridge/pybridge/ui/__init__.py	2007-06-18 11:56:20 UTC (rev 425)
+++ trunk/pybridge/pybridge/ui/__init__.py	2007-06-18 11:56:47 UTC (rev 426)
@@ -32,8 +32,8 @@
 gettext.textdomain('pybridge')
 gettext.install('pybridge')
 
-filename = env.find_config_client('client.cfg')
-settings = Settings(filename, ['Connection', 'General'])
+import config
+config.load()
 
 
 def run():
@@ -47,3 +47,5 @@
     reactor.run()
     gtk.main()
 
+    config.save()  # Save config at exit.
+

Modified: trunk/pybridge/pybridge/ui/dialog_connection.py
===================================================================
--- trunk/pybridge/pybridge/ui/dialog_connection.py	2007-06-18 11:56:20 UTC (rev 425)
+++ trunk/pybridge/pybridge/ui/dialog_connection.py	2007-06-18 11:56:47 UTC (rev 426)
@@ -20,8 +20,8 @@
 from wrapper import GladeWrapper
 
 from pybridge.network.client import client
+from config import config
 from manager import wm
-from pybridge.ui import settings
 
 TCP_PORT = 5040
 
@@ -34,13 +34,14 @@
     def setUp(self):
         # Read connection parameters from client settings.
 
-        connection = settings.connection
+        connection = config['Connection']
         if connection:
-            self.entry_hostname.set_text(connection['hostname'])
-            self.entry_portnum.set_text(connection['portnum'])
-            self.entry_username.set_text(connection['username'])
-            self.entry_password.set_text(connection['password'])
-            self.check_savepassword.set_active(connection['password'] != '')
+            self.entry_hostname.set_text(connection.get('HostAddress', 'localhost'))
+            self.entry_portnum.set_text(str(connection.get('Port', TCP_PORT)))
+            self.entry_username.set_text(connection.get('Username', ''))
+            password = connection.get('Password', '').decode('rot13')
+            self.entry_password.set_text(password)
+            self.check_savepassword.set_active(password != '')
         else:
             self.entry_portnum.set_text(str(TCP_PORT))
 
@@ -49,14 +50,17 @@
         """Actions to perform when connecting succeeds."""
 
         # Save connection information.
-        settings.connection = {}
-        settings.connection['hostname'] = self.entry_hostname.get_text()
-        settings.connection['portnum'] = self.entry_portnum.get_text()
-        settings.connection['username'] = self.entry_username.get_text()
+        connection = config['Connection']
+        connection['HostAddress'] = self.entry_hostname.get_text()
+        connection['PortNumber'] = int(self.entry_portnum.get_text())
+        connection['Username'] = self.entry_username.get_text()
         if self.check_savepassword.get_active():
-            settings.connection['password'] = self.entry_password.get_text()
-        else:  # Flush password.
-            settings.connection['password'] = ''
+            # Encode password, to confuse password sniffer software.
+            # ROT13 encoding does *not* provide security!
+            password = self.entry_password.get_text().encode('rot13')
+        else:
+            password = ''  # Flush password.
+        connection['Password'] = password
 
         wm.close(self)
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.