You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ac...@apache.org on 2015/02/18 22:37:39 UTC
svn commit: r1660733 - in /qpid/dispatch/trunk:
python/qpid_dispatch/management/ python/qpid_dispatch_internal/tools/ src/
tests/ tests/ssl_certs/ tools/
Author: aconway
Date: Wed Feb 18 21:37:38 2015
New Revision: 1660733
URL: http://svn.apache.org/r1660733
Log:
DISPATCH-116: Qpid dispatch management tools do not use SSL and SASL correctly.
Added support for SSL connections from qdmanage and qdstat tools.
Common command line option handling and SSL config code in qpid_dispatch_internal.tools.command
for existing and future tools.
Common options are:
Connection Options:
-b URL, --bus=URL URL of the messaging bus to connect to (default 0.0.0.0)
-r ROUTER-ID, --router=ROUTER-ID
Router to be queried
-t SECS, --timeout=SECS
Maximum time to wait for connection in seconds (default 5)
--ssl-certificate=CERT
Client SSL certificate (PEM Format)
--ssl-key=KEY Client SSL private key (PEM Format)
--ssl-trustfile=TRUSTED-CA-DB
Trusted Certificate Authority Database file (PEM Format)
--ssl-password=TRUSTED-CA-DB
Certificate password, will be prompted if not specifed.
NOTE: If --ssl options are present the tools will automatically assume the
amqps: scheme for the URL.
NOTE: --sasl-mechanism option was removed. Presently proton only supports
ANONYMOUS and PLAIN and will auto-detect the SASL mechanism from the URL as
follows:
amqp://host - no SASL at all
amqp://anonymous@host - ANONYMOUS mechanism
amqp://user:password@host - PLAIN mechanism
The tools will add anonymous@ if no user is present to force the use of SASL as this
is most compatible with dispatch. Dispatch can allow no-SASL connections but requires
explicit configuration, and SASL connections will always work.
Additional SASL support is in progress, we will update the tools when it is clear how
additional mechanisms are specified.
Added:
qpid/dispatch/trunk/tests/ssl_certs/
qpid/dispatch/trunk/tests/ssl_certs/bad-ca-certificate.pem
qpid/dispatch/trunk/tests/ssl_certs/bad-ca.pkcs12
qpid/dispatch/trunk/tests/ssl_certs/ca-certificate.pem
qpid/dispatch/trunk/tests/ssl_certs/ca.pkcs12
qpid/dispatch/trunk/tests/ssl_certs/client-certificate.pem
qpid/dispatch/trunk/tests/ssl_certs/client-private-key.pem
qpid/dispatch/trunk/tests/ssl_certs/client-request.pem
qpid/dispatch/trunk/tests/ssl_certs/client.pkcs12
qpid/dispatch/trunk/tests/ssl_certs/gencerts.sh (with props)
qpid/dispatch/trunk/tests/ssl_certs/server-certificate.pem
qpid/dispatch/trunk/tests/ssl_certs/server-private-key.pem
qpid/dispatch/trunk/tests/ssl_certs/server-request.pem
qpid/dispatch/trunk/tests/ssl_certs/server.pkcs12
Modified:
qpid/dispatch/trunk/python/qpid_dispatch/management/client.py
qpid/dispatch/trunk/python/qpid_dispatch/management/qdrouter.json
qpid/dispatch/trunk/python/qpid_dispatch_internal/tools/command.py
qpid/dispatch/trunk/src/server.c
qpid/dispatch/trunk/tests/CMakeLists.txt
qpid/dispatch/trunk/tests/system_test.py
qpid/dispatch/trunk/tests/system_tests_management.py
qpid/dispatch/trunk/tests/system_tests_qdmanage.py
qpid/dispatch/trunk/tests/system_tests_qdstat.py
qpid/dispatch/trunk/tools/qdmanage
qpid/dispatch/trunk/tools/qdstat
Modified: qpid/dispatch/trunk/python/qpid_dispatch/management/client.py
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/python/qpid_dispatch/management/client.py?rev=1660733&r1=1660732&r2=1660733&view=diff
==============================================================================
--- qpid/dispatch/trunk/python/qpid_dispatch/management/client.py (original)
+++ qpid/dispatch/trunk/python/qpid_dispatch/management/client.py Wed Feb 18 21:37:38 2015
@@ -75,30 +75,40 @@ class Entity(EntityBase):
class Node(object):
"""Client proxy for an AMQP management node"""
- def __init__(self, url=None, router=None, locales=None, timeout=10, connection=None):
- """
+ @staticmethod
+ def connection(url=None, router=None, timeout=10, ssl_domain=None):
+ """Return a BlockingConnection suitable for connecting to a management node
@param url: URL of the management node.
@param router: If address does not contain a path, use the management node for this router ID.
If not specified and address does not contain a path, use the default management node.
+ """
+ url = Url(url) # Convert string to Url class.
+
+ if url.path is None:
+ if router:
+ url.path = '_topo/0/%s/$management' % router
+ else:
+ url.path = '$management'
+
+ return BlockingConnection(url, timeout=timeout, ssl_domain=ssl_domain)
+
+ @staticmethod
+ def connect(url=None, router=None, timeout=10, ssl_domain=None):
+ """Return a Node connected with the given parameters, see L{connection}"""
+ return Node(Node.connection(url, router, timeout, ssl_domain))
+
+ def __init__(self, connection, locales=None):
+ """
+ Create a management node proxy using the given connection.
@param locales: Default list of locales for management operations.
- @param client: a L{BlockingConnection}
+ @param connection: a L{BlockingConnection} to the management agent.
"""
self.name = self.identity = 'self'
self.type = 'org.amqp.management' # AMQP management node type
- self.url = Url(url).defaults()
-
- # Dispatch requires SASL, default to anonymous user to trigger ANONYMOUS mechanism.
- # FIXME aconway 2015-02-17: this may change when proton SASL support is implemented.
- if not self.url.username:
- self.url.username = "anonymous"
+ self.locales = locales
self.locales = locales
- if self.url.path is None:
- if router:
- self.url.path = '_topo/0/%s/$management' % router
- else:
- self.url.path = '$management'
- connection = connection or BlockingConnection(self.url, timeout)
+ self.url = connection.url
self.client = SyncRequestResponse(connection, self.url.path)
self.reply_to = self.client.reply_to
Modified: qpid/dispatch/trunk/python/qpid_dispatch/management/qdrouter.json
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/python/qpid_dispatch/management/qdrouter.json?rev=1660733&r1=1660732&r2=1660733&view=diff
==============================================================================
--- qpid/dispatch/trunk/python/qpid_dispatch/management/qdrouter.json (original)
+++ qpid/dispatch/trunk/python/qpid_dispatch/management/qdrouter.json Wed Feb 18 21:37:38 2015
@@ -564,7 +564,7 @@
"allowUnsecured": {
"type": "boolean",
"default": false,
- "description": "For listeners using SSL only. If set to 'yes', this option causes the listener to watch the initial network traffic to determine if the client is using SSL or is running in-the-clear. The listener will enable SSL only if the client is using SSL.",
+ "description": "For listeners using SSL only. If set to 'yes' the listener will allow both SSL-secured clients and non-SSL clients to connect.",
"create": true
},
"allowNoSasl": {
Modified: qpid/dispatch/trunk/python/qpid_dispatch_internal/tools/command.py
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/python/qpid_dispatch_internal/tools/command.py?rev=1660733&r1=1660732&r2=1660733&view=diff
==============================================================================
--- qpid/dispatch/trunk/python/qpid_dispatch_internal/tools/command.py (original)
+++ qpid/dispatch/trunk/python/qpid_dispatch_internal/tools/command.py Wed Feb 18 21:37:38 2015
@@ -24,6 +24,12 @@ Utilities for command-line programs.
import sys, json, optparse, os
from collections import Sequence, Mapping
from qpid_dispatch_site import VERSION
+from proton import SSLDomain, Url
+try:
+ from proton.utils import SyncRequestResponse, BlockingConnection, SSLDomain
+except ImportError:
+ from qpid_dispatch_internal.proton_future.utils import SyncRequestResponse, BlockingConnection
+
class UsageError(Exception):
"""
@@ -71,14 +77,45 @@ def connection_options(options, title="C
metavar="ROUTER-ID", help="Router to be queried")
group.add_option("-t", "--timeout", action="store", type="float", default=5, metavar="SECS",
help="Maximum time to wait for connection in seconds (default %default)")
- group.add_option("--sasl-mechanism", action="store", type="string", metavar="MECH",
- help="Force SASL mechanism (e.g. EXTERNAL, ANONYMOUS, PLAIN, CRAM-MD5, DIGEST-MD5, GSSAPI).")
group.add_option("--ssl-certificate", action="store", type="string", metavar="CERT",
help="Client SSL certificate (PEM Format)")
group.add_option("--ssl-key", action="store", type="string", metavar="KEY",
help="Client SSL private key (PEM Format)")
+ group.add_option("--ssl-trustfile", action="store", type="string", metavar="TRUSTED-CA-DB",
+ help="Trusted Certificate Authority Database file (PEM Format)")
+ group.add_option("--ssl-password", action="store", type="string", metavar="PASSWORD",
+ help="Certificate password, will be prompted if not specifed.")
return group
+def opts_url(opts):
+ """Fix up default URL settings based on options"""
+ url = Url(opts.bus)
+
+ # Dispatch always allows SASL and requires it unless allow-no-sasl is configured.
+ # Add anonymous@ if no other username is specified to tell proton we want SASL ANONYMOUS.
+ # FIXME aconway 2015-02-17: this may change when proton supports more SASL mechs.
+ if not url.username:
+ url.username = "anonymous"
+
+ # If the options indicate SSL, make sure we use the amqps scheme.
+ if opts.ssl_certificate or opts.ssl_trustfile:
+ url.scheme = "amqps"
+
+ return url
+
+def opts_ssl_domain(opts, mode=SSLDomain.MODE_CLIENT):
+ """Return proton.SSLDomain from command line options or None if no SSL options specified.
+ @param opts: Parsed optoins including connection_options()
+ """
+ certificate, key, trustfile, password = opts.ssl_certificate, opts.ssl_key, opts.ssl_trustfile, opts.ssl_password
+ if not (certificate or trustfile): return None
+ domain = SSLDomain(mode)
+ if trustfile:
+ domain.set_trusted_ca_db(trustfile)
+ domain.set_peer_authentication(SSLDomain.VERIFY_PEER, trustfile)
+ if certificate:
+ domain.set_credentials(certificate, key, password)
+ return domain
class Option(optparse.Option):
"""Addes two new types to optparse.Option: json_map, json_list"""
Modified: qpid/dispatch/trunk/src/server.c
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/src/server.c?rev=1660733&r1=1660732&r2=1660733&view=diff
==============================================================================
--- qpid/dispatch/trunk/src/server.c (original)
+++ qpid/dispatch/trunk/src/server.c Wed Feb 18 21:37:38 2015
@@ -21,6 +21,7 @@
#include <qpid/dispatch/threading.h>
#include <qpid/dispatch/log.h>
#include <qpid/dispatch/amqp.h>
+#include <qpid/dispatch/server.h>
#include "entity.h"
#include "entity_cache.h"
#include "dispatch_private.h"
@@ -101,7 +102,6 @@ qd_error_t qd_entity_refresh_connection(
-
static void thread_process_listeners(qd_server_t *qd_server)
{
qdpn_driver_t *driver = qd_server->driver;
@@ -114,7 +114,17 @@ static void thread_process_listeners(qd_
if (!cxtr)
continue;
- qd_log(qd_server->log_source, QD_LOG_TRACE, "Accepting Connection from %s", qdpn_connector_name(cxtr));
+ // Information for error messages
+ qd_listener_t *qd_listener = qdpn_listener_context(listener);
+ assert(qd_listener);
+ const char *cname = qdpn_connector_name(cxtr);
+ const char *host = qd_listener->config->host;
+ const char *port = qd_listener->config->port;
+ assert(cname && host && port);
+
+#define FROM_TO " connection from %s to %s:%s", cname, host, port
+
+ qd_log(qd_server->log_source, QD_LOG_DEBUG, "Accepting" FROM_TO);
ctx = new_qd_connection_t();
DEQ_ITEM_INIT(ctx);
ctx->state = CONN_STATE_OPENING;
@@ -122,7 +132,7 @@ static void thread_process_listeners(qd_
ctx->enqueued = 0;
ctx->pn_cxtr = cxtr;
ctx->collector = 0;
- ctx->listener = (qd_listener_t*) qdpn_listener_context(listener);
+ ctx->listener = qd_listener;
ctx->connector = 0;
ctx->context = ctx->listener->context;
ctx->user_context = 0;
@@ -154,37 +164,43 @@ static void thread_process_listeners(qd_
//
// Configure the transport.
//
+ pn_transport_set_server(tport);
pn_transport_set_max_frame(tport, config->max_frame_size);
//
// Set up SSL if appropriate
//
if (config->ssl_enabled) {
+
pn_ssl_domain_t *domain = pn_ssl_domain(PN_SSL_MODE_SERVER);
if (!domain) {
- qd_error(QD_ERROR_RUNTIME, "SSL domain failed for connection from %s",
- qdpn_connector_name(cxtr));
- /* TODO aconway 2014-07-15: Close the connection */
+ qd_log(qd_server->log_source, QD_LOG_ERROR, "SSL setup failed on" FROM_TO);
continue;
}
- /* TODO aconway 2014-07-15: error handling on all calls. */
+#define ERROR(MSG) do { \
+ qd_log(qd_server->log_source, QD_LOG_ERROR, MSG FROM_TO); \
+ pn_ssl_domain_free(domain); \
+ goto ssl_error; \
+ } while(0)
+
// setup my identifying cert:
if (pn_ssl_domain_set_credentials(domain,
config->ssl_certificate_file,
config->ssl_private_key_file,
config->ssl_password)) {
- qd_log(qd_server->log_source, QD_LOG_ERROR,
- "SSL configuration failed for connection %s", qdpn_connector_name(cxtr));
+ ERROR("SSL credentials failed on");
+ }
+ if (config->ssl_allow_unsecured_client) {
+ if (pn_ssl_domain_allow_unsecured_client(domain)) {
+ ERROR("SSL cannot allow unsecured client on");
+ }
}
- if (config->ssl_allow_unsecured_client)
- pn_ssl_domain_allow_unsecured_client(domain);
// for peer authentication:
if (config->ssl_trusted_certificate_db) {
if (pn_ssl_domain_set_trusted_ca_db(domain, config->ssl_trusted_certificate_db)) {
- qd_log(qd_server->log_source, QD_LOG_ERROR,
- "SSL CA configuration failed for connection %s", qdpn_connector_name(cxtr));
+ ERROR("SSL CA configuration failed on" );
}
}
@@ -195,14 +211,16 @@ static void thread_process_listeners(qd_
// do we force the peer to send a cert?
if (config->ssl_require_peer_authentication) {
if (pn_ssl_domain_set_peer_authentication(domain, PN_SSL_VERIFY_PEER, trusted)) {
- qd_log(qd_server->log_source, QD_LOG_ERROR,
- "SSL Authentication configuration failed for connection %s",
- qdpn_connector_name(cxtr));
+ ERROR("SSL Authentication configuration failed on");
}
}
-
pn_ssl_t *ssl = pn_ssl(tport);
- pn_ssl_init(ssl, domain, 0);
+ if (!ssl || pn_ssl_init(ssl, domain, 0)) {
+ ERROR("SSL setup failed");
+ }
+ qd_log(qd_server->log_source, QD_LOG_TRACE, "Configured SSL on" FROM_TO);
+
+ ssl_error:
pn_ssl_domain_free(domain);
}
Modified: qpid/dispatch/trunk/tests/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/tests/CMakeLists.txt?rev=1660733&r1=1660732&r2=1660733&view=diff
==============================================================================
--- qpid/dispatch/trunk/tests/CMakeLists.txt (original)
+++ qpid/dispatch/trunk/tests/CMakeLists.txt Wed Feb 18 21:37:38 2015
@@ -102,3 +102,7 @@ install(DIRECTORY ${CMAKE_CURRENT_BINARY
DESTINATION ${QPID_DISPATCH_HOME_INSTALLED}/tests
FILES_MATCHING PATTERN *.conf
)
+
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ssl_certs
+ DESTINATION ${QPID_DISPATCH_HOME_INSTALLED}/tests)
+
Added: qpid/dispatch/trunk/tests/ssl_certs/bad-ca-certificate.pem
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/tests/ssl_certs/bad-ca-certificate.pem?rev=1660733&view=auto
==============================================================================
--- qpid/dispatch/trunk/tests/ssl_certs/bad-ca-certificate.pem (added)
+++ qpid/dispatch/trunk/tests/ssl_certs/bad-ca-certificate.pem Wed Feb 18 21:37:38 2015
@@ -0,0 +1,22 @@
+Bag Attributes
+ friendlyName: bad-ca
+ localKeyID: 54 69 6D 65 20 31 34 32 34 32 39 30 35 36 31 33 36 37
+subject=/CN=Trusted.CA.com/O=Trust Me Inc.
+issuer=/CN=Trusted.CA.com/O=Trust Me Inc.
+-----BEGIN CERTIFICATE-----
+MIICwzCCAn+gAwIBAgIELtSXGTALBgcqhkjOOAQDBQAwMTEXMBUGA1UEAxMOVHJ1
+c3RlZC5DQS5jb20xFjAUBgNVBAoTDVRydXN0IE1lIEluYy4wIBcNMTUwMjE4MjAx
+NjAxWhgPMjI4ODEyMDIyMDE2MDFaMDExFzAVBgNVBAMTDlRydXN0ZWQuQ0EuY29t
+MRYwFAYDVQQKEw1UcnVzdCBNZSBJbmMuMIIBuDCCASwGByqGSM44BAEwggEfAoGB
+AP1/U4EddRIpUt9KnC7s5Of2EbdSPO9EAMMeP4C2USZpRV1AIlH7WT2NWPq/xfW6
+MPbLm1Vs14E7gB00b/JmYLdrmVClpJ+f6AR7ECLCT7up1/63xhv4O1fnxqimFQ8E
++4P208UewwI1VBNaFpEy9nXzrith1yrv8iIDGZ3RSAHHAhUAl2BQjxUjC8yykrmC
+ouuEC/BYHPUCgYEA9+GghdabPd7LvKtcNrhXuXmUr7v6OuqC+VdMCz0HgmdRWVeO
+utRZT+ZxBxCBgLRJFnEj6EwoFhO3zwkyjMim4TwWeotUfI0o4KOuHiuzpnWRbqN/
+C/ohNWLx+2J6ASQ7zKTxvqhRkImog9/hWuWfBpKLZl6Ae1UlZAFMO/7PSSoDgYUA
+AoGBAK+JQLqbF+x5dDi9LZkMCW5e3PTLgUUwyu3Btq1b5VUFrDRtl6h5vm7QNIRW
+yTyfKxCNlSK1Hdy6qULyE6x3V3sFCAD+dTVxz8wHZk//APVEDVdMLu8I3QMuZgnX
+H7JoU/pfidXWKFZgAq5QolSwJdKDIwf9BAP0dh34yF2frNFjoyEwHzAdBgNVHQ4E
+FgQUFCScwiq/dz6vYznC+IMAymlYT1AwCwYHKoZIzjgEAwUAAzEAMC4CFQCL8ZhR
+LkxFS8phA/EO16PyYpvb7QIVAI7RaHqOK/2mXoQFRKXF1GkKRK/d
+-----END CERTIFICATE-----
Added: qpid/dispatch/trunk/tests/ssl_certs/bad-ca.pkcs12
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/tests/ssl_certs/bad-ca.pkcs12?rev=1660733&view=auto
==============================================================================
Binary files qpid/dispatch/trunk/tests/ssl_certs/bad-ca.pkcs12 (added) and qpid/dispatch/trunk/tests/ssl_certs/bad-ca.pkcs12 Wed Feb 18 21:37:38 2015 differ
Added: qpid/dispatch/trunk/tests/ssl_certs/ca-certificate.pem
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/tests/ssl_certs/ca-certificate.pem?rev=1660733&view=auto
==============================================================================
--- qpid/dispatch/trunk/tests/ssl_certs/ca-certificate.pem (added)
+++ qpid/dispatch/trunk/tests/ssl_certs/ca-certificate.pem Wed Feb 18 21:37:38 2015
@@ -0,0 +1,22 @@
+Bag Attributes
+ friendlyName: ca
+ localKeyID: 54 69 6D 65 20 31 34 32 34 32 39 30 35 36 31 31 35 38
+subject=/CN=Trusted.CA.com/O=Trust Me Inc.
+issuer=/CN=Trusted.CA.com/O=Trust Me Inc.
+-----BEGIN CERTIFICATE-----
+MIICwDCCAn6gAwIBAgIEFuNUXDALBgcqhkjOOAQDBQAwMTEXMBUGA1UEAxMOVHJ1
+c3RlZC5DQS5jb20xFjAUBgNVBAoTDVRydXN0IE1lIEluYy4wIBcNMTUwMjE4MjAx
+NjAxWhgPMjI4ODEyMDIyMDE2MDFaMDExFzAVBgNVBAMTDlRydXN0ZWQuQ0EuY29t
+MRYwFAYDVQQKEw1UcnVzdCBNZSBJbmMuMIIBtzCCASwGByqGSM44BAEwggEfAoGB
+AP1/U4EddRIpUt9KnC7s5Of2EbdSPO9EAMMeP4C2USZpRV1AIlH7WT2NWPq/xfW6
+MPbLm1Vs14E7gB00b/JmYLdrmVClpJ+f6AR7ECLCT7up1/63xhv4O1fnxqimFQ8E
++4P208UewwI1VBNaFpEy9nXzrith1yrv8iIDGZ3RSAHHAhUAl2BQjxUjC8yykrmC
+ouuEC/BYHPUCgYEA9+GghdabPd7LvKtcNrhXuXmUr7v6OuqC+VdMCz0HgmdRWVeO
+utRZT+ZxBxCBgLRJFnEj6EwoFhO3zwkyjMim4TwWeotUfI0o4KOuHiuzpnWRbqN/
+C/ohNWLx+2J6ASQ7zKTxvqhRkImog9/hWuWfBpKLZl6Ae1UlZAFMO/7PSSoDgYQA
+AoGAf+CpzXdAeZYqn55ZmWX45rib30CRI5VHJQgmkjg/FCG3/jjU7oG+N7xuVYun
+ktV4uaQBsB4TCRIw+ZW5fxDEO+QoUm/wZqFTb6puaNdQWDqyOoo5Mm18iHiHpF0o
+rFPllG1O9+V5AH4CmS7/G5qBGTiYksIWQHVwUOrZKgDApQajITAfMB0GA1UdDgQW
+BBTL/nFsubLlCB4LQ7ojixa6tluYZDALBgcqhkjOOAQDBQADLwAwLAIUFGKM43rh
+FEt8yIdTtjYx/jrX+EoCFHuOrw6hzJ8s2i2kN2SSOGbLMCK7
+-----END CERTIFICATE-----
Added: qpid/dispatch/trunk/tests/ssl_certs/ca.pkcs12
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/tests/ssl_certs/ca.pkcs12?rev=1660733&view=auto
==============================================================================
Binary files qpid/dispatch/trunk/tests/ssl_certs/ca.pkcs12 (added) and qpid/dispatch/trunk/tests/ssl_certs/ca.pkcs12 Wed Feb 18 21:37:38 2015 differ
Added: qpid/dispatch/trunk/tests/ssl_certs/client-certificate.pem
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/tests/ssl_certs/client-certificate.pem?rev=1660733&view=auto
==============================================================================
--- qpid/dispatch/trunk/tests/ssl_certs/client-certificate.pem (added)
+++ qpid/dispatch/trunk/tests/ssl_certs/client-certificate.pem Wed Feb 18 21:37:38 2015
@@ -0,0 +1,15 @@
+-----BEGIN CERTIFICATE-----
+MIIC1TCCApOgAwIBAgIEeN2OojALBgcqhkjOOAQDBQAwMTEXMBUGA1UEAxMOVHJ1c3RlZC5DQS5j
+b20xFjAUBgNVBAoTDVRydXN0IE1lIEluYy4wIBcNMTUwMjE4MjAxNjAyWhgPMjI4ODEyMDIyMDE2
+MDJaMCUxEjAQBgNVBAMTCTEyNy4wLjAuMTEPMA0GA1UEChMGQ2xpZW50MIIBtzCCASwGByqGSM44
+BAEwggEfAoGBAP1/U4EddRIpUt9KnC7s5Of2EbdSPO9EAMMeP4C2USZpRV1AIlH7WT2NWPq/xfW6
+MPbLm1Vs14E7gB00b/JmYLdrmVClpJ+f6AR7ECLCT7up1/63xhv4O1fnxqimFQ8E+4P208UewwI1
+VBNaFpEy9nXzrith1yrv8iIDGZ3RSAHHAhUAl2BQjxUjC8yykrmCouuEC/BYHPUCgYEA9+Gghdab
+Pd7LvKtcNrhXuXmUr7v6OuqC+VdMCz0HgmdRWVeOutRZT+ZxBxCBgLRJFnEj6EwoFhO3zwkyjMim
+4TwWeotUfI0o4KOuHiuzpnWRbqN/C/ohNWLx+2J6ASQ7zKTxvqhRkImog9/hWuWfBpKLZl6Ae1Ul
+ZAFMO/7PSSoDgYQAAoGAVkQ9SdE7AFFFnc3i+W1TZkbERnX2Hf6LuA8KzAZFssPanVA7nbD4H1D5
+LirNN3V2txvnqc1l8w1alDDX7e2XfZGyzAeWymmQpq0bzkp26nnXwOadcEsLbNgRgopu6PcprCn7
+IXtRzJEcTErcl6m0mHW4MMZf5nLv9eNorOV4+6ijQjBAMB8GA1UdIwQYMBaAFMv+cWy5suUIHgtD
+uiOLFrq2W5hkMB0GA1UdDgQWBBTf5tXr2SQuzjbsziPw26w1iUZLVzALBgcqhkjOOAQDBQADLwAw
+LAIUTP69DQUv1oSofzTrqGhf2rOEafICFCkn3xyd7y/JEla5R+4XzmHZaCud
+-----END CERTIFICATE-----
Added: qpid/dispatch/trunk/tests/ssl_certs/client-private-key.pem
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/tests/ssl_certs/client-private-key.pem?rev=1660733&view=auto
==============================================================================
--- qpid/dispatch/trunk/tests/ssl_certs/client-private-key.pem (added)
+++ qpid/dispatch/trunk/tests/ssl_certs/client-private-key.pem Wed Feb 18 21:37:38 2015
@@ -0,0 +1,15 @@
+Bag Attributes
+ friendlyName: client-certificate
+ localKeyID: 54 69 6D 65 20 31 34 32 34 32 39 30 35 36 32 32 31 34
+Key Attributes: <No Attributes>
+-----BEGIN ENCRYPTED PRIVATE KEY-----
+MIIBljBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQIQjGMD5Xq/WECAggA
+MBQGCCqGSIb3DQMHBAh73tcUMDKzhgSCAVCFivkeNt46vAX2u1fNQyM8ogQoZIez
+k2op33WH/XXyFLpDIa98+6uCj0yPo1IwcTw/LmL34ExZ17lW9MD/52t7ZVb9Qi+b
+bPZBHJfGw0J+EycEceFoaCzdXwUICaH6jB26ilJzGWZyJyQlydofGOz8SxxbPdt9
+Rmnb+7WzEjl99T1+nkuMEcfGixZJZtCAB3XwWcG6TuerhuAkpfrXoT6pfwEtT7ZE
+o9zfwpd2OMMB5hHfJ3IOvFW8hpvKZ4L/AtnnOd+G2VIS+Ga2BXQZIwAzw1nvKdvk
+JPw2bdgHnNE6MlQR4RNdL9RcxRSBlLjmQ6PaQyIp6CD+W1eUqDRL+DxL0o1VOWQl
+Y7XhklePvrJWaervroBEtCkCYYmZ8vurWNnk97f5gnY66dwI3i2f/t2X8F4Fdjol
+xvyuVJENU/mQESESe8OFcVG50iSfVxtd5I8=
+-----END ENCRYPTED PRIVATE KEY-----
Added: qpid/dispatch/trunk/tests/ssl_certs/client-request.pem
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/tests/ssl_certs/client-request.pem?rev=1660733&view=auto
==============================================================================
--- qpid/dispatch/trunk/tests/ssl_certs/client-request.pem (added)
+++ qpid/dispatch/trunk/tests/ssl_certs/client-request.pem Wed Feb 18 21:37:38 2015
@@ -0,0 +1,13 @@
+-----BEGIN NEW CERTIFICATE REQUEST-----
+MIICWjCCAhcCAQAwJTESMBAGA1UEAxMJMTI3LjAuMC4xMQ8wDQYDVQQKEwZDbGllbnQwggG3MIIB
+LAYHKoZIzjgEATCCAR8CgYEA/X9TgR11EilS30qcLuzk5/YRt1I870QAwx4/gLZRJmlFXUAiUftZ
+PY1Y+r/F9bow9subVWzXgTuAHTRv8mZgt2uZUKWkn5/oBHsQIsJPu6nX/rfGG/g7V+fGqKYVDwT7
+g/bTxR7DAjVUE1oWkTL2dfOuK2HXKu/yIgMZndFIAccCFQCXYFCPFSMLzLKSuYKi64QL8Fgc9QKB
+gQD34aCF1ps93su8q1w2uFe5eZSvu/o66oL5V0wLPQeCZ1FZV4661FlP5nEHEIGAtEkWcSPoTCgW
+E7fPCTKMyKbhPBZ6i1R8jSjgo64eK7OmdZFuo38L+iE1YvH7YnoBJDvMpPG+qFGQiaiD3+Fa5Z8G
+kotmXoB7VSVkAUw7/s9JKgOBhAACgYBWRD1J0TsAUUWdzeL5bVNmRsRGdfYd/ou4DwrMBkWyw9qd
+UDudsPgfUPkuKs03dXa3G+epzWXzDVqUMNft7Zd9kbLMB5bKaZCmrRvOSnbqedfA5p1wSwts2BGC
+im7o9ymsKfshe1HMkRxMStyXqbSYdbgwxl/mcu/142is5Xj7qKAwMC4GCSqGSIb3DQEJDjEhMB8w
+HQYDVR0OBBYEFN/m1evZJC7ONuzOI/DbrDWJRktXMAsGByqGSM44BAMFAAMwADAtAhUAgZrGKu/I
+eeeUIKHRRJj5VVLW9usCFEwzXpaAouip4wMRrGhIxtbqL09K
+-----END NEW CERTIFICATE REQUEST-----
Added: qpid/dispatch/trunk/tests/ssl_certs/client.pkcs12
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/tests/ssl_certs/client.pkcs12?rev=1660733&view=auto
==============================================================================
Binary files qpid/dispatch/trunk/tests/ssl_certs/client.pkcs12 (added) and qpid/dispatch/trunk/tests/ssl_certs/client.pkcs12 Wed Feb 18 21:37:38 2015 differ
Added: qpid/dispatch/trunk/tests/ssl_certs/gencerts.sh
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/tests/ssl_certs/gencerts.sh?rev=1660733&view=auto
==============================================================================
--- qpid/dispatch/trunk/tests/ssl_certs/gencerts.sh (added)
+++ qpid/dispatch/trunk/tests/ssl_certs/gencerts.sh Wed Feb 18 21:37:38 2015
@@ -0,0 +1,23 @@
+#!/bin/bash -ex
+
+#export SERVER=mrg14.lab.bos.redhat.com
+#export CLIENT=mrg38.lab.bos.redhat.com
+
+export SERVER=A1.Good.Server.domain.com
+export CLIENT=127.0.0.1
+
+keytool -storetype pkcs12 -keystore ca.pkcs12 -storepass ca-password -alias ca -keypass ca-password -genkey -dname "O=Trust Me Inc.,CN=Trusted.CA.com" -validity 99999
+openssl pkcs12 -nokeys -passin pass:ca-password -in ca.pkcs12 -passout pass:ca-password -out ca-certificate.pem
+
+keytool -storetype pkcs12 -keystore bad-ca.pkcs12 -storepass bad-ca-password -alias bad-ca -keypass bad-ca-password -genkey -dname "O=Trust Me Inc.,CN=Trusted.CA.com" -validity 99999
+openssl pkcs12 -nokeys -passin pass:bad-ca-password -in bad-ca.pkcs12 -passout pass:bad-ca-password -out bad-ca-certificate.pem
+
+keytool -storetype pkcs12 -keystore server.pkcs12 -storepass server-password -alias server-certificate -keypass server-password -genkey -dname "O=Server,CN=$SERVER" -validity 99999
+keytool -storetype pkcs12 -keystore server.pkcs12 -storepass server-password -alias server-certificate -keypass server-password -certreq -file server-request.pem
+keytool -storetype pkcs12 -keystore ca.pkcs12 -storepass ca-password -alias ca -keypass ca-password -gencert -rfc -validity 99999 -infile server-request.pem -outfile server-certificate.pem
+openssl pkcs12 -nocerts -passin pass:server-password -in server.pkcs12 -passout pass:server-password -out server-private-key.pem
+
+keytool -storetype pkcs12 -keystore client.pkcs12 -storepass client-password -alias client-certificate -keypass client-password -genkey -dname "O=Client,CN=$CLIENT" -validity 99999
+keytool -storetype pkcs12 -keystore client.pkcs12 -storepass client-password -alias client-certificate -keypass client-password -certreq -file client-request.pem
+keytool -storetype pkcs12 -keystore ca.pkcs12 -storepass ca-password -alias ca -keypass ca-password -gencert -rfc -validity 99999 -infile client-request.pem -outfile client-certificate.pem
+openssl pkcs12 -nocerts -passin pass:client-password -in client.pkcs12 -passout pass:client-password -out client-private-key.pem
Propchange: qpid/dispatch/trunk/tests/ssl_certs/gencerts.sh
------------------------------------------------------------------------------
svn:executable = *
Added: qpid/dispatch/trunk/tests/ssl_certs/server-certificate.pem
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/tests/ssl_certs/server-certificate.pem?rev=1660733&view=auto
==============================================================================
--- qpid/dispatch/trunk/tests/ssl_certs/server-certificate.pem (added)
+++ qpid/dispatch/trunk/tests/ssl_certs/server-certificate.pem Wed Feb 18 21:37:38 2015
@@ -0,0 +1,16 @@
+-----BEGIN CERTIFICATE-----
+MIIC5jCCAqSgAwIBAgIEVVAmOTALBgcqhkjOOAQDBQAwMTEXMBUGA1UEAxMOVHJ1c3RlZC5DQS5j
+b20xFjAUBgNVBAoTDVRydXN0IE1lIEluYy4wIBcNMTUwMjE4MjAxNjAyWhgPMjI4ODEyMDIyMDE2
+MDJaMDUxIjAgBgNVBAMTGUExLkdvb2QuU2VydmVyLmRvbWFpbi5jb20xDzANBgNVBAoTBlNlcnZl
+cjCCAbgwggEsBgcqhkjOOAQBMIIBHwKBgQD9f1OBHXUSKVLfSpwu7OTn9hG3UjzvRADDHj+AtlEm
+aUVdQCJR+1k9jVj6v8X1ujD2y5tVbNeBO4AdNG/yZmC3a5lQpaSfn+gEexAiwk+7qdf+t8Yb+DtX
+58aophUPBPuD9tPFHsMCNVQTWhaRMvZ1864rYdcq7/IiAxmd0UgBxwIVAJdgUI8VIwvMspK5gqLr
+hAvwWBz1AoGBAPfhoIXWmz3ey7yrXDa4V7l5lK+7+jrqgvlXTAs9B4JnUVlXjrrUWU/mcQcQgYC0
+SRZxI+hMKBYTt88JMozIpuE8FnqLVHyNKOCjrh4rs6Z1kW6jfwv6ITVi8ftiegEkO8yk8b6oUZCJ
+qIPf4VrlnwaSi2ZegHtVJWQBTDv+z0kqA4GFAAKBgQCc1Yj1CsxEYyO5JjUs/FB2KNWAdYH3VJPN
+IFb9TJ/ts6OsroChGqPULZIbp5YnC5bH+3sVD4khXGZTuW8pdBxENNlP2sEKfO/xDqLLgZhvYpsS
+iLWiYQ8bShJOC/hOui2mw3g6V2DXQXWbjxLNrMIyWPRBkp2z+O6ivEq+Qr0Yq6NCMEAwHwYDVR0j
+BBgwFoAUy/5xbLmy5QgeC0O6I4sWurZbmGQwHQYDVR0OBBYEFOSGQHg1K8opwYxpYoo/FDOmmOyx
+MAsGByqGSM44BAMFAAMvADAsAhRoUUpTu3CLYTk6r4M0YAk78gVu8wIUCSqprLCmxNkn93/GHiQJ
+uCBF3bI=
+-----END CERTIFICATE-----
Added: qpid/dispatch/trunk/tests/ssl_certs/server-private-key.pem
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/tests/ssl_certs/server-private-key.pem?rev=1660733&view=auto
==============================================================================
--- qpid/dispatch/trunk/tests/ssl_certs/server-private-key.pem (added)
+++ qpid/dispatch/trunk/tests/ssl_certs/server-private-key.pem Wed Feb 18 21:37:38 2015
@@ -0,0 +1,15 @@
+Bag Attributes
+ friendlyName: server-certificate
+ localKeyID: 54 69 6D 65 20 31 34 32 34 32 39 30 35 36 31 35 38 34
+Key Attributes: <No Attributes>
+-----BEGIN ENCRYPTED PRIVATE KEY-----
+MIIBnjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQIEw01j8nUhqoCAggA
+MBQGCCqGSIb3DQMHBAiznulHT3IkUwSCAVi3LpaVmwYUlU7PlBVBc0NDkvmeYEJT
+xBRa0FkJs7mIk7eXIJU898gcZA88WTyNlPMmy3gxje6c8tp6U1xlHBZKnMnMHA9G
+KfHPkkacsZe8zGhI+3jwd1myyWuVXlZL5Su6DEXnCh4y1PVSD4Jl0z5ExbgGQkMV
+FNcZQc4XeJI8dlXpW7on9fX8z7deWiHyS3Sqvb/RRCTtIqfFl6VkwpEhs+TNxGDo
+SnFlno1/PDjKbhnq6o2pUZRGU31/M6QFCW0VXs+eksNBXo9oyZUa4CnaggMGdcBx
+EcfRtWx0pM+KJx1jLRp2X72NR/NIZ3H1jL4lVrbwOqlULKfZMMFPNzR61AtlWjWO
+laTUo7PqOv7VB60vtwZkxmJjj+JwBsm/+WQMzZS6A4abBCQKz6lgJToTb72mNvln
+k0ZsFLtZYCK3i0++vQ6gAriE4SYKqvxIaLK0TD/AY2s04A==
+-----END ENCRYPTED PRIVATE KEY-----
Added: qpid/dispatch/trunk/tests/ssl_certs/server-request.pem
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/tests/ssl_certs/server-request.pem?rev=1660733&view=auto
==============================================================================
--- qpid/dispatch/trunk/tests/ssl_certs/server-request.pem (added)
+++ qpid/dispatch/trunk/tests/ssl_certs/server-request.pem Wed Feb 18 21:37:38 2015
@@ -0,0 +1,13 @@
+-----BEGIN NEW CERTIFICATE REQUEST-----
+MIICazCCAigCAQAwNTEiMCAGA1UEAxMZQTEuR29vZC5TZXJ2ZXIuZG9tYWluLmNvbTEPMA0GA1UE
+ChMGU2VydmVyMIIBuDCCASwGByqGSM44BAEwggEfAoGBAP1/U4EddRIpUt9KnC7s5Of2EbdSPO9E
+AMMeP4C2USZpRV1AIlH7WT2NWPq/xfW6MPbLm1Vs14E7gB00b/JmYLdrmVClpJ+f6AR7ECLCT7up
+1/63xhv4O1fnxqimFQ8E+4P208UewwI1VBNaFpEy9nXzrith1yrv8iIDGZ3RSAHHAhUAl2BQjxUj
+C8yykrmCouuEC/BYHPUCgYEA9+GghdabPd7LvKtcNrhXuXmUr7v6OuqC+VdMCz0HgmdRWVeOutRZ
+T+ZxBxCBgLRJFnEj6EwoFhO3zwkyjMim4TwWeotUfI0o4KOuHiuzpnWRbqN/C/ohNWLx+2J6ASQ7
+zKTxvqhRkImog9/hWuWfBpKLZl6Ae1UlZAFMO/7PSSoDgYUAAoGBAJzViPUKzERjI7kmNSz8UHYo
+1YB1gfdUk80gVv1Mn+2zo6yugKEao9QtkhunlicLlsf7exUPiSFcZlO5byl0HEQ02U/awQp87/EO
+osuBmG9imxKItaJhDxtKEk4L+E66LabDeDpXYNdBdZuPEs2swjJY9EGSnbP47qK8Sr5CvRiroDAw
+LgYJKoZIhvcNAQkOMSEwHzAdBgNVHQ4EFgQU5IZAeDUryinBjGliij8UM6aY7LEwCwYHKoZIzjgE
+AwUAAzAAMC0CFQCAJ5LLNjsgzKHEK7B1ITo3g+33BgIUV4pXlouKfzbBX/TiYFaSXaiPvbs=
+-----END NEW CERTIFICATE REQUEST-----
Added: qpid/dispatch/trunk/tests/ssl_certs/server.pkcs12
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/tests/ssl_certs/server.pkcs12?rev=1660733&view=auto
==============================================================================
Binary files qpid/dispatch/trunk/tests/ssl_certs/server.pkcs12 (added) and qpid/dispatch/trunk/tests/ssl_certs/server.pkcs12 Wed Feb 18 21:37:38 2015 differ
Modified: qpid/dispatch/trunk/tests/system_test.py
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/tests/system_test.py?rev=1660733&r1=1660732&r2=1660733&view=diff
==============================================================================
--- qpid/dispatch/trunk/tests/system_test.py (original)
+++ qpid/dispatch/trunk/tests/system_test.py Wed Feb 18 21:37:38 2015
@@ -352,7 +352,7 @@ class Qdrouterd(Process):
def management(self):
"""Return a management agent proxy for this router"""
if not self._management:
- self._management = Node(self.addresses[0], timeout=DEFAULT_TIMEOUT)
+ self._management = Node.connect(self.addresses[0], timeout=DEFAULT_TIMEOUT)
return self._management
def teardown(self):
@@ -426,7 +426,7 @@ class Qdrouterd(Process):
# connected. However we still get a race where the router is not
# actually ready for traffic. Investigate.
# Meantime the following actually tests send-thru to the router.
- node = Node(self.addresses[0], router_id, timeout=1)
+ node = Node.connect(self.addresses[0], router_id, timeout=1)
return retry_exception(lambda: node.query('org.apache.qpid.dispatch.router'))
except:
return False
Modified: qpid/dispatch/trunk/tests/system_tests_management.py
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/tests/system_tests_management.py?rev=1660733&r1=1660732&r2=1660733&view=diff
==============================================================================
--- qpid/dispatch/trunk/tests/system_tests_management.py (original)
+++ qpid/dispatch/trunk/tests/system_tests_management.py Wed Feb 18 21:37:38 2015
@@ -110,7 +110,7 @@ class ManagementTest(system_test.TestCas
self._routers = None # Wait on demand
self.maxDiff = None
self.longMessage = True
- self.node = self.cleanup(Node(self.router.addresses[0]))
+ self.node = self.cleanup(Node.connect(self.router.addresses[0]))
def test_bad_query(self):
"""Test that various badly formed queries get the proper response"""
@@ -173,14 +173,14 @@ class ManagementTest(system_test.TestCas
self.assertEqual(entity['addr'], '0.0.0.0')
# Connect via the new listener
- node3 = self.cleanup(Node(Url(port=port)))
+ node3 = self.cleanup(Node.connect(Url(port=port)))
router = node3.query(type=ROUTER).get_entities()
self.assertEqual(self.router.name, router[0]['routerId'])
def test_log(self):
"""Create, update and query log entities"""
- node = self.cleanup(Node(self.logrouter.addresses[0]))
+ node = self.cleanup(Node.connect(self.logrouter.addresses[0]))
default = node.read(identity='log/DEFAULT')
self.assertEqual(default.attributes,
{u'identity': u'log/DEFAULT',
@@ -388,7 +388,7 @@ class ManagementTest(system_test.TestCas
def test_router_node(self):
"""Test node entity in a trio of linked routers"""
- nodes = [self.cleanup(Node(Url(r.addresses[0]))) for r in self.routers]
+ nodes = [self.cleanup(Node.connect(Url(r.addresses[0]))) for r in self.routers]
rnode_lists = [n.query(type=NODE).get_dicts() for n in nodes]
def check(attrs):
@@ -404,7 +404,7 @@ class ManagementTest(system_test.TestCas
self.assertEqual(set(["router1", "router0"]), set([check(n) for n in rnode_lists[2]]))
def test_entity_names(self):
- nodes = [self.cleanup(Node(Url(r.addresses[0]))) for r in self.routers]
+ nodes = [self.cleanup(Node.connect(Url(r.addresses[0]))) for r in self.routers]
# Test that all entities have a consitent identity format: type/name
entities = list(chain(
*[n.query(attribute_names=['type', 'identity', 'name']).iter_entities() for n in nodes]))
@@ -416,24 +416,24 @@ class ManagementTest(system_test.TestCas
def test_remote_node(self):
"""Test that we can access management info of remote nodes using get_mgmt_nodes addresses"""
- nodes = [self.cleanup(Node(Url(r.addresses[0]))) for r in self.routers]
+ nodes = [self.cleanup(Node.connect(Url(r.addresses[0]))) for r in self.routers]
remotes = sum([n.get_mgmt_nodes() for n in nodes], [])
self.assertEqual([u'amqp:/_topo/0/router2/$management', u'amqp:/_topo/0/router1/$management'], remotes)
# Query router2 indirectly via router1
remote_url = Url(self.routers[0].addresses[0], path=Url(remotes[0]).path)
- remote = self.cleanup(Node(remote_url))
+ remote = self.cleanup(Node.connect(remote_url))
self.assertEqual(["router2"], [r.routerId for r in remote.query(type=ROUTER).get_entities()])
def test_remote_node(self):
"""Test that we can access management info of remote nodes using get_mgmt_nodes addresses"""
- nodes = [self.cleanup(Node(Url(r.addresses[0]))) for r in self.routers]
+ nodes = [self.cleanup(Node.connect(Url(r.addresses[0]))) for r in self.routers]
remotes = sum([n.get_mgmt_nodes() for n in nodes], [])
self.assertEqual(set([u'amqp:/_topo/0/router%s/$management' % i for i in [0, 1, 2]]),
set(remotes))
self.assertEqual(6, len(remotes))
# Query router2 indirectly via router1
remote_url = Url(self.routers[0].addresses[0], path=Url(remotes[0]).path)
- remote = self.cleanup(Node(remote_url))
+ remote = self.cleanup(Node.connect(remote_url))
router_id = remotes[0].split("/")[3]
assert router_id in ['router1', 'router2']
self.assertEqual([router_id], [r.routerId for r in remote.query(type=ROUTER).get_entities()])
Modified: qpid/dispatch/trunk/tests/system_tests_qdmanage.py
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/tests/system_tests_qdmanage.py?rev=1660733&r1=1660732&r2=1660733&view=diff
==============================================================================
--- qpid/dispatch/trunk/tests/system_tests_qdmanage.py (original)
+++ qpid/dispatch/trunk/tests/system_tests_qdmanage.py Wed Feb 18 21:37:38 2015
@@ -17,30 +17,43 @@
# under the License
#
-import re, json, unittest
+import re, json, unittest, os
from system_test import TestCase, Process, Qdrouterd, main_module
from subprocess import PIPE, STDOUT
from qpid_dispatch_internal.compat import OrderedDict, dictify
from qpid_dispatch_internal.management.qdrouter import QdSchema
+from proton import Url
DUMMY = "org.apache.qpid.dispatch.dummy"
class QdmanageTest(TestCase):
"""Test qdmanage tool output"""
+ @staticmethod
+ def ssl_file(name):
+ return os.path.join(os.path.dirname(__file__), 'ssl_certs', name)
+
@classmethod
def setUpClass(cls):
super(QdmanageTest, cls).setUpClass()
config = Qdrouterd.Config([
- ('listener', {'port': cls.tester.get_port()})
+ ('ssl-profile', {'name': 'server-ssl',
+ 'cert-db': cls.ssl_file('ca-certificate.pem'),
+ 'cert-file': cls.ssl_file('server-certificate.pem'),
+ 'key-file': cls.ssl_file('server-private-key.pem'),
+ 'password': 'server-password',
+ 'allow-unsecured': False,
+ 'require-peer-auth': False}),
+ ('listener', {'port': cls.tester.get_port()}),
+ ('listener', {'port': cls.tester.get_port(), 'ssl-profile': 'server-ssl'})
])
cls.router = cls.tester.qdrouterd('test-router', config, wait=True)
- def address(self): return self.router.hostports[0]
+ def address(self): return self.router.addresses[0]
- def run_qdmanage(self, cmd, input=None, expect=Process.EXIT_OK):
+ def run_qdmanage(self, cmd, input=None, expect=Process.EXIT_OK, address=None):
p = self.popen(
- ['qdmanage'] + cmd.split(' ') + ['--bus', self.address(), '--indent=-1'],
+ ['qdmanage'] + cmd.split(' ') + ['--bus', address or self.address(), '--indent=-1'],
stdin=PIPE, stdout=PIPE, stderr=STDOUT, expect=expect)
out = p.communicate(input)[0]
try:
@@ -119,7 +132,7 @@ class QdmanageTest(TestCase):
for t in long_types: self.assertIn(t, qall_types)
qlistener = json.loads(self.run_qdmanage('query --type=listener'))
- self.assertEqual([long_type('listener')], [e['type'] for e in qlistener])
+ self.assertEqual([long_type('listener')]*2, [e['type'] for e in qlistener])
self.assertEqual(self.router.ports[0], int(qlistener[0]['port']))
qattr = json.loads(
@@ -137,6 +150,13 @@ class QdmanageTest(TestCase):
schema = dictify(QdSchema().dump())
actual = self.run_qdmanage("GET-JSON-SCHEMA")
self.assertEquals(schema, dictify(json.loads(actual)))
+
+ def test_ssl(self):
+ """Simple test for SSL connection. Note system_tests_qdstat has a more complete SSL test"""
+ url = Url(self.router.addresses[1], scheme="amqps")
+ schema = dictify(QdSchema().dump())
+ actual = self.run_qdmanage("GET-JSON-SCHEMA")
+ self.assertEquals(schema, dictify(json.loads(actual)))
if __name__ == '__main__':
unittest.main(main_module())
Modified: qpid/dispatch/trunk/tests/system_tests_qdstat.py
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/tests/system_tests_qdstat.py?rev=1660733&r1=1660732&r2=1660733&view=diff
==============================================================================
--- qpid/dispatch/trunk/tests/system_tests_qdstat.py (original)
+++ qpid/dispatch/trunk/tests/system_tests_qdstat.py Wed Feb 18 21:37:38 2015
@@ -17,26 +17,54 @@
# under the License
#
+import os
import re
import system_test
import unittest
from subprocess import PIPE
+from proton import Url
class QdstatTest(system_test.TestCase):
"""Test qdstat tool output"""
+ @staticmethod
+ def ssl_file(name):
+ return os.path.join(os.path.dirname(__file__), 'ssl_certs', name)
+
@classmethod
def setUpClass(cls):
super(QdstatTest, cls).setUpClass()
config = system_test.Qdrouterd.Config([
+ ('ssl-profile', {'name': 'server-ssl-strict',
+ 'cert-db': cls.ssl_file('ca-certificate.pem'),
+ 'cert-file': cls.ssl_file('server-certificate.pem'),
+ 'key-file': cls.ssl_file('server-private-key.pem'),
+ 'password': 'server-password',
+ 'allow-unsecured': False,
+ 'require-peer-auth': False}),
+ ('ssl-profile', {'name': 'server-ssl-unsecured',
+ 'cert-db': cls.ssl_file('ca-certificate.pem'),
+ 'cert-file': cls.ssl_file('server-certificate.pem'),
+ 'key-file': cls.ssl_file('server-private-key.pem'),
+ 'password': 'server-password',
+ 'allow-unsecured': True,
+ 'require-peer-auth': False}),
+ ('ssl-profile', {'name': 'server-ssl-auth',
+ 'cert-db': cls.ssl_file('ca-certificate.pem'),
+ 'cert-file': cls.ssl_file('server-certificate.pem'),
+ 'key-file': cls.ssl_file('server-private-key.pem'),
+ 'password': 'server-password',
+ 'allow-unsecured': False,
+ 'require-peer-auth': True}),
('listener', {'port': cls.tester.get_port()}),
+ ('listener', {'port': cls.tester.get_port(), 'ssl-profile': 'server-ssl-strict'}),
+ ('listener', {'port': cls.tester.get_port(), 'ssl-profile': 'server-ssl-unsecured'}),
+ ('listener', {'port': cls.tester.get_port(), 'ssl-profile': 'server-ssl-auth'})
])
cls.router = cls.tester.qdrouterd('test-router', config)
- def address(self): return self.router.hostports[0] # Overridden by subclasses
-
- def run_qdstat(self, args, regexp=None):
- p = self.popen(['qdstat', '--bus', self.address()] + args,
+ def run_qdstat(self, args, regexp=None, address=None):
+ p = self.popen(['qdstat', '--bus', str(address or self.router.addresses[0])] + args,
name='qdstat-'+self.id(), stdout=PIPE, expect=None)
out = p.communicate()[0]
assert p.returncode == 0, \
@@ -65,5 +93,58 @@ class QdstatTest(system_test.TestCase):
def test_memory(self):
self.run_qdstat(['--memory'], r'qd_address_t\s+[0-9]+')
+ def do_test(self, url, args):
+ # FIXME aconway 2015-02-18: shouldn't be timing out, should be rejected.
+ self.run_qdstat(['--general', '--timeout=0.5'] + args,
+ regexp=r'(?s)Router Statistics.*Mode\s*Standalone',
+ address=str(url))
+
+ def test_ssl(self):
+ """
+ Test the matrix of dispatch and client SSL configuratoin and ensure we
+ can/can't connect as expected.
+ """
+ trustfile = ['--ssl-trustfile', self.ssl_file('ca-certificate.pem')]
+ bad_trustfile = ['--ssl-trustfile', self.ssl_file('bad-ca-certificate.pem')]
+ client_cert = ['--ssl-certificate', self.ssl_file('client-certificate.pem')]
+ client_key = ['--ssl-key', self.ssl_file('client-private-key.pem')]
+ client_pass = ['--ssl-password', 'client-password']
+ client_cert_all = client_cert + client_key + client_pass
+
+ addrs = [self.router.addresses[i] for i in xrange(4)];
+ none, strict, unsecured, auth = addrs
+ none_s, strict_s, unsecured_s, auth_s = (Url(a, scheme="amqps") for a in addrs)
+
+ # Non-SSL enabled listener should fail SSL connections.
+ self.do_test(none, [])
+ self.assertRaises(AssertionError, self.do_test, none_s, [])
+ self.assertRaises(AssertionError, self.do_test, none, client_cert)
+
+ # Strict SSL listener, SSL only
+ self.assertRaises(AssertionError, self.do_test, strict, [])
+ self.do_test(strict_s, [])
+ self.do_test(strict_s, client_cert_all)
+ self.do_test(strict, client_cert_all)
+ self.do_test(strict, trustfile)
+ self.do_test(strict, trustfile + client_cert_all)
+ self.assertRaises(AssertionError, self.do_test, strict, bad_trustfile)
+
+ # Requre-auth SSL listener
+ self.assertRaises(AssertionError, self.do_test, auth, [])
+ self.assertRaises(AssertionError, self.do_test, auth_s, [])
+ self.assertRaises(AssertionError, self.do_test, auth, trustfile)
+ self.do_test(auth, client_cert_all)
+ self.do_test(auth, client_cert_all + trustfile)
+ self.assertRaises(AssertionError, self.do_test, auth, client_cert_all + bad_trustfile)
+
+ # Unsecured SSL listener, allows non-SSL
+ self.do_test(unsecured_s, [])
+ self.do_test(unsecured_s, client_cert_all)
+ self.do_test(unsecured_s, trustfile)
+ self.do_test(unsecured_s, client_cert_all + trustfile)
+ self.do_test(unsecured_s, [])
+ self.do_test(unsecured, []) # Allow unsecured
+ self.assertRaises(AssertionError, self.do_test, auth, client_cert_all + bad_trustfile)
+
if __name__ == '__main__':
unittest.main(system_test.main_module())
Modified: qpid/dispatch/trunk/tools/qdmanage
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/tools/qdmanage?rev=1660733&r1=1660732&r2=1660733&view=diff
==============================================================================
--- qpid/dispatch/trunk/tools/qdmanage (original)
+++ qpid/dispatch/trunk/tools/qdmanage Wed Feb 18 21:37:38 2015
@@ -24,7 +24,7 @@ import qpid_dispatch_site
from qpid_dispatch.management.client import Node, Url
from collections import Mapping, Sequence
from optparse import OptionGroup
-from qpid_dispatch_internal.tools.command import OptionParser, Option, UsageError, connection_options, check_args, main
+from qpid_dispatch_internal.tools.command import OptionParser, Option, UsageError, connection_options, check_args, main, opts_ssl_domain, opts_url
def attr_split(attrstr):
"""Split an attribute string of the form name=value or name to indicate None"""
@@ -61,7 +61,8 @@ class QdManage():
self.opts, self.args = self.op.parse_args(argv[1:])
if len(self.args) == 0: raise UsageError("No operation specified")
operation = self.args.pop(0)
- self.node = Node(Url(self.opts.bus), self.opts.router)
+ self.node = Node.connect(
+ opts_url(self.opts), self.opts.router, self.opts.timeout, opts_ssl_domain(self.opts))
if operation.upper() in self.operations:
method = getattr(self, operation.lower().replace('-','_'))
method()
Modified: qpid/dispatch/trunk/tools/qdstat
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/tools/qdstat?rev=1660733&r1=1660732&r2=1660733&view=diff
==============================================================================
--- qpid/dispatch/trunk/tools/qdstat (original)
+++ qpid/dispatch/trunk/tools/qdstat Wed Feb 18 21:37:38 2015
@@ -30,26 +30,11 @@ import qpid_dispatch_site
from qpid_dispatch.management.client import Url, Node, Entity
from qpid_dispatch_internal.management.qdrouter import QdSchema
from qpid_dispatch_internal.tools import Display, Header, Sorter, YN, Commas, TimeLong
-from qpid_dispatch_internal.tools.command import connection_options, main, OptionParser
+from qpid_dispatch_internal.tools.command import connection_options, main, OptionParser, opts_ssl_domain, opts_url
-
-class Config:
- def __init__(self):
- self._connTimeout = 5
- self._types = ""
- self._limit = 50
- self._increasing = False
- self._sortcol = None
-
-config = Config()
-conn_options = {}
-
-def OptionsAndArguments(argv):
+def parse_args(argv):
""" Set global variables for options, return arguments """
- global config
- global conn_options
-
usage = "%prog [options]"
parser = OptionParser(usage=usage)
@@ -68,18 +53,19 @@ def OptionsAndArguments(argv):
if not opts.show:
parser.error("You must specify one of these options: -g, -c, -l, -n, -a, -m or -h.")
- config._types = opts.show
- config._address = opts.bus
- config._router = opts.router
- config._connTimeout = opts.timeout
-
- return args
+ return opts, args
class BusManager(Node):
schema = QdSchema()
+ def __init__(self, opts):
+ self.opts = opts
+ super(BusManager, self).__init__(
+ Node.connection(opts_url(opts), opts.router, timeout=opts.timeout,
+ ssl_domain=opts_ssl_domain(opts)))
+
def query(self, entity_type):
return super(BusManager, self).query(entity_type).get_entities()
@@ -307,11 +293,11 @@ class BusManager(Node):
elif main == 'c': self.displayConnections()
def display(self, identitys):
- self.displayMain(identitys, config._types)
+ self.displayMain(identitys, self.opts.show)
def run(argv):
- args = OptionsAndArguments(argv)
- bm = BusManager(config._address, config._router)
+ opts, args = parse_args(argv)
+ bm = BusManager(opts)
try:
bm.display(args)
finally:
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org