Changeset 465866c in nscp for modules/NSCPServer/handler_impl.cpp

Timestamp:

06/05/12 07:35:30 (12 months ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.1, 0.4.2

Children:

742b035

Parents:

695f240

Message:

2012-06-05 MickeM

• Tweaked all servers to use the new internals and added first testcase for NSCP socket

2012-05-24 MickeM

• Reworked real time event log support to be a lot more flexible You can now specify all options on a "filter" level.
• WARNING* Old syntax NOT supported (and will not upgrade) but hopefully not to many will be affected.
• Added support for ipv6 allowed hosts validation

2012-05-21 MickeM

• Sofia Born (My second daughter)

File:

• modules/NSCPServer/handler_impl.cpp (modified) (2 diffs)

modules/NSCPServer/handler_impl.cpp

@@ -7 +7 @@
 #include "handler_impl.hpp"
 
+
+
+nscp::packet handler_impl::process(const nscp::packet &packet) {
+  if (nscp::checks::is_query_request(packet)) {
+    Plugin::QueryRequestMessage msg;
+    msg.ParseFromString(packet.payload);
+    std::wstring command = _T("todo: fixme");//utf8::cvt<std::wstring>(msg.command());
+
+    std::string reply;
+    try {
+      NSCAPI::nagiosReturn returncode = handle_query_request(packet.payload, msg, reply);
+      if (returncode == NSCAPI::returnIgnored)
+        nscapi::functions::create_simple_query_response_unknown(command, _T("Command was not found: ") + command, _T(""), reply);
+    } catch (const nscp::nscp_exception &e) {
+      nscapi::functions::create_simple_query_response_unknown(command, _T("Processing error: ") + command + _T(": ") + utf8::cvt<std::wstring>(e.what()), _T(""), reply);
+    } catch (const std::exception &e) {
+      nscapi::functions::create_simple_query_response_unknown(command, _T("Unknown error processing: ") + command + _T(": ") + utf8::cvt<std::wstring>(e.what()), _T(""), reply);
+    }
+    return nscp::factory::create_query_response(reply);
+  } else if (nscp::checks::is_submit_request(packet)) {
+    Plugin::SubmitRequestMessage msg;
+    msg.ParseFromString(packet.payload);
+    try {
+      std::string reply;
+      NSCAPI::nagiosReturn returncode = handle_submission_request(packet.payload, msg, reply);
+      return nscp::factory::create_submission_response(reply);
+    } catch (const nscp::nscp_exception &e) {
+      return nscp::factory::create_error(_T("Exception processing message: ") + to_wstring(e.what()));
+    } catch (const std::exception &e) {
+      return nscp::factory::create_error(_T("Exception processing message: ") + to_wstring(e.what()));
+    }
+  } else if (nscp::checks::is_exec_request(packet)) {
+    Plugin::ExecuteRequestMessage msg;
+    msg.ParseFromString(packet.payload);
+    try {
+      std::string reply;
+      NSCAPI::nagiosReturn returncode = handle_exec_request(packet.payload, msg, reply);
+      return nscp::factory::create_submission_response(reply);
+    } catch (const nscp::nscp_exception &e) {
+      return nscp::factory::create_error(_T("Exception processing message: ") + to_wstring(e.what()));
+    } catch (const std::exception &e) {
+      return nscp::factory::create_error(_T("Exception processing message: ") + to_wstring(e.what()));
+    }
+  } else {
+    this->log_error("nscp:handler", __FILE__, __LINE__, "Unknown packet: " + packet.to_string());
+    return nscp::factory::create_error(_T("Unknown packet: ") + packet.to_wstring());
+  }
+  return nscp::factory::create_error(_T("Unknown error..."));
+}
 NSCAPI::nagiosReturn handler_impl::handle_query_request(const std::string &request, Plugin::QueryRequestMessage &msg, std::string &reply) {
   Plugin::Common::Header hdr;
@@ -26 +75 @@
       nscapi::functions::create_simple_query_response_unknown(command, _T("Arguments not allowed for command: ") + command, _T(""), outBuffer);
     } else {
-      bool ok = true;
-      if (!allowNasty_) {
-        for (int j=0;j<payload.arguments_size();j++) {
-          if (payload.arguments(j).find_first_of(NASTY_METACHARS) != std::wstring::npos) {
-            ok = false;
-            break;
-          }
-        }
-      }
-      if (ok) {
-        std::string tmpBuffer;
-        Plugin::QueryRequestMessage tmp;
-        tmp.mutable_header()->CopyFrom(hdr);
-        tmp.add_payload()->CopyFrom(payload);
-        tmp.SerializeToString(&tmpBuffer);
-        NSCAPI::nagiosReturn returncode = nscapi::plugin_singleton->get_core()->query(command, tmpBuffer, outBuffer);
-        if (returncode == NSCAPI::returnIgnored) {
-          nscapi::functions::create_simple_query_response_unknown(command, _T("Command was not found: ") + command, _T(""), outBuffer);
-        }
-      } else {
-        nscapi::functions::create_simple_query_response_unknown(command, _T("Nasty arguments not allowed for command: ") + command, _T(""), outBuffer);
+      std::string tmpBuffer;
+      Plugin::QueryRequestMessage tmp;
+      tmp.mutable_header()->CopyFrom(hdr);
+      tmp.add_payload()->CopyFrom(payload);
+      tmp.SerializeToString(&tmpBuffer);
+      NSCAPI::nagiosReturn returncode = nscapi::plugin_singleton->get_core()->query(command, tmpBuffer, outBuffer);
+      if (returncode == NSCAPI::returnIgnored) {
+        nscapi::functions::create_simple_query_response_unknown(command, _T("Command was not found: ") + command, _T(""), outBuffer);
       }
       Plugin::QueryResponseMessage tmpResponse;