Commit 59ad1272 authored by jan.koester's avatar jan.koester
Browse files

some more works with api

parent 4b14b424
Loading
Loading
Loading
Loading
Loading
+3 −15
Changes for api/checkgpo.json: 3 added lines, 15 removed lines.
Original line number Diff line number Diff line
{
    "commands" : [
        {
            "login" : {
                "type" : "client",
                "name" : "dibsi",
                "key" : "matrix"
            },
            "login" : {
                "type" : "user",
                "name" : "jan.koester",
                "key" : "matrix"
            }
        },{
            "checkgpo" : {
                "id" : "c839330a-68fe-46de-8c40-92141e8fc018"
            }

            "clientsession" : "cbd3165a-b99c-4968-ad86-dddfa93cac33",
            "sessionid" : "81fb1832-8cdc-431c-9134-5ce3343524f1",
            "checkgpo"  : "c839330a-68fe-46de-8c40-92141e8fc018"
        }
    ]
}
+1 −1
Changes for api/consession.json: 1 added line, 1 removed line.
Original line number Diff line number Diff line
{
    "commands" : [
        {
            "clientsession" :  "9d5872af-b4b9-499f-922a-6c095a4d1263"
            "clientsession" :  "79be215f-4547-4fbb-8204-3302df7e7edb"
        }
    ]
}

api/userlogin.json

0 → 100644
+14 −0
Changes for api/userlogin.json: 14 added lines, 0 removed lines.
Original line number Diff line number Diff line
{
    "commands" : [
        {
            "clientsession" : "7be76140-38aa-4b86-b461-222616d6e219" ,
            "login" : {
                "type" : "user",
                "name" : "jan.koester",
                "key" : "matrix"
            }
        }
    ]
}

+124 −34
Changes for src/api.cpp: 124 added lines, 34 removed lines.
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 *******************************************************************************/

#include <atomic>
#include <memory>
#include <iostream>
#include <uuid/uuid.h>

@@ -44,7 +44,10 @@

namespace authdb {

    std::atomic<class Client>  Clt;
    class Client    _Clt;
    std::mutex      _CltLock;
    class Session _Session;
    std::mutex      _SessionLock;

    class Api {
    public:
@@ -53,6 +56,9 @@ namespace authdb {
            json_object *cmd=json_object_object_get(request,"commands");
            if(!cmd)
                throw(AuthBackendError("Invalid Api Commands"));

            SessionData ses=userLogin(request,response);

            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) {
@@ -63,7 +69,8 @@ namespace authdb {
            }
        }

        bool checkConnection(json_object *request,json_object *response){
        const SessionData *checkUser(json_object *request,json_object *response){
            std::lock_guard<std::mutex> lock(_SessionLock);
            json_object *cmd=json_object_object_get(request,"commands");

            if(!cmd)
@@ -72,31 +79,46 @@ namespace authdb {
            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) {
                    if(strcmp(key,"clientsession")==0){
                    if(strcmp(key,"usersession")==0){
                            const char *id=json_object_get_string(val);
                            uuid cid;
                            if(cid.parse(id)!=0)
                                return false;
                            for(ClientConnections *curcon=Clt.ConnectionData();  curcon; curcon=curcon->next() ){
                                if(*curcon==cid)
                                    return true;
                            }

                                return nullptr;
                            return _Session.getSession(cid);
                    }
                }
            }
            return false;
            return nullptr;
        }

        bool userLogin(json_object *request,json_object *response){
            return Login(request,response,"user");
        const ClientConnections *checkConnection(json_object *request,json_object *response){
            std::lock_guard<std::mutex> lock(_CltLock);
            json_object *cmd=json_object_object_get(request,"commands");

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

            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) {
                    if(strcmp(key,"clientsession")==0){
                            const char *id=json_object_get_string(val);
                            uuid cid;
                            if(cid.parse(id)!=0)
                                return nullptr;
                            for(ClientConnections *curcon=_Clt.ConnectionData();  curcon; curcon=curcon->next() ){
                                if(*curcon==cid)
                                    return curcon;
                            }

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

        bool Login(json_object *request,json_object *response,const char *type){
        const SessionData *userLogin(json_object *request,json_object *response){
            std::lock_guard<std::mutex> lock(_SessionLock);
            json_object *cmd=json_object_object_get(request,"commands");

            if(!cmd)
@@ -110,10 +132,12 @@ namespace authdb {
                                int ocount = json_object_object_length(val);
                                for(int ii =0; ii<ocount; ++ii) {
                                    json_object_object_foreach(val,okey,oval){
                                        if(strcmp(okey,type)==0){
                                                if( strcmp(json_object_get_string(oval),"client")!=0 ||
                                                    strcmp(json_object_get_string(oval),"user")!=0 )
                                        if(strcmp(okey,"type")==0){
                                                if( strcmp(json_object_get_string(oval),"user")!=0){
                                                    name.clear();
                                                    pw.clear();
                                                    continue;
                                                }
                                        }else if(strcmp(okey,"name")==0){
                                                name=json_object_get_string(oval);
                                        }else if(strcmp(okey,"key")==0){
@@ -123,7 +147,7 @@ namespace authdb {
                                }

                                if(name.empty() || pw.empty())
                                    return false;
                                    return nullptr;

                                sha512 sha;
                                sha.hash(pw,pwsalt);
@@ -137,7 +161,7 @@ namespace authdb {
                                        _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 ){
                                        if(cur.type == UserData && strcmp(cur.fieldname,"username")==0 ){
                                            class User user;
                                            class UserData udat(cur.uuid);
                                            size_t upos = sizeof(AuthHeader);
@@ -145,41 +169,97 @@ namespace authdb {

                                            if(name==udat.getUsername()){
                                                if(pwsalt==udat.getPwHash()){
                                                    Session session;
                                                    SessionData sdat=session.addSession(_Backend,_Did.value,cur.uuid);
                                                    const SessionData *sdat=_Session.addSession(_Backend,_Did.value,cur.uuid);
                                                    json_object *respid=json_object_new_object();
                                                    uuid sessid;
                                                    sdat.getSid(sessid);
                                                    sdat->getSid(sessid);
                                                    json_object_object_add(respid,"sessionid",json_object_new_string(sessid.c_str()));
                                                    json_object_array_add(response,respid);
                                                    return true;
                                                    return sdat;
                                                }
                                                return nullptr;
                                            }
                                        }
                                }
                        }
                }
            }
                                                return false;
            return nullptr;
        }
                                        }else if(strcmp(type,"client") == 0 && cur.type == ClientData && strcmp(cur.fieldname,"clientname")==0){


        const ClientConnections *ClientLogin(json_object *request,json_object *response){
            std::lock_guard<std::mutex> lock(_CltLock);
            json_object *cmd=json_object_object_get(request,"commands");

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

            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) {
                    if(strcmp(key,"login")==0){
                        std::string name,pw,pwsalt;
                        int ocount = json_object_object_length(val);
                        for(int ii =0; ii<ocount; ++ii) {
                            json_object_object_foreach(val,okey,oval){
                                if(strcmp(okey,"type")==0){
                                    if( strcmp(json_object_get_string(oval),"client")!=0){
                                        name.clear();
                                        pw.clear();
                                        continue;
                                    }
                                }else if(strcmp(okey,"name")==0){
                                    name=json_object_get_string(oval);
                                }else if(strcmp(okey,"key")==0){
                                    pw=json_object_get_string(oval);
                                }
                            }
                        }

                        if(name.empty() || pw.empty())
                            return nullptr;

                        sha512 sha;
                        sha.hash(pw,pwsalt);

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

                        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 == ClientData && strcmp(cur.fieldname,"clientname")==0){
                                class ClientData cdat(cur.uuid);
                                size_t upos = sizeof(AuthHeader);
                                            Clt.info(_Backend,cdat,upos);
                                _Clt.info(_Backend,cdat,upos);

                                if(name==cdat.getName() ){
                                    if(pwsalt==cdat.getKey() ){
                                                    uuid cid=Clt.addConnection(_Backend,cdat);
                                        ClientConnections *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_object_add(respid,"connectionid",json_object_new_string(cid->getId().c_str()));
                                        json_object_array_add(response,respid);
                                                    return true;
                                        return cid;
                                    }
                                                return false;
                                    return nullptr;
                                }

                            }
                        }
                    }
                }
            }
            return false;
            return nullptr;
        }

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

            _SessionData=nullptr;

            libhttppp::HttpResponse rep;

            std::vector<char> recv;
@@ -207,7 +287,11 @@ namespace authdb {

            jresponse = json_object_new_array();

            if(!clientLogin(jrequest,jresponse)){
            const ClientConnections *curcon=nullptr;
            const SessionData *sessiondat=nullptr;

            if(! (curcon=checkConnection(jrequest,jresponse)) ){
                if(! (curcon=ClientLogin(jrequest,jresponse)) ){
                    const char *ret=json_object_to_json_string(jresponse);
                    rep.setState(HTTP401);
                    rep.setContentType("text/json");
@@ -216,6 +300,11 @@ namespace authdb {
                    json_object_put(jrequest) ;
                    return;
                }
            }

            if(! (_SessionData=checkUser(jrequest,jresponse)) ){
                    _SessionData=userLogin(jrequest,jresponse);
            }

            size_t outsize=0;
            const char *out=json_object_to_json_string_length(jresponse,0,&outsize);
@@ -232,6 +321,7 @@ namespace authdb {
    private:
        AuthBackend        &_Backend;
        uuid                         _Did;
        const SessionData *_SessionData;
    };
};

+8 −2
Changes for src/client.cpp: 8 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -173,6 +173,12 @@ authdb::AuthBackend * authdb::ClientConnections::getBackend(){
    return &_backend;
}

const authdb::uuid authdb::ClientConnections::getId(){
    return _sessionId;
}



bool authdb::ClientConnections::operator==(uuid sessid){
    if(sessid == _sessionId)
        return true;
@@ -199,7 +205,7 @@ authdb::Client::Client(const class Client &src){
authdb::Client::~Client(){
}

authdb::uuid &authdb::Client::addConnection(AuthBackend &backend,const class ClientData &data){
authdb::ClientConnections *authdb::Client::addConnection(AuthBackend &backend,const class ClientData &data){
    std::lock_guard<std::mutex> guard(_lockConnection);
    uuid ncid;

@@ -212,7 +218,7 @@ authdb::uuid &authdb::Client::addConnection(AuthBackend &backend,const class Cli
        _firstConnection=new ClientConnections(ncid,backend,data);
        _lastConnection=_firstConnection;
    }
    return _lastConnection->_sessionId;
    return _lastConnection;
}

void authdb::Client::delConnection(const uuid conid){
Loading