X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/186fb2b18b89a0280b8cc4b5ea8f7a59d3bd0853..1c529746ff07312e30e76fd933c628c658e3c77d:/projects/sgconf/main.cpp?ds=sidebyside diff --git a/projects/sgconf/main.cpp b/projects/sgconf/main.cpp index 6a71f652..60cc15fa 100644 --- a/projects/sgconf/main.cpp +++ b/projects/sgconf/main.cpp @@ -25,7 +25,9 @@ #include "users.h" #include "services.h" #include "corps.h" +#include "info.h" +#include "api_action.h" #include "options.h" #include "actions.h" #include "config.h" @@ -34,9 +36,10 @@ #include #include // getenv -#include // basename +#include // str* #include // access +#include // basename namespace { @@ -70,7 +73,7 @@ template class FUNC1_ADAPTER : public std::unary_function { public: - FUNC1_ADAPTER(R (*func)(A)) : m_func(func) {} + explicit FUNC1_ADAPTER(R (*func)(A)) : m_func(func) {} const R operator()(A arg) const { return (m_func)(arg); } private: R (*m_func)(A); @@ -118,7 +121,7 @@ return CONST_METHOD1_ADAPTER(func, obj); void Version(const std::string & self) { -std::cout << self << ", version: 2.0.0-alpha.\n"; +std::cout << self << ", version: 2.0.0.\n"; } void ReadUserConfigFile(SGCONF::OPTION_BLOCK & block) @@ -157,12 +160,10 @@ class CONFIG_ACTION : public ACTION m_description(paramDescription) {} - virtual ACTION * Clone() const { return new CONFIG_ACTION(*this); } - - virtual std::string ParamDescription() const { return m_description; } - virtual std::string DefaultDescription() const { return ""; } - virtual OPTION_BLOCK & Suboptions() { return m_suboptions; } - virtual PARSER_STATE Parse(int argc, char ** argv); + std::string ParamDescription() const override { return m_description; } + std::string DefaultDescription() const override { return ""; } + OPTION_BLOCK & Suboptions() override { return m_suboptions; } + PARSER_STATE Parse(int argc, char ** argv, void * /*data*/) override; private: SGCONF::CONFIG & m_config; @@ -173,109 +174,8 @@ class CONFIG_ACTION : public ACTION void ParseHostAndPort(const std::string & hostAndPort); }; -typedef bool (* API_FUNCTION) (const SGCONF::CONFIG &, - const std::string &, - const std::map &); -class COMMAND -{ - public: - COMMAND(API_FUNCTION funPtr, - const std::string & arg, - const std::map & options) - : m_funPtr(funPtr), - m_arg(arg), - m_options(options) - {} - bool Execute(const SGCONF::CONFIG & config) const - { - return m_funPtr(config, m_arg, m_options); - } - - private: - API_FUNCTION m_funPtr; - std::string m_arg; - std::map m_options; -}; - -class COMMANDS -{ - public: - void Add(API_FUNCTION funPtr, - const std::string & arg, - const std::map & options) { m_commands.push_back(COMMAND(funPtr, arg, options)); } - bool Execute(const SGCONF::CONFIG & config) const - { - std::list::const_iterator it(m_commands.begin()); - bool res = true; - while (it != m_commands.end() && res) - { - res = res && it->Execute(config); - ++it; - } - return res; - } - private: - std::list m_commands; -}; - -class API_ACTION : public ACTION -{ - public: - API_ACTION(COMMANDS & commands, - const std::string & paramDescription, - bool needArgument, - const OPTION_BLOCK& suboptions, - API_FUNCTION funPtr) - : m_commands(commands), - m_description(paramDescription), - m_argument(needArgument ? "1" : ""), // Hack - m_suboptions(suboptions), - m_funPtr(funPtr) - {} - API_ACTION(COMMANDS & commands, - const std::string & paramDescription, - bool needArgument, - API_FUNCTION funPtr) - : m_commands(commands), - m_description(paramDescription), - m_argument(needArgument ? "1" : ""), // Hack - m_funPtr(funPtr) - {} - - virtual ACTION * Clone() const { return new API_ACTION(*this); } - - virtual std::string ParamDescription() const { return m_description; } - virtual std::string DefaultDescription() const { return ""; } - virtual OPTION_BLOCK & Suboptions() { return m_suboptions; } - virtual PARSER_STATE Parse(int argc, char ** argv) - { - PARSER_STATE state(false, argc, argv); - if (!m_argument.empty()) - { - if (argc == 0 || - argv == NULL || - *argv == NULL) - throw ERROR("Missing argument."); - m_argument = *argv; - --state.argc; - ++state.argv; - } - m_suboptions.Parse(state.argc, state.argv); - m_commands.Add(m_funPtr, m_argument, m_params); - return state; - } - - private: - COMMANDS & m_commands; - std::string m_description; - std::string m_argument; - OPTION_BLOCK m_suboptions; - std::map m_params; - API_FUNCTION m_funPtr; -}; - -PARSER_STATE CONFIG_ACTION::Parse(int argc, char ** argv) +PARSER_STATE CONFIG_ACTION::Parse(int argc, char ** argv, void * /*data*/) { if (argc == 0 || argv == NULL || @@ -325,276 +225,99 @@ else } } -inline -CONFIG_ACTION * MakeParamAction(SGCONF::CONFIG & config, - const std::string & paramDescription) -{ -return new CONFIG_ACTION(config, paramDescription); -} - -inline -ACTION * MakeAPIAction(COMMANDS & commands, - const std::string & paramDescription, - bool needArgument, - API_FUNCTION funPtr) +std::unique_ptr MakeParamAction(SGCONF::CONFIG & config, + const std::string & paramDescription) { -return new API_ACTION(commands, paramDescription, needArgument, funPtr); -} - -inline -ACTION * MakeAPIAction(COMMANDS & commands, - API_FUNCTION funPtr) -{ -return new API_ACTION(commands, "", false, funPtr); +return std::make_unique(config, paramDescription); } } // namespace SGCONF -time_t stgTime; - //----------------------------------------------------------------------------- int main(int argc, char **argv) { -std::string self(basename(argv[0])); -SGCONF::CONFIG config; -SGCONF::COMMANDS commands; - -SGCONF::OPTION_BLOCKS blocks; -blocks.Add("General options") - .Add("c", "config", SGCONF::MakeParamAction(config.configFile, std::string("~/.config/stg/sgconf.conf"), ""), "override default config file") - .Add("h", "help", SGCONF::MakeFunc0Action(bind0(Method1Adapt(&SGCONF::OPTION_BLOCKS::Help, blocks), 0)), "\t\tshow this help and exit") - //.Add("help-all", SGCONF::MakeFunc0Action(UsageAll), "\t\tshow full help and exit") - .Add("v", "version", SGCONF::MakeFunc0Action(bind0(Func1Adapt(Version), self)), "\t\tshow version information and exit"); -SGCONF::OPTION_BLOCK & block = blocks.Add("Connection options") - .Add("s", "server", SGCONF::MakeParamAction(config.server, std::string("localhost"), "
"), "\t\thost to connect") - .Add("p", "port", SGCONF::MakeParamAction(config.port, uint16_t(5555), ""), "\t\tport to connect") - .Add("u", "username", SGCONF::MakeParamAction(config.userName, std::string("admin"), ""), "\tadministrative login") - .Add("w", "userpass", SGCONF::MakeParamAction(config.userPass, ""), "\tpassword for the administrative login") - .Add("a", "address", SGCONF::MakeParamAction(config, ""), "connection params as a single string in format: :@:"); -blocks.Add("Raw XML") - .Add("r", "raw", SGCONF::MakeAPIAction(commands, "", true, SGCONF::RawXMLFunction), "\tmake raw XML request"); -blocks.Add("Admin management options") - .Add("get-admins", SGCONF::MakeAPIAction(commands, SGCONF::GetAdminsFunction), "\tget admin list") - .Add("get-admin", SGCONF::MakeAPIAction(commands, "", true, SGCONF::GetAdminFunction), "get admin") - .Add("add-admin", SGCONF::MakeAPIAction(commands, "", true, SGCONF::AddAdminFunction), "add admin") - .Add("del-admin", SGCONF::MakeAPIAction(commands, "", true, SGCONF::DelAdminFunction), "del admin") - .Add("chg-admin", SGCONF::MakeAPIAction(commands, "", true, SGCONF::ChgAdminFunction), "change admin"); -blocks.Add("Tariff management options") - .Add("get-tariffs", SGCONF::MakeAPIAction(commands, SGCONF::GetTariffsFunction), "\tget tariff list") - .Add("get-tariff", SGCONF::MakeAPIAction(commands, "", true, SGCONF::GetTariffFunction), "get tariff") - .Add("add-tariff", SGCONF::MakeAPIAction(commands, "", true, SGCONF::AddTariffFunction), "add tariff") - .Add("del-tariff", SGCONF::MakeAPIAction(commands, "", true, SGCONF::DelTariffFunction), "del tariff") - .Add("chg-tariff", SGCONF::MakeAPIAction(commands, "", true, SGCONF::ChgTariffFunction), "change tariff"); -blocks.Add("User management options") - .Add("get-users", SGCONF::MakeAPIAction(commands, SGCONF::GetUsersFunction), "\tget user list") - .Add("get-user", SGCONF::MakeAPIAction(commands, "", true, SGCONF::GetUserFunction), "get user") - .Add("add-user", SGCONF::MakeAPIAction(commands, "", true, SGCONF::AddUserFunction), "add user") - .Add("del-user", SGCONF::MakeAPIAction(commands, "", true, SGCONF::DelUserFunction), "del user") - .Add("chg-user", SGCONF::MakeAPIAction(commands, "", true, SGCONF::ChgUserFunction), "change user") - .Add("check-user", SGCONF::MakeAPIAction(commands, "", true, SGCONF::CheckUserFunction), "check user existance and credentials") - .Add("send-message", SGCONF::MakeAPIAction(commands, "", true, SGCONF::SendMessageFunction), "send message"); -blocks.Add("Service management options") - .Add("get-services", SGCONF::MakeAPIAction(commands, SGCONF::GetServicesFunction), "\tget service list") - .Add("get-service", SGCONF::MakeAPIAction(commands, "", true, SGCONF::GetServiceFunction), "get service") - .Add("add-service", SGCONF::MakeAPIAction(commands, "", true, SGCONF::AddServiceFunction), "add service") - .Add("del-service", SGCONF::MakeAPIAction(commands, "", true, SGCONF::DelServiceFunction), "del service") - .Add("chg-service", SGCONF::MakeAPIAction(commands, "", true, SGCONF::ChgServiceFunction), "change service"); -blocks.Add("Corporation management options") - .Add("get-corps", SGCONF::MakeAPIAction(commands, SGCONF::GetCorpsFunction), "\tget corporation list") - .Add("get-corp", SGCONF::MakeAPIAction(commands, "", true, SGCONF::GetCorpFunction), "get corporation") - .Add("add-corp", SGCONF::MakeAPIAction(commands, "", true, SGCONF::AddCorpFunction), "add corporation") - .Add("del-corp", SGCONF::MakeAPIAction(commands, "", true, SGCONF::DelCorpFunction), "del corporation") - .Add("chg-corp", SGCONF::MakeAPIAction(commands, "", true, SGCONF::ChgCorpFunction), "change corporation"); - -SGCONF::PARSER_STATE state(false, argc, argv); - -try -{ -state = blocks.Parse(--argc, ++argv); // Skipping self name -} -catch (const SGCONF::OPTION::ERROR& ex) -{ -std::cerr << ex.what() << "\n"; -return -1; -} - -if (state.stop) - return 0; - -if (state.argc > 0) + std::string self(basename(argv[0])); + SGCONF::CONFIG config; + SGCONF::COMMANDS commands; + + SGCONF::OPTION_BLOCKS blocks; + blocks.Add("General options") + .Add("c", "config", SGCONF::MakeParamAction(config.configFile, std::string("~/.config/stg/sgconf.conf"), ""), "override default config file") + .Add("h", "help", SGCONF::MakeFunc0Action(bind0(Method1Adapt(&SGCONF::OPTION_BLOCKS::Help, blocks), 0)), "\t\tshow this help and exit") + //.Add("help-all", SGCONF::MakeFunc0Action(UsageAll), "\t\tshow full help and exit") + .Add("v", "version", SGCONF::MakeFunc0Action(bind0(Func1Adapt(Version), self)), "\t\tshow version information and exit"); + SGCONF::OPTION_BLOCK & block = blocks.Add("Connection options") + .Add("s", "server", SGCONF::MakeParamAction(config.server, std::string("localhost"), "
"), "\t\thost to connect") + .Add("p", "port", SGCONF::MakeParamAction(config.port, uint16_t(5555), ""), "\t\tport to connect") + .Add("local-address", SGCONF::MakeParamAction(config.localAddress, std::string(""), "
"), "\tlocal address to bind") + .Add("local-port", SGCONF::MakeParamAction(config.localPort, uint16_t(0), ""), "\t\tlocal port to bind") + .Add("u", "username", SGCONF::MakeParamAction(config.userName, std::string("admin"), ""), "\tadministrative login") + .Add("w", "userpass", SGCONF::MakeParamAction(config.userPass, ""), "\tpassword for the administrative login") + .Add("a", "address", SGCONF::MakeParamAction(config, ""), "connection params as a single string in format: :@:"); + blocks.Add("Debug options") + .Add("show-config", SGCONF::MakeParamAction(config.showConfig), "\tshow config and exit"); + SGCONF::AppendXMLOptionBlock(commands, blocks); + SGCONF::AppendServerInfoBlock(commands, blocks); + SGCONF::AppendAdminsOptionBlock(commands, blocks); + SGCONF::AppendTariffsOptionBlock(commands, blocks); + SGCONF::AppendUsersOptionBlock(commands, blocks); + SGCONF::AppendServicesOptionBlock(commands, blocks); + SGCONF::AppendCorpsOptionBlock(commands, blocks); + + SGCONF::PARSER_STATE state(false, argc, argv); + + try { - std::cerr << "Unknown option: '" << *state.argv << "'\n"; - return -1; + state = blocks.Parse(--argc, ++argv); // Skipping self name } - -try -{ -SGCONF::CONFIG configOverride(config); - -if (config.configFile.empty()) + catch (const SGCONF::OPTION::ERROR& ex) { - const char * mainConfigFile = "/etc/sgconf/sgconf.conf"; - if (access(mainConfigFile, R_OK) == 0) - block.ParseFile(mainConfigFile); - ReadUserConfigFile(block); + std::cerr << ex.what() << "\n"; + return -1; } -else + + if (state.stop) + return 0; + + if (state.argc > 0) { - block.ParseFile(config.configFile.data()); + std::cerr << "Unknown option: '" << *state.argv << "'\n"; + return -1; } -config = configOverride; -} -catch (const std::exception& ex) -{ -std::cerr << ex.what() << "\n"; -return -1; -} + try + { + // Preserve config values parsed from the command line + SGCONF::CONFIG configOverride(config); -std::cerr << "Config: " << config.Serialize() << std::endl; -return commands.Execute(config) ? 0 : -1; -} -//----------------------------------------------------------------------------- + if (!config.configFile) + { + // Read main config file. + const char * mainConfigFile = "/etc/sgconf/sgconf.conf"; + if (access(mainConfigFile, R_OK) == 0) + block.ParseFile(mainConfigFile); + // Read XDG-stuff. + ReadUserConfigFile(block); + } + else + { + // Read user-supplied file. + block.ParseFile(config.configFile.value()); + } -namespace -{ + // Apply overrides from the command line + config.splice(configOverride); -/*void UsageTariffs(bool full) -{ -std::cout << "Tariffs management options:\n" - << "\t--get-tariffs\t\t\t\tget a list of tariffs (subsequent options will define what to show)\n"; -if (full) - std::cout << "\t\t--name\t\t\t\tshow tariff's name\n" - << "\t\t--fee\t\t\t\tshow tariff's fee\n" - << "\t\t--free\t\t\t\tshow tariff's prepaid traffic in terms of cost\n" - << "\t\t--passive-cost\t\t\tshow tariff's cost of \"freeze\"\n" - << "\t\t--traff-type\t\t\tshow what type of traffix will be accounted by the tariff\n" - << "\t\t--dirs\t\t\t\tshow tarification rules for directions\n\n"; -std::cout << "\t--get-tariff\t\t\t\tget the information about tariff\n"; -if (full) - std::cout << "\t\t--name \t\t\tname of the tariff to show\n" - << "\t\t--fee\t\t\t\tshow tariff's fee\n" - << "\t\t--free\t\t\t\tshow tariff's prepaid traffic in terms of cost\n" - << "\t\t--passive-cost\t\t\tshow tariff's cost of \"freeze\"\n" - << "\t\t--traff-type\t\t\tshow what type of traffix will be accounted by the tariff\n" - << "\t\t--dirs\t\t\t\tshow tarification rules for directions\n\n"; -std::cout << "\t--add-tariff\t\t\t\tadd a new tariff\n"; -if (full) - std::cout << "\t\t--name \t\t\tname of the tariff to add\n" - << "\t\t--fee \t\t\tstariff's fee\n" - << "\t\t--free \t\t\ttariff's prepaid traffic in terms of cost\n" - << "\t\t--passive-cost \t\ttariff's cost of \"freeze\"\n" - << "\t\t--traff-type \t\twhat type of traffi will be accounted by the tariff\n" - << "\t\t--times \t\t\tslash-separated list of \"day\" time-spans (in form \"hh:mm-hh:mm\") for each direction\n" - << "\t\t--prices-day-a \t\tslash-separated list of prices for \"day\" traffic before threshold for each direction\n" - << "\t\t--prices-night-a \tslash-separated list of prices for \"night\" traffic before threshold for each direction\n" - << "\t\t--prices-day-b \t\tslash-separated list of prices for \"day\" traffic after threshold for each direction\n" - << "\t\t--prices-night-b \tslash-separated list of prices for \"night\" traffic after threshold for each direction\n" - << "\t\t--single-prices \tslash-separated list of \"single price\" flags for each direction\n" - << "\t\t--no-discounts \t\tslash-separated list of \"no discount\" flags for each direction\n" - << "\t\t--thresholds \tslash-separated list of thresholds (in Mb) for each direction\n\n"; -std::cout << "\t--del-tariff\t\t\t\tdelete an existing tariff\n"; -if (full) - std::cout << "\t\t--name \t\t\tname of the tariff to delete\n\n"; -std::cout << "\t--chg-tariff\t\t\t\tchange an existing tariff\n"; -if (full) - std::cout << "\t\t--name \t\t\tname of the tariff to change\n" - << "\t\t--fee \t\t\tstariff's fee\n" - << "\t\t--free \t\t\ttariff's prepaid traffic in terms of cost\n" - << "\t\t--passive-cost \t\ttariff's cost of \"freeze\"\n" - << "\t\t--traff-type \t\twhat type of traffix will be accounted by the tariff\n" - << "\t\t--dir \t\t\tnumber of direction data to change\n" - << "\t\t\t--time