Commit 0f1026e1 authored by jan.koester's avatar jan.koester
Browse files

change behavior of session

parent d2e20625
Loading
Loading
Loading
Loading
Loading
+4 −4
Changes for src/admin.cpp: 4 added lines, 4 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(){
        AdminController(authdb::AuthBackend &backend,authdb::Session &session,netplus::socket *ssock) : _AdminBackend(backend) , _Session(session){
            _Indexpage.loadFile(_IndexElement,GETDATA(index.html));
            _Loginpage.loadFile(_LoginElement,GETDATA(login.html));
        };
@@ -2638,11 +2638,11 @@ URLNOTFOUND:
        libhtmlpp::HtmlElement  _LoginElement;
        libhtmlpp::HtmlPage       _Indexpage;
        libhtmlpp::HtmlPage       _Loginpage;
        authdb::Session              _Session;
        authdb::Session            &_Session;
    };

    AdminInterface::AdminInterface(AuthBackend &bck,netplus::socket *ssock) : _bck(bck) {
        _ctl = std::make_shared<AdminController>(bck,ssock);
    AdminInterface::AdminInterface(AuthBackend &bck,Session &session,netplus::socket *ssock) : _bck(bck), _session(session) {
        _ctl = std::make_shared<AdminController>(bck,session,ssock);
    }

    AdminInterface::~AdminInterface(){
+3 −1
Changes for src/admin.h: 3 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@
#include <httppp/http.h>

#include "backend.h"
#include "session.h"

#pragma once

@@ -38,11 +39,12 @@ namespace authdb {

    class AdminInterface{
    public:
        AdminInterface(AuthBackend &bck,netplus::socket *ssock);
        AdminInterface(AuthBackend &bck,Session &session,netplus::socket *ssock);
        ~AdminInterface();
        void Request(libhttppp::HttpRequest *curreq, const int tid, ULONG_PTR args);
    public:
        std::shared_ptr<AdminController>  _ctl;
        AuthBackend                                 &_bck;
        Session                                          &_session;
    };
};
+2 −1
Changes for src/authdb.cpp: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ namespace authdb {
        AuthDB(authdb::AuthBackend &backend,netplus::socket *ssock) :
            HttpEvent(ssock),
            _AdminBackend(backend),
            _AdminInterface(backend,ssock){
            _AdminInterface(backend,_Session,ssock){
            std::ifstream authfs(GETDATA(authdb.js), std::ios::ate);
            size_t asize = authfs.tellg();
            _AuthJs.resize(asize);
@@ -306,6 +306,7 @@ namespace authdb {

    private:
        AuthBackend        &_AdminBackend;
        Session                   _Session;
        AdminInterface       _AdminInterface;
        std::vector<char>  _AuthJs;
        std::vector<char>  _AuthCss;
+23 −28
Changes for src/session.cpp: 23 added lines, 28 removed lines.
Original line number Diff line number Diff line
@@ -43,22 +43,11 @@ authdb::SessionData::SessionData(){
}

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;

         if(cur->_next){
              dest->_next=new SessionData;
              dest=dest->_next;
         }
    }
        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){
@@ -73,13 +62,6 @@ authdb::SessionData::~SessionData(){
}

void authdb::SessionData::clear(){
    SessionData *del=_next,*next=nullptr;
    while(del){
        next=del->_next;
        del->_next=nullptr;
        delete del;
        del=next;
    }
    _sid.clear();
    _uid.clear();
    _did.clear();
@@ -144,9 +126,21 @@ authdb::Session::Session(const Session& src) : Session(){
    }
}

authdb::Session::~Session(){
    _firstData->clear();
void authdb::Session::clear(){
     SessionData *del=_firstData;
    while(del){
        SessionData *next=del->_next;
        del->_next=nullptr;
        delete del;
        del=next;
    }
    _firstData=nullptr;
    _lastData=nullptr;
}


authdb::Session::~Session(){
    clear();
};

const authdb::SessionData &authdb::Session::addSession(AuthBackend &backend,uuid domainid,uuid userid){
@@ -168,9 +162,10 @@ const authdb::SessionData &authdb::Session::addSession(AuthBackend &backend,uuid
        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);
            username=reinterpret_cast<char*>(tmp.get());
            unsigned char *tmp = new unsigned char[cur.datasize];
            backend.read(tmp,cur.datasize);
            username=reinterpret_cast<char*>(tmp);
            delete[] tmp;
        }
    }

+1 −0
Changes for src/session.h: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -84,6 +84,7 @@ namespace authdb {
        const SessionData &getSession(uuid sessionid);
        void                          remSession(uuid sessionid);

        void clear();

        const SessionData &firstData() const;
    private: