Changeset ba63b95 in nscp

Timestamp:

01/13/12 06:52:23 (16 months ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2

Children:

35254d1

Parents:

7354aa1

Message:

• Fixed issue with --submit command line option erroneusly reported missing optien (when it is not supported)
• Added settings store "dummy" for people who dont want to store settings (long term use is for unit tests)
• Added new option to NSCClient --source-host for settings the host name of the caller (your machine).
• Change so enryption algorithms are case insensitevie (ie. 3DES and 3des both work)

Files:

• changelog (modified) (1 diff)
• helpers/settings_manager/CMakeLists.txt (modified) (1 diff)
• helpers/settings_manager/settings_manager_impl.cpp (modified) (3 diffs)
• include/nsca/nsca_enrypt.hpp (modified) (2 diffs)
• include/nsca/nsca_packet.hpp (modified) (1 diff)
• include/nscapi/functions.hpp (modified) (1 diff)
• include/nscapi/nscapi_plugin_wrapper.cpp (modified) (2 diffs)
• modules/DistributedClient/DistributedClient.cpp (modified) (1 diff)
• modules/NSCAClient/NSCAClient.cpp (modified) (1 diff)
• modules/PythonScript/PythonScript.cpp (modified) (1 diff)
• scripts/python/lib/test_helper.py (modified) (2 diffs)
• scripts/python/test_nrpe.py (modified) (1 diff)
• scripts/python/test_nsca.py (modified) (1 diff)
• scripts/python/test_python.py (modified) (1 diff)
• service/NSClient++.cpp (modified) (1 diff)
• service/cli_parser.hpp (modified) (3 diffs)
• version.hpp (modified) (1 diff)
• version.txt (modified) (1 diff)

changelog

@@ -5 +5 @@
  * Fixa dependonservice LanManWorkStation (old win)
  * Fix RtlStringFromGUID problem on NT4
+
+2012-01-12 MickeM
+ * Fixed issue with --submit command line option erroneusly reported missing optien (when it is not supported)
+ * Added settings store "dummy" for people who dont want to store settings (long term use is for unit tests)
+ * Added new option to NSCClient --source-host for settings the host name of the caller (your machine).
+ * Change so enryption algorithms are case insensitevie (ie. 3DES and 3des both work)
 
 2012-01-09 MickeM

helpers/settings_manager/CMakeLists.txt

@@ -25 +25 @@
     ${NSCP_INCLUDEDIR}/settings/macros.h
     ${NSCP_INCLUDEDIR}/settings/settings_ini.hpp
+    ${NSCP_INCLUDEDIR}/settings/settings_dummy.hpp
     ${NSCP_INCLUDEDIR}/settings/settings_old.hpp
     ${NSCP_INCLUDEDIR}/settings/settings_registry.hpp

helpers/settings_manager/settings_manager_impl.cpp

@@ -4 +4 @@
 
 #include <settings/settings_ini.hpp>
+#include <settings/settings_dummy.hpp>
 #include <settings/settings_http.hpp>
 #ifdef WIN32
@@ -91 +92 @@
       return settings::instance_raw_ptr(new settings::INISettings(this, key));
     }
+    if (url.protocol == _T("dummy")) {
+      return settings::instance_raw_ptr(new settings::settings_dummy(this, key));
+    }
     if (url.protocol == _T("http")) {
       return settings::instance_raw_ptr(new settings::settings_http(this, key));
@@ -128 +132 @@
     if (url.protocol == _T("ini"))
       return settings::INISettings::context_exists(this, key);
+    if (url.protocol == _T("dummy"))
+      return true;
     if (url.protocol == _T("http"))
       return true;

include/nsca/nsca_enrypt.hpp

@@ -2 +2 @@
 
 #include <algorithm>
+#include <boost/algorithm/string.hpp>
 
 #ifdef HAVE_LIBCRYPTOPP
@@ -71 +72 @@
     };
     struct helpers {
-      static int encryption_to_int(std::string encryption) {
+      static int encryption_to_int(std::string encryption_raw) {
+        std::string encryption = boost::algorithm::to_lower_copy(encryption_raw);
         if (
           (encryption.size() == 1 && std::isdigit(encryption[0])) 

include/nsca/nsca_packet.hpp

@@ -135 +135 @@
 
     std::string to_string() const {
-      return "service: " + service + ", " + 
+      return "host: " + host + ", " + 
+        "service: " + service + ", " + 
         "code: " + nstr::to_string(code) + ", " + 
         "time: " + nstr::to_string(time) + ", " + 

include/nscapi/functions.hpp

@@ -229 +229 @@
       }
       void set_string_data(std::string key, std::string value) {
-        data[key] = value;
+        if (key == "host")
+          host = value;
+        else
+          data[key] = value;
       }
       void set_int_data(std::string key, int value) {

include/nscapi/nscapi_plugin_wrapper.cpp

@@ -31 +31 @@
 #include <strEx.h>
 
+#include <boost/algorithm/string.hpp>
 #include <boost/foreach.hpp>
 #include <boost/tokenizer.hpp>
@@ -93 +94 @@
   nscapi::functions::decoded_simple_command_data data = nscapi::functions::parse_simple_query_request(char_command, request);
   std::wstring msg, perf;
-  NSCAPI::nagiosReturn ret = handleCommand(data.target, data.command, data.args, msg, perf);
+
+  NSCAPI::nagiosReturn ret = handleCommand(data.target, boost::algorithm::to_lower_copy(data.command), data.args, msg, perf);
   nscapi::functions::create_simple_query_response(data.command, ret, msg, perf, response);
   return ret;

modules/DistributedClient/DistributedClient.cpp

@@ -200 +200 @@
   setup(config);
   if (!client::command_line_parser::is_command(cmd))
-    return client::command_line_parser::do_execute_command_as_query(config, cmd, data.args, result);
+    return client::command_line_parser::do_execute_command_as_query(config, cmd, data.args, request, result);
   return commands.exec_simple(config, data.target, char_command, data.args, result);
 }

modules/NSCAClient/NSCAClient.cpp

@@ -271 +271 @@
     "Password")
 
+    ("source-host", po::value<std::string>()->notifier(boost::bind(&nscapi::functions::destination_container::set_string_data, &data->host_self, "host", _1)), 
+    "Source/sender host name (default is auto which means use the name of the actual host)")
+
+    ("sender-host", po::value<std::string>()->notifier(boost::bind(&nscapi::functions::destination_container::set_string_data, &data->host_self, "host", _1)), 
+    "Source/sender host name (default is auto which means use the name of the actual host)")
+
     ("time-offset", po::value<std::string>()->notifier(boost::bind(&nscapi::functions::destination_container::set_string_data, &data->recipient, "time offset", _1)), 
     "")

modules/PythonScript/PythonScript.cpp

@@ -375 +375 @@
     nscapi::functions::create_simple_exec_response<std::wstring>(_T("help"), ret, result, response);
     return ret;
-  } else if (command == _T("execute-and-load-python") || command == _T("execute-python") || command == _T("run") || command == _T("execute") || command == _T("exec")|| command == _T("")) {
+  } else if (command == _T("execute-and-load-python") || command == _T("execute-python") || command == _T("python-script")
+    || command == _T("run") || command == _T("execute") || command == _T("exec") || command == _T("")) {
     nscapi::functions::decoded_simple_command_data data = nscapi::functions::parse_simple_exec_request(char_command, request);
     if (data.command == _T("") && data.args.size() == 0)

scripts/python/lib/test_helper.py

@@ -126 +126 @@
   def shutdown(self):
     None
+
+  def require_boot(self):
+    return False
     
     
@@ -273 +276 @@
       
   def install(self, arguments = []):
+    boot = False
     for suite in self.suites:
       instance = suite.getInstance()
       instance.install(arguments)
-      
+      if instance.require_boot():
+        boot = True
+
+    #core = Core.get()
+    #(code, msg, perf) = core.simple_query('py_unittest', [])
+    
     log('-+---==(TEST INSTALLER)==---------------------------------------------------+-')
     log(' | Setup nessecary configuration for running test                           |')
     log(' | This includes: Loading the PythonScript module at startup                |')
     log(' | To use this please run nsclient++ in "test mode" like so:                |')
-    log(' | nscp --test                                                              |')
-    log(' | Then start the py_unittest command by typing it and press enter like so: |')
-    log(' | test_eventlog                                                            |')
-    log(' | Lastly exit by typing exit like so:                                      |')
-    log(' | exit                                                                     |')
+    if boot:
+      log(' | nscp client --boot --query py_unittest                                   |')
+    else:
+      log(' | nscp client --query py_unittest                                          |')
     log('-+--------------------------------------------------------==(DAS ENDE!)==---+-')
       

scripts/python/test_nrpe.py

@@ -247 +247 @@
     None
 
+  def require_boot(self):
+    return True
+
 setup_singleton(NRPEServerTest)
 

scripts/python/test_nsca.py

@@ -252 +252 @@
   def shutdown(self):
     None
+    
+  def require_boot(self):
+    return True
+    
 
 setup_singleton(NSCAServerTest)

scripts/python/test_python.py

@@ -4 +4 @@
 from time import time
 
-install_checks = 10
+install_checks = 1000
 
 class PythonTest(BasicTest):

service/NSClient++.cpp

@@ -1178 +1178 @@
 int exec_helper(NSClientT::plugin_type plugin, std::wstring command, std::vector<std::wstring> arguments, std::string request, std::list<std::string> *responses) {
   std::string response;
+  if (!plugin || !plugin->has_command_line_exec())
+    return -1;
   int ret = plugin->commandLineExec(command.c_str(), request, response);
   if (ret != NSCAPI::returnIgnored && !response.empty())

service/cli_parser.hpp

@@ -79 +79 @@
       ("query,q", po::value<std::wstring>(), "Run a query with a given name")
       ("submit,s", po::value<std::wstring>(), "Name of query to ask")
+      ("settings", po::value<std::wstring>(), "Override (temporarily) settings subsystem to use")
       ("module,M", po::value<std::wstring>(), "Name of module to load (if not specified all modules in ini file will be loaded)")
       ("argument,a", po::wvalue<std::vector<std::wstring> >(), "List of arguments (gets -- prefixed automatically)")
@@ -399 +400 @@
         mainClient.log_info(__FILE__, __LINE__, _T("Arguments: ") + args);
       }
+      if (vm.count("settings"))
+        core_->set_settings_context(vm["settings"].as<std::wstring>());
+
       core_->boot_init();
       if (module.empty())
@@ -420 +424 @@
           mainClient.simple_exec(module, _T("help"), arguments, resp);
         }
+      } else if (mode == submit) {
+        std::wcerr << _T("--submit is currently not supported (but you can use --exec submit which is technically the same)") << std::endl;
       } else {
         std::wcerr << _T("Need to specify one of --exec, --query or --submit") << std::endl;

version.hpp

@@ -1 +1 @@
 #ifndef VERSION_HPP
 #define VERSION_HPP
-#define PRODUCTVER     0,4,0,118
-#define STRPRODUCTVER  "0,4,0,118"
-#define STRPRODUCTDATE "2011-12-16"
+#define PRODUCTVER     0,4,0,121
+#define STRPRODUCTVER  "0,4,0,121"
+#define STRPRODUCTDATE "2012-01-12"
 #endif // VERSION_HPP

version.txt

@@ -1 +1 @@
 version=0.4.0
-build=118
-date=2011-12-16
+build=121
+date=2012-01-12