[GNUnet-SVN] r27162 - gnunet-planetlab/gplmt/gplmt

[gnunet]

Author: wachs
Date: 2013-05-16 09:54:53 +0200 (Thu, 16 May 2013)
New Revision: 27162

Modified:
   gnunet-planetlab/gplmt/gplmt/Nodes.py
   gnunet-planetlab/gplmt/gplmt/Worker.py
Log:
fix for credential handling


Modified: gnunet-planetlab/gplmt/gplmt/Nodes.py
===================================================================
--- gnunet-planetlab/gplmt/gplmt/Nodes.py       2013-05-16 07:45:36 UTC (rev 
27161)
+++ gnunet-planetlab/gplmt/gplmt/Nodes.py       2013-05-16 07:54:53 UTC (rev 
27162)
@@ -49,11 +49,11 @@
 
         if len(parts) == 2: #credentials supplied
             creds = parts[0].split(':')
-            if len(creds) != 2:
-                raise Exception("Invalid node definition: " + line)
-            username = creds[0]
-            password = creds[1]
-
+            if len(creds) == 2: # username and password
+                username = creds[0]
+                password = creds[1]
+            else: # username
+                username = parts[0]
             line = parts[1]
 
         elif len(parts) > 2:

Modified: gnunet-planetlab/gplmt/gplmt/Worker.py
===================================================================
--- gnunet-planetlab/gplmt/gplmt/Worker.py      2013-05-16 07:45:36 UTC (rev 
27161)
+++ gnunet-planetlab/gplmt/gplmt/Worker.py      2013-05-16 07:54:53 UTC (rev 
27162)
@@ -293,14 +293,23 @@
                     g_logger.log (self.node.hostname + " : Not found " + 
g_configuration.ssh_keyfile)
             
             if self.node.username is not None: #credentials are supplied in 
node file
-                g_logger.log (self.node.hostname + " : Trying to connect to " 
+ 
-                    self.node.username + "@" + self.node.hostname + 
-                    " using password '" + self.node.password)
-                ssh.connect (self.node.hostname,
-                        port=self.node.port or 22,
-                        username=self.node.username,
-                        password=self.node.password,
-                        timeout=10)
+                if (self.node.password is not None):                    
+                    g_logger.log (self.node.hostname + " : Trying to connect 
to " + 
+                                  self.node.username + "@" + 
self.node.hostname + 
+                                  " using password '" + 
str(self.node.password))
+                    ssh.connect (self.node.hostname,
+                                 port=self.node.port or 22,
+                                 username=self.node.username,
+                                 password=self.node.password,
+                                 timeout=10)
+                else:
+                    g_logger.log (self.node.hostname + " : Trying to connect 
to " + 
+                                  self.node.username + "@" + 
self.node.hostname)
+                    ssh.connect (self.node.hostname,
+                                 port=self.node.port or 22,
+                                 username=self.node.username,
+                                 timeout=10)                    
+                    
 
             elif ("" != g_configuration.ssh_username):
                 g_logger.log (self.node.hostname + " : Trying to connect to " 
+