Commit 2a4fb3db authored by jan.koester's avatar jan.koester
Browse files

test

parent 9a755b0a
Loading
Loading
Loading
Loading
+25 −33
Changes for src/blogi.cpp: 25 added lines, 33 removed lines.
Original line number Diff line number Diff line
@@ -895,34 +895,7 @@ void blogi::Blogi::loginPage(libhttppp::HttpRequest &curreq,const int tid,const

    libhtmlpp::HtmlString out;

    bool createdLoginSession = false;

    if (!username.empty() && !password.empty()) {
        // Attempt automatic login
        uuid::uuid sessid;
        if (PlgArgs->auth->login(tid, username.c_str(), password.c_str(), sessid, sessionid, ctx.domainName)) {
            // Login successful, redirect to start page
            libhttppp::HttpResponse curres;
            libhttppp::HttpCookie authid;
            libhttppp::HttpCookie scook;

            if (createdLoginSession) {
                scook.setcookie(curres, "sessionid", sessionid, "", cookieDomain(curreq).c_str(), (1000*60*60*1), "/", false, "1", "Lax", false);
            }
            authid.setcookie(curres,"authid",sessid.c_str(),"",cookieDomain(curreq).c_str(),(1000*60*60*1),"/",false,"1","Lax",false);

            curres.setState(HTTP303);
            curres.setHeaderData("location")->push_back(ctx.startPage);
            curres.setContentType("text/html");
            sendCompressed(curreq,curres, "", 0);
            return;
        } else {
            // Automatic login failed, proceed to show form
            std::cerr << "Automatic login failed. Showing login form." << std::endl;
        }
    }

    // If no credentials or automatic login failed, show the form
    if (username.empty() || password.empty()) {
        std::string _lang = blogi::getLang(*PlgArgs->database[tid]);
        libhtmlpp::HtmlString condat;
        condat << "<div id=\"content\">"
@@ -937,7 +910,27 @@ void blogi::Blogi::loginPage(libhttppp::HttpRequest &curreq,const int tid,const
        if(index.getElementbyID("main"))
            index.getElementbyID("main")->insertChild(condat.parse());

    if (ses.empty()) {
        for(const blogi::Plugin::PluginData *curplg=BlogiPlg->getFirstPlugin(); curplg; curplg=curplg->getNextPlg()){
            if(curreq.isMobile())
                curplg->getInstace()->Rendering(tid,curreq,&index,RenderingType::Mobile,sessionid);
            else
                curplg->getInstace()->Rendering(tid,curreq,&index,RenderingType::Desktop,sessionid);
        }

        PlgArgs->theme->printSite(tid,out,&index,curreq.getRequestURL(),false);
        libhttppp::HttpResponse curres;
        // Clear stale auth cookie when showing login form
        libhttppp::HttpCookie cookclr;
        cookclr.setcookie(curres,"authid","","",cookieDomain(curreq).c_str(),0,"/");
        curres.setState(HTTP200);
        curres.setContentType("text/html");
        sendCompressed(curreq,curres,out.c_str(),out.length());
        return;
    }

    std::string loginSessionId = sessionid;
    bool createdLoginSession = false;
    if (loginSessionId.empty()) {
        std::string buf;
        std::string usa;
        libhttppp::HttpHeader::HeaderData *uahdr = curreq.getHeaderData("user-agent");
@@ -949,12 +942,12 @@ void blogi::Blogi::loginPage(libhttppp::HttpRequest &curreq,const int tid,const
        }

        Session sess(*PlgArgs->database[tid]);
        sessionid = sess.createSession(buf, usa);
        loginSessionId = sess.createSession(buf, usa);
        createdLoginSession = true;
    }

    uuid::uuid sessid;
    PlgArgs->auth->login(tid,username.c_str(),password.c_str(),sessid,sessionid,ctx.domainName);
    PlgArgs->auth->login(tid,username.c_str(),password.c_str(),sessid,loginSessionId,ctx.domainName);

    if(!sessid.empty()){
        libhttppp::HttpResponse curres;
@@ -962,7 +955,7 @@ void blogi::Blogi::loginPage(libhttppp::HttpRequest &curreq,const int tid,const
        libhttppp::HttpCookie scook;

        if (createdLoginSession) {
            scook.setcookie(curres, "sessionid", sessionid, "", cookieDomain(curreq).c_str(), (1000*60*60*1), "/", false, "1", "Lax", false);
            scook.setcookie(curres, "sessionid", loginSessionId, "", cookieDomain(curreq).c_str(), (1000*60*60*1), "/", false, "1", "Lax", false);
        }

        authid.setcookie(curres,"authid",sessid.c_str(),"",cookieDomain(curreq).c_str(),(1000*60*60*1),"/",false,"1","Lax",false);
@@ -991,7 +984,6 @@ void blogi::Blogi::loginPage(libhttppp::HttpRequest &curreq,const int tid,const

        sendCompressed(curreq, curres, condat.c_str(), condat.length());
    }

}

void blogi::Blogi::logoutPage(libhttppp::HttpRequest &curreq,const int tid,const std::string &sessiondid, DomainContext &ctx){