Loading src/admin.cpp +6 −4 Changes for src/admin.cpp: 6 added lines, 4 removed lines. Original line number Diff line number Diff line Loading @@ -1404,23 +1404,25 @@ namespace authdb { throw AuthBackendError("listSessions: wrong url!"); } for(SessionData curdat=_Session.firstData(); curdat.empty(); curdat=curdat.next()){ for(const SessionData *curdat=_Session.firstData(); !curdat; curdat=curdat->next()){ uuid sdid; curdat.getDid(sdid); curdat->getDid(sdid); if( ( strcmp(cdid,"admin")==0 && sdid.empty() ) || ( !did.empty() && did==sdid ) ) { 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/api.cpp +1 −1 Changes for src/api.cpp: 1 added line, 1 removed line. Original line number Diff line number Diff line Loading @@ -118,7 +118,7 @@ namespace authdb { if(name==udat.getUsername()){ if(pwsalt==udat.getPwHash()){ Session session; const SessionData sdat=session.addSession(*_Backend,did.value,cur.uuid); SessionData sdat=session.addSession(*_Backend,did.value,cur.uuid); json_object *respid=json_object_new_object(); uuid sessid; sdat.getSid(sessid); Loading src/session.cpp +17 −9 Changes for src/session.cpp: 17 added lines, 9 removed lines. Original line number Diff line number Diff line Loading @@ -50,6 +50,14 @@ authdb::SessionData::SessionData(const SessionData& src) : SessionData() { _did=src._did; } authdb::SessionData::SessionData(const SessionData *src) : SessionData() { std::copy(src->_members.begin(),src->_members.end(), std::back_inserter(_members)); _sid=src->_sid; _uid=src->_uid; _did=src->_did; } authdb::SessionData::SessionData(uuid sessionid, uuid userid, uuid domainid,std::vector<uuid> &members) : _members(members){ _sid=sessionid; _uid=userid; Loading Loading @@ -100,8 +108,8 @@ bool authdb::SessionData::isMemberOf(const uuid& gid){ return false; } const authdb::SessionData &authdb::SessionData::next() const{ return *_next; const authdb::SessionData *authdb::SessionData::next() const{ return _next; } Loading Loading @@ -143,7 +151,7 @@ authdb::Session::~Session(){ clear(); }; const authdb::SessionData &authdb::Session::addSession(AuthBackend &backend,uuid domainid,uuid userid){ const authdb::SessionData *authdb::Session::addSession(AuthBackend &backend,uuid domainid,uuid userid){ std::lock_guard<std::mutex> guard(_lockData); Group group; std::string username; Loading Loading @@ -204,16 +212,16 @@ const authdb::SessionData &authdb::Session::addSession(AuthBackend &backend,uuid _lastData->_username=username; return *_lastData; return _lastData; } const authdb::SessionData &authdb::Session::getSession(uuid sessionid){ const authdb::SessionData *authdb::Session::getSession(uuid sessionid){ std::lock_guard<std::mutex> guard(_lockData); for(SessionData *cur=_firstData; cur; cur=cur->_next){ if(cur->_sid==sessionid) return *cur; return cur; } return _empty; return nullptr; } void authdb::Session::remSession(uuid sessionid){ Loading Loading @@ -288,6 +296,6 @@ void authdb::Session::relSession(AuthBackend &backend,uuid sessionid){ } } const authdb::SessionData & authdb::Session::firstData() const{ return *_firstData; const authdb::SessionData *authdb::Session::firstData() const{ return _firstData; } src/session.h +6 −6 Changes for src/session.h: 6 added lines, 6 removed lines. Original line number Diff line number Diff line Loading @@ -48,16 +48,16 @@ namespace authdb { const char *getUsername() const; bool empty() const; const SessionData &next() const; const SessionData *next() const; SessionData(); SessionData(const SessionData &src); SessionData(const SessionData *src); SessionData(uuid sessionid,uuid userid,uuid domainid,std::vector<uuid> &members); ~SessionData(); void clear(); bool empty() const; private: uuid _uid; Loading @@ -78,15 +78,15 @@ namespace authdb { Session(const Session &src); ~Session(); const SessionData &addSession(AuthBackend &backend,uuid domainid,uuid userid); const SessionData *addSession(AuthBackend &backend,uuid domainid,uuid userid); void relSession(AuthBackend &backend,uuid sessionid); const SessionData &getSession(uuid sessionid); const SessionData *getSession(uuid sessionid); void remSession(uuid sessionid); void clear(); const SessionData &firstData() const; const SessionData *firstData() const; private: SessionData *_firstData; SessionData *_lastData; Loading Loading
src/admin.cpp +6 −4 Changes for src/admin.cpp: 6 added lines, 4 removed lines. Original line number Diff line number Diff line Loading @@ -1404,23 +1404,25 @@ namespace authdb { throw AuthBackendError("listSessions: wrong url!"); } for(SessionData curdat=_Session.firstData(); curdat.empty(); curdat=curdat.next()){ for(const SessionData *curdat=_Session.firstData(); !curdat; curdat=curdat->next()){ uuid sdid; curdat.getDid(sdid); curdat->getDid(sdid); if( ( strcmp(cdid,"admin")==0 && sdid.empty() ) || ( !did.empty() && did==sdid ) ) { 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/api.cpp +1 −1 Changes for src/api.cpp: 1 added line, 1 removed line. Original line number Diff line number Diff line Loading @@ -118,7 +118,7 @@ namespace authdb { if(name==udat.getUsername()){ if(pwsalt==udat.getPwHash()){ Session session; const SessionData sdat=session.addSession(*_Backend,did.value,cur.uuid); SessionData sdat=session.addSession(*_Backend,did.value,cur.uuid); json_object *respid=json_object_new_object(); uuid sessid; sdat.getSid(sessid); Loading
src/session.cpp +17 −9 Changes for src/session.cpp: 17 added lines, 9 removed lines. Original line number Diff line number Diff line Loading @@ -50,6 +50,14 @@ authdb::SessionData::SessionData(const SessionData& src) : SessionData() { _did=src._did; } authdb::SessionData::SessionData(const SessionData *src) : SessionData() { std::copy(src->_members.begin(),src->_members.end(), std::back_inserter(_members)); _sid=src->_sid; _uid=src->_uid; _did=src->_did; } authdb::SessionData::SessionData(uuid sessionid, uuid userid, uuid domainid,std::vector<uuid> &members) : _members(members){ _sid=sessionid; _uid=userid; Loading Loading @@ -100,8 +108,8 @@ bool authdb::SessionData::isMemberOf(const uuid& gid){ return false; } const authdb::SessionData &authdb::SessionData::next() const{ return *_next; const authdb::SessionData *authdb::SessionData::next() const{ return _next; } Loading Loading @@ -143,7 +151,7 @@ authdb::Session::~Session(){ clear(); }; const authdb::SessionData &authdb::Session::addSession(AuthBackend &backend,uuid domainid,uuid userid){ const authdb::SessionData *authdb::Session::addSession(AuthBackend &backend,uuid domainid,uuid userid){ std::lock_guard<std::mutex> guard(_lockData); Group group; std::string username; Loading Loading @@ -204,16 +212,16 @@ const authdb::SessionData &authdb::Session::addSession(AuthBackend &backend,uuid _lastData->_username=username; return *_lastData; return _lastData; } const authdb::SessionData &authdb::Session::getSession(uuid sessionid){ const authdb::SessionData *authdb::Session::getSession(uuid sessionid){ std::lock_guard<std::mutex> guard(_lockData); for(SessionData *cur=_firstData; cur; cur=cur->_next){ if(cur->_sid==sessionid) return *cur; return cur; } return _empty; return nullptr; } void authdb::Session::remSession(uuid sessionid){ Loading Loading @@ -288,6 +296,6 @@ void authdb::Session::relSession(AuthBackend &backend,uuid sessionid){ } } const authdb::SessionData & authdb::Session::firstData() const{ return *_firstData; const authdb::SessionData *authdb::Session::firstData() const{ return _firstData; }
src/session.h +6 −6 Changes for src/session.h: 6 added lines, 6 removed lines. Original line number Diff line number Diff line Loading @@ -48,16 +48,16 @@ namespace authdb { const char *getUsername() const; bool empty() const; const SessionData &next() const; const SessionData *next() const; SessionData(); SessionData(const SessionData &src); SessionData(const SessionData *src); SessionData(uuid sessionid,uuid userid,uuid domainid,std::vector<uuid> &members); ~SessionData(); void clear(); bool empty() const; private: uuid _uid; Loading @@ -78,15 +78,15 @@ namespace authdb { Session(const Session &src); ~Session(); const SessionData &addSession(AuthBackend &backend,uuid domainid,uuid userid); const SessionData *addSession(AuthBackend &backend,uuid domainid,uuid userid); void relSession(AuthBackend &backend,uuid sessionid); const SessionData &getSession(uuid sessionid); const SessionData *getSession(uuid sessionid); void remSession(uuid sessionid); void clear(); const SessionData &firstData() const; const SessionData *firstData() const; private: SessionData *_firstData; SessionData *_lastData; Loading