Sending attributes from <auth>/send section. (#13)

[stg.git] / projects / stargazer / plugins / other / radius / radius.cpp

diff --git a/projects/stargazer/plugins/other/radius/radius.cpp b/projects/stargazer/plugins/other/radius/radius.cpp
index 68291dcfd63b9783191a52f337444e1b6779fbbf..11fbcf7be132d9547732c0ad16b8f5b126d74b48 100644 (file)
--- a/projects/stargazer/plugins/other/radius/radius.cpp
+++ b/projects/stargazer/plugins/other/radius/radius.cpp
@@ -3,16 +3,9 @@
 #include "stg/common.h"
 #include <boost/tokenizer.hpp>
 
 #include "stg/common.h"
 #include <boost/tokenizer.hpp>
 

-#include <vector>

 #include <utility>
 #include <utility>

-#include <iterator>
-#include <algorithm>
-#include <iostream>

 
 using STG::RADIUS;
 
 using STG::RADIUS;

-using STG::RAD_SETTINGS;
-using AttrValue = RAD_SETTINGS::AttrValue;
-using ASection = RAD_SETTINGS::ASection;

 
 extern "C" STG::Plugin* GetPlugin()
 {
 
 extern "C" STG::Plugin* GetPlugin()
 {


@@ -20,150 +13,18 @@ extern "C" STG::Plugin* GetPlugin()
     return &plugin;
 }
 
     return &plugin;
 }
 

-namespace
-{
-    std::string ShowRules(const std::vector<std::pair<std::string, AttrValue>>& attributes)
-    {
-        std::string result;
-        for (const auto& at : attributes)
-        {
-            if (!result.empty())
-                result += ", ";
-
-            if (at.second.type == AttrValue::Type::PARAM_NAME)
-                result.append(at.first + " = " + at.second.value);
-            else
-                result.append(at.first + " = '" + at.second.value + "'");
-        }
-        return result;
-    }
-}
-
-std::vector<std::pair<std::string, AttrValue>> RAD_SETTINGS::ParseRules(const std::string& value, const std::string& paramName)
-{
-    using tokenizer =  boost::tokenizer<boost::char_separator<char>>;
-    const boost::char_separator<char> sep(",");
-
-    const tokenizer tokens(value, sep);
-
-    std::vector<std::pair<std::string, AttrValue>> res;
-    for (const auto& token : tokens)
-    {
-        const boost::char_separator<char> sp(" =");
-        const tokenizer tok(token, sp);
-
-        std::vector<std::string> keyValue;
-        for (const auto& t : tok)
-            keyValue.push_back(t);
-
-        if (keyValue.size() != 2)
-        {
-            m_logger("The '%s' attribute specification has an incorrect format: '%s'.", paramName.c_str(),  token.c_str());
-            printfd(__FILE__, "The '%s' attribute specification has an incorrect format: '%s'.", paramName.c_str(), token.c_str());
-            return {};
-        }
-
-        auto type = AttrValue::Type::PARAM_NAME;
-        std::string valueName = keyValue[1];
-        if (valueName.front() == '\'' && valueName.back() == '\'')
-        {
-            type = AttrValue::Type::VALUE;
-            valueName.erase(0, 1);
-            valueName.erase(valueName.length() - 1, 1);
-        }
-        else if ((valueName.front() == '\'' && valueName.back() != '\'') || (valueName.front() != '\'' && valueName.back() == '\''))
-        {
-            m_logger("Error ParseRules: '%s' attribute parameter value is invalid.\n", paramName.c_str());
-            printfd(__FILE__, "Error ParseRules: '%s' attribute parameter value is invalid.\n", paramName.c_str());
-            return {};
-        }
-        res.emplace_back(keyValue[0], AttrValue{valueName, type});
-    }
-    return res;
-}
-
-ASection RAD_SETTINGS::parseASection(const std::vector<ParamValue>& conf)
-{
-    ASection res;
-    const auto mit = std::find(conf.begin(), conf.end(), ParamValue("match", {}));
-    if (mit != conf.end())
-        res.match = ParseRules(mit->value[0], mit->param);
-
-    const auto sit = std::find(conf.begin(), conf.end(), ParamValue("send", {}));
-    if (sit != conf.end())
-        res.send = ParseRules(sit->value[0], sit->param);
-
-    return res;
-}
-
-RAD_SETTINGS::RAD_SETTINGS()
-    : m_port(1812),
-      m_dictionaries("/usr/share/freeradius/dictionary"),
-      m_logger(PluginLogger::get("radius"))
-{}
-
-int RAD_SETTINGS::ParseSettings(const ModuleSettings & s)
-{
-    ParamValue pv;
-    int p;
-
-    pv.param = "Port";
-    auto pvi = std::find(s.moduleParams.begin(), s.moduleParams.end(), pv);
-    if (pvi != s.moduleParams.end() && !pvi->value.empty())
-    {
-        if (ParseIntInRange(pvi->value[0], 2, 65535, &p) != 0)
-        {
-            m_errorStr = "Cannot parse parameter \'Port\': " + m_errorStr;
-            printfd(__FILE__, "Cannot parse parameter 'Port'\n");
-            return -1;
-        }
-        m_port = static_cast<uint16_t>(p);
-    }
-
-    pv.param = "Secret";
-    pvi = std::find(s.moduleParams.begin(), s.moduleParams.end(), pv);
-    if (pvi == s.moduleParams.end() || pvi->value.empty())
-    {
-        m_errorStr = "Parameter \'Secret\' not found.";
-        printfd(__FILE__, "Parameter 'Secret' not found\n");
-        m_secret = "";
-    }
-    else
-        m_secret = pvi->value[0];
-
-    pv.param = "Dictionaries";
-    pvi = std::find(s.moduleParams.begin(), s.moduleParams.end(), pv);
-    if (pvi != s.moduleParams.end() && !pvi->value.empty())
-        m_dictionaries = pvi->value[0];
-
-    const auto authIt = std::find(s.moduleParams.begin(), s.moduleParams.end(), ParamValue("auth", {}));
-    if (authIt != s.moduleParams.end())
-        m_auth = parseASection(authIt->sections);
-
-    const auto autzIt = std::find(s.moduleParams.begin(), s.moduleParams.end(), ParamValue("autz", {}));
-    if (autzIt != s.moduleParams.end())
-        m_autz = parseASection(autzIt->sections);
-
-    printfd(__FILE__, " auth.match = \"%s\"\n", ShowRules(m_auth.match).c_str());
-    printfd(__FILE__, " auth.send = \"%s\"\n", ShowRules(m_auth.send).c_str());
-    printfd(__FILE__, " autz.match = \"%s\"\n", ShowRules(m_autz.match).c_str());
-    printfd(__FILE__, " autz.send = \"%s\"\n", ShowRules(m_autz.send).c_str());
-
-    return 0;
-}
-

 RADIUS::RADIUS()
     : m_running(false),
 RADIUS::RADIUS()
     : m_running(false),

-      m_users(NULL),
+      m_users(nullptr),

       m_logger(PluginLogger::get("radius"))
 {
 }
 
 int RADIUS::ParseSettings()
 {
       m_logger(PluginLogger::get("radius"))
 {
 }
 
 int RADIUS::ParseSettings()
 {

-    auto ret = m_radSettings.ParseSettings(m_settings);
+    auto ret = m_config.ParseSettings(m_settings);

     if (ret != 0)
     if (ret != 0)

-        m_errorStr = m_radSettings.GetStrError();
+        m_errorStr = m_config.GetStrError();

 
     return ret;
 }
 
     return ret;
 }


@@ -212,7 +73,7 @@ int RADIUS::Run(std::stop_token token)
     try
     {
         if (!m_server)
     try
     {
         if (!m_server)

-           m_server = std::make_unique<Server>(m_ioContext, m_radSettings.GetSecret(), m_radSettings.GetPort(), m_radSettings.GetDictionaries(), std::move(token), m_logger, m_users);
+           m_server = std::make_unique<Server>(m_ioContext, m_config.GetSecret(), m_config.GetPort(), m_config.GetDictionaries(), std::move(token), m_logger, m_users, m_config);

         m_ioContext.run();
     }
     catch (const std::exception& e)
         m_ioContext.run();
     }
     catch (const std::exception& e)