Changeset 1d9338a in nscp for modules/NSClientListener/NSClientListener.cpp

Timestamp:

05/23/05 21:24:32 (8 years ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2, stable

Children:

6654022

Parents:

af5bc4b

Message:

2005-05-23 MickeM

+ Added obfuscated password support
+ Added some more debug info on commands (returncode, and input args)
+ Added some more comments ot the NSC.ini
+ Added central password "override"
+ Added central "host override"
+ Fixed bug with external commands always getting WARNING state

2005-05-22 MickeM

+ Added debug outout for command
+ Added timestamps for log-to-file (date_mask to configure format)
+ Added support for "no password" with check_nt
+ Added log of bad password on NSClient requests.

• Some threading issues fixed (I hate threading :)

File:

• modules/NSClientListener/NSClientListener.cpp (modified) (3 diffs)

modules/NSClientListener/NSClientListener.cpp

@@ -32 +32 @@
 NSClientListener::~NSClientListener() {
 }
+std::string getAllowedHosts() {
+  std::string ret = NSCModuleHelper::getSettingsString(NRPE_SECTION_TITLE, MAIN_ALLOWED_HOSTS, "");
+  if (ret.empty())
+    ret = NSCModuleHelper::getSettingsString(MAIN_SECTION_TITLE, MAIN_ALLOWED_HOSTS, MAIN_ALLOWED_HOSTS_DEFAULT);
+  return ret;
+}
 
 bool NSClientListener::loadModule() {
-  allowedHosts.setAllowedHosts(strEx::splitEx(NSCModuleHelper::getSettingsString(NSCLIENT_SECTION_TITLE, NSCLIENT_SETTINGS_ALLOWED, NSCLIENT_SETTINGS_ALLOWED_DEFAULT), ","));
+  allowedHosts.setAllowedHosts(strEx::splitEx(getAllowedHosts(), ","));
   try {
     socket.setHandler(this);
@@ -85 +91 @@
 */
 
+
+std::string getPassword() {
+  static std::string password = "";
+  if (password.empty()) {
+    password = NSCModuleHelper::getSettingsString(NSCLIENT_SECTION_TITLE, MAIN_OBFUSCATED_PASWD, MAIN_OBFUSCATED_PASWD_DEFAULT);
+    if (password.empty())
+      password= NSCModuleHelper::getSettingsString(MAIN_SECTION_TITLE, MAIN_OBFUSCATED_PASWD, MAIN_OBFUSCATED_PASWD_DEFAULT);
+    if (!password.empty()) {
+      password = NSCModuleHelper::Decrypt(password);
+    } else {
+      password = NSCModuleHelper::getSettingsString(NSCLIENT_SECTION_TITLE, MAIN_SETTINGS_PWD, MAIN_SETTINGS_PWD_DEFAULT);
+      if (password.empty())
+        password = NSCModuleHelper::getSettingsString(MAIN_SECTION_TITLE, MAIN_SETTINGS_PWD, MAIN_SETTINGS_PWD_DEFAULT);
+    }
+  }
+  return password;
+}
+
 std::string NSClientListener::parseRequest(std::string buffer)  {
   strEx::token pwd = strEx::getToken(buffer, '&');
-  if ( (pwd.first.empty()) || (pwd.first != NSCModuleHelper::getSettingsString(NSCLIENT_SECTION_TITLE, NSCLIENT_SETTINGS_PWD, NSCLIENT_SETTINGS_PWD_DEFAULT)) )
-    return "ERROR: Invalid password.";
-  if (pwd.second.empty())
+  std::string rPwd = getPassword();
+  if ((pwd.first != rPwd) && ((pwd.first == "None") && (!rPwd.empty())) ) {
+    NSC_LOG_ERROR_STD("Invalid password (" + pwd.first + ").");
+    return "ERROR: Invalid password."; 
+  } if (pwd.second.empty())
     return "ERRRO: No command specified.";
   strEx::token cmd = strEx::getToken(pwd.second, '&');
@@ -113 +139 @@
     case REQ_CLIENTVERSION:
       {
-        std::string v = NSCModuleHelper::getSettingsString("nsclient compat", "version", "modern");
-        if (v == "modern")
+        std::string v = NSCModuleHelper::getSettingsString(NSCLIENT_SECTION_TITLE, NSCLIENT_SETTINGS_VERSION, NSCLIENT_SETTINGS_VERSION_DEFAULT);
+        if (v == "auto")
           return NSCModuleHelper::getApplicationName() + " " + NSCModuleHelper::getApplicationVersionString();
-        return NSCModuleHelper::getSettingsString("nsclient compat", "version", "modern");
+        return v;
       }
     case REQ_SERVICESTATE:
       cmd.first = "checkServiceState";
+      cmd.second += "&nsclient";
       break;
     case REQ_PROCSTATE:
       cmd.first = "checkProcState";
+      cmd.second += "&nsclient";
       break;
     case REQ_MEMUSE: