Loading src/admin.cpp +1 −5 Changes for src/admin.cpp: 1 added line, 5 removed lines. Original line number Diff line number Diff line Loading @@ -1204,10 +1204,6 @@ namespace authdb { } if(data){ for(auto mem : members){ std::cout << mem.c_str() << std::endl; } Group grp; try { Loading @@ -1215,6 +1211,7 @@ namespace authdb { }catch(...){ std::cerr << "no entry with this uuid exist's !" << std::endl; } grp.create(*backend,&editrec); libhttppp::HttpResponse rep; Loading Loading @@ -1289,7 +1286,6 @@ namespace authdb { std::cout << mrec.c_str() << cuuid << std::endl; if(mrec == curu->uuid ){ form << " selected "; break; } } Loading src/authdb.h +6 −3 Changes for src/authdb.h: 6 added lines, 3 removed lines. Original line number Diff line number Diff line Loading @@ -135,17 +135,20 @@ namespace authdb { template<class T> const T *getAuthData(int type,int storage,class AuthData *dat,AuthData::Record **varclass,const char *varname){ if(*varclass !=nullptr && (*varclass)->data ){ return reinterpret_cast<T*>((*varclass)->data); if(varclass ==nullptr ){ throw AuthBackendError("getAuthData invalid pointer !"); }else{ for(AuthData *curdat=dat; curdat; curdat=curdat->next()){ if(curdat->Data.data && curdat->Data.type==type && curdat->Data.storage==storage if(curdat->Data.type==type && curdat->Data.storage==storage && strcmp(curdat->Data.fieldname,varname)==0 ){ (*varclass)=&curdat->Data; return reinterpret_cast<T*>((*varclass)->data); } } } *varclass=nullptr; std::string err; err=varname; err+=" data not found !"; Loading src/gpo.cpp +1 −2 Changes for src/gpo.cpp: 1 added line, 2 removed lines. Original line number Diff line number Diff line Loading @@ -58,7 +58,7 @@ bool authdb::GpoData::getGpoValue(){ this,&_GpoDefault,"gpodefault"); } void authdb::GpoData::setAllowed(std::vector<uuid> &allowed){ void authdb::GpoData::setAllowed(const std::vector<uuid> &allowed){ size_t csize=allowed.size(); char *data=new char[(csize*sizeof(uuid_t))+sizeof(size_t)]; Loading Loading @@ -200,7 +200,6 @@ void authdb::Gpo::info(AuthBackend &backend, class GpoData& dat, size_t &pos){ if(cur->type == PolicyData && uuid_compare(dat.Data.uuid,cur->uuid)==0 && strcmp(cur->fieldname,"gponame")==0 ){ if(!getRecord(backend,dat,DataType::PolicyData)) continue; } Loading src/gpo.h +1 −1 Changes for src/gpo.h: 1 added line, 1 removed line. Original line number Diff line number Diff line Loading @@ -51,7 +51,7 @@ namespace authdb { bool getGpoValue(); public: void setAllowed(std::vector<uuid> &allowed); void setAllowed(const std::vector<uuid> &allowed); void getAlowed(std::vector<uuid> &allowed); private: AuthData::Record* _Name; Loading src/group.cpp +27 −79 Changes for src/group.cpp: 27 added lines, 79 removed lines. Original line number Diff line number Diff line Loading @@ -37,11 +37,13 @@ authdb::GroupData::GroupData(uuid gid) : AuthData(gid){ _Name=nullptr; _Members=nullptr; Data.type=DataType::GroupData; } authdb::GroupData::GroupData(const GroupData& src) : AuthData(src){ _Name=nullptr; _Members=nullptr; Data.type=DataType::GroupData; } Loading @@ -58,12 +60,9 @@ const char* authdb::GroupData::getName(){ } void authdb::GroupData::addMember(const uuid &uid){ size_t asize=0; try{ if(getAuthData<char>(DataType::GroupData,StorageType::BinaryStorage, this,&_Members,"groupmembers")){ std::copy(_Members->data,_Members->data+sizeof(size_t),&asize); } }catch(AuthBackendError &e){ std::cerr << e.what() << std::endl; Loading @@ -71,33 +70,27 @@ void authdb::GroupData::addMember(const uuid &uid){ std::vector<uuid> members; if(asize!=0){ asize*=sizeof(uuid_t); if(_Members->datasize!=0){ char *start=_Members->data+sizeof(size_t); for(size_t i =0; i<asize; i+=sizeof(uuid_t) ){ for(size_t i =0; i<_Members->datasize; i+=sizeof(uuid_t) ){ uuid_t tmp; std::copy(start+i,start+i+sizeof(uuid_t),&tmp[0]); members.push_back(tmp); std::copy(_Members->data+i,_Members->data+(i+sizeof(uuid_t)),&tmp[0]); members.emplace_back(tmp); } delete[] _Members->data; } for(const uuid &mem : members){ if(mem==uid) throw AuthBackendError("User is already member!"); } } members.push_back(uid); size_t wsize=members.size(); char *data=new char[(wsize*sizeof(uuid_t))+sizeof(size_t)]; memset(data,0,(wsize*sizeof(uuid_t))+sizeof(size_t)); members.push_back(uid); std::copy(&wsize,&wsize+sizeof(size_t),data); char *data =new char[members.size()*sizeof(uuid_t)]; wsize=sizeof(size_t); size_t wsize=0; for(const uuid &mem : members){ std::copy( Loading @@ -108,51 +101,31 @@ void authdb::GroupData::addMember(const uuid &uid){ wsize+=sizeof(uuid_t); } setAuthData<char>(DataType::GroupData,StorageType::BinaryStorage,this,&_Members,"groupmembers",data,wsize); setAuthData<char>(DataType::GroupData,StorageType::BinaryStorage,this,&_Members,"groupmembers",_Members->data,wsize); delete[] data; } void authdb::GroupData::remMember(const uuid& uid){ try{ if(!getAuthData<char>(DataType::GroupData,StorageType::BinaryStorage, this,&_Members,"groupmembers")) return; }catch(...){ return; } size_t asize=0; std::copy(_Members->data,_Members->data+sizeof(size_t),&asize); if(asize==0) return; asize*=sizeof(uuid_t); char *start=_Members->data+sizeof(size_t); std::vector<uuid> members; for(size_t i =0; i<asize; i+=sizeof(uuid_t) ){ for(size_t i =0; i<_Members->datasize; i+=sizeof(uuid_t) ){ uuid_t tmp; std::copy(start+i,start+i+sizeof(uuid_t),&tmp[0]); if(uid!=tmp) members.push_back(tmp); } for(auto mem = members.begin(); mem!=members.end(); ++mem){ if(*mem==uid) members.erase(mem); } size_t wsize=members.size(); char *data=new char[(wsize*sizeof(uuid_t))+sizeof(size_t)]; memset(data,0,(wsize*sizeof(uuid_t))+sizeof(size_t)); char *data =new char[members.size()*sizeof(uuid_t)]; std::copy(&wsize,&wsize+sizeof(size_t),data); wsize=sizeof(size_t); size_t wsize=0; for(const uuid &mem : members){ std::copy( Loading @@ -163,41 +136,23 @@ void authdb::GroupData::remMember(const uuid& uid){ wsize+=sizeof(uuid_t); } setAuthData<char>(DataType::GroupData,StorageType::BinaryStorage,this,&_Members,"groupmembers",data,wsize); setAuthData<char>(DataType::GroupData,StorageType::BinaryStorage,this,&_Members,"groupmembers",_Members->data,wsize); delete[] data; } bool authdb::GroupData::isMember(const uuid uid){ try{ if(!getAuthData<char>(DataType::GroupData,StorageType::BinaryStorage, this,&_Members,"groupmembers")) return false; }catch(...){ return false; } size_t asize=0; std::copy(_Members->data,_Members->data+sizeof(size_t),&asize); if(asize==0) return false; asize*=sizeof(uuid_t); char *start=_Members->data+sizeof(size_t); std::vector<uuid> members; for(size_t i =0; i<asize; i+=sizeof(uuid_t) ){ for(size_t i =0; i<_Members->datasize; i+=sizeof(uuid_t) ){ uuid_t tmp; std::copy(start+i,start+i+sizeof(uuid_t),&tmp[0]); members.emplace_back(tmp); } for(const uuid &mem : members){ if(mem==uid) std::copy(_Members->data+i,_Members->data+i+sizeof(uuid_t),&tmp[0]); if(uid==tmp) return true; } Loading @@ -207,24 +162,19 @@ bool authdb::GroupData::isMember(const uuid uid){ void authdb::GroupData::getMembers(std::vector<uuid>& members){ size_t asize=0; try{ if(!_Members) return; if(getAuthData<char>(DataType::GroupData,StorageType::BinaryStorage, this,&_Members,"groupmembers")) std::copy(_Members->data,_Members->data+sizeof(size_t),&asize); else return; }catch(...){ return; } if(asize==0) return; asize=sizeof(size_t); asize*=sizeof(uuid_t); char *start=_Members->data+sizeof(size_t); char *start=_Members->data+asize; for(size_t i =0; i<asize; i+=sizeof(uuid_t) ){ uuid_t tmp; Loading Loading @@ -300,8 +250,6 @@ void authdb::Group::info(AuthBackend &backend, class GroupData& dat, size_t &pos if(cur->type == GroupData && uuid_compare(dat.Data.uuid,cur->uuid) == 0 && strcmp(cur->fieldname,"groupname")==0 ){ dat._Name=&dat.Data; if(!getRecord(backend,dat,DataType::GroupData)) continue; Loading Loading
src/admin.cpp +1 −5 Changes for src/admin.cpp: 1 added line, 5 removed lines. Original line number Diff line number Diff line Loading @@ -1204,10 +1204,6 @@ namespace authdb { } if(data){ for(auto mem : members){ std::cout << mem.c_str() << std::endl; } Group grp; try { Loading @@ -1215,6 +1211,7 @@ namespace authdb { }catch(...){ std::cerr << "no entry with this uuid exist's !" << std::endl; } grp.create(*backend,&editrec); libhttppp::HttpResponse rep; Loading Loading @@ -1289,7 +1286,6 @@ namespace authdb { std::cout << mrec.c_str() << cuuid << std::endl; if(mrec == curu->uuid ){ form << " selected "; break; } } Loading
src/authdb.h +6 −3 Changes for src/authdb.h: 6 added lines, 3 removed lines. Original line number Diff line number Diff line Loading @@ -135,17 +135,20 @@ namespace authdb { template<class T> const T *getAuthData(int type,int storage,class AuthData *dat,AuthData::Record **varclass,const char *varname){ if(*varclass !=nullptr && (*varclass)->data ){ return reinterpret_cast<T*>((*varclass)->data); if(varclass ==nullptr ){ throw AuthBackendError("getAuthData invalid pointer !"); }else{ for(AuthData *curdat=dat; curdat; curdat=curdat->next()){ if(curdat->Data.data && curdat->Data.type==type && curdat->Data.storage==storage if(curdat->Data.type==type && curdat->Data.storage==storage && strcmp(curdat->Data.fieldname,varname)==0 ){ (*varclass)=&curdat->Data; return reinterpret_cast<T*>((*varclass)->data); } } } *varclass=nullptr; std::string err; err=varname; err+=" data not found !"; Loading
src/gpo.cpp +1 −2 Changes for src/gpo.cpp: 1 added line, 2 removed lines. Original line number Diff line number Diff line Loading @@ -58,7 +58,7 @@ bool authdb::GpoData::getGpoValue(){ this,&_GpoDefault,"gpodefault"); } void authdb::GpoData::setAllowed(std::vector<uuid> &allowed){ void authdb::GpoData::setAllowed(const std::vector<uuid> &allowed){ size_t csize=allowed.size(); char *data=new char[(csize*sizeof(uuid_t))+sizeof(size_t)]; Loading Loading @@ -200,7 +200,6 @@ void authdb::Gpo::info(AuthBackend &backend, class GpoData& dat, size_t &pos){ if(cur->type == PolicyData && uuid_compare(dat.Data.uuid,cur->uuid)==0 && strcmp(cur->fieldname,"gponame")==0 ){ if(!getRecord(backend,dat,DataType::PolicyData)) continue; } Loading
src/gpo.h +1 −1 Changes for src/gpo.h: 1 added line, 1 removed line. Original line number Diff line number Diff line Loading @@ -51,7 +51,7 @@ namespace authdb { bool getGpoValue(); public: void setAllowed(std::vector<uuid> &allowed); void setAllowed(const std::vector<uuid> &allowed); void getAlowed(std::vector<uuid> &allowed); private: AuthData::Record* _Name; Loading
src/group.cpp +27 −79 Changes for src/group.cpp: 27 added lines, 79 removed lines. Original line number Diff line number Diff line Loading @@ -37,11 +37,13 @@ authdb::GroupData::GroupData(uuid gid) : AuthData(gid){ _Name=nullptr; _Members=nullptr; Data.type=DataType::GroupData; } authdb::GroupData::GroupData(const GroupData& src) : AuthData(src){ _Name=nullptr; _Members=nullptr; Data.type=DataType::GroupData; } Loading @@ -58,12 +60,9 @@ const char* authdb::GroupData::getName(){ } void authdb::GroupData::addMember(const uuid &uid){ size_t asize=0; try{ if(getAuthData<char>(DataType::GroupData,StorageType::BinaryStorage, this,&_Members,"groupmembers")){ std::copy(_Members->data,_Members->data+sizeof(size_t),&asize); } }catch(AuthBackendError &e){ std::cerr << e.what() << std::endl; Loading @@ -71,33 +70,27 @@ void authdb::GroupData::addMember(const uuid &uid){ std::vector<uuid> members; if(asize!=0){ asize*=sizeof(uuid_t); if(_Members->datasize!=0){ char *start=_Members->data+sizeof(size_t); for(size_t i =0; i<asize; i+=sizeof(uuid_t) ){ for(size_t i =0; i<_Members->datasize; i+=sizeof(uuid_t) ){ uuid_t tmp; std::copy(start+i,start+i+sizeof(uuid_t),&tmp[0]); members.push_back(tmp); std::copy(_Members->data+i,_Members->data+(i+sizeof(uuid_t)),&tmp[0]); members.emplace_back(tmp); } delete[] _Members->data; } for(const uuid &mem : members){ if(mem==uid) throw AuthBackendError("User is already member!"); } } members.push_back(uid); size_t wsize=members.size(); char *data=new char[(wsize*sizeof(uuid_t))+sizeof(size_t)]; memset(data,0,(wsize*sizeof(uuid_t))+sizeof(size_t)); members.push_back(uid); std::copy(&wsize,&wsize+sizeof(size_t),data); char *data =new char[members.size()*sizeof(uuid_t)]; wsize=sizeof(size_t); size_t wsize=0; for(const uuid &mem : members){ std::copy( Loading @@ -108,51 +101,31 @@ void authdb::GroupData::addMember(const uuid &uid){ wsize+=sizeof(uuid_t); } setAuthData<char>(DataType::GroupData,StorageType::BinaryStorage,this,&_Members,"groupmembers",data,wsize); setAuthData<char>(DataType::GroupData,StorageType::BinaryStorage,this,&_Members,"groupmembers",_Members->data,wsize); delete[] data; } void authdb::GroupData::remMember(const uuid& uid){ try{ if(!getAuthData<char>(DataType::GroupData,StorageType::BinaryStorage, this,&_Members,"groupmembers")) return; }catch(...){ return; } size_t asize=0; std::copy(_Members->data,_Members->data+sizeof(size_t),&asize); if(asize==0) return; asize*=sizeof(uuid_t); char *start=_Members->data+sizeof(size_t); std::vector<uuid> members; for(size_t i =0; i<asize; i+=sizeof(uuid_t) ){ for(size_t i =0; i<_Members->datasize; i+=sizeof(uuid_t) ){ uuid_t tmp; std::copy(start+i,start+i+sizeof(uuid_t),&tmp[0]); if(uid!=tmp) members.push_back(tmp); } for(auto mem = members.begin(); mem!=members.end(); ++mem){ if(*mem==uid) members.erase(mem); } size_t wsize=members.size(); char *data=new char[(wsize*sizeof(uuid_t))+sizeof(size_t)]; memset(data,0,(wsize*sizeof(uuid_t))+sizeof(size_t)); char *data =new char[members.size()*sizeof(uuid_t)]; std::copy(&wsize,&wsize+sizeof(size_t),data); wsize=sizeof(size_t); size_t wsize=0; for(const uuid &mem : members){ std::copy( Loading @@ -163,41 +136,23 @@ void authdb::GroupData::remMember(const uuid& uid){ wsize+=sizeof(uuid_t); } setAuthData<char>(DataType::GroupData,StorageType::BinaryStorage,this,&_Members,"groupmembers",data,wsize); setAuthData<char>(DataType::GroupData,StorageType::BinaryStorage,this,&_Members,"groupmembers",_Members->data,wsize); delete[] data; } bool authdb::GroupData::isMember(const uuid uid){ try{ if(!getAuthData<char>(DataType::GroupData,StorageType::BinaryStorage, this,&_Members,"groupmembers")) return false; }catch(...){ return false; } size_t asize=0; std::copy(_Members->data,_Members->data+sizeof(size_t),&asize); if(asize==0) return false; asize*=sizeof(uuid_t); char *start=_Members->data+sizeof(size_t); std::vector<uuid> members; for(size_t i =0; i<asize; i+=sizeof(uuid_t) ){ for(size_t i =0; i<_Members->datasize; i+=sizeof(uuid_t) ){ uuid_t tmp; std::copy(start+i,start+i+sizeof(uuid_t),&tmp[0]); members.emplace_back(tmp); } for(const uuid &mem : members){ if(mem==uid) std::copy(_Members->data+i,_Members->data+i+sizeof(uuid_t),&tmp[0]); if(uid==tmp) return true; } Loading @@ -207,24 +162,19 @@ bool authdb::GroupData::isMember(const uuid uid){ void authdb::GroupData::getMembers(std::vector<uuid>& members){ size_t asize=0; try{ if(!_Members) return; if(getAuthData<char>(DataType::GroupData,StorageType::BinaryStorage, this,&_Members,"groupmembers")) std::copy(_Members->data,_Members->data+sizeof(size_t),&asize); else return; }catch(...){ return; } if(asize==0) return; asize=sizeof(size_t); asize*=sizeof(uuid_t); char *start=_Members->data+sizeof(size_t); char *start=_Members->data+asize; for(size_t i =0; i<asize; i+=sizeof(uuid_t) ){ uuid_t tmp; Loading Loading @@ -300,8 +250,6 @@ void authdb::Group::info(AuthBackend &backend, class GroupData& dat, size_t &pos if(cur->type == GroupData && uuid_compare(dat.Data.uuid,cur->uuid) == 0 && strcmp(cur->fieldname,"groupname")==0 ){ dat._Name=&dat.Data; if(!getRecord(backend,dat,DataType::GroupData)) continue; Loading