Loading src/admin.cpp +13 −13 Changes for src/admin.cpp: 13 added lines, 13 removed lines. Original line number Diff line number Diff line Loading @@ -39,14 +39,14 @@ #include "types.h" #include "hash.h" #include "hash/sha512.h" #include "session.h" #include "gpo.h" #include "client.h" #include "session.h" namespace authdb { class AdminController { public: AdminController(authdb::AuthBackend &backend,authdb::Session &session,netplus::socket *ssock) : _AdminBackend(backend) , _Session(session){ AdminController(authdb::AuthBackend &backend,netplus::socket *ssock) : _AdminBackend(backend) { _Indexpage.loadFile(_IndexElement,GETDATA(index.html)); _Loginpage.loadFile(_LoginElement,GETDATA(login.html)); }; Loading Loading @@ -1403,7 +1403,7 @@ namespace authdb { throw AuthBackendError("listSessions: wrong url!"); } for(const SessionData *curdat=_Session.firstData(); curdat; curdat=curdat->next()){ for(const SessionData *curdat=AuthSession.firstData(); curdat; curdat=curdat->next()){ uuid sdid; curdat->getDid(sdid); Loading Loading @@ -1452,7 +1452,7 @@ namespace authdb { uuid_parse(csid,sid); _Session.remSession(sid); AuthSession.remSession(sid); libhttppp::HttpResponse rep; rep.setState(HTTP303); Loading Loading @@ -1486,7 +1486,7 @@ namespace authdb { throw AuthBackendError("login: could not parse uuid!"); } _Session.relSession(*backend,sid); AuthSession.relSession(*backend,sid); char rurl[255]; snprintf(rurl,255,"/settings/%s/listsessions",cdid); Loading Loading @@ -2098,7 +2098,7 @@ namespace authdb { libhttppp::HttpCookie cookie; uuid sid; const SessionData *cses=_Session.addSession(*backend,did,udat.uid); const SessionData *cses=AuthSession.addSession(*backend,did,udat.uid); cses->getSid(sid); char csid[255]; uuid_unparse(sid.value,csid); Loading Loading @@ -2471,7 +2471,7 @@ namespace authdb { } void SettingsController(libhttppp::HttpRequest *curreq, const int tid, ULONG_PTR args){ std::lock_guard<std::mutex> lock(AuthSessionLock); libhttppp::HttpCookie cookie; const SessionData *sdat=nullptr; Loading @@ -2483,14 +2483,15 @@ namespace authdb { for(libhttppp::HttpCookie::CookieData *cur=cookie.getfirstCookieData(); cur; cur=cur->nextCookieData()){ if(strcmp(cur->getKey(),"authdbid")==0){ if(ssid.parse(cur->getValue())==0) sdat=_Session.getSession(ssid); if(ssid.parse(cur->getValue())==0){ sdat=AuthSession.getSession(ssid); } break; } } if(strncmp("/settings/logout",curreq->getRequestURL(),15)==0){ _Session.remSession(ssid); AuthSession.remSession(ssid); libhttppp::HttpResponse rep; rep.setState(HTTP303); rep.setVersion(HTTPVERSION(1.1)); Loading Loading @@ -2641,11 +2642,10 @@ URLNOTFOUND: libhtmlpp::HtmlElement _LoginElement; libhtmlpp::HtmlPage _Indexpage; libhtmlpp::HtmlPage _Loginpage; authdb::Session &_Session; }; AdminInterface::AdminInterface(AuthBackend &bck,Session &session,netplus::socket *ssock) : _bck(bck), _session(session) { _ctl =new AdminController(bck,session,ssock); AdminInterface::AdminInterface(AuthBackend &bck,netplus::socket *ssock) : _bck(bck) { _ctl =new AdminController(bck,ssock); } AdminInterface::~AdminInterface(){ Loading src/admin.h +1 −2 Changes for src/admin.h: 1 added line, 2 removed lines. Original line number Diff line number Diff line Loading @@ -37,12 +37,11 @@ namespace authdb { class AdminInterface{ public: AdminInterface(AuthBackend &bck,Session &session,netplus::socket *ssock); AdminInterface(AuthBackend &bck,netplus::socket *ssock); ~AdminInterface(); void Request(libhttppp::HttpRequest *curreq, const int tid, ULONG_PTR args); public: AdminController * _ctl; AuthBackend &_bck; Session &_session; }; }; src/api.cpp +12 −23 Changes for src/api.cpp: 12 added lines, 23 removed lines. Original line number Diff line number Diff line Loading @@ -40,16 +40,11 @@ #include "api.h" #include "user.h" #include "client.h" #include "session.h" #include "gpo.h" #include "session.h" namespace authdb { class Client _Clt; std::mutex _CltLock; class Session _Session; std::mutex _SessionLock; class Api { public: Loading @@ -74,15 +69,9 @@ namespace authdb { gpdat.getAlowed(&allow); uuid uid; _SessionData->getUid(uid); for(size_t ii =0; ii<allow.count; ++ii ){ if(uid==allow.uid[ii]){ if(alowed) alowed=false; else alowed=true; if(uuid(id)==allow.uid[ii]){ alowed=!alowed; } } Loading @@ -99,7 +88,7 @@ namespace authdb { } const SessionData *checkUser(json_object *request,json_object *response){ std::lock_guard<std::mutex> lock(_SessionLock); std::lock_guard<std::mutex> lock(AuthSessionLock); json_object *cmd=json_object_object_get(request,"commands"); if(!cmd) Loading @@ -113,7 +102,7 @@ namespace authdb { uuid cid; if(cid.parse(id)!=0) return nullptr; return _Session.getSession(cid); return AuthSession.getSession(cid); } } } Loading @@ -121,7 +110,7 @@ namespace authdb { } const ClientConnections *checkConnection(json_object *request,json_object *response){ std::lock_guard<std::mutex> lock(_CltLock); std::lock_guard<std::mutex> lock(AuthClientLock); json_object *cmd=json_object_object_get(request,"commands"); if(!cmd) Loading @@ -135,7 +124,7 @@ namespace authdb { uuid cid; if(cid.parse(id)!=0) return nullptr; for(ClientConnections *curcon=_Clt.ConnectionData(); curcon; curcon=curcon->next() ){ for(ClientConnections *curcon=AuthClient.ConnectionData(); curcon; curcon=curcon->next() ){ if(*curcon==cid) return curcon; } Loading @@ -147,7 +136,7 @@ namespace authdb { } const SessionData *userLogin(json_object *request,json_object *response){ std::lock_guard<std::mutex> lock(_SessionLock); std::lock_guard<std::mutex> lock(AuthSessionLock); json_object *cmd=json_object_object_get(request,"commands"); if(!cmd) Loading Loading @@ -200,7 +189,7 @@ namespace authdb { if(name==udat.getUsername()){ if(pwsalt==udat.getPwHash()){ const SessionData *sdat=_Session.addSession(_Backend,_Did.value,cur.uuid); const SessionData *sdat=AuthSession.addSession(_Backend,_Did.value,cur.uuid); json_object *respid=json_object_new_object(); uuid sessid; sdat->getSid(sessid); Loading @@ -220,7 +209,7 @@ namespace authdb { const ClientConnections *ClientLogin(json_object *request,json_object *response){ std::lock_guard<std::mutex> lock(_CltLock); std::lock_guard<std::mutex> lock(AuthClientLock); json_object *cmd=json_object_object_get(request,"commands"); if(!cmd) Loading Loading @@ -266,11 +255,11 @@ namespace authdb { if(cur.type == ClientData && strcmp(cur.fieldname,"clientname")==0){ class ClientData cdat(cur.uuid); size_t upos = sizeof(AuthHeader); _Clt.info(_Backend,cdat,upos); AuthClient.info(_Backend,cdat,upos); if(name==cdat.getName() ){ if(pwsalt==cdat.getKey() ){ ClientConnections *cid=_Clt.addConnection(_Backend,cdat); ClientConnections *cid=AuthClient.addConnection(_Backend,cdat); json_object *respid=json_object_new_object(); json_object_object_add(respid,"connectionid",json_object_new_string(cid->getId().c_str())); json_object_array_add(response,respid); Loading src/authdb.cpp +9 −1 Changes for src/authdb.cpp: 9 added lines, 1 removed line. Original line number Diff line number Diff line Loading @@ -50,9 +50,16 @@ #include "hash/sha512.h" #include "admin.h" #include "api.h" #include "client.h" #include "session.h" namespace authdb { class Client AuthClient; std::mutex AuthClientLock; class Session AuthSession; std::mutex AuthSessionLock; std::mutex g_wizzard; bool initalized=true; Loading @@ -62,7 +69,7 @@ namespace authdb { AuthDB(authdb::AuthBackend &backend,netplus::socket *ssock) : HttpEvent(ssock), _AdminBackend(backend), _AdminInterface(backend,_Session,ssock){ _AdminInterface(backend,ssock){ std::ifstream authfs(GETDATA(authdb.js), std::ios::ate); size_t asize = authfs.tellg(); _AuthJs.resize(asize); Loading Loading @@ -631,4 +638,5 @@ int main(int argc, char *argv[]){ }catch(authdb::AuthBackendError &e){ std::cerr << e.what() << std::endl; } return 0; } src/authdb.h +9 −1 Changes for src/authdb.h: 9 added lines, 1 removed line. Original line number Diff line number Diff line Loading @@ -26,7 +26,7 @@ *******************************************************************************/ #include <cstring> #include <memory> #include <mutex> #include <uuid/uuid.h> Loading @@ -40,6 +40,14 @@ #define VERSION 1 namespace authdb { class Client; class Session; extern class Client AuthClient; extern std::mutex AuthClientLock; extern class Session AuthSession; extern std::mutex AuthSessionLock; struct AuthHeader{ char start = 0xFE; char domain[255]; Loading Loading
src/admin.cpp +13 −13 Changes for src/admin.cpp: 13 added lines, 13 removed lines. Original line number Diff line number Diff line Loading @@ -39,14 +39,14 @@ #include "types.h" #include "hash.h" #include "hash/sha512.h" #include "session.h" #include "gpo.h" #include "client.h" #include "session.h" namespace authdb { class AdminController { public: AdminController(authdb::AuthBackend &backend,authdb::Session &session,netplus::socket *ssock) : _AdminBackend(backend) , _Session(session){ AdminController(authdb::AuthBackend &backend,netplus::socket *ssock) : _AdminBackend(backend) { _Indexpage.loadFile(_IndexElement,GETDATA(index.html)); _Loginpage.loadFile(_LoginElement,GETDATA(login.html)); }; Loading Loading @@ -1403,7 +1403,7 @@ namespace authdb { throw AuthBackendError("listSessions: wrong url!"); } for(const SessionData *curdat=_Session.firstData(); curdat; curdat=curdat->next()){ for(const SessionData *curdat=AuthSession.firstData(); curdat; curdat=curdat->next()){ uuid sdid; curdat->getDid(sdid); Loading Loading @@ -1452,7 +1452,7 @@ namespace authdb { uuid_parse(csid,sid); _Session.remSession(sid); AuthSession.remSession(sid); libhttppp::HttpResponse rep; rep.setState(HTTP303); Loading Loading @@ -1486,7 +1486,7 @@ namespace authdb { throw AuthBackendError("login: could not parse uuid!"); } _Session.relSession(*backend,sid); AuthSession.relSession(*backend,sid); char rurl[255]; snprintf(rurl,255,"/settings/%s/listsessions",cdid); Loading Loading @@ -2098,7 +2098,7 @@ namespace authdb { libhttppp::HttpCookie cookie; uuid sid; const SessionData *cses=_Session.addSession(*backend,did,udat.uid); const SessionData *cses=AuthSession.addSession(*backend,did,udat.uid); cses->getSid(sid); char csid[255]; uuid_unparse(sid.value,csid); Loading Loading @@ -2471,7 +2471,7 @@ namespace authdb { } void SettingsController(libhttppp::HttpRequest *curreq, const int tid, ULONG_PTR args){ std::lock_guard<std::mutex> lock(AuthSessionLock); libhttppp::HttpCookie cookie; const SessionData *sdat=nullptr; Loading @@ -2483,14 +2483,15 @@ namespace authdb { for(libhttppp::HttpCookie::CookieData *cur=cookie.getfirstCookieData(); cur; cur=cur->nextCookieData()){ if(strcmp(cur->getKey(),"authdbid")==0){ if(ssid.parse(cur->getValue())==0) sdat=_Session.getSession(ssid); if(ssid.parse(cur->getValue())==0){ sdat=AuthSession.getSession(ssid); } break; } } if(strncmp("/settings/logout",curreq->getRequestURL(),15)==0){ _Session.remSession(ssid); AuthSession.remSession(ssid); libhttppp::HttpResponse rep; rep.setState(HTTP303); rep.setVersion(HTTPVERSION(1.1)); Loading Loading @@ -2641,11 +2642,10 @@ URLNOTFOUND: libhtmlpp::HtmlElement _LoginElement; libhtmlpp::HtmlPage _Indexpage; libhtmlpp::HtmlPage _Loginpage; authdb::Session &_Session; }; AdminInterface::AdminInterface(AuthBackend &bck,Session &session,netplus::socket *ssock) : _bck(bck), _session(session) { _ctl =new AdminController(bck,session,ssock); AdminInterface::AdminInterface(AuthBackend &bck,netplus::socket *ssock) : _bck(bck) { _ctl =new AdminController(bck,ssock); } AdminInterface::~AdminInterface(){ Loading
src/admin.h +1 −2 Changes for src/admin.h: 1 added line, 2 removed lines. Original line number Diff line number Diff line Loading @@ -37,12 +37,11 @@ namespace authdb { class AdminInterface{ public: AdminInterface(AuthBackend &bck,Session &session,netplus::socket *ssock); AdminInterface(AuthBackend &bck,netplus::socket *ssock); ~AdminInterface(); void Request(libhttppp::HttpRequest *curreq, const int tid, ULONG_PTR args); public: AdminController * _ctl; AuthBackend &_bck; Session &_session; }; };
src/api.cpp +12 −23 Changes for src/api.cpp: 12 added lines, 23 removed lines. Original line number Diff line number Diff line Loading @@ -40,16 +40,11 @@ #include "api.h" #include "user.h" #include "client.h" #include "session.h" #include "gpo.h" #include "session.h" namespace authdb { class Client _Clt; std::mutex _CltLock; class Session _Session; std::mutex _SessionLock; class Api { public: Loading @@ -74,15 +69,9 @@ namespace authdb { gpdat.getAlowed(&allow); uuid uid; _SessionData->getUid(uid); for(size_t ii =0; ii<allow.count; ++ii ){ if(uid==allow.uid[ii]){ if(alowed) alowed=false; else alowed=true; if(uuid(id)==allow.uid[ii]){ alowed=!alowed; } } Loading @@ -99,7 +88,7 @@ namespace authdb { } const SessionData *checkUser(json_object *request,json_object *response){ std::lock_guard<std::mutex> lock(_SessionLock); std::lock_guard<std::mutex> lock(AuthSessionLock); json_object *cmd=json_object_object_get(request,"commands"); if(!cmd) Loading @@ -113,7 +102,7 @@ namespace authdb { uuid cid; if(cid.parse(id)!=0) return nullptr; return _Session.getSession(cid); return AuthSession.getSession(cid); } } } Loading @@ -121,7 +110,7 @@ namespace authdb { } const ClientConnections *checkConnection(json_object *request,json_object *response){ std::lock_guard<std::mutex> lock(_CltLock); std::lock_guard<std::mutex> lock(AuthClientLock); json_object *cmd=json_object_object_get(request,"commands"); if(!cmd) Loading @@ -135,7 +124,7 @@ namespace authdb { uuid cid; if(cid.parse(id)!=0) return nullptr; for(ClientConnections *curcon=_Clt.ConnectionData(); curcon; curcon=curcon->next() ){ for(ClientConnections *curcon=AuthClient.ConnectionData(); curcon; curcon=curcon->next() ){ if(*curcon==cid) return curcon; } Loading @@ -147,7 +136,7 @@ namespace authdb { } const SessionData *userLogin(json_object *request,json_object *response){ std::lock_guard<std::mutex> lock(_SessionLock); std::lock_guard<std::mutex> lock(AuthSessionLock); json_object *cmd=json_object_object_get(request,"commands"); if(!cmd) Loading Loading @@ -200,7 +189,7 @@ namespace authdb { if(name==udat.getUsername()){ if(pwsalt==udat.getPwHash()){ const SessionData *sdat=_Session.addSession(_Backend,_Did.value,cur.uuid); const SessionData *sdat=AuthSession.addSession(_Backend,_Did.value,cur.uuid); json_object *respid=json_object_new_object(); uuid sessid; sdat->getSid(sessid); Loading @@ -220,7 +209,7 @@ namespace authdb { const ClientConnections *ClientLogin(json_object *request,json_object *response){ std::lock_guard<std::mutex> lock(_CltLock); std::lock_guard<std::mutex> lock(AuthClientLock); json_object *cmd=json_object_object_get(request,"commands"); if(!cmd) Loading Loading @@ -266,11 +255,11 @@ namespace authdb { if(cur.type == ClientData && strcmp(cur.fieldname,"clientname")==0){ class ClientData cdat(cur.uuid); size_t upos = sizeof(AuthHeader); _Clt.info(_Backend,cdat,upos); AuthClient.info(_Backend,cdat,upos); if(name==cdat.getName() ){ if(pwsalt==cdat.getKey() ){ ClientConnections *cid=_Clt.addConnection(_Backend,cdat); ClientConnections *cid=AuthClient.addConnection(_Backend,cdat); json_object *respid=json_object_new_object(); json_object_object_add(respid,"connectionid",json_object_new_string(cid->getId().c_str())); json_object_array_add(response,respid); Loading
src/authdb.cpp +9 −1 Changes for src/authdb.cpp: 9 added lines, 1 removed line. Original line number Diff line number Diff line Loading @@ -50,9 +50,16 @@ #include "hash/sha512.h" #include "admin.h" #include "api.h" #include "client.h" #include "session.h" namespace authdb { class Client AuthClient; std::mutex AuthClientLock; class Session AuthSession; std::mutex AuthSessionLock; std::mutex g_wizzard; bool initalized=true; Loading @@ -62,7 +69,7 @@ namespace authdb { AuthDB(authdb::AuthBackend &backend,netplus::socket *ssock) : HttpEvent(ssock), _AdminBackend(backend), _AdminInterface(backend,_Session,ssock){ _AdminInterface(backend,ssock){ std::ifstream authfs(GETDATA(authdb.js), std::ios::ate); size_t asize = authfs.tellg(); _AuthJs.resize(asize); Loading Loading @@ -631,4 +638,5 @@ int main(int argc, char *argv[]){ }catch(authdb::AuthBackendError &e){ std::cerr << e.what() << std::endl; } return 0; }
src/authdb.h +9 −1 Changes for src/authdb.h: 9 added lines, 1 removed line. Original line number Diff line number Diff line Loading @@ -26,7 +26,7 @@ *******************************************************************************/ #include <cstring> #include <memory> #include <mutex> #include <uuid/uuid.h> Loading @@ -40,6 +40,14 @@ #define VERSION 1 namespace authdb { class Client; class Session; extern class Client AuthClient; extern std::mutex AuthClientLock; extern class Session AuthSession; extern std::mutex AuthSessionLock; struct AuthHeader{ char start = 0xFE; char domain[255]; Loading