diff options
| author | Carl C. Trieloff <cctrieloff@apache.org> | 2008-09-02 21:49:55 +0000 |
|---|---|---|
| committer | Carl C. Trieloff <cctrieloff@apache.org> | 2008-09-02 21:49:55 +0000 |
| commit | 804cfbdaf19ee803f362b6aa4c35696ca4e850c3 (patch) | |
| tree | 090db6b2fc272c6df0a88b7f10bd816942a883b9 /cpp/src/qpid/broker/SessionAdapter.cpp | |
| parent | 1d07b5b9c71fb74ab87fc15d4559832bbc2d254c (diff) | |
| download | qpid-python-804cfbdaf19ee803f362b6aa4c35696ca4e850c3.tar.gz | |
QPID-107 Implementation for ACL for C++ broker
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@691396 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/qpid/broker/SessionAdapter.cpp')
| -rw-r--r-- | cpp/src/qpid/broker/SessionAdapter.cpp | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/cpp/src/qpid/broker/SessionAdapter.cpp b/cpp/src/qpid/broker/SessionAdapter.cpp index 03022b00bb..9ab2c3a75e 100644 --- a/cpp/src/qpid/broker/SessionAdapter.cpp +++ b/cpp/src/qpid/broker/SessionAdapter.cpp @@ -56,11 +56,11 @@ void SessionAdapter::ExchangeHandlerImpl::declare(const string& exchange, const AclModule* acl = getBroker().getAcl(); if (acl) { - std::map<std::string, std::string> params; - params.insert(make_pair("TYPE", type)); - params.insert(make_pair("ALT", alternateExchange)); - params.insert(make_pair("PAS", std::string(passive ? "Y" : "N") )); - params.insert(make_pair("DURA", std::string(durable ? "Y" : "N"))); + std::map<acl::Property, std::string> params; + params.insert(make_pair(acl::TYPE, type)); + params.insert(make_pair(acl::ALTERNATE, alternateExchange)); + params.insert(make_pair(acl::PASSIVE, std::string(passive ? "true" : "false") )); + params.insert(make_pair(acl::DURABLE, std::string(durable ? "true" : "false"))); if (!acl->authorise(getConnection().getUserId(),acl::CREATE,acl::EXCHANGE,exchange,¶ms) ) throw NotAllowedException("ACL denied exhange declare request"); } @@ -182,9 +182,9 @@ SessionAdapter::ExchangeHandlerImpl::unbind(const string& queueName, AclModule* acl = getBroker().getAcl(); if (acl) { - std::map<std::string, std::string> params; - params.insert(make_pair("QN", queueName)); - params.insert(make_pair("RKEY", routingKey)); + std::map<acl::Property, std::string> params; + params.insert(make_pair(acl::QUEUENAME, queueName)); + params.insert(make_pair(acl::ROUTINGKEY, routingKey)); if (!acl->authorise(getConnection().getUserId(),acl::UNBIND,acl::EXCHANGE,exchangeName,¶ms) ) throw NotAllowedException("ACL denied exchange unbind request"); } @@ -211,9 +211,9 @@ ExchangeBoundResult SessionAdapter::ExchangeHandlerImpl::bound(const std::string AclModule* acl = getBroker().getAcl(); if (acl) { - std::map<std::string, std::string> params; - params.insert(make_pair("QUEUE", queueName)); - params.insert(make_pair("RKEY", queueName)); + std::map<acl::Property, std::string> params; + params.insert(make_pair(acl::QUEUENAME, queueName)); + params.insert(make_pair(acl::ROUTINGKEY, key)); if (!acl->authorise(getConnection().getUserId(),acl::CREATE,acl::EXCHANGE,exchangeName,¶ms) ) throw NotAllowedException("ACL denied exhange bound request"); } @@ -310,12 +310,12 @@ void SessionAdapter::QueueHandlerImpl::declare(const string& name, const string& AclModule* acl = getBroker().getAcl(); if (acl) { - std::map<std::string, std::string> params; - params.insert(make_pair("ALT", alternateExchange)); - params.insert(make_pair("PAS", std::string(passive ? "Y" : "N") )); - params.insert(make_pair("DURA", std::string(durable ? "Y" : "N"))); - params.insert(make_pair("EXCLUS", std::string(exclusive ? "Y" : "N"))); - params.insert(make_pair("AUTOD", std::string(autoDelete ? "Y" : "N"))); + std::map<acl::Property, std::string> params; + params.insert(make_pair(acl::ALTERNATE, alternateExchange)); + params.insert(make_pair(acl::PASSIVE, std::string(passive ? "true" : "false") )); + params.insert(make_pair(acl::DURABLE, std::string(durable ? "true" : "false"))); + params.insert(make_pair(acl::EXCLUSIVE, std::string(exclusive ? "true" : "false"))); + params.insert(make_pair(acl::AUTODELETE, std::string(autoDelete ? "true" : "false"))); if (!acl->authorise(getConnection().getUserId(),acl::CREATE,acl::QUEUE,name,¶ms) ) throw NotAllowedException("ACL denied queue create request"); } |