summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/qpid/acl/AclReader.cpp2
-rwxr-xr-xcpp/src/tests/acl.py5
2 files changed, 4 insertions, 3 deletions
diff --git a/cpp/src/qpid/acl/AclReader.cpp b/cpp/src/qpid/acl/AclReader.cpp
index 8f419a6f50..e2bdbc8ad1 100644
--- a/cpp/src/qpid/acl/AclReader.cpp
+++ b/cpp/src/qpid/acl/AclReader.cpp
@@ -522,7 +522,7 @@ void AclReader::printRules() const {
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;
}
diff --git a/cpp/src/tests/acl.py b/cpp/src/tests/acl.py
index b27f2f1916..b4dfa557df 100755
--- a/cpp/src/tests/acl.py
+++ b/cpp/src/tests/acl.py
@@ -194,13 +194,14 @@ class ACLTests(TestBase010):
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 joe@EXAMPLE.com\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()