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

Fix nullptr deref in cluster events

Browse Source
This commit is contained in:
Noah Hilverling 2018-01-31 10:17:49 +01:00 committed by Jean Flach
parent 3ba5090867
commit 71c420d501
3 changed files with 5 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
lib/icinga/clusterevents.cpp
View File

@ -114,9 +114,6 @@ Value ClusterEvents::CheckResultAPIHandler(const MessageOrigin::Ptr& origin, con
return Empty; return Empty;
} }
if (!params)
return Empty;
CheckResult::Ptr cr; CheckResult::Ptr cr;
Array::Ptr vperf; Array::Ptr vperf;
@ -220,9 +217,6 @@ Value ClusterEvents::NextCheckChangedAPIHandler(const MessageOrigin::Ptr& origin
return Empty; return Empty;
} }
if (!params)
return Empty;
Host::Ptr host = Host::GetByName(params->Get("host")); Host::Ptr host = Host::GetByName(params->Get("host"));
if (!host) if (!host)
@ -284,9 +278,6 @@ Value ClusterEvents::NextNotificationChangedAPIHandler(const MessageOrigin::Ptr&
return Empty; return Empty;
} }
if (!params)
return Empty;
Notification::Ptr notification = Notification::GetByName(params->Get("notification")); Notification::Ptr notification = Notification::GetByName(params->Get("notification"));
if (!notification) if (!notification)
@ -344,9 +335,6 @@ Value ClusterEvents::ForceNextCheckChangedAPIHandler(const MessageOrigin::Ptr& o
return Empty; return Empty;
} }
if (!params)
return Empty;
Host::Ptr host = Host::GetByName(params->Get("host")); Host::Ptr host = Host::GetByName(params->Get("host"));
if (!host) if (!host)
@ -409,9 +397,6 @@ Value ClusterEvents::ForceNextNotificationChangedAPIHandler(const MessageOrigin:
return Empty; return Empty;
} }
if (!params)
return Empty;
Host::Ptr host = Host::GetByName(params->Get("host")); Host::Ptr host = Host::GetByName(params->Get("host"));
if (!host) if (!host)
@ -480,9 +465,6 @@ Value ClusterEvents::AcknowledgementSetAPIHandler(const MessageOrigin::Ptr& orig
return Empty; return Empty;
} }
if (!params)
return Empty;
Host::Ptr host = Host::GetByName(params->Get("host")); Host::Ptr host = Host::GetByName(params->Get("host"));
if (!host) if (!host)
@ -546,9 +528,6 @@ Value ClusterEvents::AcknowledgementClearedAPIHandler(const MessageOrigin::Ptr&
return Empty; return Empty;
} }
if (!params)
return Empty;
Host::Ptr host = Host::GetByName(params->Get("host")); Host::Ptr host = Host::GetByName(params->Get("host"));
if (!host) if (!host)
@ -717,9 +696,6 @@ Value ClusterEvents::SendNotificationsAPIHandler(const MessageOrigin::Ptr& origi
return Empty; return Empty;
} }
if (!params)
return Empty;
Host::Ptr host = Host::GetByName(params->Get("host")); Host::Ptr host = Host::GetByName(params->Get("host"));
if (!host) if (!host)
@ -811,9 +787,6 @@ Value ClusterEvents::NotificationSentUserAPIHandler(const MessageOrigin::Ptr& or
return Empty; return Empty;
} }
if (!params)
return Empty;
Host::Ptr host = Host::GetByName(params->Get("host")); Host::Ptr host = Host::GetByName(params->Get("host"));
if (!host) if (!host)
@ -927,9 +900,6 @@ Value ClusterEvents::NotificationSentToAllUsersAPIHandler(const MessageOrigin::P
return Empty; return Empty;
} }
if (!params)
return Empty;
Host::Ptr host = Host::GetByName(params->Get("host")); Host::Ptr host = Host::GetByName(params->Get("host"));
if (!host) if (!host)

3
lib/remote/jsonrpcconnection-pki.cpp
View File

@ -40,9 +40,6 @@ REGISTER_APIFUNCTION(UpdateCertificate, pki, &UpdateCertificateHandler);
Value RequestCertificateHandler(const MessageOrigin::Ptr& origin, const Dictionary::Ptr& params) Value RequestCertificateHandler(const MessageOrigin::Ptr& origin, const Dictionary::Ptr& params)
{ {
if (!params)
return Empty;
String certText = params->Get("cert_request"); String certText = params->Get("cert_request");
boost::shared_ptr<X509> cert; boost::shared_ptr<X509> cert;

9
lib/remote/jsonrpcconnection.cpp
View File

@ -212,7 +212,11 @@ void JsonRpcConnection::MessageHandler(const String& jsonString)
Log(LogNotice, "JsonRpcConnection") Log(LogNotice, "JsonRpcConnection")
<< "Call to non-existent function '" << method << "' from endpoint '" << m_Identity << "'."; << "Call to non-existent function '" << method << "' from endpoint '" << m_Identity << "'.";
} else { } else {
resultMessage->Set("result", afunc->Invoke(origin, message->Get("params"))); Dictionary::Ptr params = message->Get("params");
if (params)
resultMessage->Set("result", afunc->Invoke(origin, params));
else
resultMessage->Set("result", Empty);
} }
} catch (const std::exception& ex) { } catch (const std::exception& ex) {
/* TODO: Add a user readable error message for the remote caller */ /* TODO: Add a user readable error message for the remote caller */
@ -274,9 +278,6 @@ void JsonRpcConnection::DataAvailableHandler(void)
Value SetLogPositionHandler(const MessageOrigin::Ptr& origin, const Dictionary::Ptr& params) Value SetLogPositionHandler(const MessageOrigin::Ptr& origin, const Dictionary::Ptr& params)
{ {
if (!params)
return Empty;
double log_position = params->Get("log_position"); double log_position = params->Get("log_position");
Endpoint::Ptr endpoint = origin->FromClient->GetEndpoint(); Endpoint::Ptr endpoint = origin->FromClient->GetEndpoint();