$Author: faust $
*/
+#include "stg/common.h"
+#include "admins_impl.h"
+#include "admin_impl.h"
+
#include <cerrno>
#include <cassert>
#include <algorithm>
-#include "admins.h"
-#include "admin.h"
-#include "common.h"
-
-using namespace std;
-
//-----------------------------------------------------------------------------
-ADMINS::ADMINS(BASE_STORE * st)
- : stg(0xFFFF, "@stargazer", ""),
- noAdmin(0xFFFF, "NO-ADMIN", ""),
+ADMINS_IMPL::ADMINS_IMPL(STORE * st)
+ : ADMINS(),
+ stg(PRIV(0xFFFF), "@stargazer", ""),
+ noAdmin(PRIV(0xFFFF), "NO-ADMIN", ""),
data(),
store(st),
WriteServLog(GetStgLogger()),
searchDescriptors(),
- handle(0)
+ handle(0),
+ mutex(),
+ strError()
{
pthread_mutex_init(&mutex, NULL);
-ReadAdmins();
+Read();
}
//-----------------------------------------------------------------------------
-int ADMINS::Add(const string & login, const ADMIN & admin)
+int ADMINS_IMPL::Add(const std::string & login, const ADMIN * admin)
{
-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
-const PRIV * priv = admin.GetPriv();
+STG_LOCKER lock(&mutex);
+const PRIV * priv = admin->GetPriv();
if (!priv->adminChg)
{
- string s = admin.GetLogStr() + " Add administrator \'" + login + "\'. Access denied.";
+ std::string s = admin->GetLogStr() + " Add administrator \'" + login + "\'. Access denied.";
strError = "Access denied.";
WriteServLog(s.c_str());
return -1;
}
-ADMIN adm(0, login, "");
+ADMIN_IMPL adm(PRIV(0), login, "");
admin_iter ai(find(data.begin(), data.end(), adm));
if (ai != data.end())
{
- strError = "Administrator \'" + login + "\' cannot not be added. Administrator alredy exist.";
- WriteServLog("%s %s", admin.GetLogStr().c_str(), strError.c_str());
+ strError = "Administrator \'" + login + "\' cannot not be added. Administrator already exist.";
+ WriteServLog("%s %s", admin->GetLogStr().c_str(), strError.c_str());
return -1;
}
data.push_back(adm);
-/*ADMIN_CONF ac;
-ac.login = login;*/
-if (store->AddAdmin(login) == 0 /*&& store->SaveAdmin(ac) == 0*/)
+
+if (store->AddAdmin(login) == 0)
{
WriteServLog("%s Administrator \'%s\' added.",
- admin.GetLogStr().c_str(), login.c_str());
+ admin->GetLogStr().c_str(), login.c_str());
return 0;
}
strError = "Administrator \'" + login + "\' was not added. Error: " + store->GetStrError();
-WriteServLog("%s %s", admin.GetLogStr().c_str(), strError.c_str());
+WriteServLog("%s %s", admin->GetLogStr().c_str(), strError.c_str());
return -1;
}
//-----------------------------------------------------------------------------
-int ADMINS::Del(const string & login, const ADMIN & admin)
+int ADMINS_IMPL::Del(const std::string & login, const ADMIN * admin)
{
-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
-ADMIN adm(0, login, "");
-const PRIV * priv = admin.GetPriv();
+STG_LOCKER lock(&mutex);
+const PRIV * priv = admin->GetPriv();
if (!priv->adminChg)
{
- string s = admin.GetLogStr() + " Delete administrator \'" + login + "\'. Access denied.";
+ std::string s = admin->GetLogStr() + " Delete administrator \'" + login + "\'. Access denied.";
strError = "Access denied.";
WriteServLog(s.c_str());
return -1;
}
-admin_iter ai(find(data.begin(), data.end(), adm));
+admin_iter ai(find(data.begin(), data.end(), ADMIN_IMPL(PRIV(0), login, "")));
if (ai == data.end())
{
strError = "Administrator \'" + login + "\' cannot be deleted. Administrator does not exist.";
- WriteServLog("%s %s", admin.GetLogStr().c_str(), strError.c_str());
+ WriteServLog("%s %s", admin->GetLogStr().c_str(), strError.c_str());
return -1;
}
-map<int, const_admin_iter>::iterator si;
+std::map<int, const_admin_iter>::iterator si;
si = searchDescriptors.begin();
while (si != searchDescriptors.end())
{
if (si->second == ai)
(si->second)++;
- si++;
+ ++si;
}
data.remove(*ai);
if (store->DelAdmin(login) < 0)
{
strError = "Administrator \'" + login + "\' was not deleted. Error: " + store->GetStrError();
- WriteServLog("%s %s", admin.GetLogStr().c_str(), strError.c_str());
+ WriteServLog("%s %s", admin->GetLogStr().c_str(), strError.c_str());
return -1;
}
-WriteServLog("%s Administrator \'%s\' deleted.", admin.GetLogStr().c_str(), login.c_str());
+WriteServLog("%s Administrator \'%s\' deleted.", admin->GetLogStr().c_str(), login.c_str());
return 0;
}
//-----------------------------------------------------------------------------
-int ADMINS::Change(const ADMIN_CONF & ac, const ADMIN & admin)
+int ADMINS_IMPL::Change(const ADMIN_CONF & ac, const ADMIN * admin)
{
-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
-const PRIV * priv = admin.GetPriv();
+STG_LOCKER lock(&mutex);
+const PRIV * priv = admin->GetPriv();
if (!priv->adminChg)
{
- string s = admin.GetLogStr() + " Change administrator \'" + ac.login + "\'. Access denied.";
+ std::string s = admin->GetLogStr() + " Change administrator \'" + ac.login + "\'. Access denied.";
strError = "Access denied.";
WriteServLog(s.c_str());
return -1;
}
-ADMIN adm(0, ac.login, "");
-admin_iter ai(find(data.begin(), data.end(), adm));
+admin_iter ai(find(data.begin(), data.end(), ADMIN_IMPL(PRIV(0), ac.login, "")));
if (ai == data.end())
{
strError = "Administrator \'" + ac.login + "\' cannot be changed " + ". Administrator does not exist.";
- WriteServLog("%s %s", admin.GetLogStr().c_str(), strError.c_str());
+ WriteServLog("%s %s", admin->GetLogStr().c_str(), strError.c_str());
return -1;
}
}
WriteServLog("%s Administrator \'%s\' changed.",
- admin.GetLogStr().c_str(), ac.login.c_str());
+ admin->GetLogStr().c_str(), ac.login.c_str());
return 0;
}
//-----------------------------------------------------------------------------
-int ADMINS::ReadAdmins()
+int ADMINS_IMPL::Read()
{
-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
-vector<string> adminsList;
+STG_LOCKER lock(&mutex);
+std::vector<std::string> adminsList;
if (store->GetAdminsList(&adminsList) < 0)
{
WriteServLog(store->GetStrError().c_str());
for (unsigned int i = 0; i < adminsList.size(); i++)
{
- ADMIN_CONF ac(0, adminsList[i], "");
+ ADMIN_CONF ac(PRIV(0), adminsList[i], "");
if (store->RestoreAdmin(&ac, adminsList[i]))
{
return -1;
}
- data.push_back(ADMIN(ac));
+ data.push_back(ADMIN_IMPL(ac));
}
return 0;
}
//-----------------------------------------------------------------------------
-void ADMINS::PrintAdmins() const
-{
-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
-const_admin_iter ai(data.begin());
-while (ai != data.end())
- {
- ai->PrintAdmin();
- ai++;
- }
-}
-//-----------------------------------------------------------------------------
-bool ADMINS::FindAdmin(const string & l, ADMIN * admin) const
+bool ADMINS_IMPL::Find(const std::string & l, ADMIN ** admin)
{
assert(admin != NULL && "Pointer to admin is not null");
-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);
if (data.empty())
{
- printfd(__FILE__, "no admin in system!\n");
- *admin = noAdmin;
+ printfd(__FILE__, "No admin in system!\n");
+ *admin = &noAdmin;
return false;
}
-ADMIN adm(0, l, "");
-const_admin_iter ai(find(data.begin(), data.end(), adm));
+admin_iter ai(find(data.begin(), data.end(), ADMIN_IMPL(PRIV(0), l, "")));
if (ai != data.end())
{
- *admin = *ai;
+ *admin = &(*ai);
return false;
}
return true;
}
//-----------------------------------------------------------------------------
-bool ADMINS::AdminExists(const string & login) const
+bool ADMINS_IMPL::Exists(const std::string & login) const
{
-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);
if (data.empty())
{
printfd(__FILE__, "no admin in system!\n");
return true;
}
-ADMIN adm(0, login, "");
-const_admin_iter ai(find(data.begin(), data.end(), adm));
+const_admin_iter ai(find(data.begin(), data.end(), ADMIN_IMPL(PRIV(0), login, "")));
if (ai != data.end())
return true;
return false;
}
//-----------------------------------------------------------------------------
-bool ADMINS::AdminCorrect(const string & login, const std::string & password, ADMIN * admin) const
+bool ADMINS_IMPL::Correct(const std::string & login, const std::string & password, ADMIN ** admin)
{
-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);
if (data.empty())
{
printfd(__FILE__, "no admin in system!\n");
return true;
}
-ADMIN adm(0, login, "");
-const_admin_iter ai(find(data.begin(), data.end(), adm));
+admin_iter ai(find(data.begin(), data.end(), ADMIN_IMPL(PRIV(0), login, "")));
if (ai == data.end())
{
return false;
}
-*admin = *ai;
+*admin = &(*ai);
return true;
}
//-----------------------------------------------------------------------------
-int ADMINS::OpenSearch() const
+int ADMINS_IMPL::OpenSearch() const
{
-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);
handle++;
searchDescriptors[handle] = data.begin();
return handle;
}
//-----------------------------------------------------------------------------
-int ADMINS::SearchNext(int h, ADMIN_CONF * ac) const
+int ADMINS_IMPL::SearchNext(int h, ADMIN_CONF * ac) const
{
-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);
if (searchDescriptors.find(h) == searchDescriptors.end())
{
WriteServLog("ADMINS. Incorrect search handle.");
if (searchDescriptors[h] == data.end())
return -1;
-ADMIN a = *searchDescriptors[h]++;
+ADMIN_IMPL a = *searchDescriptors[h]++;
*ac = a.GetConf();
return 0;
}
//-----------------------------------------------------------------------------
-int ADMINS::CloseSearch(int h) const
+int ADMINS_IMPL::CloseSearch(int h) const
{
-STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+STG_LOCKER lock(&mutex);
if (searchDescriptors.find(h) != searchDescriptors.end())
{
searchDescriptors.erase(searchDescriptors.find(h));
git.stg.codes / stg.git / blobdiff