Attachment 691644 Details for Bug 710429 – Adds --sasl-mechanism to qpid-tool and changes qpid-config usage text

[patch] Adds --sasl-mechanism to qpid-tool and changes qpid-config usage text

tools-bz710429.patch (text/plain), 5.57 KB, created by Ernie on 2013-02-01 18:14:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ernie

Created: 2013-02-01 18:14:33 UTC

Size: 5.57 KB

patch

obsolete

>diff --git a/qpid/tools/src/py/qpid-cluster b/qpid/tools/src/py/qpid-cluster
>index 7d800b5..743124e 100755
>--- a/qpid/tools/src/py/qpid-cluster
>+++ b/qpid/tools/src/py/qpid-cluster
>@@ -238,8 +238,8 @@ def main(argv=None):
>     try:
>         config = Config()
> 
>-        parser = OptionParser(usage="usage: %prog [options] BROKER",
>-                      description="Example: $ qpid-cluster -C  broker-host:10000")
>+        parser = OptionParser(usage="usage: %prog [options] [username/password@]BROKER",
>+                      description="Example: $ qpid-cluster -C  guest/guest@broker-host:10000")
> 
>         parser.add_option("-t", "--timeout", action="store", type="int", default=10, metavar="SECS", help="Maximum time to wait for broker connection (in seconds)")
>         parser.add_option("--sasl-mechanism", action="store", type="string", metavar="<mech>", help="SASL mechanism for authentication (e.g. EXTERNAL, ANONYMOUS, PLAIN, CRAM-MD, DIGEST-MD5, GSSAPI). SASL automatically picks the most secure available mechanism - use this option to override.")
>diff --git a/qpid/tools/src/py/qpid-tool b/qpid/tools/src/py/qpid-tool
>index 4afa18d..c2ce03a 100755
>--- a/qpid/tools/src/py/qpid-tool
>+++ b/qpid/tools/src/py/qpid-tool
>@@ -20,7 +20,7 @@
> #
> 
> import os
>-import optparse
>+from optparse import OptionParser
> import sys
> import socket
> from types       import *
>@@ -32,6 +32,11 @@ from qpid.disp   import Display
> from qpid.peer   import Closed
> from qmf.console import Session, Console, SchemaClass, ObjectId
> 
>+class Config:
>+    def __init__(self):
>+        self._host = "localhost"
>+        self._conn_options = {}
>+
> class Mcli(Cmd):
>   """ Management Command Interpreter """
> 
>@@ -173,11 +178,11 @@ class Mcli(Cmd):
> class QmfData(Console):
>   """
>   """
>-  def __init__(self, disp, url, cert):
>+  def __init__(self, disp, url, conn_options={}):
>     self.disp = disp
>     self.url = url
>     self.session = Session(self, manageConnections=True)
>-    self.broker = self.session.addBroker(self.url, ssl_certfile=cert)
>+    self.broker = self.session.addBroker(self.url, **conn_options)
>     self.lock = Lock()
>     self.connected = None
>     self.closing = None
>@@ -701,53 +706,63 @@ class IdRegistry(object):
>       agent = 'Broker'
>     return (displayId, bootSeq, agent, oid.getObject())
> 
>-
> def Usage():
>-  print "Usage:  qpid-tool [[<username>/<password>@]<target-host>[:<tcp-port>]]"
>+  print "Usage:  qpid-tool [options] [[<username>/<password>@]<target-host>[:<tcp-port>]] [cert]"
>   print
> 
> #=========================================================
> # Main Program
> #=========================================================
>-
>-# Get host name and port if specified on the command line
>-cargs = sys.argv[1:]
>-_host = "localhost"
>-
>-if len(cargs) > 0:
>-  _host = cargs[0]
>-
>-if _host[0] == '-':
>-  Usage()
>-  if _host != '-h' and _host != "--help":
>-    print "qpid-tool: error: no such option:", _host
>-  sys.exit(1)
>-
>-disp = Display()
>-cert = None
>-if len(cargs) > 1:
>-  cert = cargs[1]
>-
>-# Attempt to make a connection to the target broker
>-try:
>-  data = QmfData(disp, _host, cert)
>-except Exception, e:
>-  if str(e).find("Exchange not found") != -1:
>-    print "Management not enabled on broker:  Use '-m yes' option on broker startup."
>-  else:
>+def main(argv=None):
>+
>+  config = Config()
>+
>+  parser = OptionParser(usage="Usage: %prog [options] [[<username>/<password>@]<target-host>[:<tcp-port>]]",
>+              description="Example: $ qpid-tool -sasl-mechanism ANONYMOUS guest/guest@localhost:10000")
>+
>+  parser.add_option("--sasl-mechanism", action="store", type="string", metavar="<mech>", help="SASL mechanism for authentication (e.g. EXTERNAL, ANONYMOUS, PLAIN, CRAM-MD, DIGEST-MD5, GSSAPI). SASL automatically picks the most secure available mechanism - use this option to override.")
>+  parser.add_option("--ssl-certificate", action="store", type="string", metavar="<cert>", help="Client SSL certificate (PEM Format)")
>+
>+  opts, args = parser.parse_args(args=argv)
>+
>+  disp = Display()
>+  # Get host name and port if specified on the command line
>+  if len(args) > 0:
>+    config._host = args[0]
>+
>+    # For backward compatibility, allow the cert to be passed after the broker
>+    if len(args) > 1:
>+      config._conn_options['ssl_certfile'] = args[1]
>+
>+  if opts.sasl_mechanism:
>+    config._conn_options['mechanisms'] = opts.sasl_mechanism
>+  if opts.ssl_certificate:
>+    # this overrides any cert passed after the broker on the command line
>+    config._conn_options['ssl_certfile'] = opts.ssl_certificate
>+  
>+  # Attempt to make a connection to the target broker
>+  try:
>+    data = QmfData(disp, config._host, conn_options=config._conn_options)
>+  except Exception, e:
>+    if str(e).find("Exchange not found") != -1:
>+      print "Management not enabled on broker:  Use '-m yes' option on broker startup."
>+    else:
>+      print "Failed: %s - %s" % (e.__class__.__name__, e)
>+    return 1
>+
>+  # Instantiate the CLI interpreter and launch it.
>+  cli = Mcli(data, disp)
>+  print("Management Tool for QPID")
>+  try:
>+    cli.cmdloop()
>+  except KeyboardInterrupt:
>+    print
>+    print "Exiting..."
>+  except Exception, e:
>     print "Failed: %s - %s" % (e.__class__.__name__, e)
>-  sys.exit(1)
>-
>-# Instantiate the CLI interpreter and launch it.
>-cli = Mcli(data, disp)
>-print("Management Tool for QPID")
>-try:
>-  cli.cmdloop()
>-except KeyboardInterrupt:
>-  print
>-  print "Exiting..."
>-except Exception, e:
>-  print "Failed: %s - %s" % (e.__class__.__name__, e)
> 
>-# alway attempt to cleanup broker resources
>-data.close()
>+  # alway attempt to cleanup broker resources
>+  data.close()
>+
>+if __name__ == "__main__":
>+        sys.exit(main())
>

Actions: View | Diff

Attachments on bug 710429: 691644 | 696160 | 738574