Changeset 70f2d7b in nscp

Timestamp:

03/29/06 22:19:32 (7 years ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2, stable

Children:

76aafc4

Parents:

aabbd97

Message:

Updated with reg settings (take 1)

Files:

• NSClient++.cpp (modified) (5 diffs)
• NSClient++.h (modified) (1 diff)
• NSClient++.sln (modified) (1 diff)
• include/INISettings.h (modified) (1 diff)
• include/REGSettings.h (modified) (5 diffs)
• include/Settings.h (modified) (2 diffs)
• include/TSettings.h (modified) (1 diff)
• include/config.h (modified) (1 diff)

NSClient++.cpp

@@ -20 +20 @@
 #include <Socket.h>
 #include <b64/b64.h>
+#include <config.h>
 
 
@@ -65 +66 @@
       g_bConsoleLog = true;
       std::string password;
-      Settings::getInstance()->setFile(mainClient.getBasePath() + "NSC.ini");
+      try {
+        Settings::getInstance()->setFile(mainClient.getBasePath() + "NSC.ini");
+      } catch (SettingsException e) {
+        std::cout << "Could not find settings: " << e.getMessage() << std::endl;;
+        return 1;
+      }
       std::cout << "Enter password to encrypt (has to be a single word): ";
       std::cin >> password;
@@ -97 +103 @@
 #endif
       g_bConsoleLog = true;
-      mainClient.InitiateService();
+      if (!mainClient.InitiateService()) {
+        LOG_ERROR_STD("Service *NOT* started!");
+        return -1;
+      }
+      LOG_MESSAGE_STD("Using settings from: " + Settings::getInstance()->getActiveType());
       LOG_MESSAGE("Enter command to inject or exit to terminate...");
       std::string s = "";
@@ -146 +156 @@
  * When the program is started as a service this will be the entry point.
  */
-void NSClientT::InitiateService(void) {
-  Settings::getInstance()->setFile(getBasePath() + "NSC.ini");
-
+bool NSClientT::InitiateService(void) {
+  try {
+    Settings::getInstance()->setFile(getBasePath() + "NSC.ini");
+  } catch (SettingsException e) {
+    LOG_ERROR_STD("Could not find settings: " + e.getMessage());
+    return false;
+  }
   try {
     simpleSocket::WSAStartup();
   } catch (simpleSocket::SocketException e) {
     LOG_ERROR_STD("Uncaught exception: " + e.getMessage());
+    return false;
   }
 
@@ -161 +176 @@
     } catch(const NSPluginException& e) {
       LOG_ERROR_STD("Exception raised: " + e.error_ + " in module: " + e.file_);
+      return false;
     }
   }
   loadPlugins();
+  return true;
 }
 /**

NSClient++.h

@@ -53 +53 @@
 
   // Service helper functions
-  void InitiateService(void);
+  bool InitiateService(void);
   void TerminateService(void);
   static void WINAPI service_main_dispatch(DWORD dwArgc, LPTSTR *lpszArgv);

NSClient++.sln

@@ -119 +119 @@
     {BD93F0C3-E342-4D68-9717-FCAC2E7189AA}.Distribution.Build.0 = Debug|Win32
     {BD93F0C3-E342-4D68-9717-FCAC2E7189AA}.Release.ActiveCfg = Release|Win32
-    {BD93F0C3-E342-4D68-9717-FCAC2E7189AA}.Release.Build.0 = Release|Win32
     {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45}.Debug.ActiveCfg = Debug|Win32
     {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45}.Debug.Build.0 = Debug|Win32

include/INISettings.h

@@ -25 +25 @@
   {
   }
+  std::string getActiveType() {
+    return "INI-file";
+  }
 
   static bool hasSettings(std::string file) {
-    std::cout << GetPrivateProfileInt(MAIN_SECTION_TITLE, MAIN_USEFILE, MAIN_USEFILE_DEFAULT, file.c_str()) << ":" << file << std::endl;
     return GetPrivateProfileInt(MAIN_SECTION_TITLE, MAIN_USEFILE, MAIN_USEFILE_DEFAULT, file.c_str()) == 1;
   }

include/REGSettings.h

@@ -6 +6 @@
 #define BUFF_LEN 4096
 
+#include <iostream>
 class REGSettings : public TSettings
 {
@@ -19 +20 @@
 
   static bool hasSettings() {
-    // @todo
-    return false;
+    return getInt_(NS_HKEY_ROOT, NS_REG_ROOT, "use_reg", 0) == 1;
+  }
+
+  std::string getActiveType() {
+    return "registry";
   }
 
   sectionList getSections(unsigned int bufferLength = BUFF_LEN) {
-    sectionList ret;
-    return ret;
+    return getSubKeys_(NS_HKEY_ROOT, NS_REG_ROOT);
   }
 
@@ -34 +37 @@
   */
   sectionList getSection(std::string section, unsigned int bufferLength = BUFF_LEN) {
-    sectionList ret;
-    return ret;
+    return getValues_(NS_HKEY_ROOT, std::string((std::string)NS_REG_ROOT + "\\" + section).c_str());
   }
   /**
@@ -45 +47 @@
   */
   std::string getString(std::string section, std::string key, std::string defaultValue = "") const {
-    std::string ret;
-    return ret;
+    return getString_(NS_HKEY_ROOT, std::string((std::string)NS_REG_ROOT + "\\" + section).c_str(), key.c_str(), defaultValue);
   }
 
@@ -60 +61 @@
   */
   int getInt(std::string section, std::string key, int defaultValue = 0) {
-    return 0;
+    return getInt_(NS_HKEY_ROOT, std::string((std::string)NS_REG_ROOT + "\\" + section).c_str(), key.c_str(), defaultValue);
   }
   void setInt(std::string section, std::string key, int value) {
   }
+
+
+  static std::string getString_(HKEY hKey, LPCTSTR lpszPath, LPCTSTR lpszKey, std::string def) {
+    std::string ret = def;
+    HKEY hTemp;
+    if (RegOpenKeyEx(hKey, lpszPath, 0, KEY_QUERY_VALUE, &hTemp) != ERROR_SUCCESS) {
+      return def;
+    }
+    DWORD type;
+    DWORD cbData = 1024;
+    BYTE *bData = new BYTE[cbData];
+    BOOL bRet = RegQueryValueEx(hTemp, lpszKey, NULL, &type, bData, &cbData);
+    if (type != REG_SZ) {
+      bRet = false;
+    }
+    RegCloseKey(hTemp);
+    if (bRet) {
+      ret = (LPCTSTR)bData;
+    }
+    delete [] bData;
+    return ret;
+  }
+  static DWORD getInt_(HKEY hKey, LPCTSTR lpszPath, LPCTSTR lpszKey, DWORD def) {
+    DWORD ret = def;
+    LONG bRet;
+    HKEY hTemp;
+    if ((bRet = RegOpenKeyEx(hKey, lpszPath, 0, KEY_READ, &hTemp)) != ERROR_SUCCESS) {
+      return def;
+    }
+    DWORD type;
+    DWORD cbData = 1024;
+    BYTE *bData = new BYTE[sizeof(DWORD)];
+    bRet = RegQueryValueEx(hTemp, lpszKey, NULL, &type, bData, &cbData);
+    if (type != REG_DWORD) {
+      bRet = -1;
+    }
+    RegCloseKey(hTemp);
+    if (bRet == ERROR_SUCCESS) {
+      ret = (DWORD)*bData;
+    }
+    delete [] bData;
+    return ret;
+  }
+  static sectionList getValues_(HKEY hKey, LPCTSTR lpszPath) {
+    sectionList ret;
+    LONG bRet;
+    HKEY hTemp;
+    if ((bRet = RegOpenKeyEx(hKey, lpszPath, 0, KEY_READ, &hTemp)) != ERROR_SUCCESS) {
+      return ret;
+    }
+    DWORD    cValues=0;
+    DWORD    cMaxValLen;
+    // Get the class name and the value count. 
+    bRet = RegQueryInfoKey(hTemp,NULL,NULL,NULL,NULL,NULL,NULL,&cValues,&cMaxValLen,NULL,NULL,NULL);
+    if ((bRet == ERROR_SUCCESS)&&(cValues>0)) {
+      TCHAR *lpValueName = new TCHAR[cMaxValLen+1];
+      for (unsigned int i=0; i<cValues; i++) {
+        DWORD len = cMaxValLen;
+        bRet = RegEnumValue(hKey, i, lpValueName, &len, NULL, NULL, NULL, NULL);
+        if (bRet == ERROR_SUCCESS) {
+          ret.push_back(std::string(lpValueName));
+        }
+      }
+      delete [] lpValueName;
+    }
+    return ret;
+  }
+  static sectionList getSubKeys_(HKEY hKey, LPCTSTR lpszPath) {
+    sectionList ret;
+    LONG bRet;
+    HKEY hTemp;
+    if ((bRet = RegOpenKeyEx(hKey, lpszPath, 0, KEY_READ, &hTemp)) != ERROR_SUCCESS) {
+      return ret;
+    }
+    DWORD    cSubKeys=0;
+    DWORD    cMaxKeyLen;
+    // Get the class name and the value count. 
+    bRet = RegQueryInfoKey(hTemp,NULL,NULL,NULL,&cSubKeys,&cMaxKeyLen,NULL,NULL,NULL,NULL,NULL,NULL);
+    if ((bRet == ERROR_SUCCESS)&&(cSubKeys>0)) {
+      TCHAR *lpValueName = new TCHAR[cMaxKeyLen+1];
+      for (unsigned int i=0; i<cSubKeys; i++) {
+        DWORD len = cMaxKeyLen;
+        bRet = RegEnumKey(hKey, i, lpValueName, len);
+        if (bRet == ERROR_SUCCESS) {
+          ret.push_back(std::string(lpValueName));
+        }
+      }
+      delete [] lpValueName;
+    }
+    return ret;
+  }
 };

include/Settings.h

@@ -10 +10 @@
 
 class SettingsException {
+private:
+  std::string err;
 public:
-  SettingsException(std::string str) {}
+  SettingsException(std::string str) : err(str) {}
+  std::string getMessage() {
+    return err;
+  }
 
 };
@@ -41 +46 @@
       delete settingsManager;
   }
+  std::string getActiveType() {
+    if (!settingsManager) {
+      return "";
+    } return settingsManager->getActiveType();
+  }
 
   /**

include/TSettings.h

@@ -16 +16 @@
   {
   }
-
+  virtual std::string getActiveType() = 0;
   virtual sectionList getSections(unsigned int bufferLength = BUFF_LEN) = 0;
   virtual sectionList getSection(std::string section, unsigned int bufferLength = BUFF_LEN) = 0;

include/config.h

@@ -105 +105 @@
 #define MAIN_ALLOWED_HOSTS "allowed_hosts"
 #define MAIN_ALLOWED_HOSTS_DEFAULT "127.0.0.1"
+
+
+// Main Registry ROOT
+#define NS_HKEY_ROOT HKEY_LOCAL_MACHINE
+#define NS_REG_ROOT "SOFTWARE\\NSClient++"