On 12/21/2010 11:46 PM, [email protected] wrote:
Author: jonathan
Date: Tue Dec 21 23:46:42 2010
New Revision: 1051700
URL: http://svn.apache.org/viewvc?rev=1051700&view=rev
Log:
Allow command line utilities to require a given SASL mechanism.
Useful if the client's most secure mechanism is suspect, e.g. if Kerberos
configuration problems may exist.
Also useful in a variety of test scenarios.
Modified:
qpid/trunk/qpid/cpp/src/tests/cli_tests.py
qpid/trunk/qpid/tools/src/py/qpid-config
qpid/trunk/qpid/tools/src/py/qpid-printevents
qpid/trunk/qpid/tools/src/py/qpid-queue-stats
qpid/trunk/qpid/tools/src/py/qpid-route
qpid/trunk/qpid/tools/src/py/qpid-stat
Modified: qpid/trunk/qpid/tools/src/py/qpid-config
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/tools/src/py/qpid-config?rev=1051700&r1=1051699&r2=1051700&view=diff
==============================================================================
--- qpid/trunk/qpid/tools/src/py/qpid-config (original)
+++ qpid/trunk/qpid/tools/src/py/qpid-config Tue Dec 21 23:46:42 2010
@@ -46,6 +46,7 @@ class Config:
self._ive = False
self._eventGeneration = None
self._file = None
+ self._sasl_mechanism = None
config = Config()
@@ -138,26 +139,27 @@ def OptionsAndArguments(argv):
formatter=JHelpFormatter())
group1 = OptionGroup(parser, "General Options")
- group1.add_option("-t", "--timeout", action="store", type="int", default=10,
metavar="SECS", help="Maximum time to wait for broker connection (in seconds)")
+ group1.add_option("-t", "--timeout", action="store", type="int", default=10,
metavar="<secs>", help="Maximum time to wait for broker connection (in seconds)")
group1.add_option("-b", "--bindings", action="store_true", help="Show bindings
in queue or exchange list")
- group1.add_option("-a", "--broker-addr", action="store", type="string",
default="localhost:5672", metavar="ADDRESS", help="Maximum time to wait for broker connection (in seconds)")
+ group1.add_option("-a", "--broker-addr", action="store", type="string", default="localhost:5672",
metavar="<address>", help="Maximum time to wait for broker connection (in seconds)")
+ group1.add_option("--sasl-mechanism", action="store",
choices=["EXTERNAL","ANONYMOUS","PLAIN","CRAM-MD5","DIGEST-MD5","GSSAPI"], metavar="<mech>", help="SASL
mechanism for authentication. SASL automatically picks the most secure available mechanism - use this option to override.")
parser.add_option_group(group1)
The purpose of SASL is to allow for an extensible set of mechanisms so I
don't think the tool should constrain the options to specific
mechanisms. Not all those options will be valid in a given deployment
and its conceivable that some deployments would have others.
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:[email protected]
