Commit d2e20625 authored by jan.koester's avatar jan.koester
Browse files

fixed

parent 168a4be1
Loading
Loading
Loading
Loading
Loading
+5 −6
Changes for src/admin.cpp: 5 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@
namespace authdb {
    class AdminController {
    public:
        AdminController(authdb::AuthBackend &backend,netplus::socket *ssock) : _AdminBackend(backend) , _Session(backend){
        AdminController(authdb::AuthBackend &backend,netplus::socket *ssock) : _AdminBackend(backend) , _Session(){
            _Indexpage.loadFile(_IndexElement,GETDATA(index.html));
            _Loginpage.loadFile(_LoginElement,GETDATA(login.html));
        };
@@ -1384,7 +1384,7 @@ namespace authdb {

            libhtmlpp::HtmlElement slist("ul");

            domel=DomainChangeForm(curreq,"listsessions",_AdminBackend,ddat);
            domel=DomainChangeForm(curreq,curreq->getRequestURL(),_AdminBackend,ddat);

            if(!domel){
                throw AuthBackendError("listSessions: cannot load doamin's!");
@@ -1405,10 +1405,9 @@ namespace authdb {
            }

            for(SessionData curdat=_Session.firstData(); curdat.empty(); curdat=curdat.next()){
                std::cout << "test" << std::endl;
                uuid sdid;
                curdat.getDid(sdid);
                if( ( strcmp(cdid,"admin")==0 && !sdid.empty() ) ||
                if( ( strcmp(cdid,"admin")==0 && sdid.empty() ) ||
                    ( !did.empty() && did==sdid ) ) {

                    libhtmlpp::HtmlString listel;
@@ -1486,7 +1485,7 @@ namespace authdb {
                throw AuthBackendError("login: could not parse uuid!");
            }

            _Session.relSession(sid);
            _Session.relSession(*backend,sid);

            char rurl[255];
            snprintf(rurl,255,"/settings/%s/listsessions",cdid);
@@ -2096,7 +2095,7 @@ namespace authdb {
                    if(username==udat.getUsername() && pwhash==udat.getPwHash() ){
                        libhttppp::HttpCookie cookie;
                        uuid sid;
                        const SessionData cses=_Session.addSession(did,udat.uid);
                        const SessionData cses=_Session.addSession(*backend,did,udat.uid);
                        cses.getSid(sid);
                        char csid[255];
                        uuid_unparse(sid.value,csid);
+2 −2
Changes for src/api.cpp: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -117,8 +117,8 @@ namespace authdb {

                                            if(name==udat.getUsername()){
                                                if(pwsalt==udat.getPwHash()){
                                                    Session session(*_Backend);
                                                    const SessionData sdat=session.addSession(did.value,cur.uuid);
                                                    Session session;
                                                    const SessionData sdat=session.addSession(*_Backend,did.value,cur.uuid);
                                                    json_object *respid=json_object_new_object();
                                                    uuid sessid;
                                                    sdat.getSid(sessid);
+26 −25
Changes for src/session.cpp: 26 added lines, 25 removed lines.
Original line number Diff line number Diff line
@@ -42,12 +42,14 @@ authdb::SessionData::SessionData(){
    _next=nullptr;
}

authdb::SessionData::SessionData(const SessionData& src){
authdb::SessionData::SessionData(const SessionData& src) :SessionData() {
    SessionData *dest=this;

    for(const SessionData *cur=&src; cur; cur=cur->_next){
        if(!cur->_members.empty()){
            std::copy(cur->_members.begin(),cur->_members.end(),
                            std::back_inserter(dest->_members));
        }
         dest->_sid=cur->_sid;
         dest->_uid=cur->_uid;
         dest->_did=cur->_did;
@@ -57,7 +59,6 @@ authdb::SessionData::SessionData(const SessionData& src){
              dest=dest->_next;
         }
    }
    _next=nullptr;
}

authdb::SessionData::SessionData(uuid sessionid, uuid userid, uuid domainid,std::vector<uuid> &members) : _members(members){
@@ -69,9 +70,6 @@ authdb::SessionData::SessionData(uuid sessionid, uuid userid, uuid domainid,std:

authdb::SessionData::~SessionData(){
    clear();
    _sid.clear();
    _uid.clear();
    _did.clear();
}

void authdb::SessionData::clear(){
@@ -82,6 +80,9 @@ void authdb::SessionData::clear(){
        delete del;
        del=next;
    }
    _sid.clear();
    _uid.clear();
    _did.clear();
    _next=nullptr;
}

@@ -122,12 +123,12 @@ const authdb::SessionData &authdb::SessionData::next() const{
}


authdb::Session::Session(AuthBackend &backend) : _Backend(backend){
authdb::Session::Session() {
    _firstData=nullptr;
    _lastData=nullptr;
}

authdb::Session::Session(const Session& src) : Session(src._Backend){
authdb::Session::Session(const Session& src) : Session(){
    std::lock_guard<std::mutex> guard(_lockData);

    for(SessionData *cur=src._firstData; cur; cur=cur->_next){
@@ -148,27 +149,27 @@ authdb::Session::~Session(){
    _lastData=nullptr;
};

const authdb::SessionData &authdb::Session::addSession(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;

    size_t rd=sizeof(authdb::AuthHeader),end=_Backend.end();
    size_t rd=sizeof(authdb::AuthHeader),end=backend.end();
    while(rd<end){
        authdb::AuthData::Record cur;

        cur.type=EmptyData;

        _Backend.setPos(rd);
        _Backend.read(reinterpret_cast<unsigned char*>(&cur),sizeof(AuthData::Record));
        backend.setPos(rd);
        backend.read(reinterpret_cast<unsigned char*>(&cur),sizeof(AuthData::Record));

        rd=_Backend.getPos()+cur.datasize;
        rd=backend.getPos()+cur.datasize;

        if(cur.type == UserData && strcmp(cur.fieldname,"username")==0
            && uuid_compare(cur.uuid,userid.value)==0){

            const std::shared_ptr<unsigned char[]> tmp(new unsigned char[cur.datasize]);
            _Backend.read(tmp.get(),cur.datasize);
            backend.read(tmp.get(),cur.datasize);
            username=reinterpret_cast<char*>(tmp.get());
        }
    }
@@ -180,15 +181,15 @@ const authdb::SessionData &authdb::Session::addSession(uuid domainid,uuid userid

        cur.type=EmptyData;

        _Backend.setPos(rd);
        _Backend.read(reinterpret_cast<unsigned char*>(&cur),sizeof(AuthData::Record));
        backend.setPos(rd);
        backend.read(reinterpret_cast<unsigned char*>(&cur),sizeof(AuthData::Record));

        rd=_Backend.getPos()+cur.datasize;
        rd=backend.getPos()+cur.datasize;

        if(cur.type == GroupData && strcmp(cur.fieldname,"groupname")==0){
            class GroupData grpi(cur.uuid);
            size_t upos=sizeof(authdb::AuthHeader);
            group.info(_Backend,grpi,upos);
            group.info(backend,grpi,upos);
            if(grpi.isMember(cur.uuid)){
                mbs.emplace_back(cur.uuid);
            }
@@ -214,7 +215,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(SessionData *cur=_firstData; cur; cur=cur->_next){
        if(cur->_sid==sessionid.value)
        if(cur->_sid==sessionid)
            return *cur;
    }
    return _empty;
@@ -242,7 +243,7 @@ void authdb::Session::remSession(uuid sessionid){
    }
}

void authdb::Session::relSession(uuid sessionid){
void authdb::Session::relSession(AuthBackend &backend,uuid sessionid){
    std::lock_guard<std::mutex> guard(_lockData);
    Group group;

@@ -262,29 +263,29 @@ void authdb::Session::relSession(uuid sessionid){

    cursess->_members.clear();

    size_t rd=sizeof(authdb::AuthHeader),end=_Backend.end();
    size_t rd=sizeof(authdb::AuthHeader),end=backend.end();
    while(rd<end){
        authdb::AuthData::Record cur;

        cur.type=EmptyData;

        _Backend.setPos(rd);
        _Backend.read(reinterpret_cast<unsigned char*>(&cur),sizeof(AuthData::Record));
        backend.setPos(rd);
        backend.read(reinterpret_cast<unsigned char*>(&cur),sizeof(AuthData::Record));

        rd=_Backend.getPos()+cur.datasize;
        rd=backend.getPos()+cur.datasize;

        if(cur.type == UserData && strcmp(cur.fieldname,"username")==0
            && uuid_compare(cur.uuid,cursess->_uid.value)==0){

            const std::shared_ptr<unsigned char[]>tmp(new unsigned char[cur.datasize]);
            _Backend.read(tmp.get(),cur.datasize);
            backend.read(tmp.get(),cur.datasize);
            username=reinterpret_cast<char*>(tmp.get());
        }

        if(cur.type == GroupData && strcmp(cur.fieldname,"groupname")==0){
            class GroupData grpi(cur.uuid);
            size_t upos=sizeof(authdb::AuthHeader);
            group.info(_Backend,grpi,upos);
            group.info(backend,grpi,upos);

            if(grpi.isMember(cursess->_uid.value))
                cursess->_members.emplace_back(cursess->_uid);
+5 −4
Changes for src/session.h: 5 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -74,20 +74,21 @@ namespace authdb {

    class Session{
    public:
        Session(AuthBackend &backend);
        Session();
        Session(const Session &src);
        ~Session();

        const SessionData &addSession(uuid domainid,uuid userid);
        const SessionData &addSession(AuthBackend &backend,uuid domainid,uuid userid);
        void                          relSession(AuthBackend &backend,uuid sessionid);

        const SessionData &getSession(uuid sessionid);
        void                          remSession(uuid sessionid);
        void               relSession(uuid sessionid);


        const SessionData &firstData() const;
    private:
        SessionData   *_firstData;
        SessionData   *_lastData;
        std::mutex       _lockData;
        AuthBackend &_Backend;
    };
};