From 1a859715334e23559bd3d68181aec1ca6a778e5e Mon Sep 17 00:00:00 2001 From: "Carl C. Trieloff" Date: Fri, 12 Sep 2008 19:11:35 +0000 Subject: QPID-106 - Added mgnt schema - Added ability to reload ACL file - Added events for ACL deny - Added stats for ACL. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@694778 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/qpid/acl/Acl.cpp | 61 ++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 56 insertions(+), 5 deletions(-) (limited to 'cpp/src/qpid/acl/Acl.cpp') diff --git a/cpp/src/qpid/acl/Acl.cpp b/cpp/src/qpid/acl/Acl.cpp index 982b9e3bb0..f9c307c7d3 100644 --- a/cpp/src/qpid/acl/Acl.cpp +++ b/cpp/src/qpid/acl/Acl.cpp @@ -24,6 +24,7 @@ #include "qpid/Options.h" #include "qpid/shared_ptr.h" #include "qpid/log/Logger.h" +#include "qpid/management/PackageACL.h" #include @@ -33,12 +34,28 @@ namespace qpid { namespace acl { using namespace std; +using qpid::management::ManagementAgent; +using qpid::management::ManagementObject; +using qpid::management::Manageable; +using qpid::management::Args; Acl::Acl (AclValues& av, broker::Broker& b): aclValues(av), broker(&b), transferAcl(false) { - if (!readAclFile()) throw Exception("Could not read ACL file"); - QPID_LOG(info, "ACL Plugin loaded"); + + ManagementAgent* agent = ManagementAgent::Singleton::getInstance(); + + if (agent != 0){ + management::PackageACL packageInit(agent); + mgmtObject = new management::Acl (agent, this, broker); + agent->addObject (mgmtObject); + } + if (!readAclFile()){ + throw Exception("Could not read ACL file"); + if (mgmtObject!=0) mgmtObject->set_enforcingAcl(0); + } + QPID_LOG(info, "ACL Plugin loaded"); + if (mgmtObject!=0) mgmtObject->set_enforcingAcl(1); } bool Acl::authorise(const std::string& id, const Action& action, const ObjectType& objType, const std::string& name, std::map* params) @@ -74,10 +91,16 @@ using namespace std; case ALLOW: return true; case DENY: + if (mgmtObject!=0) mgmtObject->inc_aclDenyCount(); return false; case DENYLOG: + if (mgmtObject!=0) mgmtObject->inc_aclDenyCount(); default: QPID_LOG(info, "ACL Deny id:" << id << " action:" << AclHelper::getActionStr(action) << " ObjectType:" << AclHelper::getObjectTypeStr(objType) << " Name:" << name); + if (mgmtObject!=0){ + framing::FieldTable _params; + mgmtObject->event_aclEvent(1, id, AclHelper::getActionStr(action),AclHelper::getObjectTypeStr(objType),name, _params); + } return false; } return false; @@ -92,16 +115,44 @@ using namespace std; bool Acl::readAclFile(std::string& aclFile) { boost::shared_ptr d(new AclData); AclReader ar; - if (ar.read(aclFile, d)) + if (ar.read(aclFile, d)){ + mgmtObject->event_fileNotLoaded("","See log for file load reason failure"); return false; - + } + data = d; transferAcl = data->transferAcl; // any transfer ACL + if (mgmtObject!=0){ + mgmtObject->set_transferAcl(transferAcl?1:0); + mgmtObject->set_policyFile(aclFile); + sys::AbsTime now = sys::AbsTime::now(); + int64_t ns = sys::Duration(now); + mgmtObject->set_lastAclLoad(ns); + mgmtObject->event_fileLoaded(""); + } return true; } Acl::~Acl(){} + ManagementObject* Acl::GetManagementObject(void) const + { + return (ManagementObject*) mgmtObject; + } + + Manageable::status_t Acl::ManagementMethod (uint32_t methodId, Args& /*args*/, string&) + { + Manageable::status_t status = Manageable::STATUS_UNKNOWN_METHOD; + QPID_LOG (debug, "Queue::ManagementMethod [id=" << methodId << "]"); + + switch (methodId) + { + case management::Acl::METHOD_RELOADACLFILE : + readAclFile(); + status = Manageable::STATUS_OK; + break; + } - + return status; +} }} // namespace qpid::acl -- cgit v1.2.1