Commit 65301d75 authored by jan.koester's avatar jan.koester
Browse files

basic domain support

parent c0ea549f
Loading
Loading
Loading
Loading
+1 −5
Changes for data/index.html: 1 added line, 5 removed lines.
Original line number Diff line number Diff line
@@ -100,12 +100,8 @@
                    <li><a href="#" >Sessions</a></li>
                </ul>
            </div>
            <div id="maincell">
                <div id="domain">
                </div>
                <script src="authdb.js"></script>
            <div id="content">
                </div>
                <script src="authdb.js"></script>
            </div>
        </div>
    </body>
+143 −60
Changes for src/authdb.cpp: 143 added lines, 60 removed lines.
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ namespace authdb {

    class AuthDB : public libhttppp::HttpEvent{
    public:
        AuthDB(authdb::AuthBackend &backend,netplus::socket *ssock) : HttpEvent(ssock), _Backend(backend){
        AuthDB(authdb::AuthBackend &backend,netplus::socket *ssock) : HttpEvent(ssock), _AdminBackend(backend){
            _Indexpage.loadFile(_IndexElement,"../data/index.html");

            std::ifstream authfs("../data/authdb.js", std::ios::ate);
@@ -64,18 +64,24 @@ namespace authdb {

        };

        void listUsers(libhttppp::HttpRequest *curreq, const int tid, ULONG_PTR args){
            size_t rd=sizeof(authdb::AuthHeader),end=_Backend.end();
        void listUsers(libhttppp::HttpRequest *curreq, const int tid, ULONG_PTR args,const char *baseurl){
            size_t rd=sizeof(authdb::AuthHeader),end=_AdminBackend.end();

            libhtmlpp::HtmlString userlist,out,dform;
            libhtmlpp::HtmlString userlist,out,ddat;

            libhtmlpp::HtmlElement root=_IndexElement;

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

            User user;

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

            if(!domel)
                return;

            content->appendChild(domel);

            userlist <<"<div><p>UserList:</p><table class=\"userlist\">";

            while(rd<end){
@@ -83,16 +89,16 @@ namespace authdb {

                cur.type=EmptyData;

                _Backend.setPos(rd);
                _Backend.read((unsigned char*)&cur,sizeof(AuthData::Record));
                _AdminBackend.setPos(rd);
                _AdminBackend.read((unsigned char*)&cur,sizeof(AuthData::Record));

                rd=_Backend.getPos()+cur.datasize;
                rd=_AdminBackend.getPos()+cur.datasize;

                if(cur.type == UserData && strcmp(cur.fieldname,"username")==0){
                    class UserData udat(cur.uuid);
                    try {
                        size_t upos=sizeof(authdb::AuthHeader);
                        user.info(_Backend,udat,upos);
                        user.info(_AdminBackend,udat,upos);

                        char cruid[20];
                        uuid_unparse(cur.uuid,cruid);
@@ -117,19 +123,9 @@ namespace authdb {
                }
            }

            dform << "<form>"
                  << "<label for=\"domain_selector\">Select Domain:</label>"
                  << "<select id=\"domain_selector\" name=\"domain_selector\">"
                  << "<option value=\"admin.local\" >admin.local</option>"
                  << "<option value=\"tuxist.de\" >tuxist.de</option>"
                  << "</select>"
                  << "</form>";

            domain->insertChild(dform.parse());

            userlist << "</table></div><div><ul class=\"usertoolbar\" ><li><a class=\"button\" href=\"/admin/createuser\">CreateUser</a></li></ul></div>";

            content->insertChild(userlist.parse());
            content->appendChild(userlist.parse());

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

@@ -138,12 +134,16 @@ namespace authdb {
            rep.send(curreq,out.c_str(),out.size());
        }

        void createUser(libhttppp::HttpRequest *curreq, const int tid, ULONG_PTR args){
        void createUser(libhttppp::HttpRequest *curreq, const int tid, ULONG_PTR args,const char *baseurl){
            libhttppp::HttpResponse rep;

            libhttppp::HttpForm curform;
            curform.parse(curreq);

            char cdid[255];
            if(sscanf(curreq->getRequestURL()+strlen(baseurl),"/%s[^/]",cdid)<0)
                cdid[0]='\0';

            if (curform.getBoundary()) {
                uuid_t uid;
                uuid_generate(uid);
@@ -217,7 +217,7 @@ namespace authdb {
                    delete[] cudat.data;
                }
                User user;
                user.create(_Backend,&udat);
                user.create(_AdminBackend,&udat);
                std::cout << "user created!" << std::endl;
            }

@@ -267,7 +267,7 @@ namespace authdb {

            uuid_parse(uid,uuid);

            user.remove(_Backend,uuid);
            user.remove(_AdminBackend,uuid);

            libhttppp::HttpResponse rep;
            rep.setState(HTTP307);
@@ -279,23 +279,32 @@ namespace authdb {

        void getAvatar(libhttppp::HttpRequest *curreq, const int tid, ULONG_PTR args){
            libhttppp::HttpResponse rep;
            char cuid[255],ext[16];
            sscanf(curreq->getRequestURL(),"/admin/getavatar/%[^.].%s",cuid,ext);
            AuthBackend *backend;

            char domain[255],cuid[255],ext[16];
            if(sscanf(curreq->getRequestURL(),"/%[^/]/getavatar/%[^.].%s",domain,cuid,ext)<0)
                return;

            if( strcmp(domain,"admin")==0 ){
                backend=&_AdminBackend;
            }else{
                return;
            }

            uuid_t uid;
            uuid_parse(cuid,uid);

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

            while(rd<end){
                authdb::AuthData::Record cur;
                _Backend.setPos(rd);
                _Backend.read((unsigned char*)&cur,sizeof(AuthData::Record));
                rd=_Backend.getPos()+cur.datasize;
                backend->setPos(rd);
                backend->read((unsigned char*)&cur,sizeof(AuthData::Record));
                rd=backend->getPos()+cur.datasize;

                if(uuid_compare(cur.uuid,uid)==0 && strcmp(cur.fieldname,"avatar")==0){
                    cur.data = new char[cur.datasize];
                    _Backend.read((unsigned char*)cur.data,cur.datasize);
                    backend->read((unsigned char*)cur.data,cur.datasize);
                    char ctype[255];
                    snprintf(ctype,255,"image/%s",ext);
                    rep.setContentType(ctype);
@@ -313,7 +322,7 @@ namespace authdb {
        };

        void editUser(libhttppp::HttpRequest *curreq, const int tid, ULONG_PTR args){
            size_t rd=sizeof(authdb::AuthHeader),end=_Backend.end();
            size_t rd=sizeof(authdb::AuthHeader),end=_AdminBackend.end();
            char cuid[255];

            sscanf(curreq->getRequestURL(),"/admin/edituser/%s",cuid);
@@ -394,7 +403,7 @@ namespace authdb {
            }

            if(data){
                editRecord(_Backend,editrec,UserData);
                editRecord(_AdminBackend,editrec,UserData);
                libhttppp::HttpResponse rep;
                rep.setState(HTTP307);
                rep.setVersion(HTTPVERSION(1.1));
@@ -413,13 +422,13 @@ namespace authdb {
            while(rd<end){
                authdb::AuthData::Record cur;

                _Backend.setPos(rd);
                _Backend.read((unsigned char*)&cur,sizeof(AuthData::Record));
                rd=_Backend.getPos()+cur.datasize;
                _AdminBackend.setPos(rd);
                _AdminBackend.read((unsigned char*)&cur,sizeof(AuthData::Record));
                rd=_AdminBackend.getPos()+cur.datasize;

                if(uuid_compare(cur.uuid,uid)==0 && cur.type==UserData && cur.storage==TextStorage){
                    cur.data = new char[cur.datasize];
                    _Backend.read((unsigned char*)cur.data,cur.datasize);
                    _AdminBackend.read((unsigned char*)cur.data,cur.datasize);
                    try {
                        form  << "<tr><td><label for=\"username\">" << cur.fieldname << "</label></td>"
                              << "<td><input type=\"text\" name=\"" << cur.fieldname << "\" value=\""
@@ -450,8 +459,76 @@ namespace authdb {
            rep.send(curreq,out.c_str(),out.size());
        }

        libhtmlpp::HtmlElement *DomainChangeForm(libhttppp::HttpRequest *curreq,const char *baseurl,
                                                 AuthBackend &backend,libhtmlpp::HtmlString &dest){
            libhttppp::HttpForm form;
            form.parse(curreq);

            char cdid[255];
            if(sscanf(curreq->getRequestURL()+strlen(baseurl),"/%s[^/]",cdid)<0)
                cdid[0]='\0';

            for (libhttppp::HttpForm::UrlcodedForm::Data* cururlform = form.UrlFormData.getFormData(); cururlform;
                    cururlform = cururlform->nextData()) {
                if( strcmp(cururlform->getKey(),"domaindid")==0){
                    if(strcmp(cdid,cururlform->getValue())!=0){
                        char rurl[255];
                        snprintf(rurl,255,"%s/%s",baseurl,cururlform->getValue());
                        libhttppp::HttpResponse rep;
                        rep.setState(HTTP307);
                        rep.setVersion(HTTPVERSION(1.1));
                        rep.setHeaderData("Location")->push_back(rurl);
                        rep.setContentType("text/html");
                        rep.send(curreq,nullptr,0);
                        return nullptr;
                    }
                }
            }

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

            Domain domain;

            dest.clear();
            dest << "<form method=\"post\" ><select name=\"domaindid\" onchange=\"this.form.submit()\">";

            dest << "<option value=\"\" >admin.local</option>";

            while(rd<end){
                authdb::AuthData::Record cur;

                cur.type=EmptyData;

                backend.setPos(rd);
                backend.read((unsigned char*)&cur,sizeof(AuthData::Record));

                rd=backend.getPos()+cur.datasize;
                if(cur.type == DataType::DomainData && strcmp(cur.fieldname,"domainName")==0){
                    size_t dpos=sizeof(authdb::AuthHeader);

                    cur.data = new char[cur.datasize];
                    backend.read((unsigned char*)cur.data,cur.datasize);

                    char did[255];
                    uuid_unparse(cur.uuid,did);

                    dest << "<option value=\"" << did << "\" ";
                    if ( strcmp(cdid,did)==0 ){
                        dest << "selected";
                    }
                    dest << ">"
                         << cur.data << "</option>";

                    delete [] cur.data;
                }
            }
            dest << "</select></form>";

            return (libhtmlpp::HtmlElement*)dest.parse();
        }

        void listDomains(libhttppp::HttpRequest *curreq, const int tid, ULONG_PTR args){
            size_t rd=sizeof(authdb::AuthHeader),end=_Backend.end();
            size_t rd=sizeof(authdb::AuthHeader),end=_AdminBackend.end();

            libhtmlpp::HtmlString list,out;

@@ -467,17 +544,17 @@ namespace authdb {

                cur.type=EmptyData;

                _Backend.setPos(rd);
                _Backend.read((unsigned char*)&cur,sizeof(AuthData::Record));
                _AdminBackend.setPos(rd);
                _AdminBackend.read((unsigned char*)&cur,sizeof(AuthData::Record));

                rd=_Backend.getPos()+cur.datasize;
                rd=_AdminBackend.getPos()+cur.datasize;

                if(cur.type == DataType::DomainData && strcmp(cur.fieldname,"domainName")==0){
                    class DomainData ddat(cur.uuid);

                    try {
                        size_t dpos=sizeof(authdb::AuthHeader);
                        domain.info(_Backend,ddat,dpos);
                        domain.info(_AdminBackend,ddat,dpos);

                        char crdid[20];
                        uuid_unparse(cur.uuid,crdid);
@@ -502,7 +579,7 @@ namespace authdb {
                  << "<li><a class=\"button\" href=\"/admin/createdomain\">CreateDomain</a>"
                  << "</li></ul></div>";

            content->insertChild(list.parse());
            content->appendChild(list.parse());

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

@@ -607,7 +684,7 @@ namespace authdb {
                    }
                }
                Domain domain;
                domain.create(_Backend,&ddat);
                domain.create(_AdminBackend,&ddat);
                std::cout << "domain created!" << std::endl;
            }

@@ -653,7 +730,7 @@ namespace authdb {

            uuid_parse(uid,uuid);

            domain.remove(_Backend,uuid);
            domain.remove(_AdminBackend,uuid);

            libhttppp::HttpResponse rep;
            rep.setState(HTTP307);
@@ -664,25 +741,31 @@ namespace authdb {
        }

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

            char domain[255],url[255];

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

            try {
                if(strncmp(curreq->getRequestURL(),"/admin/listusers",16)==0){
                    listUsers(curreq,tid,args);
                }else if(strncmp(curreq->getRequestURL(),"/admin/createuser",17)==0){
                    createUser(curreq,tid,args);
                }else if(strncmp(curreq->getRequestURL(),"/admin/removeuser",17)==0){
                if(strncmp(url,"listusers",9)==0){
                    listUsers(curreq,tid,args,"/admin/listusers");
                }else if(strncmp(url,"createuser",9)==0){
                    createUser(curreq,tid,args,"/admin/createuser");
                }else if(strncmp(url,"removeuser",9)==0){
                    removeuser(curreq,tid,args);
                }else if(strncmp(curreq->getRequestURL(),"/admin/edituser",15)==0){
                }else if(strncmp(url,"edituser",8)==0){
                    editUser(curreq,tid,args);
                }else if(strncmp(curreq->getRequestURL(),"/admin/getavatar/",17)==0){
                }else if(strncmp(url,"getavatar/",10)==0){
                    getAvatar(curreq,tid,args);
                }else if(strncmp(curreq->getRequestURL(),"/admin/listdomains/",18)==0){
                }else if(strncmp(url,"listdomains",9)==0){
                    listDomains(curreq,tid,args);
                }else if(strncmp(curreq->getRequestURL(),"/admin/createdomain/",19)==0){
                }else if(strncmp(url,"createdomain",10)==0){
                    createDomain(curreq,tid,args);
                }else if(strncmp(curreq->getRequestURL(),"/admin/removedomain/",19)==0){
                }else if(strncmp(url,"removedomain",10)==0){
                    removeDomain(curreq,tid,args);
                }else if(strncmp(curreq->getRequestURL(),"/admin/authdb.js",16)==0){
                }else if(strncmp(url,"authdb.js",9)==0){
                    libhttppp::HttpResponse rep;
                    rep.setContentType("text/javascript");
                    rep.send(curreq,_AuthJs.data(),_AuthJs.size());
@@ -702,7 +785,7 @@ namespace authdb {
                    rep.setContentType("text/html");
                    rep.send(curreq,e.what(),strlen(e.what()));
            }
            _Backend.unlock();
            _AdminBackend.unlock();
        }

        void RequestEvent(libhttppp::HttpRequest *curreq, const int tid, ULONG_PTR args){
@@ -714,13 +797,13 @@ namespace authdb {
                libhttppp::HttpResponse rep;
                rep.setState(HTTP307);
                rep.setVersion(HTTPVERSION(1.1));
                rep.setHeaderData("Location")->push_back("/admin");
                rep.setHeaderData("Location")->push_back("/admin/index");
                rep.setContentType("text/html");
                rep.send(curreq,nullptr,0);
            }
        };
    private:
        authdb::AuthBackend     _Backend;
        authdb::AuthBackend     _AdminBackend;
        libhtmlpp::HtmlElement  _IndexElement;
        libhtmlpp::HtmlPage     _Indexpage;
        std::vector<char>       _AuthJs;