valitydev/osquery-1
14
0
Fork 0
mirror of https://github.com/valitydev/osquery-1.git synced 2024-11-07 09:58:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

extensions: Gate access to resource state within Handler (#2975)

Browse Source
This commit is contained in:
Teddy Reed 2017-02-07 11:45:55 -08:00 committed by GitHub
parent d2e7295462
commit f8c16b0316
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
osquery/extensions/interface.cpp
View File

@ -92,6 +92,8 @@ ExtensionManagerHandler::ExtensionManagerHandler() {
void ExtensionManagerHandler::extensions(InternalExtensionList& _return) {
refresh();
ReadLock lock(extensions_mutex_);
_return = extensions_;
}
@ -140,6 +142,7 @@ void ExtensionManagerHandler::registerExtension(
return;
}
WriteLock lock(extensions_mutex_);
extensions_[uuid] = info;
_return.code = ExtensionCode::EXT_SUCCESS;
_return.message = "OK";
@ -148,15 +151,20 @@ void ExtensionManagerHandler::registerExtension(
void ExtensionManagerHandler::deregisterExtension(
ExtensionStatus& _return, const ExtensionRouteUUID uuid) {
if (extensions_.count(uuid) == 0) {
_return.code = ExtensionCode::EXT_FAILED;
_return.message = "No extension UUID registered";
_return.uuid = 0;
return;
{
ReadLock lock(extensions_mutex_);
if (extensions_.count(uuid) == 0) {
_return.code = ExtensionCode::EXT_FAILED;
_return.message = "No extension UUID registered";
_return.uuid = 0;
return;
}
}
// On success return the uuid of the now de-registered extension.
RegistryFactory::get().removeBroadcast(uuid);
WriteLock lock(extensions_mutex_);
extensions_.erase(uuid);
_return.code = ExtensionCode::EXT_SUCCESS;
_return.uuid = uuid;
@ -196,6 +204,8 @@ void ExtensionManagerHandler::getQueryColumns(ExtensionResponse& _return,
void ExtensionManagerHandler::refresh() {
std::vector<RouteUUID> removed_routes;
const auto uuids = RegistryFactory::get().routeUUIDs();
WriteLock lock(extensions_mutex_);
for (const auto& ext : extensions_) {
// Find extension UUIDs that have gone away.
if (std::find(uuids.begin(), uuids.end(), ext.first) == uuids.end()) {
@ -213,6 +223,7 @@ bool ExtensionManagerHandler::exists(const std::string& name) {
refresh();
// Search the remaining extension list for duplicates.
ReadLock lock(extensions_mutex_);
for (const auto& extension : extensions_) {
if (extension.second.name == name) {
return true;

7
osquery/extensions/interface.h
View File

@ -10,6 +10,8 @@
#pragma once
#include <thread>
#include <osquery/dispatcher.h>
#include <osquery/extensions.h>
@ -121,7 +123,7 @@ class ExtensionHandler : virtual public ExtensionIf {
protected:
/// Transient UUID assigned to the extension after registering.
RouteUUID uuid_;
std::atomic<RouteUUID> uuid_;
};
/**
@ -227,6 +229,9 @@ class ExtensionManagerHandler : virtual public ExtensionManagerIf,
/// Maintain a map of extension UUID to metadata for tracking deregistration.
InternalExtensionList extensions_;
/// Mutex for extensions accessors.
Mutex extensions_mutex_;
};
typedef SHARED_PTR_IMPL<ExtensionHandler> ExtensionHandlerRef;