Merge branch 'stg-2.409' into stg-2.409-radius

[stg.git] / projects / stargazer / plugins / other / radius / config.h

diff --git a/projects/stargazer/plugins/other/radius/config.h b/projects/stargazer/plugins/other/radius/config.h
index 809d91c9783b444650e18734960309d676c3e488..44d5ed856c38818f7c211072183260e1f86da7a9 100644 (file)
--- a/projects/stargazer/plugins/other/radius/config.h
+++ b/projects/stargazer/plugins/other/radius/config.h
@@ -31,6 +31,8 @@
 #include <unistd.h> // uid_t, gid_t
 #include <sys/stat.h> // mode_t
 
 #include <unistd.h> // uid_t, gid_t
 #include <sys/stat.h> // mode_t
 

+class USER;
+

 namespace STG
 {
 
 namespace STG
 {
 


@@ -52,15 +54,29 @@ struct Config
         UPDATED   // Module sends some updates.
     };
 
         UPDATED   // Module sends some updates.
     };
 

+    class Authorize
+    {
+        public:
+            Authorize() : m_auth(false) {}
+            Authorize(const Pairs& cond) : m_auth(true), m_cond(cond) {}
+
+            bool check(const USER& user, const Pairs& radiusData) const;
+            bool exists() const { return m_auth; }
+        private:
+            bool m_auth;
+            Pairs m_cond;
+    };
+

     struct Section
     {
         Section() {}
     struct Section
     {
         Section() {}

-        Section(const Pairs& ma, const Pairs& mo, const Pairs& re, ReturnCode code)
-            : match(ma), modify(mo), reply(re), returnCode(code) {}
+        Section(const Pairs& ma, const Pairs& mo, const Pairs& re, ReturnCode code, const Authorize& auth)
+            : match(ma), modify(mo), reply(re), returnCode(code), authorize(auth) {}

         Pairs match;
         Pairs modify;
         Pairs reply;
         ReturnCode returnCode;
         Pairs match;
         Pairs modify;
         Pairs reply;
         ReturnCode returnCode;

+        Authorize authorize;

     };
 
     Config() {}
     };
 
     Config() {}


@@ -75,8 +91,8 @@ struct Config
     bool verbose;
 
     std::string address;
     bool verbose;
 
     std::string address;

-    std::string bindAddress;

     Type connectionType;
     Type connectionType;

+    std::string bindAddress;

     std::string portStr;
     uint16_t port;
     std::string key;
     std::string portStr;
     uint16_t port;
     std::string key;