Commit 998a71a8 authored by jan.koester's avatar jan.koester
Browse files

shorter and better

parent f9bc0b3a
Loading
Loading
Loading
Loading
Loading
+10 −33
Changes for src/api.cpp: 10 added lines, 33 removed lines.
Original line number Diff line number Diff line
@@ -76,36 +76,16 @@ namespace authdb {
        bool Login( uuid &did,json_object *request,json_object *response,const char *type){
            json_object *cmd=json_object_object_get(request,"commands");

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

            std::unique_ptr<AuthBackend> curback(nullptr);

            if(!cmd)
                throw(AuthBackendError("Invalid Api Commands"));

            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 && did==cur.uuid ){
                        class DomainData ddat(cur.uuid );
            class DomainData ddat(did.value);
            Domain dinf;
            size_t rdinf=sizeof(authdb::AuthHeader);
            dinf.info(*_Backend,ddat,rdinf);
                        curback=std::make_unique<AuthBackend>( ddat.getStorageType(),
                                                                                                     ddat.getStorageOptions(),ddat.getDomainName());
                }

            }

            if( !curback.get() )
                throw(AuthBackendError("Invalid Domain uuid"));
            AuthBackend curback( ddat.getStorageType(),ddat.getStorageOptions(), ddat.getDomainName());

            int fcount = json_object_array_length(cmd);
            for(int i =0; i<fcount; ++i) {
@@ -133,25 +113,25 @@ namespace authdb {
                                sha512 sha;
                                sha.hash(pw,pwsalt);

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

                                while(rd<end){
                                        authdb::AuthData::Record cur;
                                        cur.type=EmptyData;

                                        curback->setPos(rd);
                                        curback->read((unsigned char*)&cur,sizeof(AuthData::Record));
                                        rd=curback->getPos()+cur.datasize;
                                        curback.setPos(rd);
                                        curback.read((unsigned char*)&cur,sizeof(AuthData::Record));
                                        rd=curback.getPos()+cur.datasize;
                                        if( strcmp(type,"user") == 0 && cur.type == UserData && strcmp(cur.fieldname,"username")==0 ){
                                            class User user;
                                            class UserData udat(cur.uuid);
                                            size_t upos = sizeof(AuthHeader);
                                            user.info(*curback,udat,upos);
                                            user.info(curback,udat,upos);

                                            if(name==udat.getUsername()){
                                                if(pwsalt==udat.getPwHash()){
                                                    Session session;
                                                    SessionData sdat=session.addSession(*curback,did.value,cur.uuid);
                                                    SessionData sdat=session.addSession(curback,did.value,cur.uuid);
                                                    json_object *respid=json_object_new_object();
                                                    uuid sessid;
                                                    sdat.getSid(sessid);
@@ -165,11 +145,11 @@ namespace authdb {
                                            class Client clt;
                                            class ClientData cdat(cur.uuid);
                                            size_t upos = sizeof(AuthHeader);
                                            clt.info(*curback,cdat,upos);
                                            clt.info(curback,cdat,upos);

                                            if(name==cdat.getName() ){
                                                if(pwsalt==cdat.getKey() ){
                                                    uuid cid=clt.addConnection(*curback,cdat);
                                                    uuid cid=clt.addConnection(curback,cdat);
                                                    json_object *respid=json_object_new_object();
                                                    json_object_object_add(respid,"connectionid",json_object_new_string(cid.c_str()));
                                                    json_object_array_add(response,respid);
@@ -216,11 +196,8 @@ namespace authdb {
            char cdid[sizeof(uuid_t)];
            sscanf(curreq->getRequestURL(),"/api/%[^/]",cdid);

            std::cout << cdid << std::endl;

            uuid did(cdid);


            if(!clientLogin(did, jrequest,jresponse)){
                const char *ret=json_object_to_json_string(jresponse);
                rep.setState(HTTP401);