Author: rajith
Date: Mon Jan 11 19:20:34 2010
New Revision: 898016
URL: http://svn.apache.org/viewvc?rev=898016&view=rev
Log:
This is a fix for QPID-2297
Modified:
qpid/trunk/qpid/cpp/src/qpid/acl/AclReader.cpp
qpid/trunk/qpid/cpp/src/tests/acl.py
Modified: qpid/trunk/qpid/cpp/src/qpid/acl/AclReader.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/acl/AclReader.cpp?rev=898016&r1=898015&r2=898016&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/acl/AclReader.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/acl/AclReader.cpp Mon Jan 11 19:20:34 2010
@@ -522,7 +522,7 @@
bool AclReader::checkName(const std::string& name) {
for (unsigned i=0; i<name.size(); i++) {
const char ch = name.at(i);
- if (!std::isalnum(ch) && ch != '-' && ch != '_' && ch != '@') return
false;
+ if (!std::isalnum(ch) && ch != '-' && ch != '_' && ch != '@' && ch !=
'.') return false;
}
return true;
}
Modified: qpid/trunk/qpid/cpp/src/tests/acl.py
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/acl.py?rev=898016&r1=898015&r2=898016&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/acl.py (original)
+++ qpid/trunk/qpid/cpp/src/tests/acl.py Mon Jan 11 19:20:34 2010
@@ -194,13 +194,14 @@
if (result.text.find("contains illegal characters",0,len(result.text))
== -1):
self.fail(result)
- def test_user_without_realm(self):
+ def test_user_domain(self):
"""
Test a user defined without a realm
Ex. group admin rajith
"""
aclf = ACLFile()
- aclf.write('group admin bob\n')
+ aclf.write('group test [email protected]\n') # should be allowed
+ aclf.write('group admin bob\n') # shouldn't be allowed
aclf.write('acl deny admin bind exchange\n')
aclf.write('acl allow all all')
aclf.close()
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:[email protected]
