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

test

parent abd4f685
Loading
Loading
Loading
Loading
Loading
+45 −27
Changes for src/admin.cpp: 45 added lines, 27 removed lines.
Original line number Diff line number Diff line
@@ -1385,7 +1385,7 @@ namespace authdb {
            domel=DomainChangeForm(curreq,"listsessions",_AdminBackend,ddat);

            if(!domel){
                throw AuthBackendError("listUsers: cannot load doamin's!");
                throw AuthBackendError("listSessions: cannot load doamin's!");
            }

            content->appendChild(domel);
@@ -1393,17 +1393,21 @@ namespace authdb {
            char cdid[255];
            uuid_t did;

            if(sscanf(curreq->getRequestURL(),"/settings/%[^/]",cdid)<0){
                throw AuthBackendError("listUsers: wrong url!");
            if(sscanf(curreq->getRequestURL(),"/settings/%[^/]/*",cdid)<0){
                throw AuthBackendError("listSessions: wrong url!");
            }

            uuid_parse(cdid,did);

            if(strcmp(cdid,"admin")!=0){
                if(uuid_parse(cdid,did)!=0)
                    throw AuthBackendError("listSessions: wrong url!");
            }

            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){
                if( ( strcmp(cdid,"admin")==0 && uuid_is_null(sdid)==1 ) ||
                    (uuid_is_null(did)==0 && uuid_compare(did,sdid)==0) ) {

                    libhtmlpp::HtmlString listel;
                    uuid_t sid,uid;

@@ -1456,6 +1460,8 @@ namespace authdb {

            uuid_t did;

            uuid_clear(did);

            DomainBackend dbackend(_AdminBackend);

            AuthBackend *backend=nullptr;
@@ -1516,6 +1522,7 @@ namespace authdb {
            const SessionData *sdat=nullptr;

            try{
                uuid_clear(ssid);

                cookie.parse(curreq);

@@ -1527,6 +1534,17 @@ namespace authdb {
                    }
                }

                if(strncmp("/settings/logout",curreq->getRequestURL(),15)==0){
                    _Session.remSession(ssid);
                    libhttppp::HttpResponse rep;
                    rep.setState(HTTP303);
                    rep.setVersion(HTTPVERSION(1.1));
                    rep.setHeaderData("Location")->push_back("/settings/index");
                    rep.setContentType("text/html");
                    rep.send(curreq,nullptr,0);
                    return;
                }

                if(!sdat){
                    libhttppp::HttpResponse rep;
                    cookie.setcookie(&rep,"authdbid",nullptr,nullptr,nullptr,-1,"/");
@@ -1589,22 +1607,10 @@ namespace authdb {
                }
            }

            if(strncmp("/settings/logout",curreq->getRequestURL(),15)==0){
                _Session.remSession(ssid);
                libhttppp::HttpResponse rep;
                cookie.setcookie(&rep,"authdbid",nullptr,nullptr,nullptr,-1,"/");
                rep.setState(HTTP307);
                rep.setVersion(HTTPVERSION(1.1));
                rep.setHeaderData("Location")->push_back("/settings/index");
                rep.setContentType("text/html");
                rep.send(curreq,nullptr,0);
                return;
            }

            char domain[255],url[255];

            if(sscanf(curreq->getRequestURL(),"/settings/%[^/]/%s",domain,url)<0)
                throw AuthBackendError("wrong url!");
                goto URLNOTFOUND;

            if(strncmp("listusers",url,9)==0){
                listUsers(curreq,tid,args,"listusers");
@@ -1631,14 +1637,27 @@ namespace authdb {
            }else if(strncmp("listsessions",url,12)==0){
                listSessions(curreq,tid,args);
            }else{
                libhtmlpp::HtmlElement root=_IndexElement;
                libhtmlpp::HtmlString out;
                libhtmlpp::print(&root,out,true);
URLNOTFOUND:
                uuid_t did;
                uuid_clear(did);

                if(sdat)
                    sdat->getDid(did);

                char url[255],cdid[255];

                if(uuid_is_null(did)==1){
                    snprintf(url,255,"/settings/admin/listusers");
                }else{
                    uuid_unparse(did,cdid);
                    snprintf(url,255,"/settings/%s/listusers",cdid);
                }
                libhttppp::HttpResponse rep;
                rep.setState(HTTP307);
                rep.setVersion(HTTPVERSION(1.1));
                rep.setHeaderData("Location")->push_back(url);
                rep.setContentType("text/html");
                rep.setContentLength(out.size());
                rep.send(curreq,out.c_str(),out.size());
                rep.send(curreq,nullptr,0);
            }
        }
    private:
@@ -1659,13 +1678,12 @@ namespace authdb {
    }

    void AdminInterface::Request(libhttppp::HttpRequest *curreq, const int tid, ULONG_PTR args){
            if(strncmp(curreq->getRequestURL(),"/settings",9)==0){
            if(strncmp("/settings",curreq->getRequestURL(),9)==0){
                _ctl->SettingsController(curreq,tid,args);
            }else{
                libhttppp::HttpResponse rep;
                rep.setState(HTTP307);
                rep.setState(HTTP404);
                rep.setVersion(HTTPVERSION(1.1));
                rep.setHeaderData("Location")->push_back("/settings/admin/index");
                rep.setContentType("text/html");
                rep.send(curreq,nullptr,0);
            }
+0 −1
Changes for src/authdb.cpp: 0 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -109,7 +109,6 @@ namespace authdb {
                    rep.setContentType("text/html");
                    rep.send(curreq,nullptr,0);
            }

        }

        void getAvatar(libhttppp::HttpRequest *curreq, const int tid, ULONG_PTR args){
+2 −1
Changes for src/session.cpp: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ void authdb::Session::remSession(uuid_t sessionid){
    SessionData *prev=nullptr;

    for(SessionData *cur=_firstData; cur; cur=cur->_next){
        if(uuid_compare(cur->_did,sessionid)){
        if(uuid_compare(cur->_sid,sessionid)){
            if(prev)
                prev->_next=cur->_next;

@@ -176,6 +176,7 @@ void authdb::Session::remSession(uuid_t sessionid){

            cur->_next=nullptr;
            delete cur;
            break;
        }
        prev=cur;
    }