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

changes

parent 1fb3583c
Loading
Loading
Loading
Loading
Loading
+0 −59
Changes for src/admin.cpp: 0 added lines, 59 removed lines.
Original line number Diff line number Diff line
@@ -44,14 +44,6 @@ namespace authdb {
    public:
        AdminController(authdb::AuthBackend &backend,netplus::socket *ssock) : _AdminBackend(backend){
            _Indexpage.loadFile(_IndexElement,"../data/index.html");

            std::ifstream authfs("../data/authdb.js", std::ios::ate);

            size_t asize = authfs.tellg();
            _AuthJs.resize(asize);
            authfs.seekg(0);
            authfs.read(_AuthJs.data(),asize);

        };

        void listUsers(libhttppp::HttpRequest *curreq, const int tid, ULONG_PTR args,const char *url){
@@ -354,56 +346,6 @@ namespace authdb {
            rep.send(curreq,nullptr,0);
        }

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

            DomainBackend dbackend(_AdminBackend);
            AuthBackend *backend=nullptr;

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

            uuid_t did;

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

            uuid_t uid;
            uuid_parse(cuid,uid);

            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;

                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);
                    char ctype[255];
                    snprintf(ctype,255,"image/%s",ext);
                    rep.setContentType(ctype);
                    rep.send(curreq,cur.data,cur.datasize);
                    end=0;
                    delete[] cur.data;
                }
            }

            if(end!=0){
                rep.setState(HTTP404);
                rep.send(curreq,nullptr,0);
            }

        };

        void editUser(libhttppp::HttpRequest *curreq, const int tid, ULONG_PTR args){
            char cdid[255],cuid[255];
            uuid_t did;
@@ -1460,7 +1402,6 @@ namespace authdb {
        authdb::AuthBackend     _AdminBackend;
        libhtmlpp::HtmlElement  _IndexElement;
        libhtmlpp::HtmlPage     _Indexpage;
        std::vector<char>       _AuthJs;
    };

    AdminInterface::AdminInterface(AuthBackend &bck,netplus::socket *ssock) : _bck(bck) {
+65 −0
Changes for src/authdb.cpp: 65 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -57,6 +57,11 @@ namespace authdb {
            HttpEvent(ssock),
            _AdminBackend(backend),
            _AdminInterface(backend,ssock){
                std::ifstream authfs("../data/authdb.js", std::ios::ate);
                size_t asize = authfs.tellg();
                _AuthJs.resize(asize);
                authfs.seekg(0);
                authfs.read(_AuthJs.data(),asize);
        };

        void RequestEvent(libhttppp::HttpRequest * curreq, const int tid, ULONG_PTR args){
@@ -65,6 +70,15 @@ namespace authdb {
                    _AdminBackend.lock();
                    _AdminInterface.Request(curreq,tid,args);
                    _AdminBackend.unlock();
                }else if(strncmp("/getavatar",curreq->getRequestURL(),9)==0){
                    _AdminBackend.lock();
                    getAvatar(curreq,tid,args);
                    _AdminBackend.unlock();
                }else if(strncmp("/authdb.js",curreq->getRequestURL(),9)==0){
                    libhttppp::HttpResponse rep;
                    rep.setState(HTTP200);
                    rep.setContentType("text/javascript");
                    rep.send(curreq,_AuthJs.data(),_AuthJs.size());
                }else{
                    libhttppp::HttpResponse rep;
                    rep.setState(HTTP404);
@@ -79,9 +93,60 @@ namespace authdb {
            }
        }

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

            DomainBackend dbackend(_AdminBackend);
            AuthBackend *backend=nullptr;

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

            uuid_t did;

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

            uuid_t uid;
            uuid_parse(cuid,uid);

            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;

                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);
                    char ctype[255];
                    snprintf(ctype,255,"image/%s",ext);
                    rep.setContentType(ctype);
                    rep.send(curreq,cur.data,cur.datasize);
                    end=0;
                    delete[] cur.data;
                }
            }

            if(end!=0){
                rep.setState(HTTP404);
                rep.send(curreq,nullptr,0);
            }

        };

    private:
        AuthBackend       &_AdminBackend;
        AdminInterface     _AdminInterface;
        std::vector<char>  _AuthJs;
    };

    int searchValue(authdb::AuthBackend &backend,const char*fieldname,const char *value){