Commit 39b1fb53 authored by jan.koester's avatar jan.koester
Browse files

logout working

parent 635fe98e
Loading
Loading
Loading
Loading
Loading
+1 −0
Changes for data/index.html: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -98,6 +98,7 @@
                    <li><a href="#" >Clients</a></li>
                    <li><a href="#" >Policies</a></li>
                    <li><a href="#" >Sessions</a></li>
                    <li><a href="/settings/logout" >Logout</a></li>
                </ul>
            </div>
            <div id="content">
+40 −6
Changes for data/login.html: 40 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -7,21 +7,55 @@
                color:#ffffff;
                margin:0;
                padding:0;
                min-width:1024px;
                min-width:800px;
            }
        #login {
            min-width:640px;
            min-height:480px;
            padding:2%;
            font-size:1.5em;
            border:solid 1px #ffffff;
            border-radius:10px;
            box-shadow: 1px 1px 5px 5px #ffffff;
            position:absolute;
            top:50%;
            bottom:50%;
            left:50%;
            right:50%;
            margin-left:-20vw;
            margin-right:-20vw;
            margin-top:-20vh;
            margin-bottom:-20vh;
            background:#404347;
        }
        </style>
    </head>
    <body>
        <div id="login" >
            <p><span style="font-size:4em;">AuthDB</span></p>
            <form method="post" id="loginform">
                <label for="username">Username:</label>
                <input type="text" name="username" id="username">
                <label for="password">Password:</label>
                <input type="password" name="password" id="password">
                <table>
                <tr>
                    <td><label for="username">Username:</label></td>
                    <td><input type="text" name="username" id="username"></td>
                </tr>
                <tr>
                    <td><label for="password">Password:</label></td>
                    <td><input type="password" name="password" id="password"></td>
                </tr>
                <tr>
                    <td></td>
                    <td>
                        <select id="domain" name="domain" >
                            <option value="admin">admin.local</option>
                        </select>
                <input type="submit" value="Login">
                    </td>
                </tr>
                <tr>
                    <td></td>
                    <td><input type="submit" value="Login"></td>
                </tr>
                </table>
            </form>
        </div>
    </body>
+14 −1
Changes for src/admin.cpp: 14 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -1456,9 +1456,10 @@ namespace authdb {
        void SettingsController(libhttppp::HttpRequest *curreq, const int tid, ULONG_PTR args){

            libhttppp::HttpCookie cookie;
            uuid_t ssid;

            try{
                uuid_t ssid;

                cookie.parse(curreq);

                for(libhttppp::HttpCookie::CookieData *cur=cookie.getfirstCookieData(); cur; cur=cur->nextCookieData()){
@@ -1522,6 +1523,18 @@ namespace authdb {
                }
            }

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

            char domain[255],url[255];

            if(sscanf(curreq->getRequestURL(),"/settings/%[^/]/%s",domain,url)<0)
+21 −0
Changes for src/session.cpp: 21 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -152,3 +152,24 @@ authdb::SessionData * authdb::Session::getSession(uuid_t sessionid){
    }
    return nullptr;
}

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(prev)
                prev->_next=cur->_next;

            if(cur==_firstData)
                _firstData=cur->_next;

            if(cur==_lastData)
                _lastData=prev;

            cur->_next=nullptr;
            delete cur;
        }
        prev=cur;
    }
}
+1 −0
Changes for src/session.h: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ namespace authdb {

        SessionData *addSession(AuthBackend &backend,uuid_t domainid,uuid_t userid);
        SessionData *getSession(uuid_t sessionid);
        void         remSession(uuid_t sessionid);

    private:
        SessionData           *_firstData;