Sending attributes from <auth>/send section. #13
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,147 @@ | ||
| #include "rad_settings.h" | ||
| #include "radproto/error.h" | ||
| #include "stg/common.h" | ||
| #include <boost/tokenizer.hpp> | ||
|
|
||
| #include <vector> | ||
| #include <utility> | ||
| #include <iterator> | ||
| #include <algorithm> | ||
| #include <iostream> | ||
|
|
||
| using STG::RAD_SETTINGS; | ||
| using AttrValue = RAD_SETTINGS::AttrValue; | ||
| using ASection = RAD_SETTINGS::ASection; | ||
|
|
||
| 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; | ||
| } | ||
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| #pragma once | ||
|
|
||
| #include "stg/module_settings.h" | ||
| #include "stg/subscriptions.h" | ||
| #include "stg/logger.h" | ||
|
|
||
| #include <string> | ||
| #include <cstdint> //uint8_t, uint32_t | ||
|
|
||
| namespace STG | ||
| { | ||
| struct Settings; | ||
|
|
||
| class RAD_SETTINGS | ||
| { | ||
| public: | ||
| RAD_SETTINGS(); | ||
|
|
||
| struct AttrValue | ||
| { | ||
| enum class Type | ||
| { | ||
| PARAM_NAME, | ||
| VALUE | ||
| }; | ||
| std::string value; | ||
| Type type; | ||
| }; | ||
|
|
||
| struct ASection | ||
| { | ||
| using Pairs = std::vector<std::pair<std::string, AttrValue>>; | ||
| Pairs match; | ||
| Pairs send; | ||
| }; | ||
|
|
||
| const std::string& GetStrError() const { return m_errorStr; } | ||
| int ParseSettings(const ModuleSettings& s); | ||
|
|
||
| uint16_t GetPort() const { return m_port; } | ||
| const std::string& GetDictionaries() const { return m_dictionaries; } | ||
| const std::string& GetSecret() const { return m_secret; } | ||
| const ASection& getAuth() const { return m_auth; } | ||
| const ASection& getAutz() const { return m_autz; } | ||
|
|
||
| private: | ||
| std::vector<std::pair<std::string, AttrValue>> ParseRules(const std::string& value, const std::string& paramName); | ||
| ASection parseASection(const std::vector<ParamValue>& conf); | ||
|
|
||
| std::string m_errorStr; | ||
| uint16_t m_port; | ||
| std::string m_dictionaries; | ||
| std::string m_secret; | ||
|
|
||
| ASection m_auth; | ||
| ASection m_autz; | ||
|
|
||
| PluginLogger m_logger; | ||
| }; | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Let's keep the original value. It makes more sense.