X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/70f8adff2c970496bdc45717cad49ddec0405ae7..e1ae9f8e2762ae257addb02450438dc40b70c4fd:/projects/stargazer/plugins/other/radius/config.cpp

diff --git a/projects/stargazer/plugins/other/radius/config.cpp b/projects/stargazer/plugins/other/radius/config.cpp
index 8a90567d..23339c02 100644
--- a/projects/stargazer/plugins/other/radius/config.cpp
+++ b/projects/stargazer/plugins/other/radius/config.cpp
@@ -39,6 +39,7 @@ struct ParserError : public std::runtime_error
           position(pos),
           error(message)
     {}
+    virtual ~ParserError() throw() {}
 
     size_t position;
     std::string error;
@@ -51,19 +52,20 @@ size_t skipSpaces(const std::string& value, size_t start)
     return start;
 }
 
-size_t checkChar(const std:string& value, size_t start, char ch)
+size_t checkChar(const std::string& value, size_t start, char ch)
 {
     if (start >= value.length())
-        throw ParserError(start, "Unexpected end of string. Expected '" + std::string(ch) + "'.");
+        throw ParserError(start, "Unexpected end of string. Expected '" + std::string(1, ch) + "'.");
     if (value[start] != ch)
-        throw ParserError(start, "Expected '" + std::string(ch) + "', got '" + std::string(value[start]) + "'.");
+        throw ParserError(start, "Expected '" + std::string(1, ch) + "', got '" + std::string(1, value[start]) + "'.");
     return start + 1;
 }
 
 std::pair<size_t, std::string> readString(const std::string& value, size_t start)
 {
     std::string dest;
-    while (start < value.length() && !std::isspace(value[start]))
+    while (start < value.length() && !std::isspace(value[start]) &&
+           value[start] != ',' && value[start] != '(' && value[start] != ')')
         dest.push_back(value[start++]);
     if (dest.empty()) {
         if (start == value.length())
@@ -71,7 +73,7 @@ std::pair<size_t, std::string> readString(const std::string& value, size_t start
         else
             throw ParserError(start, "Unexpected whitespace. Expected string.");
     }
-    return dest;
+    return std::make_pair(start, dest);
 }
 
 Config::Pairs toPairs(const std::vector<std::string>& values)
@@ -84,17 +86,22 @@ Config::Pairs toPairs(const std::vector<std::string>& values)
     while (start < value.size()) {
         Config::Pair pair;
         start = skipSpaces(value, start);
+        if (!res.empty())
+        {
+            start = checkChar(value, start, ',');
+            start = skipSpaces(value, start);
+        }
         size_t pairStart = start;
         start = checkChar(value, start, '(');
-        std::pair<size_t, std::string> key = readString(value, start);
+        const std::pair<size_t, std::string> key = readString(value, start);
         start = key.first;
         pair.first = key.second;
         start = skipSpaces(value, start);
-        start = checkChar(value, start, ',')
+        start = checkChar(value, start, ',');
         start = skipSpaces(value, start);
-        std::pair<size_t, std::string> value = readString(value, start);
-        start = key.first;
-        pair.second = value.second;
+        const std::pair<size_t, std::string> val = readString(value, start);
+        start = val.first;
+        pair.second = val.second;
         start = skipSpaces(value, start);
         start = checkChar(value, start, ')');
         if (res.find(pair.first) != res.end())
@@ -125,7 +132,7 @@ T toInt(const std::vector<std::string>& values)
     if (values.empty())
         return 0;
     T res = 0;
-    if (srt2x(values[0], res) == 0)
+    if (str2x(values[0], res) == 0)
         return res;
     return 0;
 }
@@ -133,24 +140,24 @@ T toInt(const std::vector<std::string>& values)
 Config::Pairs parseVector(const std::string& paramName, const MODULE_SETTINGS& params)
 {
     for (size_t i = 0; i < params.moduleParams.size(); ++i)
-        if (params.moduleParams[i].first == paramName)
-            return toPairs(params.moduleParams[i].second);
+        if (params.moduleParams[i].param == paramName)
+            return toPairs(params.moduleParams[i].value);
     return Config::Pairs();
 }
 
 bool parseBool(const std::string& paramName, const MODULE_SETTINGS& params)
 {
     for (size_t i = 0; i < params.moduleParams.size(); ++i)
-        if (params.moduleParams[i].first == paramName)
-            return toBool(params.moduleParams[i].second);
+        if (params.moduleParams[i].param == paramName)
+            return toBool(params.moduleParams[i].value);
     return false;
 }
 
 std::string parseString(const std::string& paramName, const MODULE_SETTINGS& params)
 {
     for (size_t i = 0; i < params.moduleParams.size(); ++i)
-        if (params.moduleParams[i].first == paramName)
-            return toString(params.moduleParams[i].second);
+        if (params.moduleParams[i].param == paramName)
+            return toString(params.moduleParams[i].value);
     return "";
 }
 
@@ -158,11 +165,32 @@ template <typename T>
 T parseInt(const std::string& paramName, const MODULE_SETTINGS& params)
 {
     for (size_t i = 0; i < params.moduleParams.size(); ++i)
-        if (params.moduleParams[i].first == paramName)
-            return toInt<T>(params.moduleParams[i].second);
+        if (params.moduleParams[i].param == paramName)
+            return toInt<T>(params.moduleParams[i].value);
     return 0;
 }
 
+std::string parseAddress(const std::string& address)
+{
+    size_t pos = address.find_first_of(':');
+    if (pos == std::string::npos)
+        throw ParserError(0, "Connection type is not specified. Should be either 'unix' or 'tcp'.");
+    return address.substr(pos + 1);
+}
+
+Config::Type parseConnectionType(const std::string& address)
+{
+    size_t pos = address.find_first_of(':');
+    if (pos == std::string::npos)
+        throw ParserError(0, "Connection type is not specified. Should be either 'unix' or 'tcp'.");
+    std::string type = ToLower(address.substr(0, pos));
+    if (type == "unix")
+        return Config::UNIX;
+    else if (type == "tcp")
+        return Config::TCP;
+    throw ParserError(0, "Invalid connection type. Should be either 'unix' or 'tcp', got '" + type + "'");
+}
+
 } // namespace anonymous
 
 Config::Config(const MODULE_SETTINGS& settings)
@@ -170,7 +198,10 @@ Config::Config(const MODULE_SETTINGS& settings)
       modify(parseVector("modify", settings)),
       reply(parseVector("reply", settings)),
       verbose(parseBool("verbose", settings)),
-      bindAddress(parseString("bind_address", settings)),
+      address(parseString("bind_address", settings)),
+      bindAddress(parseAddress(address)),
+      connectionType(parseConnectionType(address)),
+      portStr(parseString("port", settings)),
       port(parseInt<uint16_t>("port", settings)),
       key(parseString("key", settings))
 {