tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-25 22:54:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

Check object access when replaying log files

Browse Source 
fixes #6205
This commit is contained in:
Gunnar Beutner 2014-08-26 10:24:04 +02:00
parent 634ef772c3
commit fca79dd66c
2 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
lib/remote/apilistener.cpp
View File

@ -433,7 +433,7 @@ void ApiListener::RelayMessage(const MessageOrigin& origin, const DynamicObject:
m_RelayQueue.Enqueue(boost::bind(&ApiListener::SyncRelayMessage, this, origin, secobj, message, log)); m_RelayQueue.Enqueue(boost::bind(&ApiListener::SyncRelayMessage, this, origin, secobj, message, log));
} }
void ApiListener::PersistMessage(const Dictionary::Ptr& message) void ApiListener::PersistMessage(const Dictionary::Ptr& message, const DynamicObject::Ptr& secobj)
{ {
double ts = message->Get("ts"); double ts = message->Get("ts");
@ -443,6 +443,11 @@ void ApiListener::PersistMessage(const Dictionary::Ptr& message)
pmessage->Set("timestamp", ts); pmessage->Set("timestamp", ts);
pmessage->Set("message", JsonSerialize(message)); pmessage->Set("message", JsonSerialize(message));
Dictionary::Ptr secname = make_shared<Dictionary>();
secname->Set("type", secobj->GetType()->GetName());
secname->Set("name", secobj->GetName());
pmessage->Set("secobj", secname);
boost::mutex::scoped_lock lock(m_LogLock); boost::mutex::scoped_lock lock(m_LogLock);
if (m_LogFile) { if (m_LogFile) {
@ -466,7 +471,7 @@ void ApiListener::SyncRelayMessage(const MessageOrigin& origin, const DynamicObj
Log(LogNotice, "ApiListener", "Relaying '" + message->Get("method") + "' message"); Log(LogNotice, "ApiListener", "Relaying '" + message->Get("method") + "' message");
if (log) if (log)
m_LogQueue.Enqueue(boost::bind(&ApiListener::PersistMessage, this, message)); PersistMessage(message, secobj);
if (origin.FromZone) if (origin.FromZone)
message->Set("originZone", origin.FromZone->GetName()); message->Set("originZone", origin.FromZone->GetName());
@ -608,6 +613,14 @@ void ApiListener::ReplayLog(const ApiClient::Ptr& client)
int count = -1; int count = -1;
double peer_ts = endpoint->GetLocalLogPosition(); double peer_ts = endpoint->GetLocalLogPosition();
bool last_sync = false; bool last_sync = false;
Endpoint::Ptr target_endpoint = client->GetEndpoint();
ASSERT(target_endpoint);
Zone::Ptr target_zone = target_endpoint->GetZone();
if (!target_zone)
return;
for (;;) { for (;;) {
boost::mutex::scoped_lock lock(m_LogLock); boost::mutex::scoped_lock lock(m_LogLock);
@ -658,6 +671,23 @@ void ApiListener::ReplayLog(const ApiClient::Ptr& client)
if (pmessage->Get("timestamp") <= peer_ts) if (pmessage->Get("timestamp") <= peer_ts)
continue; continue;
Dictionary::Ptr secname = pmessage->Get("secname");
if (secname) {
DynamicType::Ptr dtype = DynamicType::GetByName(secname->Get("type"));
if (!dtype)
continue;
DynamicObject::Ptr secobj = dtype->GetObject(secname->Get("name"));
if (!secobj)
continue;
if (!target_zone->CanAccessObject(secobj))
continue;
}
NetString::WriteStringToStream(client->GetStream(), pmessage->Get("message")); NetString::WriteStringToStream(client->GetStream(), pmessage->Get("message"));
count++; count++;

3
lib/remote/apilistener.hpp
View File

@ -88,14 +88,13 @@ private:
void MessageHandler(const TlsStream::Ptr& sender, const String& identity, const Dictionary::Ptr& message); void MessageHandler(const TlsStream::Ptr& sender, const String& identity, const Dictionary::Ptr& message);
WorkQueue m_RelayQueue; WorkQueue m_RelayQueue;
WorkQueue m_LogQueue;
boost::mutex m_LogLock; boost::mutex m_LogLock;
Stream::Ptr m_LogFile; Stream::Ptr m_LogFile;
size_t m_LogMessageCount; size_t m_LogMessageCount;
void SyncRelayMessage(const MessageOrigin& origin, const DynamicObject::Ptr& secobj, const Dictionary::Ptr& message, bool log); void SyncRelayMessage(const MessageOrigin& origin, const DynamicObject::Ptr& secobj, const Dictionary::Ptr& message, bool log);
void PersistMessage(const Dictionary::Ptr& message); void PersistMessage(const Dictionary::Ptr& message, const DynamicObject::Ptr& secobj);
void OpenLogFile(void); void OpenLogFile(void);
void RotateLogFile(void); void RotateLogFile(void);