[gnue] r7520 - in trunk/gnue-reports/src: client server

[johannes]

Author: johannes
Date: 2005-05-04 07:59:38 -0500 (Wed, 04 May 2005)
New Revision: 7520

Modified:
   trunk/gnue-reports/src/client/GRRun.py
   trunk/gnue-reports/src/client/GRRunUI.py
   trunk/gnue-reports/src/server/GRServer.py
Log:
Use new GLoginHandler and/or derived classes


Modified: trunk/gnue-reports/src/client/GRRun.py
===================================================================
--- trunk/gnue-reports/src/client/GRRun.py      2005-05-04 12:59:09 UTC (rev 
7519)
+++ trunk/gnue-reports/src/client/GRRun.py      2005-05-04 12:59:38 UTC (rev 
7520)
@@ -37,6 +37,7 @@
 from GRRunUI import GRRunUI
 from gnue.reports.base.GRReportInfo import GRReportInfo
 from gnue.reports.base.GRConfig import ConfigOptions
+from gnue.common.datasources.GLoginHandler import SilentLoginHandler
 import string, sys
 import tempfile
 
@@ -221,8 +222,7 @@
       sortoption      = runui.getSortOption ()
 
     else:
-      lh = NoLoginHandler()
-      self.getConnectionManager().setLoginHandler(lh)
+      self.getConnectionManager().setLoginHandler(SilentLoginHandler ())
 
     #
     # Now, run an engine instance
@@ -336,28 +336,6 @@
   def getReportInformation(self, location):
     return GRReportInfo(location)
 
-
-
-#
-# Login handler for --batch mode
-#
-from gnue.common.datasources import GLoginHandler
-class NoLoginHandler(GLoginHandler.LoginHandler):
-
-  defaults = {'_username': None, '_password': None}
-
-  def getLogin(self, loginData, error):
-    val = {}
-    for prompt in loginData[2]:
-       if self.defaults.has_key(prompt[0])  and self.defaults[prompt[0]]:
-         val[prompt[0]] = self.defaults[prompt[0]]
-       else:
-         val[prompt[0]] = None
-    return val
-
-  def destroyLoginDialog(self):
-    pass
-
 if __name__ == '__main__':
   GRRun().run()
 

Modified: trunk/gnue-reports/src/client/GRRunUI.py
===================================================================
--- trunk/gnue-reports/src/client/GRRunUI.py    2005-05-04 12:59:09 UTC (rev 
7519)
+++ trunk/gnue-reports/src/client/GRRunUI.py    2005-05-04 12:59:38 UTC (rev 
7520)
@@ -27,6 +27,7 @@
 
 from gnue.common.apps import errors
 from gnue.common.utils.FileUtils import dyn_import
+from gnue.common.datasources.GLoginHandler import BasicLoginHandler
 
 
 # =============================================================================
@@ -68,7 +69,11 @@
 
     if ui == 'text':
       self.uimodule     = None
-      self.loginhandler = LoginHandler ()
+
+      from GRRun import quietprint, _quietprintSuppress
+      silent = quietprint == _quietprintSuppress
+
+      self.loginhandler = BasicLoginHandler (True, silent)
     else:
       self.loginhandler = self.uimodule.UILoginHandler ()
 
@@ -608,51 +613,3 @@
       result.append ("%s</%s>" % (indent, tag))
 
     return result
-
-
-#
-# This is a (temporary?) solution to getting a login
-#
-from gnue.common.datasources import GLoginHandler
-
-try:
-  import getpass
-except:
-  getpass = None
-
-class LoginHandler(GLoginHandler.LoginHandler):
-
-  defaults = {'_username': None, '_password': None}
-
-  def getLogin(self, loginData, error):
-    try:
-      from GRRun import quietprint, quietprint_nl
-      quietprint ( "*"*60 )
-      if len(loginData[1]):
-        quietprint ( 'Attempting to log into "%s" (%s):' % (loginData[1], 
loginData[0]) )
-      else:
-        quietprint ( 'Attempting to log into %s:' % (loginData[0]) )
-      quietprint ("")
-      val = {}
-      for prompt in loginData[2]:
-         if self.defaults.has_key(prompt[0])  and self.defaults[prompt[0]]:
-           quietprint_nl ( "  %s: " % prompt[1] )
-           if prompt[2]:
-             quietprint ( "***" )
-           else:
-             quietprint ( self.defaults[prompt[0]] )
-           val[prompt[0]] = self.defaults[prompt[0]]
-         else:
-           if prompt[2] and getpass:
-             val[prompt[0]] = getpass.getpass("  %s: " % prompt[1])
-           else:
-             val[prompt[0]] = raw_input("  %s: " % prompt[1])
-      quietprint ("")
-      quietprint ("*"*60)
-      return val
-    except KeyboardInterrupt:
-      raise GLoginHandler.UserCanceledLogin
-
-
-  def destroyLoginDialog(self):
-    pass

Modified: trunk/gnue-reports/src/server/GRServer.py
===================================================================
--- trunk/gnue-reports/src/server/GRServer.py   2005-05-04 12:59:09 UTC (rev 
7519)
+++ trunk/gnue-reports/src/server/GRServer.py   2005-05-04 12:59:38 UTC (rev 
7520)
@@ -32,7 +32,7 @@
 from gnue.common.rpc import GComm
 from gnue.reports.base.GRConfig import ConfigOptions
 from gnue.reports.server.GRRpcWrapper import GRRpcHandler
-from gnue.reports.client.GRRun import NoLoginHandler
+from gnue.common.datasources.GLoginHandler import SilentLoginHandler
 import string, sys, time
 from gnue.reports import VERSION
 
@@ -104,14 +104,11 @@
       print "The protocol you've set is currently not supported."
       sys.exit (-1)
 
-    loginhandler = NoLoginHandler()
+    loginhandler = SilentLoginHandler (_username = self.OPTIONS ['username'],
+                                       _password = self.OPTIONS ['password'])
+    self.connections.setLoginHandler (loginhandler)
 
-    loginhandler.defaults['_username'] = self.OPTIONS ["username"]
-    loginhandler.defaults['_password'] = self.OPTIONS ["password"]
 
-    self.connections.setLoginHandler(loginhandler)
-
-
   def run(self):
            
     # Create the various servers