Update async-radius.

[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 376e427860fd18e7eb5d07d501fbba57e498c935..8e5b37a895edc3f5b2cdb195087faf5787276721 100644 (file)
--- a/projects/stargazer/plugins/other/radius/radius.cpp
+++ b/projects/stargazer/plugins/other/radius/radius.cpp
@@ -1,363 +1,131 @@
-/*
- *    This program is free software; you can redistribute it and/or modify
- *    it under the terms of the GNU General Public License as published by
- *    the Free Software Foundation; either version 2 of the License, or
- *    (at your option) any later version.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU General Public License for more details.
- *
- *    You should have received a copy of the GNU General Public License
- *    along with this program; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-/*
- *    Author : Maxim Mamontov <faust@stargazer.dp.ua>
- */
-

 #include "radius.h"
 #include "radius.h"

-
-#include "stg/store.h"
-#include "stg/users.h"
-#include "stg/plugin_creator.h"
+#include "radproto/error.h"

 #include "stg/common.h"
 
 #include "stg/common.h"
 

-#include <algorithm>
-#include <stdexcept>
-#include <csignal>
-#include <cerrno>
-#include <cstring>
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/un.h> // UNIX
-#include <netinet/in.h> // IP
-#include <netinet/tcp.h> // TCP
-#include <netdb.h>
-
-using STG::Config;
-using STG::Conn;
-
-namespace
-{
+#include <iterator>
+#include <iostream>

 
 

-PLUGIN_CREATOR<RADIUS> creator;
+using STG::RADIUS;
+using STG::RAD_SETTINGS;

 
 

-}
-
-extern "C" PLUGIN * GetPlugin()
-{
-    return creator.GetPlugin();
-}
-
-RADIUS::RADIUS()
-    : m_config(),
-      m_running(false),
-      m_stopped(true),
-      m_users(NULL),
-      m_store(NULL),
-      m_listenSocket(0),
-      m_logger(GetPluginLogger(GetStgLogger(), "radius"))
+extern "C" STG::Plugin* GetPlugin()

 {
 {

+    static RADIUS plugin;
+    return &plugin;

 }
 
 }
 

-int RADIUS::ParseSettings()
-{
-    try {
-        m_config = STG::Config(m_settings);
-        return reconnect() ? 0 : -1;
-    } catch (const std::runtime_error& ex) {
-        m_logger("Failed to parse settings. %s", ex.what());
-        return -1;
-    }
-}
-
-int RADIUS::Start()
-{
-    if (m_running)
-        return 0;
-
-    int res = pthread_create(&m_thread, NULL, run, this);
-    if (res == 0)
-        return 0;
-
-    m_error = strerror(res);
-    m_logger("Failed to create thread: '" + m_error + "'.");
-    return -1;
-}
-
-int RADIUS::Stop()
-{
-    if (m_stopped)
-        return 0;
-
-    m_running = false;
-
-    for (size_t i = 0; i < 25 && !m_stopped; i++) {
-        struct timespec ts = {0, 200000000};
-        nanosleep(&ts, NULL);
-    }
+RAD_SETTINGS::RAD_SETTINGS()
+    : m_port(1812),
+      m_dictionaries("/usr/share/freeradius/dictionary")
+{}

 
 

-    if (m_stopped) {
-        pthread_join(m_thread, NULL);
-        return 0;
-    }
-
-    if (m_config.connectionType == Config::UNIX)
-        unlink(m_config.bindAddress.c_str());
-
-    m_error = "Failed to stop thread.";
-    m_logger(m_error);
-    return -1;
-}
-//-----------------------------------------------------------------------------
-void* RADIUS::run(void* d)
+int RAD_SETTINGS::ParseSettings(const ModuleSettings & s)

 {
 {

-    sigset_t signalSet;
-    sigfillset(&signalSet);
-    pthread_sigmask(SIG_BLOCK, &signalSet, NULL);
-
-    static_cast<RADIUS *>(d)->runImpl();
+    ParamValue pv;
+    int p;

 
 

-    return NULL;
-}
-
-bool RADIUS::reconnect()
-{
-    if (!m_conns.empty())
+    pv.param = "Port";
+    auto pvi = std::find(s.moduleParams.begin(), s.moduleParams.end(), pv);
+    if (pvi != s.moduleParams.end() && !pvi->value.empty())

     {
     {

-        std::deque<STG::Conn *>::const_iterator it;
-        for (it = m_conns.begin(); it != m_conns.end(); ++it)
-            delete(*it);
-        m_conns.clear();
+        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);

     }
     }

-    if (m_listenSocket != 0)
+
+    pv.param = "Secret";
+    pvi = std::find(s.moduleParams.begin(), s.moduleParams.end(), pv);
+    if (pvi == s.moduleParams.end() || pvi->value.empty())

     {
     {

-        shutdown(m_listenSocket, SHUT_RDWR);
-        close(m_listenSocket);
+        m_errorStr = "Parameter \'Secret\' not found.";
+        printfd(__FILE__, "Parameter 'Secret' not found\n");
+        m_secret = "";

     }
     }

-    if (m_config.connectionType == Config::UNIX)
-        m_listenSocket = createUNIX();

     else
     else

-        m_listenSocket = createTCP();
-    if (m_listenSocket == 0)
-        return false;
-    if (listen(m_listenSocket, 100) == -1)

     {
     {

-        m_error = std::string("Error starting to listen socket: ") + strerror(errno);
-        m_logger(m_error);
-        return false;
+        m_secret = pvi->value[0];

     }
     }

-    return true;
-}

 
 

-int RADIUS::createUNIX() const
-{
-    int fd = socket(AF_UNIX, SOCK_STREAM, 0);
-    if (fd == -1)
-    {
-        m_error = std::string("Error creating UNIX socket: ") + strerror(errno);
-        m_logger(m_error);
-        return 0;
-    }
-    struct sockaddr_un addr;
-    memset(&addr, 0, sizeof(addr));
-    addr.sun_family = AF_UNIX;
-    strncpy(addr.sun_path, m_config.bindAddress.c_str(), m_config.bindAddress.length());
-    unlink(m_config.bindAddress.c_str());
-    if (bind(fd, reinterpret_cast<struct sockaddr*>(&addr), sizeof(addr)) == -1)
-    {
-        shutdown(fd, SHUT_RDWR);
-        close(fd);
-        m_error = std::string("Error binding UNIX socket: ") + strerror(errno);
-        m_logger(m_error);
-        return 0;
-    }
-    chown(m_config.bindAddress.c_str(), m_config.sockUID, m_config.sockGID);
-    if (m_config.sockMode != static_cast<mode_t>(-1))
-        chmod(m_config.bindAddress.c_str(), m_config.sockMode);
-    return fd;
+    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;

 }
 
 }
 

-int RADIUS::createTCP() const
+RADIUS::RADIUS()
+    : m_running(false),
+      m_logger(PluginLogger::get("radius"))

 {
 {

-    addrinfo hints;
-    memset(&hints, 0, sizeof(addrinfo));
-
-    hints.ai_family = AF_INET;       /* Allow IPv4 */
-    hints.ai_socktype = SOCK_STREAM; /* Stream socket */
-    hints.ai_flags = AI_PASSIVE;     /* For wildcard IP address */
-    hints.ai_protocol = 0;           /* Any protocol */
-    hints.ai_canonname = NULL;
-    hints.ai_addr = NULL;
-    hints.ai_next = NULL;
-
-    addrinfo* ais = NULL;
-    int res = getaddrinfo(m_config.bindAddress.c_str(), m_config.portStr.c_str(), &hints, &ais);
-    if (res != 0)
-    {
-        m_error = "Error resolving address '" + m_config.bindAddress + "': " + gai_strerror(res);
-        m_logger(m_error);
-        return 0;
-    }
-
-    for (addrinfo* ai = ais; ai != NULL; ai = ai->ai_next)
-    {
-        int fd = socket(AF_INET, SOCK_STREAM, 0);
-        if (fd == -1)
-        {
-            m_error = std::string("Error creating TCP socket: ") + strerror(errno);
-            m_logger(m_error);
-            freeaddrinfo(ais);
-            return 0;
-        }
-        if (bind(fd, ai->ai_addr, ai->ai_addrlen) == -1)
-        {
-            shutdown(fd, SHUT_RDWR);
-            close(fd);
-            m_error = std::string("Error binding TCP socket: ") + strerror(errno);
-            m_logger(m_error);
-            continue;
-        }
-        freeaddrinfo(ais);
-        return fd;
-    }
-
-    m_error = "Failed to resolve '" + m_config.bindAddress;
-    m_logger(m_error);
-
-    freeaddrinfo(ais);
-    return 0;

 }
 
 }
 

-void RADIUS::runImpl()
+int RADIUS::ParseSettings()

 {
 {

-    m_running = true;
-    m_stopped = false;
-
-    while (m_running) {
-        fd_set fds;
-
-        buildFDSet(fds);
-
-        struct timeval tv;
-        tv.tv_sec = 0;
-        tv.tv_usec = 500000;
-
-        int res = select(maxFD() + 1, &fds, NULL, NULL, &tv);
-        if (res < 0)
-        {
-            if (errno == EINTR)
-                continue;
-            m_error = std::string("'select' is failed: '") + strerror(errno) + "'.";
-            m_logger(m_error);
-            break;
-        }
-
-        if (!m_running)
-            break;
-
-        if (res > 0)
-            handleEvents(fds);
-        else
-        {
-            for (std::deque<Conn*>::iterator it = m_conns.begin(); it != m_conns.end(); ++it)
-                (*it)->tick();
-        }
-
-        cleanupConns();
-    }
+    auto ret = m_radSettings.ParseSettings(m_settings);
+    if (ret != 0)
+        m_errorStr = m_radSettings.GetStrError();

 
 

-    m_stopped = true;
+    return ret;

 }
 
 }
 

-int RADIUS::maxFD() const
+std::string RADIUS::GetVersion() const

 {
 {

-    int maxFD = m_listenSocket;
-    std::deque<STG::Conn *>::const_iterator it;
-    for (it = m_conns.begin(); it != m_conns.end(); ++it)
-        if (maxFD < (*it)->sock())
-            maxFD = (*it)->sock();
-    return maxFD;
+    return "Radius v.1.0";

 }
 
 }
 

-void RADIUS::buildFDSet(fd_set & fds) const
+int RADIUS::Start()

 {
 {

-    FD_ZERO(&fds);
-    FD_SET(m_listenSocket, &fds);
-    std::deque<STG::Conn *>::const_iterator it;
-    for (it = m_conns.begin(); it != m_conns.end(); ++it)
-        FD_SET((*it)->sock(), &fds);
+    m_thread = std::jthread([this](auto token){ Run(std::move(token)); });
+    return 0;

 }
 
 }
 

-void RADIUS::cleanupConns()
+int RADIUS::Stop()

 {
 {

-    std::deque<STG::Conn *>::iterator pos;
-    for (pos = m_conns.begin(); pos != m_conns.end(); ++pos)
-        if (!(*pos)->isOk()) {
-            delete *pos;
-            *pos = NULL;
-        }
+    if (!m_thread.joinable())
+        return 0;
+
+    m_thread.request_stop();

 
 

-    pos = std::remove(m_conns.begin(), m_conns.end(), static_cast<STG::Conn *>(NULL));
-    m_conns.erase(pos, m_conns.end());
+    if (m_server)
+        m_server->stop();
+
+    m_thread.join();
+    return 0;

 }
 
 }
 

-void RADIUS::handleEvents(const fd_set & fds)
+bool RADIUS::IsRunning()

 {
 {

-    if (FD_ISSET(m_listenSocket, &fds))
-        acceptConnection();
-    else
-    {
-        std::deque<STG::Conn *>::iterator it;
-        for (it = m_conns.begin(); it != m_conns.end(); ++it)
-            if (FD_ISSET((*it)->sock(), &fds))
-                (*it)->read();
-            else
-                (*it)->tick();
-    }
+    const std::lock_guard lock(m_mutex);
+    return m_running;

 }
 
 }
 

-void RADIUS::acceptConnection()
+void RADIUS::SetRunning(bool val)

 {
 {

-    if (m_config.connectionType == Config::UNIX)
-        acceptUNIX();
-    else
-        acceptTCP();
+    const std::lock_guard lock(m_mutex);
+    m_running = val;

 }
 
 }
 

-void RADIUS::acceptUNIX()
+int RADIUS::Run(std::stop_token token)

 {
 {

-    struct sockaddr_un addr;
-    memset(&addr, 0, sizeof(addr));
-    socklen_t size = sizeof(addr);
-    int res = accept(m_listenSocket, reinterpret_cast<sockaddr*>(&addr), &size);
-    if (res == -1)
+    SetRunning(true);
+
+    try

     {
     {

-        m_error = std::string("Failed to accept UNIX connection: ") + strerror(errno);
-        m_logger(m_error);
-        return;
+        if (!m_server)
+           m_server = std::make_unique<Server>(m_ioService, m_radSettings.GetSecret(), m_radSettings.GetPort(), m_radSettings.GetDictionaries(), std::move(token), m_logger);
+        m_ioService.run();

     }
     }

-    printfd(__FILE__, "New UNIX connection: '%s'\n", addr.sun_path);
-    m_conns.push_back(new Conn(*m_users, m_logger, m_config, res, addr.sun_path));
-}
-
-void RADIUS::acceptTCP()
-{
-    struct sockaddr_in addr;
-    memset(&addr, 0, sizeof(addr));
-    socklen_t size = sizeof(addr);
-    int res = accept(m_listenSocket, reinterpret_cast<sockaddr*>(&addr), &size);
-    if (res == -1)
+    catch (const std::exception& e)

     {
     {

-        m_error = std::string("Failed to accept TCP connection: ") + strerror(errno);
-        m_logger(m_error);
-        return;
+        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());

     }
     }

-    std::string remote = inet_ntostring(addr.sin_addr.s_addr) + ":" + x2str(ntohs(addr.sin_port));
-    printfd(__FILE__, "New TCP connection: '%s'\n", remote.c_str());
-    m_conns.push_back(new Conn(*m_users, m_logger, m_config, res, remote));
+
+    SetRunning(false);
+    return 0;

 }
 }