From 9bc70bfcd5fbced071fa304a5591ca8acb61c32f Mon Sep 17 00:00:00 2001 From: "Charles E. Rolke" Date: Wed, 2 May 2012 17:00:54 +0000 Subject: QPID-2616 Count and limit client connections. Bug fix: use Connection.getUserId() and not getUsername() to identify user and upgrade selftest to match. Add comment to Connection.h to suggest the particular pitfall. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1333110 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/src/tests/acl.py | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-) (limited to 'qpid/cpp/src/tests') diff --git a/qpid/cpp/src/tests/acl.py b/qpid/cpp/src/tests/acl.py index 9b170c16f5..720b3b4216 100755 --- a/qpid/cpp/src/tests/acl.py +++ b/qpid/cpp/src/tests/acl.py @@ -1518,29 +1518,41 @@ class ACLTests(TestBase010): """ # By username should be able to connect twice per user try: - sessiona1 = self.get_session_by_port('anonymous','anonymous', self.port_u()) - sessiona2 = self.get_session_by_port('anonymous','anonymous', self.port_u()) + sessiona1 = self.get_session_by_port('alice','alice', self.port_u()) + sessiona2 = self.get_session_by_port('alice','alice', self.port_u()) except Exception, e: - self.fail("Could not create two connections per user: " + str(e)) + self.fail("Could not create two connections for user alice: " + str(e)) # Third session should fail try: - sessiona3 = self.get_session_by_port('anonymous','anonymous', self.port_u()) - self.fail("Should not be able to create third connection") + sessiona3 = self.get_session_by_port('alice','alice', self.port_u()) + self.fail("Should not be able to create third connection for user alice") + except Exception, e: + result = None + + try: + sessionb1 = self.get_session_by_port('bob','bob', self.port_u()) + sessionb2 = self.get_session_by_port('bob','bob', self.port_u()) + except Exception, e: + self.fail("Could not create two connections for user bob: " + str(e)) + + try: + sessionb3 = self.get_session_by_port('bob','bob', self.port_u()) + self.fail("Should not be able to create third connection for user bob") except Exception, e: result = None # By IP address should be able to connect twice per client address try: - sessionb1 = self.get_session_by_port('anonymous','anonymous', self.port_i()) - sessionb2 = self.get_session_by_port('anonymous','anonymous', self.port_i()) + sessionb1 = self.get_session_by_port('alice','alice', self.port_i()) + sessionb2 = self.get_session_by_port('bob','bob', self.port_i()) except Exception, e: - self.fail("Could not create two connections per user: " + str(e)) + self.fail("Could not create two connections for client address: " + str(e)) # Third session should fail try: - sessionb3 = self.get_session_by_port('anonymous','anonymous', self.port_i()) - self.fail("Should not be able to create third connection") + sessionb3 = self.get_session_by_port('charlie','charlie', self.port_i()) + self.fail("Should not be able to create third connection for client address") except Exception, e: result = None -- cgit v1.2.1