Loading src/api.cpp +22 −3 Changes for src/api.cpp: 22 added lines, 3 removed lines. Original line number Diff line number Diff line Loading @@ -38,12 +38,21 @@ #include "backend.h" #include "api.h" #include "user.h" #include "client.h" namespace authdb { class Api { public: bool userLogin(json_object *request,json_object *response){ return Login(request,response,"user"); } bool clientLogin(json_object *request,json_object *response){ return Login(request,response,"client"); } bool Login(json_object *request,json_object *response,const char *type){ json_object *cmd=json_tokener_parse("commands"); int fcount = json_object_array_length(cmd); for(int i =0; i<fcount; ++i) { Loading @@ -53,7 +62,7 @@ namespace authdb { int ocount = json_object_array_length(cmd); for(int ii =0; ii<ocount; ++ii) { json_object_object_foreach(val,okey,oval){ if(strcmp(okey,"type")==0){ if(strcmp(okey,type)==0){ if( strcmp(json_object_get_string(oval),"client")!=0 ) continue; }else if(strcmp(okey,"name")==0){ Loading @@ -79,8 +88,7 @@ namespace authdb { _Backend->setPos(rd); _Backend->read((unsigned char*)&cur,sizeof(AuthData::Record)); rd=_Backend->getPos()+cur.datasize; if(cur.type == UserData && strcmp(cur.fieldname,"username")==0){ 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(AuthData::Record); Loading @@ -91,6 +99,17 @@ namespace authdb { return true; return false; } }else if(strcmp(type,"client") == 0 && cur.type == ClientData && strcmp(cur.fieldname,"clientname")==0){ class Client clt; class ClientData cdat(cur.uuid); size_t upos = sizeof(AuthData::Record); clt.info(*_Backend,cdat,upos); if(name==cdat.getName() ){ if(pwsalt==cdat.getKey() ) return true; return false; } } } } Loading Loading
src/api.cpp +22 −3 Changes for src/api.cpp: 22 added lines, 3 removed lines. Original line number Diff line number Diff line Loading @@ -38,12 +38,21 @@ #include "backend.h" #include "api.h" #include "user.h" #include "client.h" namespace authdb { class Api { public: bool userLogin(json_object *request,json_object *response){ return Login(request,response,"user"); } bool clientLogin(json_object *request,json_object *response){ return Login(request,response,"client"); } bool Login(json_object *request,json_object *response,const char *type){ json_object *cmd=json_tokener_parse("commands"); int fcount = json_object_array_length(cmd); for(int i =0; i<fcount; ++i) { Loading @@ -53,7 +62,7 @@ namespace authdb { int ocount = json_object_array_length(cmd); for(int ii =0; ii<ocount; ++ii) { json_object_object_foreach(val,okey,oval){ if(strcmp(okey,"type")==0){ if(strcmp(okey,type)==0){ if( strcmp(json_object_get_string(oval),"client")!=0 ) continue; }else if(strcmp(okey,"name")==0){ Loading @@ -79,8 +88,7 @@ namespace authdb { _Backend->setPos(rd); _Backend->read((unsigned char*)&cur,sizeof(AuthData::Record)); rd=_Backend->getPos()+cur.datasize; if(cur.type == UserData && strcmp(cur.fieldname,"username")==0){ 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(AuthData::Record); Loading @@ -91,6 +99,17 @@ namespace authdb { return true; return false; } }else if(strcmp(type,"client") == 0 && cur.type == ClientData && strcmp(cur.fieldname,"clientname")==0){ class Client clt; class ClientData cdat(cur.uuid); size_t upos = sizeof(AuthData::Record); clt.info(*_Backend,cdat,upos); if(name==cdat.getName() ){ if(pwsalt==cdat.getKey() ) return true; return false; } } } } Loading