X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/ae7ea38fdaf2d96f407eb85b6515b9dbffcc0c44..92c80f9accb9816105923994b7091edc9198f9b6:/projects/stargazer/user_impl.cpp diff --git a/projects/stargazer/user_impl.cpp b/projects/stargazer/user_impl.cpp index 44fac908..36930576 100644 --- a/projects/stargazer/user_impl.cpp +++ b/projects/stargazer/user_impl.cpp @@ -53,12 +53,32 @@ #include #include // access +namespace +{ + +std::string dirsToString(const bool * dirs) +{ +std::string res; +for (size_t i = 0; i < DIR_NUM; i++) + res += dirs[i] ? '1' : '0'; +return res; +} + +void dirsFromBits(bool * dirs, uint32_t bits) +{ +for (size_t i = 0; i < DIR_NUM; i++) + dirs[i] = bits & (1 << i); +} + +} + #ifdef USE_ABSTRACT_SETTINGS USER_IMPL::USER_IMPL(const SETTINGS * s, const STORE * st, const TARIFFS * t, const ADMIN * a, - const USERS * u) + const USERS * u, + const SERVICES & svcs) : users(u), property(s->GetScriptsDir()), WriteServLog(GetStgLogger()), @@ -74,6 +94,7 @@ USER_IMPL::USER_IMPL(const SETTINGS * s, store(st), tariffs(t), tariff(NULL), + m_services(svcs), settings(s), authorizedModificationTime(0), deleted(false), @@ -126,7 +147,8 @@ USER_IMPL::USER_IMPL(const SETTINGS_IMPL * s, const STORE * st, const TARIFFS * t, const ADMIN * a, - const USERS * u) + const USERS * u, + const SERVICES & svcs) : users(u), property(s->GetScriptsDir()), WriteServLog(GetStgLogger()), @@ -142,6 +164,7 @@ USER_IMPL::USER_IMPL(const SETTINGS_IMPL * s, store(st), tariffs(t), tariff(NULL), + m_services(svcs), settings(s), authorizedModificationTime(0), deleted(false), @@ -230,6 +253,7 @@ USER_IMPL::USER_IMPL(const USER_IMPL & u) store(u.store), tariffs(u.tariffs), tariff(u.tariff), + m_services(u.m_services), traffStat(u.traffStat), traffStatSaved(u.traffStatSaved), settings(u.settings), @@ -448,6 +472,12 @@ STG_LOCKER lock(&mutex); * Example: user is authorized but disconnected due to 0 money or blocking */ +/* + * TODO: in fact "authorization" means allowing access to a service. What we + * call "authorization" here, int STG, is "authentication". So this should be + * fixed in future. + */ + /* * Prevent double authorization by identical authorizers */ @@ -457,16 +487,13 @@ if (authorizedBy.find(auth) != authorizedBy.end()) if (!ip) return -1; -for (int i = 0; i < DIR_NUM; i++) - { - enabledDirs[i] = dirs & (1 << i); - } +dirsFromBits(enabledDirs, dirs); if (!authorizedBy.empty()) { if (currIP != ip) { - // We are already authorized, but with different IP address + // We are already authorized, but with different IP address errorStr = "User " + login + " already authorized with IP address " + inet_ntostring(ip); return -1; } @@ -474,11 +501,11 @@ if (!authorizedBy.empty()) USER * u = NULL; if (!users->FindByIPIdx(ip, &u)) { - // Address is already present in IP-index - // If it's not our IP - throw an error + // Address presents in IP-index. + // If it's not our IP - report it. if (u != this) { - errorStr = "IP address " + inet_ntostring(ip) + " already in use"; + errorStr = "IP address " + inet_ntostring(ip) + " is already in use"; return -1; } } @@ -487,8 +514,8 @@ else { if (users->IsIPInIndex(ip)) { - // Address is already present in IP-index - errorStr = "IP address " + inet_ntostring(ip) + " already in use"; + // Address is already present in IP-index. + errorStr = "IP address " + inet_ntostring(ip) + " is already in use"; return -1; } @@ -500,7 +527,7 @@ else else { printfd(__FILE__, " user %s: ips = %s\n", login.c_str(), ips.ConstData().GetIpStr().c_str()); - errorStr = "IP address " + inet_ntostring(ip) + " not belong user " + login; + errorStr = "IP address " + inet_ntostring(ip) + " does not belong to user " + login; return -1; } } @@ -523,9 +550,10 @@ STG_LOCKER lock(&mutex); if (!authorizedBy.erase(auth)) return; +authorizedModificationTime = stgTime; + if (authorizedBy.empty()) { - authorizedModificationTime = stgTime; lastDisconnectReason = reason; lastIPForDisconnect = currIP; currIP = 0; // DelUser in traffcounter @@ -536,12 +564,13 @@ if (authorizedBy.empty()) bool USER_IMPL::IsAuthorizedBy(const AUTH * auth) const { STG_LOCKER lock(&mutex); -// Is this user authorized by specified authorizer? +// Is this user authorized by specified authorizer? return authorizedBy.find(auth) != authorizedBy.end(); } //----------------------------------------------------------------------------- std::vector USER_IMPL::GetAuthorizers() const { + STG_LOCKER lock(&mutex); std::vector list; std::transform(authorizedBy.begin(), authorizedBy.end(), std::back_inserter(list), std::mem_fun(&AUTH::GetVersion)); return list; @@ -550,7 +579,7 @@ std::vector USER_IMPL::GetAuthorizers() const void USER_IMPL::Connect(bool fakeConnect) { /* - * Connect user to Internet. This function is differ from Authorize() !!! + * Connect user to Internet. This function is differ from Authorize() !!! */ STG_LOCKER lock(&mutex); @@ -561,23 +590,17 @@ if (!fakeConnect) if (access(scriptOnConnect.c_str(), X_OK) == 0) { - char dirsStr[DIR_NUM + 1]; - dirsStr[DIR_NUM] = 0; - for (int i = 0; i < DIR_NUM; i++) - { - dirsStr[i] = enabledDirs[i] ? '1' : '0'; - } + std::string dirs = dirsToString(enabledDirs); std::string scriptOnConnectParams; - strprintf(&scriptOnConnectParams, - "%s \"%s\" \"%s\" \"%f\" \"%d\" \"%s\"", - scriptOnConnect.c_str(), - login.c_str(), - inet_ntostring(currIP).c_str(), - cash.ConstData(), - id, - dirsStr); + "%s \"%s\" \"%s\" \"%f\" \"%d\" \"%s\"", + scriptOnConnect.c_str(), + login.c_str(), + inet_ntostring(currIP).c_str(), + cash.ConstData(), + id, + dirs.c_str()); std::vector::const_iterator it(settings->GetScriptParams().begin()); while (it != settings->GetScriptParams().end()) @@ -627,12 +650,7 @@ if (!fakeDisconnect) if (access(scriptOnDisonnect.c_str(), X_OK) == 0) { - char dirsStr[DIR_NUM + 1]; - dirsStr[DIR_NUM] = 0; - for (int i = 0; i < DIR_NUM; i++) - { - dirsStr[i] = enabledDirs[i] ? '1' : '0'; - } + std::string dirs = dirsToString(enabledDirs); std::string scriptOnDisonnectParams; strprintf(&scriptOnDisonnectParams, @@ -642,7 +660,7 @@ if (!fakeDisconnect) inet_ntostring(lastIPForDisconnect).c_str(), cash.ConstData(), id, - dirsStr); + dirs.c_str()); std::vector::const_iterator it(settings->GetScriptParams().begin()); while (it != settings->GetScriptParams().end()) @@ -675,51 +693,12 @@ if (store->WriteUserDisconnect(login, up, down, sessionUpload, sessionDownload, if (!fakeDisconnect) lastIPForDisconnect = 0; -DIR_TRAFF zeroSesssion; - -sessionUpload = zeroSesssion; -sessionDownload = zeroSesssion; +sessionUpload.Reset(); +sessionDownload.Reset(); sessionUploadModTime = stgTime; sessionDownloadModTime = stgTime; } //----------------------------------------------------------------------------- -void USER_IMPL::PrintUser() const -{ -//return; -STG_LOCKER lock(&mutex); -std::cout << "============================================================" << std::endl; -std::cout << "id=" << id << std::endl; -std::cout << "login=" << login << std::endl; -std::cout << "password=" << password << std::endl; -std::cout << "passive=" << passive << std::endl; -std::cout << "disabled=" << disabled << std::endl; -std::cout << "disabledDetailStat=" << disabledDetailStat << std::endl; -std::cout << "alwaysOnline=" << alwaysOnline << std::endl; -std::cout << "tariffName=" << tariffName << std::endl; -std::cout << "address=" << address << std::endl; -std::cout << "phone=" << phone << std::endl; -std::cout << "email=" << email << std::endl; -std::cout << "note=" << note << std::endl; -std::cout << "realName=" <GetFreeMbAllowInet()) } if (settings->GetShowFeeInCash() || tariff == NULL) - { return (cash >= -credit); - } return (cash - tariff->GetFee() >= -credit); } //----------------------------------------------------------------------------- std::string USER_IMPL::GetEnabledDirs() const { -//STG_LOCKER lock(&mutex); - -std::string dirs = ""; -for(int i = 0; i < DIR_NUM; i++) - dirs += enabledDirs[i] ? "1" : "0"; -return dirs; +return dirsToString(enabledDirs); } //----------------------------------------------------------------------------- #ifdef TRAFF_STAT_WITH_PORTS @@ -1063,11 +1028,7 @@ std::string scriptOnAdd = settings->GetScriptsDir() + "/OnUserAdd"; if (access(scriptOnAdd.c_str(), X_OK) == 0) { - std::string scriptOnAddParams; - strprintf(&scriptOnAddParams, - "%s \"%s\"", - scriptOnAdd.c_str(), - login.c_str()); + std::string scriptOnAddParams = scriptOnAdd + " \"" + login + "\""; ScriptExec(scriptOnAddParams.c_str()); } @@ -1085,11 +1046,7 @@ std::string scriptOnDel = settings->GetScriptsDir() + "/OnUserDel"; if (access(scriptOnDel.c_str(), X_OK) == 0) { - std::string scriptOnDelParams; - strprintf(&scriptOnDelParams, - "%s \"%s\"", - scriptOnDel.c_str(), - login.c_str()); + std::string scriptOnDelParams = scriptOnDel + " \"" + login + "\""; ScriptExec(scriptOnDelParams.c_str()); } @@ -1204,36 +1161,25 @@ void USER_IMPL::ProcessNewMonth() STG_LOCKER lock(&mutex); // Reset traff if (connected) - { Disconnect(true, "fake"); - } -DIR_TRAFF zeroTarff; WriteMonthStat(); -up = zeroTarff; -down = zeroTarff; +property.Stat().monthUp.Reset(); +property.Stat().monthDown.Reset(); if (connected) - { Connect(true); - } // Set new tariff if (nextTariff.ConstData() != "") { - const TARIFF * nt; - nt = tariffs->FindByName(nextTariff); + const TARIFF * nt = tariffs->FindByName(nextTariff); if (nt == NULL) - { WriteServLog("Cannot change tariff for user %s. Tariff %s not exist.", login.c_str(), property.tariffName.Get().c_str()); - } else - { property.tariffName.Set(nextTariff, sysAdmin, login, store); - //tariff = nt; - } ResetNextTariff(); WriteConf(); } @@ -1539,14 +1485,9 @@ if (newPassive && !oldPassive && user->tariff != NULL) void CHG_DISABLED_NOTIFIER::Notify(const int & oldValue, const int & newValue) { if (oldValue && !newValue && user->GetConnected()) - { user->Disconnect(false, "disabled"); - } else if (!oldValue && newValue && user->IsInetable()) - { user->Connect(false); - } - } //----------------------------------------------------------------------------- void CHG_TARIFF_NOTIFIER::Notify(const std::string &, const std::string & newTariff) @@ -1568,10 +1509,9 @@ user->lastCashAdd = newCash - oldCash; //----------------------------------------------------------------------------- void CHG_IPS_NOTIFIER::Notify(const USER_IPS & from, const USER_IPS & to) { - printfd(__FILE__, "Change IP from '%s' to '%s'\n", from.GetIpStr().c_str(), to.GetIpStr().c_str()); - if (user->connected) - user->Disconnect(false, "Change IP"); - if (!user->authorizedBy.empty() && user->IsInetable()) - user->Connect(false); +printfd(__FILE__, "Change IP from '%s' to '%s'\n", from.GetIpStr().c_str(), to.GetIpStr().c_str()); +if (user->connected) + user->Disconnect(false, "Change IP"); +if (!user->authorizedBy.empty() && user->IsInetable()) + user->Connect(false); } -//-----------------------------------------------------------------------------