Commit 12f2d7aa authored by jan.koester's avatar jan.koester
Browse files

cleanup

parent 62e690ee
Loading
Loading
Loading
Loading

config.yaml

deleted100644 → 0
+0 −14
Changes for config.yaml: 0 added lines, 14 removed lines.
Original line number Diff line number Diff line
AUTHDB:
    BIND: "0.0.0.0"
    PORT: 8889
    PREFIX: "/autdb"
    PASSWORD: "test"
    DOMAINS:
        - NAME: tuxist
            BACKEND: file
            PATH: /var/lib/authdb/tuxist.de.db
            KEY: 4a92e945-a3ff-11ef-90c7-3cecefce9ac2
        - NAME: bolli.tuxist.de
            BACKEND: file
            PATH: /var/lib/authfb/bolli.tuxist.de
            KEY: 53d9030c-a3ff-11ef-b9fa-3cecefce9ac2
+2 −2
Changes for data/index.html: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -94,14 +94,14 @@
                <ul>
                    <li><a href="/settings/admin/listdomains" >Domains</a></li>
                    <li><a href="/settings/admin/listusers" >Users</a></li>
                    <li><a href="#" >Groups</a></li>
                    <li><a href="/settings/admin/listgroups" >Groups</a></li>
                    <li><a href="#" >Clients</a></li>
                    <li><a href="#" >Policies</a></li>
                    <li><a href="#" >Sessions</a></li>
                </ul>
            </div>
            <div id="content">
                <script src="authdb.js"></script>
                <script src="/authdb.js"></script>
            </div>
        </div>
    </body>
+67 −6
Changes for src/authdb.cpp: 67 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@
#include "authdb.h"
#include "user.h"
#include "domain.h"
#include "group.h"
#include "types.h"
#include "hash.h"

@@ -932,6 +933,62 @@ namespace authdb {
            rep.send(curreq,nullptr,0);
        }

        void listGroups(libhttppp::HttpRequest *curreq, const int tid, ULONG_PTR args,const char *url){
            libhtmlpp::HtmlString grouplist,out,ddat;

            libhtmlpp::HtmlElement root=_IndexElement;

            libhtmlpp::HtmlElement *content=root.getElementbyID("content"),*domel=nullptr;

            Group group;

            domel=DomainChangeForm(curreq,url,_AdminBackend,ddat);

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

            char cdid[255];
            uuid_t did;

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

            DomainBackend dbackend(_AdminBackend);

            AuthBackend *backend=nullptr;

            if(strcmp(cdid,"admin") == 0 ){
                backend=&_AdminBackend;
            }else if(uuid_parse(cdid,did) == 0 ){
                backend=dbackend.data(did);
            }else{
                throw AuthBackendError("listGroups: could not parse uuid!");
            }

            size_t rd=sizeof(authdb::AuthHeader),end=backend->end();

            content->appendChild(domel);

            grouplist << "<div><ul class=\"grouptoolbar\" ><li><a class=\"button\" href=\"/settings/"<< cdid << "/creategroup\">CreateGroup</a></li></ul></div>";

            content->appendChild(grouplist.parse());

            libhtmlpp::print(&root,out,true);

            libhttppp::HttpResponse rep;
            rep.setContentType("text/html");
            rep.setContentLength(out.size());
            rep.send(curreq,out.c_str(),out.size());

        }

        void createGroup(libhttppp::HttpRequest *curreq, const int tid, ULONG_PTR args,const char *url){


        }

        void SettingsController(libhttppp::HttpRequest *curreq, const int tid, ULONG_PTR args){
            _AdminBackend.lock();

@@ -951,14 +1008,14 @@ namespace authdb {
                    editUser(curreq,tid,args);
                }else if(strncmp(url,"listdomains",9)==0){
                    listDomains(curreq,tid,args);
                }else if(strncmp(url,"createdomain",10)==0){
                }else if(strncmp(url,"createdomain",12)==0){
                    createDomain(curreq,tid,args);
                }else if(strncmp(url,"removedomain",10)==0){
                }else if(strncmp(url,"removedomain",12)==0){
                    removeDomain(curreq,tid,args);
                }else if(strncmp(url,"authdb.js",9)==0){
                    libhttppp::HttpResponse rep;
                    rep.setContentType("text/javascript");
                    rep.send(curreq,_AuthJs.data(),_AuthJs.size());
                }else if(strncmp(url,"listgroups",10)==0){
                    listGroups(curreq,tid,args,"listgroups");
                }else if(strncmp(url,"creategroup",11)==0){
                    createGroup(curreq,tid,args,"creategroup");
                }else{
                    libhtmlpp::HtmlElement root=_IndexElement;
                    libhtmlpp::HtmlString out;
@@ -985,6 +1042,10 @@ namespace authdb {
                getAvatar(curreq,tid,args);
            }else if(strncmp(curreq->getRequestURL(),"/api",4)==0){

            }else if(strncmp(curreq->getRequestURL(),"/authdb.js",10)==0){
                libhttppp::HttpResponse rep;
                rep.setContentType("text/javascript");
                rep.send(curreq,_AuthJs.data(),_AuthJs.size());
            }else{
                libhttppp::HttpResponse rep;
                rep.setState(HTTP307);
+7 −0
Changes for src/group.h: 7 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -42,6 +42,13 @@ namespace authdb {

        ~GroupData();

        void setName(const char *name);
        const char *getName() const;

        void addMember(uuid_t uid);
        void remMember(uuid_t uid);
        bool isMember(uuid_t uid) const;

        struct MemberUids {
            size_t  count;
            uuid_t *uid;