Loading api/consession.json 0 → 100644 +7 −0 Changes for api/consession.json: 7 added lines, 0 removed lines. Original line number Diff line number Diff line { "commands" : [ { "clientsession" : "9d5872af-b4b9-499f-922a-6c095a4d1263" } ] } src/admin.cpp +0 −2 Changes for src/admin.cpp: 0 added lines, 2 removed lines. Original line number Diff line number Diff line Loading @@ -585,8 +585,6 @@ namespace authdb { size_t rd=sizeof(authdb::AuthHeader),end=backend.end(); Domain domain; dest.clear(); dest << "<form method=\"post\">" << "<select name=\"domaindid\" onchange=\"this.form.submit()\">"; Loading src/api.cpp +14 −4 Changes for src/api.cpp: 14 added lines, 4 removed lines. Original line number Diff line number Diff line Loading @@ -25,7 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *******************************************************************************/ #include <memory> #include <atomic> #include <iostream> #include <uuid/uuid.h> Loading @@ -43,6 +43,9 @@ #include "session.h" namespace authdb { std::atomic<class Client> Clt; class Api { public: Loading Loading @@ -70,6 +73,14 @@ namespace authdb { 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 false; for(ClientConnections *curcon=Clt.ConnectionData(); curcon; curcon=curcon->next() ){ if(*curcon==cid) return true; } } } Loading Loading @@ -146,14 +157,13 @@ namespace authdb { 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(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); 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); Loading src/client.cpp +29 −0 Changes for src/client.cpp: 29 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -161,16 +161,41 @@ authdb::ClientConnections::ClientConnections(uuid sid, AuthBackend& bck, const c _next=nullptr; } authdb::ClientConnections *authdb::ClientConnections::next(){ return _next; } void authdb::Client::remove(AuthBackend& backend, const uuid_t clid){ delRecord(backend,clid,DataType::ClientData); } authdb::AuthBackend * authdb::ClientConnections::getBackend(){ return &_backend; } bool authdb::ClientConnections::operator==(uuid sessid){ if(sessid == _sessionId) return true; return false; } authdb::Client::Client(){ _firstConnection=nullptr; _lastConnection=nullptr; } authdb::Client::Client(const class Client &src){ for(ClientConnections *curcon=src._firstConnection; curcon; curcon=curcon->next()){ if(_firstConnection){ _lastConnection->_next=new ClientConnections(curcon->_sessionId,curcon->_backend,curcon->_Data); _lastConnection=_lastConnection->_next; }else{ _firstConnection=new ClientConnections(curcon->_sessionId,curcon->_backend,curcon->_Data); _lastConnection=_firstConnection; } } } authdb::Client::~Client(){ } Loading Loading @@ -214,3 +239,7 @@ bool authdb::Client::checkConnection(const uuid conid) const{ } return false; } authdb::ClientConnections * authdb::Client::ConnectionData(){ return _firstConnection; } src/client.h +9 −0 Changes for src/client.h: 9 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -51,6 +51,11 @@ namespace authdb { class ClientConnections { public: ClientConnections(uuid sid,AuthBackend &bck,const class ClientData &clt); ClientConnections *next(); AuthBackend *getBackend(); bool operator==(uuid sessid); private: ClientConnections *_next; AuthBackend _backend; Loading @@ -62,6 +67,7 @@ namespace authdb { class Client { public: Client(); Client(const Client &src); ~Client(); void create(AuthBackend &backend,class ClientData *data); void remove(AuthBackend &backend,const uuid_t clid); Loading @@ -73,6 +79,9 @@ namespace authdb { bool checkConnection(const uuid conid) const; ClientConnections *ConnectionData(); private: ClientConnections *_firstConnection; ClientConnections *_lastConnection; }; Loading Loading
api/consession.json 0 → 100644 +7 −0 Changes for api/consession.json: 7 added lines, 0 removed lines. Original line number Diff line number Diff line { "commands" : [ { "clientsession" : "9d5872af-b4b9-499f-922a-6c095a4d1263" } ] }
src/admin.cpp +0 −2 Changes for src/admin.cpp: 0 added lines, 2 removed lines. Original line number Diff line number Diff line Loading @@ -585,8 +585,6 @@ namespace authdb { size_t rd=sizeof(authdb::AuthHeader),end=backend.end(); Domain domain; dest.clear(); dest << "<form method=\"post\">" << "<select name=\"domaindid\" onchange=\"this.form.submit()\">"; Loading
src/api.cpp +14 −4 Changes for src/api.cpp: 14 added lines, 4 removed lines. Original line number Diff line number Diff line Loading @@ -25,7 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *******************************************************************************/ #include <memory> #include <atomic> #include <iostream> #include <uuid/uuid.h> Loading @@ -43,6 +43,9 @@ #include "session.h" namespace authdb { std::atomic<class Client> Clt; class Api { public: Loading Loading @@ -70,6 +73,14 @@ namespace authdb { 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 false; for(ClientConnections *curcon=Clt.ConnectionData(); curcon; curcon=curcon->next() ){ if(*curcon==cid) return true; } } } Loading Loading @@ -146,14 +157,13 @@ namespace authdb { 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(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); 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); Loading
src/client.cpp +29 −0 Changes for src/client.cpp: 29 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -161,16 +161,41 @@ authdb::ClientConnections::ClientConnections(uuid sid, AuthBackend& bck, const c _next=nullptr; } authdb::ClientConnections *authdb::ClientConnections::next(){ return _next; } void authdb::Client::remove(AuthBackend& backend, const uuid_t clid){ delRecord(backend,clid,DataType::ClientData); } authdb::AuthBackend * authdb::ClientConnections::getBackend(){ return &_backend; } bool authdb::ClientConnections::operator==(uuid sessid){ if(sessid == _sessionId) return true; return false; } authdb::Client::Client(){ _firstConnection=nullptr; _lastConnection=nullptr; } authdb::Client::Client(const class Client &src){ for(ClientConnections *curcon=src._firstConnection; curcon; curcon=curcon->next()){ if(_firstConnection){ _lastConnection->_next=new ClientConnections(curcon->_sessionId,curcon->_backend,curcon->_Data); _lastConnection=_lastConnection->_next; }else{ _firstConnection=new ClientConnections(curcon->_sessionId,curcon->_backend,curcon->_Data); _lastConnection=_firstConnection; } } } authdb::Client::~Client(){ } Loading Loading @@ -214,3 +239,7 @@ bool authdb::Client::checkConnection(const uuid conid) const{ } return false; } authdb::ClientConnections * authdb::Client::ConnectionData(){ return _firstConnection; }
src/client.h +9 −0 Changes for src/client.h: 9 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -51,6 +51,11 @@ namespace authdb { class ClientConnections { public: ClientConnections(uuid sid,AuthBackend &bck,const class ClientData &clt); ClientConnections *next(); AuthBackend *getBackend(); bool operator==(uuid sessid); private: ClientConnections *_next; AuthBackend _backend; Loading @@ -62,6 +67,7 @@ namespace authdb { class Client { public: Client(); Client(const Client &src); ~Client(); void create(AuthBackend &backend,class ClientData *data); void remove(AuthBackend &backend,const uuid_t clid); Loading @@ -73,6 +79,9 @@ namespace authdb { bool checkConnection(const uuid conid) const; ClientConnections *ConnectionData(); private: ClientConnections *_firstConnection; ClientConnections *_lastConnection; }; Loading