Changeset 1d9338a in nscp for modules

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 :)

Location:

modules

Files:

• CheckDisk/CheckDisk.cpp (modified) (2 diffs)
• CheckSystem/CheckSystem.cpp (modified) (9 diffs)
• CheckSystem/PDHCollector.cpp (modified) (6 diffs)
• CheckSystem/PDHCollector.h (modified) (1 diff)
• FileLogger/FileLogger.cpp (modified) (4 diffs)
• FileLogger/FileLogger.h (modified) (2 diffs)
• NRPEListener/NRPEListener.cpp (modified) (3 diffs)
• NSClientListener/NSClientListener.cpp (modified) (3 diffs)

modules/CheckDisk/CheckDisk.cpp

@@ -204 +204 @@
       return NSCAPI::returnUNKNOWN;
     }
+    //10597515264&80015491072
 
     if (bNSClient) {
-      message += strEx::itos(totalNumberOfFreeBytes.QuadPart) + "&";
-      message += strEx::itos(totalNumberOfBytes.QuadPart) + "&";
+      if (!message.empty())
+        message += "&";
+      message += strEx::itos(totalNumberOfFreeBytes.QuadPart);
+      message += "&";
+      message += strEx::itos(totalNumberOfBytes.QuadPart);
     } else {
       std::string tStr;
@@ -236 +240 @@
   if (message.empty())
     message = "All drive sizes are within bounds.";
-  else
+  else if (!bNSClient)
     message = NSCHelper::translateReturn(returnCode) + ": " + message;
   return returnCode;

modules/CheckSystem/CheckSystem.cpp

@@ -297 +297 @@
   NSCAPI::nagiosReturn ret = NSCAPI::returnOK;
   bool bShowAll = false;
+  bool bNSClient = false;
 
   for (arrayBuffer::arrayList::const_iterator it = stl_args.begin(); it != stl_args.end(); ++it) {
@@ -302 +303 @@
     if (t.first == SHOW_ALL)
       bShowAll = true;
+    else if (t.first == NSCLIENT)
+      bNSClient = true;
     else if (t.first == SHOW_FAIL)  {
       bShowAll = false;
@@ -339 +342 @@
   }
   if (msg.empty())
-    msg ="All services ok.";
+    msg ="All services are running.";
+  else if (!bNSClient)
+    msg = NSCHelper::translateReturn(ret) + ": " + msg;
   return ret;
 }
@@ -345 +350 @@
 
 /**
- * Check availible memory and return various check results
+ * Check available memory and return various check results
  * Example: checkMem showAll maxWarn=50 maxCrit=75
  *
@@ -468 +473 @@
   NSCAPI::nagiosReturn ret = NSCAPI::returnOK;
   bool bShowAll = false;
+  bool bNSClient = false;
 
   for (arrayBuffer::arrayList::const_iterator it = stl_args.begin(); it != stl_args.end(); ++it) {
@@ -473 +479 @@
     if (t.first == SHOW_ALL)
       bShowAll = true;
+    else if (t.first == NSCLIENT)
+      bNSClient = true;
     else if (t.first == SHOW_FAIL)  {
       bShowAll = false;
@@ -518 +526 @@
   if (msg.empty())
     msg ="All processes ok.";
+  else if (!bNSClient)
+    msg = NSCHelper::translateReturn(ret) + ": " + msg;
   return ret;
 }
@@ -583 +593 @@
     try {
       PDH::PDHQuery pdh;
-      PDHCollectors::StaticPDHCounterListener counter;
+      PDHCollectors::StaticPDHCounterListenerInt counter;
       std::string name = (*it).first;
       if (name.empty())
@@ -591 +601 @@
       pdh.collect();
       if (bNSCLientCompatible) {
+//        std::cout << counter.getValue() << std::endl;
         msg += strEx::itos(counter.getValue());
       } else {

modules/CheckSystem/PDHCollector.cpp

@@ -36 +36 @@
 
 /**
- * Thread that collects the data every "CHECK_INTERVAL" seconds.
- *
- * @param lpParameter Not used
- * @return thread exit status
- *
- * @author mickem
- *
- * @date 03-13-2004
- *
- * @bug If we have "custom named" counters ?
- * @bug This whole concept needs work I think.
- *
- */
+* Thread that collects the data every "CHECK_INTERVAL" seconds.
+*
+* @param lpParameter Not used
+* @return thread exit status
+*
+* @author mickem
+*
+* @date 03-13-2004
+*
+* @bug If we have "custom named" counters ?
+* @bug This whole concept needs work I think.
+*
+*/
 DWORD PDHCollector::threadProc(LPVOID lpParameter) {
   PDH::PDHQuery pdh;
@@ -103 +103 @@
 
 /**
- * Request termination of the thread (waiting for thread termination is not handled)
- */
+* Request termination of the thread (waiting for thread termination is not handled)
+*/
 void PDHCollector::exitThread(void) {
   MutexLock mutex(mutexHandler);
@@ -116 +116 @@
     if (!SetEvent(hStopEvent_)) {
       NSC_LOG_ERROR_STD("SetStopEvent failed");
-  }
+    }
 }
 /**
- * Get the average CPU usage for "time"
- * @param time Time to check 
- * @return average CPU usage
- */
+* Get the average CPU usage for "time"
+* @param time Time to check 
+* @return average CPU usage
+*/
 int PDHCollector::getCPUAvrage(std::string time) {
   unsigned int mseconds = strEx::stoui_as_time(time, checkIntervall_*100);
@@ -133 +133 @@
 }
 /**
- * Get uptime from counter
- * @bug Do we need to collect this all the time ? (perhaps we can collect this in real time ?)
- * @return uptime for the system
- * @bug Are we overflow protected here ? (seem to recall some issues with overflow before ?)
- */
+* Get uptime from counter
+* @bug Do we need to collect this all the time ? (perhaps we can collect this in real time ?)
+* @return uptime for the system
+* @bug Are we overflow protected here ? (seem to recall some issues with overflow before ?)
+*/
 long long PDHCollector::getUptime() {
   MutexLock mutex(mutexHandler);
@@ -147 +147 @@
 }
 /**
- * Memory commit limit (your guess is as good as mine to what this is :)
- * @return Some form of memory check
- */
+* Memory commit limit (your guess is as good as mine to what this is :)
+* @return Some form of memory check
+*/
 long long PDHCollector::getMemCommitLimit() {
   MutexLock mutex(mutexHandler);
@@ -159 +159 @@
 }
 /**
- *
- * Memory committed bytes (your guess is as good as mine to what this is :)
- * @return Some form of memory check
- */
+*
+* Memory committed bytes (your guess is as good as mine to what this is :)
+* @return Some form of memory check
+*/
 long long PDHCollector::getMemCommit() {
   MutexLock mutex(mutexHandler);

modules/CheckSystem/PDHCollector.h

@@ -30 +30 @@
   int checkIntervall_;
 
-  PDHCollectors::StaticPDHCounterListener memCmtLim;
-  PDHCollectors::StaticPDHCounterListener memCmt;
-  PDHCollectors::StaticPDHCounterListener upTime;
+  PDHCollectors::StaticPDHCounterListenerInt memCmtLim;
+  PDHCollectors::StaticPDHCounterListenerInt memCmt;
+  PDHCollectors::StaticPDHCounterListenerInt upTime;
   PDHCollectors::RoundINTPDHBufferListener cpu;
 

modules/FileLogger/FileLogger.cpp

@@ -4 +4 @@
 #include "stdafx.h"
 #include "FileLogger.h"
+
+#include <sys/timeb.h>
+#include <time.h>
 
 FileLogger gFileLogger;
@@ -18 +21 @@
 }
 
+std::string FileLogger::getFileName()
+{
+  if (file_.empty()) {
+    file_ = NSCModuleHelper::getSettingsString(LOG_SECTION_TITLE, LOG_FILENAME, LOG_FILENAME_DEFAULT);
+    if (file_.find("\\") == std::string::npos)
+      file_ = NSCModuleHelper::getBasePath() + "\\" + file_;
+  }
+  return file_;
+}
+
 bool FileLogger::loadModule() {
-  file_ = NSCModuleHelper::getSettingsString(LOG_SECTION_TITLE, LOG_FILENAME, LOG_FILENAME_DEFAULT);
+  _tzset();
+  getFileName();
+  format_ = NSCModuleHelper::getSettingsString(LOG_SECTION_TITLE, LOG_DATEMASK, LOG_DATEMASK_DEFAULT);
   return true;
 }
@@ -26 +41 @@
 }
 std::string FileLogger::getModuleName() {
-  return "File logger: " + NSCModuleHelper::getSettingsString(LOG_SECTION_TITLE, LOG_FILENAME, LOG_FILENAME_DEFAULT);
+  return "File logger: " + getFileName();
 }
 NSCModuleWrapper::module_version FileLogger::getModuleVersion() {
@@ -39 +54 @@
 }
 void FileLogger::handleMessage(int msgType, char* file, int line, char* message) {
+  char buffer[64];
   std::ofstream stream(file_.c_str(), std::ios::app);
-  stream << NSCHelper::translateMessageType(msgType) << ":" << file << ":" << line << ": " << message << std::endl;
+  __time64_t ltime;
+  _time64( &ltime );
+  struct tm *today = _localtime64( &ltime );
+  if (today) {
+    int len = strftime(buffer, 63, format_.c_str(), today);
+    if ((len < 1)||(len > 64))
+      strncpy(buffer, "???", 63);
+    else
+      buffer[len] = 0;
+  } else {
+    strncpy(buffer, "???", 63);
+  }
+  stream << buffer << ": " << NSCHelper::translateMessageType(msgType) << ":" << file << ":" << line << ": " << message << std::endl;
 }
 

modules/FileLogger/FileLogger.h

@@ -6 +6 @@
 private:
   std::string file_;
+  std::string format_;
 
 public:
@@ -19 +20 @@
   void handleMessage(int msgType, char* file, int line, char* message);
   int handleCommand(char* command, char **argument, char *returnBuffer, int returnBufferLen);
+
+
+  std::string getFileName();
 };

modules/NRPEListener/NRPEListener.cpp

@@ -22 +22 @@
 }
 
-
+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 NRPEListener::loadModule() {
@@ -43 +48 @@
   }
 
-  allowedHosts.setAllowedHosts(strEx::splitEx(NSCModuleHelper::getSettingsString(NRPE_SECTION_TITLE, NRPE_SETTINGS_ALLOWED, NRPE_SETTINGS_ALLOWED_DEFAULT), ","));
+  allowedHosts.setAllowedHosts(strEx::splitEx(getAllowedHosts(), ","));
   try {
     if (bUseSSL_) {
@@ -201 +206 @@
       }
       delete [] buf;
-      result = NSCHelper::int2nagios(GetExitCodeProcess(pi.hProcess, &dwexitcode));
+      GetExitCodeProcess(pi.hProcess, &dwexitcode);
+      result = NSCHelper::int2nagios(dwexitcode);
     }
     CloseHandle(pi.hThread);

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: