Loading src/admin.cpp +29 −8 Changes for src/admin.cpp: 29 added lines, 8 removed lines. Original line number Diff line number Diff line Loading @@ -1376,20 +1376,41 @@ namespace authdb { void listSessions(libhttppp::HttpRequest *curreq, const int tid, ULONG_PTR args){ libhtmlpp::HtmlElement root=_IndexElement; libhtmlpp::HtmlElement *content=root.getElementbyID("content"); libhtmlpp::HtmlElement *content=root.getElementbyID("content"),*domel=nullptr; libhtmlpp::HtmlString out; libhtmlpp::HtmlString out,ddat; libhtmlpp::HtmlElement slist("ul"); for(SessionData *curdat=_Session.firstData(); curdat; curdat=curdat->next()){ domel=DomainChangeForm(curreq,"listsessions",_AdminBackend,ddat); if(!domel){ throw AuthBackendError("listUsers: cannot load doamin's!"); } content->appendChild(domel); char cdid[255]; uuid_t did; if(sscanf(curreq->getRequestURL(),"/settings/%[^/]",cdid)<0){ throw AuthBackendError("listUsers: wrong url!"); } uuid_parse(cdid,did); for(const SessionData *curdat=_Session.firstData(); curdat; curdat=curdat->next()){ uuid_t sdid; curdat->getDid(sdid); if(strcmp(cdid,"admin")==0 || uuid_compare(did,sdid)==0){ libhtmlpp::HtmlString listel; uuid_t sid,uid; curdat->getSid(sid); curdat->getUid(uid); char csid[25],cuid[25]; char csid[255],cuid[255]; uuid_unparse(sid,csid); uuid_unparse(uid,cuid); Loading @@ -1398,6 +1419,7 @@ namespace authdb { slist.appendChild(listel.parse()); } } content->appendChild(&slist); Loading Loading @@ -1432,7 +1454,6 @@ namespace authdb { sha512 hash; hash.hash(password,pwhash); char cdid[255]; uuid_t did; DomainBackend dbackend(_AdminBackend); Loading Loading @@ -1469,13 +1490,13 @@ namespace authdb { if(username==udat.getUsername() && pwhash==udat.getPwHash() ){ libhttppp::HttpCookie cookie; uuid_t sid; SessionData *cses=_Session.addSession(*backend,did,udat.uid); const SessionData *cses=_Session.addSession(*backend,did,udat.uid); cses->getSid(sid); char csid[25]; char csid[255]; uuid_unparse(sid,csid); libhttppp::HttpResponse rep; cookie.setcookie(&rep,"authdbid",csid); cookie.setcookie(&rep,"authdbid",csid,nullptr,nullptr,-1,"/"); rep.setState(HTTP307); rep.setVersion(HTTPVERSION(1.1)); rep.setHeaderData("Location")->push_back(curreq->getRequestURL()); Loading src/session.cpp +14 −11 Changes for src/session.cpp: 14 added lines, 11 removed lines. Original line number Diff line number Diff line Loading @@ -52,14 +52,17 @@ authdb::SessionData::~SessionData(){ delete[] _member.gid; } void authdb::SessionData::getUid(uuid_t& dest){ void authdb::SessionData::getUid(uuid_t& dest) const{ uuid_copy(dest,_uid); } void authdb::SessionData::getSid(uuid_t& dest){ void authdb::SessionData::getSid(uuid_t& dest) const{ uuid_copy(dest,_sid); } void authdb::SessionData::getDid(uuid_t& dest) const{ uuid_copy(dest,_did); } bool authdb::SessionData::isMemberOf(const uuid_t& gid){ for(size_t i=0; i<_member.count; ++i){ Loading @@ -69,7 +72,7 @@ bool authdb::SessionData::isMemberOf(const uuid_t& gid){ return false; } authdb::SessionData * authdb::SessionData::next(){ const authdb::SessionData * authdb::SessionData::next() const{ return _next; } Loading @@ -83,10 +86,7 @@ authdb::Session::Session(){ authdb::Session::~Session(){ } authdb::SessionData * authdb::Session::addSession(AuthBackend &backend,uuid_t domainid,uuid_t userid){ uuid_t sid; uuid_generate(sid); const authdb::SessionData * authdb::Session::addSession(AuthBackend &backend,uuid_t domainid,uuid_t userid){ Group group; SessionData::Groups grpdat; Loading Loading @@ -138,6 +138,9 @@ authdb::SessionData * authdb::Session::addSession(AuthBackend &backend,uuid_t do } } uuid_t sid; uuid_generate(sid); if(!_firstData){ _firstData=new SessionData(sid,userid,domainid,grpdat.gid,grpdat.count); _lastData=_firstData; Loading @@ -149,9 +152,9 @@ authdb::SessionData * authdb::Session::addSession(AuthBackend &backend,uuid_t do return _lastData; } authdb::SessionData * authdb::Session::getSession(uuid_t sessionid){ for(SessionData *cur=_firstData; cur; cur=cur->_next){ if(uuid_compare(cur->_did,sessionid)) const authdb::SessionData * authdb::Session::getSession(uuid_t sessionid) const{ for(const SessionData *cur=firstData(); cur; cur=cur->next()){ if(uuid_compare(cur->_sid,sessionid)==0) return cur; } return nullptr; Loading @@ -178,6 +181,6 @@ void authdb::Session::remSession(uuid_t sessionid){ } } authdb::SessionData * authdb::Session::firstData(){ const authdb::SessionData * authdb::Session::firstData() const{ return _firstData; } src/session.h +7 −6 Changes for src/session.h: 7 added lines, 6 removed lines. Original line number Diff line number Diff line Loading @@ -40,10 +40,11 @@ namespace authdb { public: bool isMemberOf(const uuid_t &gid); void getSid(uuid_t &dest); void getUid(uuid_t &dest); void getSid(uuid_t &dest) const; void getUid(uuid_t &dest) const; void getDid(uuid_t &dest) const; SessionData *next(); const SessionData *next() const; private: SessionData(uuid_t sessionid,uuid_t userid,uuid_t domainid, Loading @@ -68,11 +69,11 @@ namespace authdb { Session(); ~Session(); SessionData *addSession(AuthBackend &backend,uuid_t domainid,uuid_t userid); SessionData *getSession(uuid_t sessionid); const SessionData *addSession(AuthBackend &backend,uuid_t domainid,uuid_t userid); const SessionData *getSession(uuid_t sessionid) const; void remSession(uuid_t sessionid); SessionData *firstData(); const SessionData *firstData() const; private: SessionData *_firstData; Loading Loading
src/admin.cpp +29 −8 Changes for src/admin.cpp: 29 added lines, 8 removed lines. Original line number Diff line number Diff line Loading @@ -1376,20 +1376,41 @@ namespace authdb { void listSessions(libhttppp::HttpRequest *curreq, const int tid, ULONG_PTR args){ libhtmlpp::HtmlElement root=_IndexElement; libhtmlpp::HtmlElement *content=root.getElementbyID("content"); libhtmlpp::HtmlElement *content=root.getElementbyID("content"),*domel=nullptr; libhtmlpp::HtmlString out; libhtmlpp::HtmlString out,ddat; libhtmlpp::HtmlElement slist("ul"); for(SessionData *curdat=_Session.firstData(); curdat; curdat=curdat->next()){ domel=DomainChangeForm(curreq,"listsessions",_AdminBackend,ddat); if(!domel){ throw AuthBackendError("listUsers: cannot load doamin's!"); } content->appendChild(domel); char cdid[255]; uuid_t did; if(sscanf(curreq->getRequestURL(),"/settings/%[^/]",cdid)<0){ throw AuthBackendError("listUsers: wrong url!"); } uuid_parse(cdid,did); for(const SessionData *curdat=_Session.firstData(); curdat; curdat=curdat->next()){ uuid_t sdid; curdat->getDid(sdid); if(strcmp(cdid,"admin")==0 || uuid_compare(did,sdid)==0){ libhtmlpp::HtmlString listel; uuid_t sid,uid; curdat->getSid(sid); curdat->getUid(uid); char csid[25],cuid[25]; char csid[255],cuid[255]; uuid_unparse(sid,csid); uuid_unparse(uid,cuid); Loading @@ -1398,6 +1419,7 @@ namespace authdb { slist.appendChild(listel.parse()); } } content->appendChild(&slist); Loading Loading @@ -1432,7 +1454,6 @@ namespace authdb { sha512 hash; hash.hash(password,pwhash); char cdid[255]; uuid_t did; DomainBackend dbackend(_AdminBackend); Loading Loading @@ -1469,13 +1490,13 @@ namespace authdb { if(username==udat.getUsername() && pwhash==udat.getPwHash() ){ libhttppp::HttpCookie cookie; uuid_t sid; SessionData *cses=_Session.addSession(*backend,did,udat.uid); const SessionData *cses=_Session.addSession(*backend,did,udat.uid); cses->getSid(sid); char csid[25]; char csid[255]; uuid_unparse(sid,csid); libhttppp::HttpResponse rep; cookie.setcookie(&rep,"authdbid",csid); cookie.setcookie(&rep,"authdbid",csid,nullptr,nullptr,-1,"/"); rep.setState(HTTP307); rep.setVersion(HTTPVERSION(1.1)); rep.setHeaderData("Location")->push_back(curreq->getRequestURL()); Loading
src/session.cpp +14 −11 Changes for src/session.cpp: 14 added lines, 11 removed lines. Original line number Diff line number Diff line Loading @@ -52,14 +52,17 @@ authdb::SessionData::~SessionData(){ delete[] _member.gid; } void authdb::SessionData::getUid(uuid_t& dest){ void authdb::SessionData::getUid(uuid_t& dest) const{ uuid_copy(dest,_uid); } void authdb::SessionData::getSid(uuid_t& dest){ void authdb::SessionData::getSid(uuid_t& dest) const{ uuid_copy(dest,_sid); } void authdb::SessionData::getDid(uuid_t& dest) const{ uuid_copy(dest,_did); } bool authdb::SessionData::isMemberOf(const uuid_t& gid){ for(size_t i=0; i<_member.count; ++i){ Loading @@ -69,7 +72,7 @@ bool authdb::SessionData::isMemberOf(const uuid_t& gid){ return false; } authdb::SessionData * authdb::SessionData::next(){ const authdb::SessionData * authdb::SessionData::next() const{ return _next; } Loading @@ -83,10 +86,7 @@ authdb::Session::Session(){ authdb::Session::~Session(){ } authdb::SessionData * authdb::Session::addSession(AuthBackend &backend,uuid_t domainid,uuid_t userid){ uuid_t sid; uuid_generate(sid); const authdb::SessionData * authdb::Session::addSession(AuthBackend &backend,uuid_t domainid,uuid_t userid){ Group group; SessionData::Groups grpdat; Loading Loading @@ -138,6 +138,9 @@ authdb::SessionData * authdb::Session::addSession(AuthBackend &backend,uuid_t do } } uuid_t sid; uuid_generate(sid); if(!_firstData){ _firstData=new SessionData(sid,userid,domainid,grpdat.gid,grpdat.count); _lastData=_firstData; Loading @@ -149,9 +152,9 @@ authdb::SessionData * authdb::Session::addSession(AuthBackend &backend,uuid_t do return _lastData; } authdb::SessionData * authdb::Session::getSession(uuid_t sessionid){ for(SessionData *cur=_firstData; cur; cur=cur->_next){ if(uuid_compare(cur->_did,sessionid)) const authdb::SessionData * authdb::Session::getSession(uuid_t sessionid) const{ for(const SessionData *cur=firstData(); cur; cur=cur->next()){ if(uuid_compare(cur->_sid,sessionid)==0) return cur; } return nullptr; Loading @@ -178,6 +181,6 @@ void authdb::Session::remSession(uuid_t sessionid){ } } authdb::SessionData * authdb::Session::firstData(){ const authdb::SessionData * authdb::Session::firstData() const{ return _firstData; }
src/session.h +7 −6 Changes for src/session.h: 7 added lines, 6 removed lines. Original line number Diff line number Diff line Loading @@ -40,10 +40,11 @@ namespace authdb { public: bool isMemberOf(const uuid_t &gid); void getSid(uuid_t &dest); void getUid(uuid_t &dest); void getSid(uuid_t &dest) const; void getUid(uuid_t &dest) const; void getDid(uuid_t &dest) const; SessionData *next(); const SessionData *next() const; private: SessionData(uuid_t sessionid,uuid_t userid,uuid_t domainid, Loading @@ -68,11 +69,11 @@ namespace authdb { Session(); ~Session(); SessionData *addSession(AuthBackend &backend,uuid_t domainid,uuid_t userid); SessionData *getSession(uuid_t sessionid); const SessionData *addSession(AuthBackend &backend,uuid_t domainid,uuid_t userid); const SessionData *getSession(uuid_t sessionid) const; void remSession(uuid_t sessionid); SessionData *firstData(); const SessionData *firstData() const; private: SessionData *_firstData; Loading