Commit 54047c6b authored by jan.koester's avatar jan.koester
Browse files

less is more

parent b28814b0
Loading
Loading
Loading
Loading
Loading
+18 −33
Changes for src/api.cpp: 18 added lines, 33 removed lines.
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@
#include "user.h"
#include "client.h"
#include "session.h"
#include "domain.h"

namespace authdb {
    class Api {
@@ -65,28 +64,20 @@ namespace authdb {
            return false;
        }

        bool userLogin(uuid &did,json_object *request,json_object *response){
            return Login(did,request,response,"user");
        bool userLogin(json_object *request,json_object *response){
            return Login(request,response,"user");
        }

        bool clientLogin (uuid &did,json_object *request,json_object *response){
            return Login(did,request,response,"client");
        bool clientLogin (json_object *request,json_object *response){
            return Login(request,response,"client");
        }

        bool Login( uuid &did,json_object *request,json_object *response,const char *type){
        bool Login(json_object *request,json_object *response,const char *type){
            json_object *cmd=json_object_object_get(request,"commands");

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


            class DomainData ddat(did.value);
            Domain dinf;
            size_t rdinf=sizeof(authdb::AuthHeader);
            dinf.info(_Backend,ddat,rdinf);

            AuthBackend curback( ddat.getStorageType(),ddat.getStorageOptions(), ddat.getDomainName());

            int fcount = json_object_array_length(cmd);
            for(int i =0; i<fcount; ++i) {
                json_object_object_foreach(json_object_array_get_idx(cmd,i), key, val) {
@@ -113,25 +104,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=_Backend.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;
                                        _Backend.setPos(rd);
                                        _Backend.read((unsigned char*)&cur,sizeof(AuthData::Record));
                                        rd=_Backend.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(_Backend,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(_Backend,_Did.value,cur.uuid);
                                                    json_object *respid=json_object_new_object();
                                                    uuid sessid;
                                                    sdat.getSid(sessid);
@@ -145,11 +136,11 @@ namespace authdb {
                                            class Client clt;
                                            class ClientData cdat(cur.uuid);
                                            size_t upos = sizeof(AuthHeader);
                                            clt.info(curback,cdat,upos);
                                            clt.info(_Backend,cdat,upos);

                                            if(name==cdat.getName() ){
                                                if(pwsalt==cdat.getKey() ){
                                                    uuid cid=clt.addConnection(curback,cdat);
                                                    uuid cid=clt.addConnection(_Backend,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);
@@ -165,7 +156,7 @@ namespace authdb {
            return false;
        }

        Api(AuthBackend &admin,libhttppp::HttpRequest* curreq, const int tid, ULONG_PTR args) : _Backend(admin) {
        Api(AuthBackend &admin,class uuid did, libhttppp::HttpRequest* curreq, const int tid, ULONG_PTR args) : _Backend(admin), _Did(did){
            libhttppp::HttpResponse rep;

            std::vector<char> recv;
@@ -193,14 +184,7 @@ namespace authdb {

            jresponse = json_object_new_array();

            char cdid[sizeof(uuid_t)+1];
            sscanf(curreq->getRequestURL(),"/api/%[^/]",cdid);

            std::cout << "did: " << cdid << std::endl;

            uuid did(cdid);

            if(!clientLogin(did, jrequest,jresponse)){
            if(!clientLogin(jrequest,jresponse)){
                const char *ret=json_object_to_json_string(jresponse);
                rep.setState(HTTP401);
                rep.setContentType("text/json");
@@ -224,11 +208,12 @@ namespace authdb {
        }
    private:
        AuthBackend &_Backend;
        uuid         _Did;
    };
};

authdb::ApiController::ApiController(AuthBackend &admin,libhttppp::HttpRequest * curreq, const int tid, ULONG_PTR args){
    Api(admin,curreq,tid,args);
authdb::ApiController::ApiController(AuthBackend &admin,class uuid did,libhttppp::HttpRequest * curreq, const int tid, ULONG_PTR args){
    Api(admin,did,curreq,tid,args);
}

authdb::ApiController::~ApiController(){
+3 −1
Changes for src/api.h: 3 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -27,12 +27,14 @@

#include <httppp/httpd.h>

#include "uuid.h"

#pragma once

namespace authdb {
    class ApiController {
    public:
        ApiController(AuthBackend &admin,libhttppp::HttpRequest * curreq, const int tid, ULONG_PTR args);
        ApiController(AuthBackend &admin,class uuid did,libhttppp::HttpRequest * curreq, const int tid, ULONG_PTR args);
        ~ApiController();
    };
};
+2 −2
Changes for src/authdb.cpp: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -205,7 +205,7 @@ namespace authdb {
                AuthBackend *apidb=nullptr;

                char domain[255];
                if(sscanf(curreq->getRequestURL(),"/api/%s",domain)<0)
                if(sscanf(curreq->getRequestURL(),"/api/%[^/]",domain)<0)
                    return;

                uuid_t did;
@@ -219,7 +219,7 @@ namespace authdb {
                if(apidb){
                    apidb->lock();
                    try{
                        ApiController(*apidb,curreq,tid,args);
                        ApiController(*apidb,did,curreq,tid,args);
                    }catch(AuthBackendError &e){
                        libhttppp::HttpResponse rep;
                        rep.setState(HTTP500);