X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/b2feeb7214b97678c52075570e40e52828914a82..35c60a5b8d010b881af44c14c8438473dab55335:/projects/stargazer/user_impl.cpp diff --git a/projects/stargazer/user_impl.cpp b/projects/stargazer/user_impl.cpp index 4f216b06..aea25c78 100644 --- a/projects/stargazer/user_impl.cpp +++ b/projects/stargazer/user_impl.cpp @@ -53,15 +53,34 @@ #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) - : USER(), - users(u), - property(s->GetScriptsDir()), + const USERS * u, + const SERVICES & svcs) + : users(u), + property(*s), WriteServLog(GetStgLogger()), lastScanMessages(0), id(0), @@ -75,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), @@ -115,36 +135,22 @@ USER_IMPL::USER_IMPL(const SETTINGS * s, userdata8(property.userdata8), userdata9(property.userdata9), passiveNotifier(this), + disabledNotifier(this), tariffNotifier(this), cashNotifier(this), ipNotifier(this) { -password = "*_EMPTY_PASSWORD_*"; -tariffName = NO_TARIFF_NAME; -ips = StrToIPS("*"); -lastWriteStat = stgTime + random() % settings->GetStatWritePeriod(); -lastWriteDetailedStat = stgTime; - -property.tariffName.AddBeforeNotifier(&tariffNotifier); -property.passive.AddBeforeNotifier(&passiveNotifier); -property.disabled.AddAfterNotifier(&disabledNotifier); -property.cash.AddBeforeNotifier(&cashNotifier); -ips.AddAfterNotifier(&ipNotifier); - -pthread_mutexattr_t attr; -pthread_mutexattr_init(&attr); -pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE); -pthread_mutex_init(&mutex, &attr); +Init(); } #else USER_IMPL::USER_IMPL(const SETTINGS_IMPL * s, const STORE * st, const TARIFFS * t, const ADMIN * a, - const USERS * u) - : USER(), - users(u), - property(s->GetScriptsDir()), + const USERS * u, + const SERVICES & svcs) + : users(u), + property(*s), WriteServLog(GetStgLogger()), lastScanMessages(0), id(0), @@ -158,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), @@ -203,6 +210,12 @@ USER_IMPL::USER_IMPL(const SETTINGS_IMPL * s, cashNotifier(this), ipNotifier(this) { +Init(); +} +#endif +//----------------------------------------------------------------------------- +void USER_IMPL::Init() +{ password = "*_EMPTY_PASSWORD_*"; tariffName = NO_TARIFF_NAME; ips = StrToIPS("*"); @@ -220,12 +233,11 @@ pthread_mutexattr_init(&attr); pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE); pthread_mutex_init(&mutex, &attr); } -#endif //----------------------------------------------------------------------------- USER_IMPL::USER_IMPL(const USER_IMPL & u) : USER(), users(u.users), - property(u.settings->GetScriptsDir()), + property(*u.settings), WriteServLog(GetStgLogger()), lastScanMessages(0), login(u.login), @@ -241,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), @@ -319,7 +332,7 @@ pthread_mutex_destroy(&mutex); //----------------------------------------------------------------------------- void USER_IMPL::SetLogin(const std::string & l) { -STG_LOCKER lock(&mutex, __FILE__, __LINE__); +STG_LOCKER lock(&mutex); assert(login.empty() && "Login is already set"); login = l; id = userIDGenerator.GetNextID(); @@ -327,7 +340,7 @@ id = userIDGenerator.GetNextID(); //----------------------------------------------------------------------------- int USER_IMPL::ReadConf() { -STG_LOCKER lock(&mutex, __FILE__, __LINE__); +STG_LOCKER lock(&mutex); USER_CONF conf; if (store->RestoreUserConf(&conf, login)) @@ -375,7 +388,7 @@ return 0; //----------------------------------------------------------------------------- int USER_IMPL::ReadStat() { -STG_LOCKER lock(&mutex, __FILE__, __LINE__); +STG_LOCKER lock(&mutex); USER_STAT stat; if (store->RestoreUserStat(&stat, login)) @@ -394,7 +407,7 @@ return 0; //----------------------------------------------------------------------------- int USER_IMPL::WriteConf() { -STG_LOCKER lock(&mutex, __FILE__, __LINE__); +STG_LOCKER lock(&mutex); USER_CONF conf(property.GetConf()); printfd(__FILE__, "USER::WriteConf()\n"); @@ -413,7 +426,7 @@ return 0; //----------------------------------------------------------------------------- int USER_IMPL::WriteStat() { -STG_LOCKER lock(&mutex, __FILE__, __LINE__); +STG_LOCKER lock(&mutex); USER_STAT stat(property.GetStat()); if (store->SaveUserStat(stat, login)) @@ -432,7 +445,7 @@ return 0; //----------------------------------------------------------------------------- int USER_IMPL::WriteMonthStat() { -STG_LOCKER lock(&mutex, __FILE__, __LINE__); +STG_LOCKER lock(&mutex); time_t tt = stgTime - 3600; struct tm t1; localtime_r(&tt, &t1); @@ -452,13 +465,19 @@ return 0; //----------------------------------------------------------------------------- int USER_IMPL::Authorize(uint32_t ip, uint32_t dirs, const AUTH * auth) { -STG_LOCKER lock(&mutex, __FILE__, __LINE__); +STG_LOCKER lock(&mutex); /* * Authorize user. It only means that user will be authorized. Nothing more. * User can be connected or disconnected while authorized. * 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 */ @@ -468,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; } @@ -485,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; } } @@ -498,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; } @@ -511,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; } } @@ -525,33 +541,38 @@ ScanMessage(); return 0; } //----------------------------------------------------------------------------- -void USER_IMPL::Unauthorize(const AUTH * auth) +void USER_IMPL::Unauthorize(const AUTH * auth, const std::string & reason) { -STG_LOCKER lock(&mutex, __FILE__, __LINE__); +STG_LOCKER lock(&mutex); /* * Authorizer tries to unauthorize user, that was not authorized by it */ if (!authorizedBy.erase(auth)) return; +authorizedModificationTime = stgTime; + if (authorizedBy.empty()) { - authorizedModificationTime = stgTime; + lastDisconnectReason = reason; lastIPForDisconnect = currIP; currIP = 0; // DelUser in traffcounter + if (connected) + Disconnect(false, "not authorized"); return; } } //----------------------------------------------------------------------------- bool USER_IMPL::IsAuthorizedBy(const AUTH * auth) const { -STG_LOCKER lock(&mutex, __FILE__, __LINE__); -// Is this user authorized by specified authorizer? +STG_LOCKER lock(&mutex); +// 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; @@ -560,10 +581,10 @@ 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, __FILE__, __LINE__); +STG_LOCKER lock(&mutex); if (!fakeConnect) { @@ -571,22 +592,24 @@ 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()) + { + scriptOnConnectParams += " \"" + GetParamValue(it->c_str()) + "\""; + ++it; + } ScriptExec(scriptOnConnectParams.c_str()); } @@ -598,7 +621,7 @@ if (!fakeConnect) connected = true; } -if (store->WriteUserConnect(login, currIP)) +if (!settings->GetDisableSessionLog() && store->WriteUserConnect(login, currIP)) { WriteServLog("Cannot write connect for user %s.", login.c_str()); WriteServLog("%s", store->GetStrError().c_str()); @@ -614,7 +637,7 @@ void USER_IMPL::Disconnect(bool fakeDisconnect, const std::string & reason) * Disconnect user from Internet. This function is differ from UnAuthorize() !!! */ -STG_LOCKER lock(&mutex, __FILE__, __LINE__); +STG_LOCKER lock(&mutex); if (!lastIPForDisconnect) { @@ -629,12 +652,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, @@ -644,7 +662,14 @@ 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()) + { + scriptOnDisonnectParams += " \"" + GetParamValue(it->c_str()) + "\""; + ++it; + } ScriptExec(scriptOnDisonnectParams.c_str()); } @@ -656,7 +681,12 @@ if (!fakeDisconnect) connected = false; } -if (store->WriteUserDisconnect(login, up, down, sessionUpload, sessionDownload, cash, freeMb, reason)) +std::string reasonMessage(reason); +if (!lastDisconnectReason.empty()) + reasonMessage += ": " + lastDisconnectReason; + +if (!settings->GetDisableSessionLog() && store->WriteUserDisconnect(login, up, down, sessionUpload, sessionDownload, + cash, freeMb, reasonMessage)) { WriteServLog("Cannot write disconnect for user %s.", login.c_str()); WriteServLog("%s", store->GetStrError().c_str()); @@ -665,52 +695,15 @@ if (store->WriteUserDisconnect(login, up, down, sessionUpload, sessionDownload, if (!fakeDisconnect) lastIPForDisconnect = 0; -DIR_TRAFF zeroSesssion; - -sessionUpload = zeroSesssion; -sessionDownload = zeroSesssion; -} -//----------------------------------------------------------------------------- -void USER_IMPL::PrintUser() const -{ -//return; -STG_LOCKER lock(&mutex, __FILE__, __LINE__); -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=" < static_cast(lastWriteStat + settings->GetStatWritePeriod())) { @@ -736,13 +729,11 @@ if (passive.ConstData() if (!authorizedBy.empty()) { if (connected) - { property.Stat().lastActivityTime = stgTime; - } + if (!connected && IsInetable()) - { Connect(); - } + if (connected && !IsInetable()) { if (disabled) @@ -762,17 +753,14 @@ if (!authorizedBy.empty()) else { if (connected) - { Disconnect(false, "not authorized"); - } } } //----------------------------------------------------------------------------- void USER_IMPL::UpdatePingTime(time_t t) { -STG_LOCKER lock(&mutex, __FILE__, __LINE__); -//printfd(__FILE__, "UpdatePingTime(%d) %s\n", t, login.c_str()); +STG_LOCKER lock(&mutex); if (t) pingTime = t; else @@ -781,8 +769,6 @@ else //----------------------------------------------------------------------------- bool USER_IMPL::IsInetable() { -//STG_LOCKER lock(&mutex, __FILE__, __LINE__); - if (disabled || passive) return false; @@ -793,21 +779,14 @@ if (settings->GetFreeMbAllowInet()) } if (settings->GetShowFeeInCash() || tariff == NULL) - { return (cash >= -credit); - } return (cash - tariff->GetFee() >= -credit); } //----------------------------------------------------------------------------- -std::string USER_IMPL::GetEnabledDirs() +std::string USER_IMPL::GetEnabledDirs() const { -//STG_LOCKER lock(&mutex, __FILE__, __LINE__); - -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 @@ -816,7 +795,7 @@ void USER_IMPL::AddTraffStatU(int dir, uint32_t ip, uint16_t port, uint32_t len) void USER_IMPL::AddTraffStatU(int dir, uint32_t ip, uint32_t len) #endif { -STG_LOCKER lock(&mutex, __FILE__, __LINE__); +STG_LOCKER lock(&mutex); if (!connected || tariff == NULL) return; @@ -830,10 +809,10 @@ int64_t threshold = tariff->GetThreshold(dir) * 1024 * 1024; dt[dir] += len; int tt = tariff->GetTraffType(); -if (tt == TRAFF_UP || - tt == TRAFF_UP_DOWN || +if (tt == TARIFF::TRAFF_UP || + tt == TARIFF::TRAFF_UP_DOWN || // Check NEW traff data - (tt == TRAFF_MAX && dt[dir] > down.ConstData()[dir])) + (tt == TARIFF::TRAFF_MAX && dt[dir] > down.ConstData()[dir])) { double dc = 0; if (traff < threshold && @@ -874,6 +853,7 @@ if (tt == TRAFF_UP || up = dt; sessionUpload[dir] += len; +sessionUploadModTime = stgTime; //Add detailed stat @@ -908,7 +888,7 @@ void USER_IMPL::AddTraffStatD(int dir, uint32_t ip, uint16_t port, uint32_t len) void USER_IMPL::AddTraffStatD(int dir, uint32_t ip, uint32_t len) #endif { -STG_LOCKER lock(&mutex, __FILE__, __LINE__); +STG_LOCKER lock(&mutex); if (!connected || tariff == NULL) return; @@ -922,10 +902,10 @@ int64_t threshold = tariff->GetThreshold(dir) * 1024 * 1024; dt[dir] += len; int tt = tariff->GetTraffType(); -if (tt == TRAFF_DOWN || - tt == TRAFF_UP_DOWN || +if (tt == TARIFF::TRAFF_DOWN || + tt == TARIFF::TRAFF_UP_DOWN || // Check NEW traff data - (tt == TRAFF_MAX && up.ConstData()[dir] <= dt[dir])) + (tt == TARIFF::TRAFF_MAX && up.ConstData()[dir] <= dt[dir])) { double dc = 0; if (traff < threshold && @@ -965,6 +945,7 @@ if (tt == TRAFF_DOWN || down = dt; sessionDownload[dir] += len; +sessionDownloadModTime = stgTime; //Add detailed stat @@ -995,65 +976,61 @@ else //----------------------------------------------------------------------------- void USER_IMPL::AddCurrIPBeforeNotifier(CURR_IP_NOTIFIER * notifier) { -STG_LOCKER lock(&mutex, __FILE__, __LINE__); +STG_LOCKER lock(&mutex); currIP.AddBeforeNotifier(notifier); } //----------------------------------------------------------------------------- void USER_IMPL::DelCurrIPBeforeNotifier(const CURR_IP_NOTIFIER * notifier) { -STG_LOCKER lock(&mutex, __FILE__, __LINE__); +STG_LOCKER lock(&mutex); currIP.DelBeforeNotifier(notifier); } //----------------------------------------------------------------------------- void USER_IMPL::AddCurrIPAfterNotifier(CURR_IP_NOTIFIER * notifier) { -STG_LOCKER lock(&mutex, __FILE__, __LINE__); +STG_LOCKER lock(&mutex); currIP.AddAfterNotifier(notifier); } //----------------------------------------------------------------------------- void USER_IMPL::DelCurrIPAfterNotifier(const CURR_IP_NOTIFIER * notifier) { -STG_LOCKER lock(&mutex, __FILE__, __LINE__); +STG_LOCKER lock(&mutex); currIP.DelAfterNotifier(notifier); } //----------------------------------------------------------------------------- void USER_IMPL::AddConnectedBeforeNotifier(CONNECTED_NOTIFIER * notifier) { -STG_LOCKER lock(&mutex, __FILE__, __LINE__); +STG_LOCKER lock(&mutex); connected.AddBeforeNotifier(notifier); } //----------------------------------------------------------------------------- void USER_IMPL::DelConnectedBeforeNotifier(const CONNECTED_NOTIFIER * notifier) { -STG_LOCKER lock(&mutex, __FILE__, __LINE__); +STG_LOCKER lock(&mutex); connected.DelBeforeNotifier(notifier); } //----------------------------------------------------------------------------- void USER_IMPL::AddConnectedAfterNotifier(CONNECTED_NOTIFIER * notifier) { -STG_LOCKER lock(&mutex, __FILE__, __LINE__); +STG_LOCKER lock(&mutex); connected.AddAfterNotifier(notifier); } //----------------------------------------------------------------------------- void USER_IMPL::DelConnectedAfterNotifier(const CONNECTED_NOTIFIER * notifier) { -STG_LOCKER lock(&mutex, __FILE__, __LINE__); +STG_LOCKER lock(&mutex); connected.DelAfterNotifier(notifier); } //----------------------------------------------------------------------------- void USER_IMPL::OnAdd() { -STG_LOCKER lock(&mutex, __FILE__, __LINE__); +STG_LOCKER lock(&mutex); 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()); } @@ -1065,17 +1042,13 @@ else //----------------------------------------------------------------------------- void USER_IMPL::OnDelete() { -STG_LOCKER lock(&mutex, __FILE__, __LINE__); +STG_LOCKER lock(&mutex); 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()); } @@ -1106,7 +1079,7 @@ if (!traffStatSaved.second.empty()) TRAFF_STAT ts; { - STG_LOCKER lock(&mutex, __FILE__, __LINE__); + STG_LOCKER lock(&mutex); ts.swap(traffStat); } @@ -1122,7 +1095,7 @@ if (ts.size() && !disabledDetailStat) if (!hard) { printfd(__FILE__, "USER::WriteDetailStat() - pushing detail stat to queue\n"); - STG_LOCKER lock(&mutex, __FILE__, __LINE__); + STG_LOCKER lock(&mutex); traffStatSaved.second.swap(ts); traffStatSaved.first = lastWriteDetailedStat; } @@ -1135,7 +1108,7 @@ return 0; //----------------------------------------------------------------------------- double USER_IMPL::GetPassiveTimePart() const { -STG_LOCKER lock(&mutex, __FILE__, __LINE__); +STG_LOCKER lock(&mutex); static int daysInMonth[12] = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}; @@ -1162,7 +1135,7 @@ return static_cast(dt) / secMonth; //----------------------------------------------------------------------------- void USER_IMPL::SetPassiveTimeAsNewUser() { -STG_LOCKER lock(&mutex, __FILE__, __LINE__); +STG_LOCKER lock(&mutex); time_t t = stgTime; struct tm tm; @@ -1176,7 +1149,7 @@ passiveTime = static_cast(pt * 24 * 3600 * daysCurrMon); //----------------------------------------------------------------------------- void USER_IMPL::MidnightResetSessionStat() { -STG_LOCKER lock(&mutex, __FILE__, __LINE__); +STG_LOCKER lock(&mutex); if (connected) { @@ -1187,29 +1160,23 @@ if (connected) //----------------------------------------------------------------------------- void USER_IMPL::ProcessNewMonth() { -STG_LOCKER lock(&mutex, __FILE__, __LINE__); +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.", @@ -1217,8 +1184,17 @@ if (nextTariff.ConstData() != "") } else { - property.tariffName.Set(nextTariff, sysAdmin, login, store); - //tariff = nt; + std::string message = tariff->TariffChangeIsAllowed(*nt); + if (message.empty()) + { + property.tariffName.Set(nextTariff, sysAdmin, login, store); + } + else + { + WriteServLog("Tariff change is prohibited for user %s. %s", + login.c_str(), + message.c_str()); + } } ResetNextTariff(); WriteConf(); @@ -1227,11 +1203,14 @@ if (nextTariff.ConstData() != "") //----------------------------------------------------------------------------- void USER_IMPL::ProcessDayFeeSpread() { -STG_LOCKER lock(&mutex, __FILE__, __LINE__); +STG_LOCKER lock(&mutex); if (passive.ConstData() || tariff == NULL) return; +if (tariff->GetPeriod() != TARIFF::MONTH) + return; + double fee = tariff->GetFee() / DaysInCurrentMonth(); if (std::fabs(fee) < 1.0e-3) @@ -1261,11 +1240,14 @@ ResetPassiveTime(); //----------------------------------------------------------------------------- void USER_IMPL::ProcessDayFee() { -STG_LOCKER lock(&mutex, __FILE__, __LINE__); +STG_LOCKER lock(&mutex); if (tariff == NULL) return; +if (tariff->GetPeriod() != TARIFF::MONTH) + return; + double passiveTimePart = 1.0; if (!settings->GetFullFee()) { @@ -1327,6 +1309,39 @@ switch (settings->GetFeeChargeType()) } } //----------------------------------------------------------------------------- +void USER_IMPL::ProcessDailyFee() +{ +STG_LOCKER lock(&mutex); + +if (passive.ConstData() || tariff == NULL) + return; + +if (tariff->GetPeriod() != TARIFF::DAY) + return; + +double fee = tariff->GetFee(); + +if (fee == 0.0) + return; + +double c = cash; +switch (settings->GetFeeChargeType()) + { + case 0: + property.cash.Set(c - fee, sysAdmin, login, store, "Subscriber fee charge"); + break; + case 1: + if (c + credit >= 0) + property.cash.Set(c - fee, sysAdmin, login, store, "Subscriber fee charge"); + break; + case 2: + if (c + credit >= fee) + property.cash.Set(c - fee, sysAdmin, login, store, "Subscriber fee charge"); + break; + } +ResetPassiveTime(); +} +//----------------------------------------------------------------------------- void USER_IMPL::SetPrepaidTraff() { if (tariff != NULL) @@ -1335,7 +1350,7 @@ if (tariff != NULL) //----------------------------------------------------------------------------- int USER_IMPL::AddMessage(STG_MSG * msg) { -STG_LOCKER lock(&mutex, __FILE__, __LINE__); +STG_LOCKER lock(&mutex); if (SendMessage(*msg)) { @@ -1449,6 +1464,28 @@ while (it != messages.end()) } } //----------------------------------------------------------------------------- +std::string USER_IMPL::GetParamValue(const std::string & name) const +{ + std::string lowerName = ToLower(name); + if (lowerName == "id") + { + std::ostringstream stream; + stream << id; + return stream.str(); + } + if (lowerName == "login") return login; + if (lowerName == "currip") return currIP.ToString(); + if (lowerName == "enableddirs") return GetEnabledDirs(); + if (lowerName == "tariff") return property.tariffName; + if (property.Exists(lowerName)) + return property.GetPropertyValue(lowerName); + else + { + WriteServLog("User’s parameter '%s' does not exist.", name.c_str()); + return ""; + } +} +//----------------------------------------------------------------------------- //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- void CHG_PASSIVE_NOTIFIER::Notify(const int & oldPassive, const int & newPassive) @@ -1464,25 +1501,25 @@ 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) { +STG_LOCKER lock(&user->mutex); if (user->settings->GetReconnectOnTariffChange() && user->connected) user->Disconnect(false, "Change tariff"); user->tariff = user->tariffs->FindByName(newTariff); if (user->settings->GetReconnectOnTariffChange() && !user->authorizedBy.empty() && user->IsInetable()) + { + // This notifier gets called *before* changing the tariff, and in Connect we want to see new tariff name. + user->property.Conf().tariffName = newTariff; user->Connect(false); + } } //----------------------------------------------------------------------------- void CHG_CASH_NOTIFIER::Notify(const double & oldCash, const double & newCash) @@ -1493,10 +1530,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); } -//-----------------------------------------------------------------------------