X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/5a98249bfadbe1d22d316dc3e9e770e0c305e5d6..a91e9542b384905187890f161d4da5396996fcfd:/projects/sgconf/main.cpp diff --git a/projects/sgconf/main.cpp b/projects/sgconf/main.cpp index 135cd3c0..60cc15fa 100644 --- a/projects/sgconf/main.cpp +++ b/projects/sgconf/main.cpp @@ -23,48 +23,26 @@ #include "admins.h" #include "tariffs.h" #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" -#include "stg/servconf.h" -#include "stg/user_conf.h" -#include "stg/user_stat.h" -#include "stg/common.h" - -#include -#include -#include -#include -#include #include -#include - -#include -#include -#include -#include +#include -namespace -{ - -template -struct ARRAY_TYPE -{ -typedef typename T::value_type type; -}; +#include // getenv +#include // str* -template -struct ARRAY_TYPE -{ -typedef T type; -}; +#include // access +#include // basename -template -struct ARRAY_TYPE +namespace { -typedef T type; -}; template struct nullary_function @@ -91,6 +69,16 @@ binder0 bind0(const F & func, const typename F::argument_type & arg) return binder0(func, arg); } +template +class FUNC1_ADAPTER : public std::unary_function +{ + public: + explicit FUNC1_ADAPTER(R (*func)(A)) : m_func(func) {} + const R operator()(A arg) const { return (m_func)(arg); } + private: + R (*m_func)(A); +}; + template class METHOD1_ADAPTER : public std::unary_function { @@ -113,6 +101,12 @@ class CONST_METHOD1_ADAPTER : public std::unary_function C & m_obj; }; +template +FUNC1_ADAPTER Func1Adapt(R (func)(A)) +{ +return FUNC1_ADAPTER(func); +} + template METHOD1_ADAPTER Method1Adapt(R (C::* func)(A), C & obj) { @@ -125,38 +119,11 @@ CONST_METHOD1_ADAPTER Method1Adapt(R (C::* func)(A) const, C & obj) return CONST_METHOD1_ADAPTER(func, obj); } -template -bool SetArrayItem(T & array, const char * index, const typename ARRAY_TYPE::type & value) +void Version(const std::string & self) { -size_t pos = 0; -if (str2x(index, pos)) - return false; -array[pos] = value; -return true; -} - -void RawXMLCallback(bool result, const std::string & reason, const std::string & response, void * /*data*/) -{ -if (!result) - { - std::cerr << "Failed to get raw XML response. Reason: '" << reason << "'." << std::endl; - return; - } -SGCONF::PrintXML(response); +std::cout << self << ", version: 2.0.0.\n"; } -void Usage(); -void UsageAll(); -void UsageImpl(bool full); -void UsageConnection(); -void UsageAdmins(bool full); -void UsageTariffs(bool full); -void UsageUsers(bool full); -void UsageServices(bool full); -void UsageCorporations(bool full); - -void Version(); - void ReadUserConfigFile(SGCONF::OPTION_BLOCK & block) { std::vector paths; @@ -193,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; @@ -209,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 || @@ -361,373 +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) -{ -return new API_ACTION(commands, paramDescription, needArgument, funPtr); -} - -inline -ACTION * MakeAPIAction(COMMANDS & commands, - API_FUNCTION funPtr) -{ -return new API_ACTION(commands, "", false, funPtr); -} - -bool RawXMLFunction(const SGCONF::CONFIG & config, - const std::string & arg, - const std::map & /*options*/) +std::unique_ptr MakeParamAction(SGCONF::CONFIG & config, + const std::string & paramDescription) { - STG::SERVCONF proto(config.server.data(), - config.port.data(), - config.userName.data(), - config.userPass.data()); - return proto.RawXML(arg, RawXMLCallback, NULL) == STG::st_ok; +return std::make_unique(config, paramDescription); } } // namespace SGCONF -time_t stgTime; - //----------------------------------------------------------------------------- int main(int argc, char **argv) { -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(Version), "\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), "\tget admin") - .Add("add-admin", SGCONF::MakeAPIAction(commands, "", true, SGCONF::AddAdminFunction), "\tadd admin") - .Add("del-admin", SGCONF::MakeAPIAction(commands, "", true, SGCONF::DelAdminFunction), "\tdel admin") - .Add("chg-admin", SGCONF::MakeAPIAction(commands, "", true, SGCONF::ChgAdminFunction), "\tchange 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), "\tget tariff") - .Add("add-tariff", SGCONF::MakeAPIAction(commands, "", true, SGCONF::AddTariffFunction), "\tadd tariff") - .Add("del-tariff", SGCONF::MakeAPIAction(commands, "", true, SGCONF::DelTariffFunction), "\tdel tariff") - .Add("chg-tariff", SGCONF::MakeAPIAction(commands, "", true, SGCONF::ChgTariffFunction), "\tchange 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), "\tget user") - .Add("add-user", SGCONF::MakeAPIAction(commands, "", true, SGCONF::AddUserFunction), "\tadd user") - .Add("del-user", SGCONF::MakeAPIAction(commands, "", true, SGCONF::DelUserFunction), "\tdel user") - .Add("chg-user", SGCONF::MakeAPIAction(commands, "", true, SGCONF::ChgUserFunction), "\tchange user"); - -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::cerr << "Unknown option: '" << *state.argv << "'\n"; - return -1; - } - -try -{ -SGCONF::CONFIG configOverride(config); - -if (config.configFile.empty()) + 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 { - const char * mainConfigFile = "/etc/sgconf/sgconf.conf"; - if (access(mainConfigFile, R_OK) == 0) - block.ParseFile(mainConfigFile); - ReadUserConfigFile(block); + state = blocks.Parse(--argc, ++argv); // Skipping self name } -else + catch (const SGCONF::OPTION::ERROR& ex) { - block.ParseFile(config.configFile.data()); + std::cerr << ex.what() << "\n"; + return -1; } -config = configOverride; -} -catch (const std::exception& ex) -{ -std::cerr << ex.what() << "\n"; -return -1; -} - -std::cerr << "Config: " << config.Serialize() << std::endl; -return commands.Execute(config) ? 0 : -1; - -/*return 0; + if (state.stop) + return 0; -if (argc < 2) + if (state.argc > 0) { - Usage(); - return 1; + std::cerr << "Unknown option: '" << *state.argv << "'\n"; + return -1; } -if (argc <= 2) + try { - UsageConf(); - exit(PARAMETER_PARSING_ERR_CODE); - } + // Preserve config values parsed from the command line + SGCONF::CONFIG configOverride(config); -if (strcmp(argv[1], "get") == 0) - { - //printf("get\n"); - return mainGet(argc - 1, argv + 1); - } -else if (strcmp(argv[1], "set") == 0) - { - //printf("set\n"); - if (mainSet(argc - 1, argv + 1) ) - return 0; - return -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()); + } + + // Apply overrides from the command line + config.splice(configOverride); + + if (config.showConfig && config.showConfig.value()) + { + std::cout << config.Serialize() << std::endl; + return 0; + } + return commands.Execute(config) ? 0 : -1; } -else + catch (const std::exception& ex) { - UsageConf(); - exit(PARAMETER_PARSING_ERR_CODE); + std::cerr << ex.what() << "\n"; + return -1; } -return UNKNOWN_ERR_CODE;*/ } -//----------------------------------------------------------------------------- - -namespace -{ - -void Usage() -{ -UsageImpl(false); -} - -void UsageAll() -{ -UsageImpl(true); -} - -void UsageImpl(bool full) -{ -std::cout << "sgconf is the Stargazer management utility.\n\n" - << "Usage:\n" - << "\tsgconf [options]\n\n" - << "General options:\n" - << "\t-c, --config \t\toverride default config file (default: \"~/.config/stg/sgconf.conf\")\n" - << "\t-h, --help\t\t\t\tshow this help and exit\n" - << "\t--help-all\t\t\t\tshow full help and exit\n" - << "\t-v, --version\t\t\t\tshow version information and exit\n\n"; -UsageConnection(); -UsageAdmins(full); -UsageTariffs(full); -UsageUsers(full); -UsageServices(full); -UsageCorporations(full); -} -//----------------------------------------------------------------------------- -void UsageConnection() -{ -std::cout << "Connection options:\n" - << "\t-s, --server
\t\t\thost to connect (ip or domain name, default: \"localhost\")\n" - << "\t-p, --port \t\t\tport to connect (default: \"5555\")\n" - << "\t-u, --username \t\tadministrative login (default: \"admin\")\n" - << "\t-w, --userpass \t\tpassword for administrative login\n" - << "\t-a, --address \tconnection params as a single string in format: :@:\n\n"; -} -//----------------------------------------------------------------------------- -void UsageAdmins(bool full) -{ -std::cout << "Admins management options:\n" - << "\t--get-admins\t\t\t\tget a list of admins (subsequent options will define what to show)\n"; -if (full) - std::cout << "\t\t--login\t\t\t\tshow admin's login\n" - << "\t\t--priv\t\t\t\tshow admin's priviledges\n\n"; -std::cout << "\t--get-admin\t\t\t\tget the information about admin\n"; -if (full) - std::cout << "\t\t--login \t\t\tlogin of the admin to show\n" - << "\t\t--priv\t\t\t\tshow admin's priviledges\n\n"; -std::cout << "\t--add-admin\t\t\t\tadd a new admin\n"; -if (full) - std::cout << "\t\t--login \t\t\tlogin of the admin to add\n" - << "\t\t--password \t\tpassword of the admin to add\n" - << "\t\t--priv \t\tpriviledges of the admin to add\n\n"; -std::cout << "\t--del-admin\t\t\t\tdelete an existing admin\n"; -if (full) - std::cout << "\t\t--login \t\t\tlogin of the admin to delete\n\n"; -std::cout << "\t--chg-admin\t\t\t\tchange an existing admin\n"; -if (full) - std::cout << "\t\t--login \t\t\tlogin of the admin to change\n" - << "\t\t--priv \t\tnew priviledges\n\n"; -} -//----------------------------------------------------------------------------- -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