X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/58d030a0db2b320459ce55d5a7b7b440d873d1d1..4fe07d7c76c7c9006780389a5babb524560b3ff0:/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 e517c959..11fbcf7b 100644
--- a/projects/stargazer/plugins/other/radius/radius.cpp
+++ b/projects/stargazer/plugins/other/radius/radius.cpp
@@ -1,16 +1,11 @@
 #include "radius.h"
-#include "server.h"
 #include "radproto/error.h"
-
 #include "stg/common.h"
+#include <boost/tokenizer.hpp>
 
-#include <boost/asio.hpp>
-#include <string>
-#include <iterator>
-#include <iostream>
+#include <utility>
 
 using STG::RADIUS;
-using STG::RAD_SETTINGS;
 
 extern "C" STG::Plugin* GetPlugin()
 {
@@ -18,81 +13,18 @@ extern "C" STG::Plugin* GetPlugin()
     return &plugin;
 }
 
-RAD_SETTINGS::RAD_SETTINGS()
-    : m_port(1812),
-      m_dictionaries("/usr/share/freeradius/dictionary")
-{}
-
-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];
-    return 0;
-}
-
 RADIUS::RADIUS()
     : m_running(false),
+      m_users(nullptr),
       m_logger(PluginLogger::get("radius"))
 {
 }
 
-int RADIUS::Run(std::stop_token token)
-{
-    SetRunning(true);
-
-    try
-    {
-        boost::asio::io_service ioService;
-        Server server(ioService, m_radSettings.GetSecret(), m_radSettings.GetPort(), m_radSettings.GetDictionaries());
-        ioService.run();
-    }
-    catch (const std::exception& e)
-    {
-        m_errorStr = "Exception in RADIUS::Run(): " + std::string(e.what());
-        m_logger("Exception in RADIUS:: Run(): %s", e.what());
-        printfd(__FILE__, "Exception in RADIUS:: Run(). Message: '%s'\n", e.what());
-    }
-
-    SetRunning(false);
-    return 0;
-}
-
 int RADIUS::ParseSettings()
 {
-    auto ret = m_radSettings.ParseSettings(m_settings);
+    auto ret = m_config.ParseSettings(m_settings);
     if (ret != 0)
-        m_errorStr = m_radSettings.GetStrError();
+        m_errorStr = m_config.GetStrError();
 
     return ret;
 }
@@ -115,6 +47,9 @@ int RADIUS::Stop()
 
     m_thread.request_stop();
 
+    if (m_server)
+        m_server->stop();
+
     m_thread.join();
     return 0;
 }
@@ -130,3 +65,24 @@ void RADIUS::SetRunning(bool val)
     const std::lock_guard lock(m_mutex);
     m_running = val;
 }
+
+int RADIUS::Run(std::stop_token token)
+{
+    SetRunning(true);
+
+    try
+    {
+        if (!m_server)
+           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_errorStr = "Exception in RADIUS::Run(): " + std::string(e.what());
+        m_logger("Exception in RADIUS:: Run(): %s", e.what());
+        printfd(__FILE__, "Exception in RADIUS:: Run(). Message: '%s'\n", e.what());
+    }
+
+    SetRunning(false);
+    return 0;
+}