Loading src/admin.cpp +4 −4 Changes for src/admin.cpp: 4 added lines, 4 removed lines. Original line number Diff line number Diff line Loading @@ -1404,23 +1404,23 @@ namespace authdb { throw AuthBackendError("listSessions: wrong url!"); } for(std::shared_ptr<SessionData> curdat=std::make_shared<SessionData>(_Session.firstData()); curdat; curdat=curdat->next()){ for(SessionData curdat=_Session.firstData(); !curdat.empty(); curdat=curdat.next()){ uuid sdid; curdat->getDid(sdid); curdat.getDid(sdid); if( ( strcmp(cdid,"admin")==0 && uuid_is_null(sdid.value)==1 ) || (uuid_is_null(did)==0 && uuid_compare(did,sdid.value)==0) ) { libhtmlpp::HtmlString listel; uuid sid; curdat->getSid(sid); curdat.getSid(sid); char csid[255],cuid[255]; uuid_unparse(sid.value,csid); listel << "<li class=\"sessionel\">" << "<span>" << curdat->getUsername() << ": " << csid << "</span>" << "<span>" << curdat.getUsername() << ": " << csid << "</span>" << "<span><a class=\"button\" href=\"/settings/"<< cdid <<"/removesession/" << csid << "\">Remove</a></span>" << "<span><a class=\"button\" href=\"/settings/"<< cdid <<"/reloadsession/" << csid << "\">Reload</a></span>" << "</li>"; Loading src/session.cpp +17 −14 Changes for src/session.cpp: 17 added lines, 14 removed lines. Original line number Diff line number Diff line Loading @@ -66,8 +66,8 @@ const char * authdb::SessionData::getUsername() const{ return _username.c_str(); } bool authdb::SessionData::empty(){ if(sizeof(*this)==sizeof(_empty)) bool authdb::SessionData::empty() const{ if(_uid.empty() && _sid.empty() && _did.empty() && _members.empty()) return true; return false; } Loading @@ -81,12 +81,14 @@ bool authdb::SessionData::isMemberOf(const uuid& gid){ return false; } const std::shared_ptr<authdb::SessionData> authdb::SessionData::next(){ return _next; const authdb::SessionData &authdb::SessionData::next() const{ return *_next; } authdb::Session::Session(AuthBackend &backend) : _Backend(backend){ _firstData=nullptr; _lastData=nullptr; } authdb::Session::~Session()=default; Loading Loading @@ -142,10 +144,10 @@ const authdb::SessionData &authdb::Session::addSession(uuid domainid,uuid userid uuid_generate(sid); if(!_firstData){ _firstData=std::shared_ptr<SessionData>(new SessionData(sid,userid,domainid,mbs)); _firstData=new SessionData(sid,userid,domainid,mbs); _lastData=_firstData; }else{ _lastData->_next=std::shared_ptr<SessionData>(new SessionData(sid,userid,domainid,mbs)); _lastData->_next=new SessionData(sid,userid,domainid,mbs); _lastData=_lastData->_next; } Loading @@ -156,7 +158,7 @@ const authdb::SessionData &authdb::Session::addSession(uuid domainid,uuid userid const authdb::SessionData &authdb::Session::getSession(uuid sessionid){ std::lock_guard<std::mutex> guard(_lockData); for(std::shared_ptr<SessionData> cur=_firstData; cur.get(); cur=cur->_next){ for(SessionData *cur=_firstData; cur; cur=cur->_next){ if(cur->_sid==sessionid.value) return *cur; } Loading @@ -165,9 +167,9 @@ const authdb::SessionData &authdb::Session::getSession(uuid sessionid){ void authdb::Session::remSession(uuid sessionid){ std::lock_guard<std::mutex> guard(_lockData); std::shared_ptr<SessionData> prev; SessionData *prev=nullptr; for(std::shared_ptr<SessionData> cur=_firstData; cur; cur=cur->_next){ for(SessionData *cur=_firstData; cur; cur=cur->_next){ if(cur->_sid==sessionid){ if(prev) prev->_next=cur->_next; Loading @@ -191,9 +193,9 @@ void authdb::Session::relSession(uuid sessionid){ std::string username; std::shared_ptr<SessionData> cursess=nullptr; SessionData *cursess=nullptr; for(std::shared_ptr<SessionData> cur=_firstData; cur; cur=cur->_next){ for(SessionData *cur=_firstData; cur; cur=cur->_next){ if(cur->_sid==sessionid){ cursess=cur; break; Loading Loading @@ -242,12 +244,13 @@ const authdb::SessionData & authdb::Session::firstData() const{ void authdb::Session::operator=(const Session& src){ std::lock_guard<std::mutex> guard(_lockData); for(std::shared_ptr<SessionData> cur=std::make_shared<SessionData>(src.firstData()); cur.get(); cur=cur->_next){ for(SessionData *cur=_firstData; cur; cur=cur->_next){ if(!_firstData){ _firstData=std::make_shared<SessionData>(cur->_sid,cur->_uid,cur->_did,cur->_members); _firstData=new SessionData(cur->_sid,cur->_uid,cur->_did,cur->_members); _lastData=_firstData; }else{ _lastData->_next=std::make_shared<SessionData>(cur->_sid,cur->_uid,cur->_did,cur->_members); _lastData->_next=new SessionData(cur->_sid,cur->_uid,cur->_did,cur->_members); _lastData=_lastData->_next; } Loading src/session.h +5 −5 Changes for src/session.h: 5 added lines, 5 removed lines. Original line number Diff line number Diff line Loading @@ -48,9 +48,9 @@ namespace authdb { const char *getUsername() const; bool empty(); bool empty() const; const std::shared_ptr<SessionData> next(); const SessionData &next() const; SessionData(); SessionData(uuid sessionid,uuid userid,uuid domainid,std::vector<uuid> &members); Loading @@ -65,7 +65,7 @@ namespace authdb { std::string _username; std::shared_ptr<SessionData> _next; SessionData *_next; friend class Session; }; Loading @@ -82,8 +82,8 @@ namespace authdb { const SessionData &firstData() const; void operator=(const Session &src); private: std::shared_ptr<SessionData> _firstData; std::shared_ptr<SessionData> _lastData; SessionData *_firstData; SessionData *_lastData; std::mutex _lockData; AuthBackend &_Backend; }; Loading src/uuid.cpp +6 −2 Changes for src/uuid.cpp: 6 added lines, 2 removed lines. Original line number Diff line number Diff line Loading @@ -28,7 +28,7 @@ #include "uuid.h" authdb::uuid::uuid(){ uuid_generate(value); uuid_clear(value); } authdb::uuid::uuid(const uuid& src){ Loading @@ -39,10 +39,14 @@ authdb::uuid::uuid(const uuid_t& src){ uuid_copy(value,src); } authdb::uuid::~uuid(){ } const bool authdb::uuid::empty() const{ return uuid_is_null(value); } bool authdb::uuid::operator==(const uuid_t src) const{ return uuid_compare(value,src); } Loading src/uuid.h +2 −0 Changes for src/uuid.h: 2 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -42,6 +42,8 @@ namespace authdb{ const char *c_str(); const bool empty() const; void operator=(const uuid_t &src); void operator=(const uuid &src); bool operator==(const uuid_t src) const; Loading Loading
src/admin.cpp +4 −4 Changes for src/admin.cpp: 4 added lines, 4 removed lines. Original line number Diff line number Diff line Loading @@ -1404,23 +1404,23 @@ namespace authdb { throw AuthBackendError("listSessions: wrong url!"); } for(std::shared_ptr<SessionData> curdat=std::make_shared<SessionData>(_Session.firstData()); curdat; curdat=curdat->next()){ for(SessionData curdat=_Session.firstData(); !curdat.empty(); curdat=curdat.next()){ uuid sdid; curdat->getDid(sdid); curdat.getDid(sdid); if( ( strcmp(cdid,"admin")==0 && uuid_is_null(sdid.value)==1 ) || (uuid_is_null(did)==0 && uuid_compare(did,sdid.value)==0) ) { libhtmlpp::HtmlString listel; uuid sid; curdat->getSid(sid); curdat.getSid(sid); char csid[255],cuid[255]; uuid_unparse(sid.value,csid); listel << "<li class=\"sessionel\">" << "<span>" << curdat->getUsername() << ": " << csid << "</span>" << "<span>" << curdat.getUsername() << ": " << csid << "</span>" << "<span><a class=\"button\" href=\"/settings/"<< cdid <<"/removesession/" << csid << "\">Remove</a></span>" << "<span><a class=\"button\" href=\"/settings/"<< cdid <<"/reloadsession/" << csid << "\">Reload</a></span>" << "</li>"; Loading
src/session.cpp +17 −14 Changes for src/session.cpp: 17 added lines, 14 removed lines. Original line number Diff line number Diff line Loading @@ -66,8 +66,8 @@ const char * authdb::SessionData::getUsername() const{ return _username.c_str(); } bool authdb::SessionData::empty(){ if(sizeof(*this)==sizeof(_empty)) bool authdb::SessionData::empty() const{ if(_uid.empty() && _sid.empty() && _did.empty() && _members.empty()) return true; return false; } Loading @@ -81,12 +81,14 @@ bool authdb::SessionData::isMemberOf(const uuid& gid){ return false; } const std::shared_ptr<authdb::SessionData> authdb::SessionData::next(){ return _next; const authdb::SessionData &authdb::SessionData::next() const{ return *_next; } authdb::Session::Session(AuthBackend &backend) : _Backend(backend){ _firstData=nullptr; _lastData=nullptr; } authdb::Session::~Session()=default; Loading Loading @@ -142,10 +144,10 @@ const authdb::SessionData &authdb::Session::addSession(uuid domainid,uuid userid uuid_generate(sid); if(!_firstData){ _firstData=std::shared_ptr<SessionData>(new SessionData(sid,userid,domainid,mbs)); _firstData=new SessionData(sid,userid,domainid,mbs); _lastData=_firstData; }else{ _lastData->_next=std::shared_ptr<SessionData>(new SessionData(sid,userid,domainid,mbs)); _lastData->_next=new SessionData(sid,userid,domainid,mbs); _lastData=_lastData->_next; } Loading @@ -156,7 +158,7 @@ const authdb::SessionData &authdb::Session::addSession(uuid domainid,uuid userid const authdb::SessionData &authdb::Session::getSession(uuid sessionid){ std::lock_guard<std::mutex> guard(_lockData); for(std::shared_ptr<SessionData> cur=_firstData; cur.get(); cur=cur->_next){ for(SessionData *cur=_firstData; cur; cur=cur->_next){ if(cur->_sid==sessionid.value) return *cur; } Loading @@ -165,9 +167,9 @@ const authdb::SessionData &authdb::Session::getSession(uuid sessionid){ void authdb::Session::remSession(uuid sessionid){ std::lock_guard<std::mutex> guard(_lockData); std::shared_ptr<SessionData> prev; SessionData *prev=nullptr; for(std::shared_ptr<SessionData> cur=_firstData; cur; cur=cur->_next){ for(SessionData *cur=_firstData; cur; cur=cur->_next){ if(cur->_sid==sessionid){ if(prev) prev->_next=cur->_next; Loading @@ -191,9 +193,9 @@ void authdb::Session::relSession(uuid sessionid){ std::string username; std::shared_ptr<SessionData> cursess=nullptr; SessionData *cursess=nullptr; for(std::shared_ptr<SessionData> cur=_firstData; cur; cur=cur->_next){ for(SessionData *cur=_firstData; cur; cur=cur->_next){ if(cur->_sid==sessionid){ cursess=cur; break; Loading Loading @@ -242,12 +244,13 @@ const authdb::SessionData & authdb::Session::firstData() const{ void authdb::Session::operator=(const Session& src){ std::lock_guard<std::mutex> guard(_lockData); for(std::shared_ptr<SessionData> cur=std::make_shared<SessionData>(src.firstData()); cur.get(); cur=cur->_next){ for(SessionData *cur=_firstData; cur; cur=cur->_next){ if(!_firstData){ _firstData=std::make_shared<SessionData>(cur->_sid,cur->_uid,cur->_did,cur->_members); _firstData=new SessionData(cur->_sid,cur->_uid,cur->_did,cur->_members); _lastData=_firstData; }else{ _lastData->_next=std::make_shared<SessionData>(cur->_sid,cur->_uid,cur->_did,cur->_members); _lastData->_next=new SessionData(cur->_sid,cur->_uid,cur->_did,cur->_members); _lastData=_lastData->_next; } Loading
src/session.h +5 −5 Changes for src/session.h: 5 added lines, 5 removed lines. Original line number Diff line number Diff line Loading @@ -48,9 +48,9 @@ namespace authdb { const char *getUsername() const; bool empty(); bool empty() const; const std::shared_ptr<SessionData> next(); const SessionData &next() const; SessionData(); SessionData(uuid sessionid,uuid userid,uuid domainid,std::vector<uuid> &members); Loading @@ -65,7 +65,7 @@ namespace authdb { std::string _username; std::shared_ptr<SessionData> _next; SessionData *_next; friend class Session; }; Loading @@ -82,8 +82,8 @@ namespace authdb { const SessionData &firstData() const; void operator=(const Session &src); private: std::shared_ptr<SessionData> _firstData; std::shared_ptr<SessionData> _lastData; SessionData *_firstData; SessionData *_lastData; std::mutex _lockData; AuthBackend &_Backend; }; Loading
src/uuid.cpp +6 −2 Changes for src/uuid.cpp: 6 added lines, 2 removed lines. Original line number Diff line number Diff line Loading @@ -28,7 +28,7 @@ #include "uuid.h" authdb::uuid::uuid(){ uuid_generate(value); uuid_clear(value); } authdb::uuid::uuid(const uuid& src){ Loading @@ -39,10 +39,14 @@ authdb::uuid::uuid(const uuid_t& src){ uuid_copy(value,src); } authdb::uuid::~uuid(){ } const bool authdb::uuid::empty() const{ return uuid_is_null(value); } bool authdb::uuid::operator==(const uuid_t src) const{ return uuid_compare(value,src); } Loading
src/uuid.h +2 −0 Changes for src/uuid.h: 2 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -42,6 +42,8 @@ namespace authdb{ const char *c_str(); const bool empty() const; void operator=(const uuid_t &src); void operator=(const uuid &src); bool operator==(const uuid_t src) const; Loading