Merge lp:~dpigott/lava-scheduler-tool/fix842524-add-token-file into lp:lava-scheduler-tool

[Zygmunt Krynicki]

[Zygmunt Krynicki (zyga)]

Could you look at resolving the merge conflict?

review: Needs Fixing

Unmerged revisions

10. By Dave Pigott on 2011-09-12

Added authentiaction token file support to cancel-job

9. By Dave Pigott on 2011-09-06

Added authentiction token file support to submit-job

=== modified file 'lava_scheduler_tool/commands.py'
--- lava_scheduler_tool/commands.py	2011-10-19 03:11:36 +0000
+++ lava_scheduler_tool/commands.py	2011-10-20 13:34:26 +0000
@@ -16,12 +16,36 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with lava-scheduler-tool.  If not, see <http://www.gnu.org/licenses/>.
 
-import xmlrpclib
+<<<<<<< TREE
+import xmlrpclib
+=======
+import getpass
+import urlparse
+import xmlrpclib
+>>>>>>> MERGE-SOURCE
 
+<<<<<<< TREE
 from lava_tool.authtoken import AuthenticatingServerProxy, KeyringAuthBackend
 from lava_tool.interface import Command, LavaCommandError
+=======
+from lava_tool.authtoken import (
+    AuthenticatingServerProxy,
+    KeyringAuthBackend,
+    MemoryAuthBackend,
+    )
+from lava_tool.interface import Command, LavaCommandError
+>>>>>>> MERGE-SOURCE
 from lava_tool.commands import ExperimentalCommandMixIn
 
+def normalize_xmlrpc_url(uri):
+    if '://' not in uri:
+        uri = 'http://' + uri
+    if not uri.endswith('/'):
+        uri += '/'
+    if not uri.endswith('/RPC2/'):
+        uri += 'RPC2/'
+    return uri
+
 
 class submit_job(ExperimentalCommandMixIn, Command):
     """
@@ -33,11 +57,53 @@
         super(submit_job, cls).register_arguments(parser)
         parser.add_argument("SERVER")
         parser.add_argument("JSON_FILE")
+        parser.add_argument(
+            "--token-file", default=None,
+            help="Read the password from a file rather than prompting for it.")
 
     def invoke(self):
         self.print_experimental_notice()
+
+        uri = normalize_xmlrpc_url(self.args.SERVER)
+        parsed_host = urlparse.urlparse(uri)
+
+        if parsed_host.username:
+            username = parsed_host.username
+        else:
+            username = getpass.getuser()
+
+        host = parsed_host.hostname
+        if parsed_host.port:
+            host += ':' + str(parsed_host.port)
+
+        uri = '%s://%s@%s%s' % (
+            parsed_host.scheme, username, host, parsed_host.path)
+
+        if self.args.token_file:
+            if parsed_host.password:
+                raise LavaCommandError(
+                    "Token specified in url but --token-file also passed.");
+            else:
+                try:
+                    token_file = open(self.args.token_file)
+                except IOError as ex:
+                    raise LavaCommandError(
+                        "opening %r failed: %s" % (self.args.token_file, ex))
+                token = token_file.read().strip()
+        else:
+            if parsed_host.password:
+                token = parsed_host.password
+            else:
+                token = getpass.getpass("Paste token for %s: " % uri)
+        
+        userless_uri = '%s://%s%s' % (
+            parsed_host.scheme, host, parsed_host.path)
+
+
         server = AuthenticatingServerProxy(
-            self.args.SERVER, auth_backend=KeyringAuthBackend())
+            uri, auth_backend = MemoryAuthBackend(
+                [(username, userless_uri, token)]))
+
         with open(self.args.JSON_FILE, 'rb') as stream:
             command_text = stream.read()
         try:
@@ -54,9 +120,52 @@
     def register_arguments(self, parser):
         parser.add_argument("SERVER")
         parser.add_argument("JOB_ID", type=int)
+        parser.add_argument(
+            "--token-file", default=None,
+            help="Read the password from a file rather than prompting for it.")
 
     def invoke(self):
         self.print_experimental_notice()
+
+        uri = normalize_xmlrpc_url(self.args.SERVER)
+        parsed_host = urlparse.urlparse(uri)
+
+        if parsed_host.username:
+            username = parsed_host.username
+        else:
+            username = getpass.getuser()
+
+        host = parsed_host.hostname
+        if parsed_host.port:
+            host += ':' + str(parsed_host.port)
+
+        uri = '%s://%s@%s%s' % (
+            parsed_host.scheme, username, host, parsed_host.path)
+
+        if self.args.token_file:
+            if parsed_host.password:
+                raise LavaCommandError(
+                    "Token specified in url but --token-file also passed.");
+            else:
+                try:
+                    token_file = open(self.args.token_file)
+                except IOError as ex:
+                    raise LavaCommandError(
+                        "opening %r failed: %s" % (self.args.token_file, ex))
+                token = token_file.read().strip()
+        else:
+            if parsed_host.password:
+                token = parsed_host.password
+            else:
+                token = getpass.getpass("Paste token for %s: " % uri)
+        
+        userless_uri = '%s://%s%s' % (
+            parsed_host.scheme, host, parsed_host.path)
+
+        self.print_experimental_notice()
+
         server = AuthenticatingServerProxy(
-            self.args.SERVER, auth_backend=KeyringAuthBackend())
+            uri, auth_backend = MemoryAuthBackend(
+                [(username, userless_uri, token)]))
+
         server.scheduler.cancel_job(self.args.JOB_ID)