Loading src/admin.cpp +79 −9 Changes for src/admin.cpp: 79 added lines, 9 removed lines. Original line number Diff line number Diff line Loading @@ -106,7 +106,7 @@ namespace authdb { size_t upos=sizeof(authdb::AuthHeader); user.info(*backend,udat,upos); char cruid[20]; char cruid[255]; uuid_unparse(cur.uuid,cruid); userlist << "<tr><td class=\"list_username\">" << udat.getUsername() Loading Loading @@ -653,7 +653,7 @@ namespace authdb { size_t dpos=sizeof(authdb::AuthHeader); domain.info(_AdminBackend,ddat,dpos); char crdid[20]; char crdid[255]; uuid_unparse(cur.uuid,crdid); list << "<tr><td>" Loading Loading @@ -891,7 +891,7 @@ namespace authdb { size_t upos=sizeof(authdb::AuthHeader); group.info(*backend,gdat,upos); char cruid[20]; char cruid[255]; uuid_unparse(cur.uuid,cruid); grouplist << "<tr><td class=\"list_groupname\">" << gdat.getName() << "</td><td>" Loading Loading @@ -1687,7 +1687,7 @@ namespace authdb { if(!backend) throw AuthBackendError("createGroups: no backend seleted!"); libhtmlpp::HtmlElement root=_IndexElement,domel("ul"); libhtmlpp::HtmlElement root=_IndexElement,domel("table"); libhtmlpp::HtmlElement *content=root.getElementbyID("content"); libhtmlpp::HtmlString list,out; Loading @@ -1696,6 +1696,18 @@ namespace authdb { Gpo gpo; libhtmlpp::HtmlString gpoli; gpoli << "<tr>" << "<th>Policy ID</th>" << "<th>Policy Name</th>" << "<th>Policy Description</th>" << "<th>Policy Default</th>" << "<th>Policy Actions:</th>" << "</tr>"; domel.appendChild(gpoli.parse()); while(rd<end){ authdb::AuthData::Record cur; Loading @@ -1712,11 +1724,24 @@ namespace authdb { size_t upos=sizeof(authdb::AuthHeader); gpo.info(*backend,gdat,upos); libhtmlpp::HtmlString gpoli; char cruid[20]; char cruid[255]; uuid_unparse(cur.uuid,cruid); gpoli << "<li> " << gdat.getName() << "</li>"; gpoli.clear(); gpoli << "<tr><td>" << cruid << "</td>" << "<td>" << gdat.getName() << "</td>" << "<td>"; try{ gpoli << gdat.getDesc(); }catch(...){} gpoli << "</td>" << "<td>" << gdat.getGpoValue() <<"</td>" << "<td>" << "<a class=\"button\" href=\"" << "/settings/" << cdid <<"/removegpo/" << cruid <<"\">Delete</a>" << "</td>" << "</tr>"; domel.appendChild(gpoli.parse()); }catch(AuthBackendError &e){ std::cerr << e.what() << std::endl; Loading @@ -1737,6 +1762,49 @@ namespace authdb { rep.send(curreq,out.c_str(),out.size()); } void removeGPO(libhttppp::HttpRequest *curreq, const int tid, ULONG_PTR args){ char cdid[255],cgpid[255]; uuid_t did,gpid; uuid_clear(gpid); uuid_clear(did); if(sscanf(curreq->getRequestURL(),"/settings/%[^/]/removegpo/%s",cdid,cgpid)<0){ throw AuthBackendError("removeGPO: wrong url!"); } uuid_parse(cdid,did); uuid_parse(cgpid,gpid); DomainBackend dbackend(_AdminBackend); AuthBackend *backend=nullptr; if(strcmp(cdid,"admin") == 0 ){ backend=&_AdminBackend; }else if(uuid_parse(cdid,did) == 0 ){ backend=dbackend.data(did); }else{ throw AuthBackendError("removeGPO: could not parse uuid!"); } if(!backend) throw AuthBackendError("removeGPO: no backend seleted!"); Gpo gpo; gpo.remove(*backend,gpid); libhttppp::HttpResponse rep; rep.setState(HTTP303); rep.setVersion(HTTPVERSION(1.1)); std::string rurl="/settings/"; rurl +=cdid; rurl+="/listgpos"; rep.setHeaderData("Location")->push_back(rurl.c_str()); rep.setContentType("text/html"); rep.send(curreq,nullptr,0); } void login(libhttppp::HttpRequest *curreq, const int tid, ULONG_PTR args){ libhttppp::HttpForm form; Loading Loading @@ -1886,7 +1954,7 @@ namespace authdb { size_t dpos=sizeof(authdb::AuthHeader); domain.info(_AdminBackend,ddat,dpos); char crdid[20]; char crdid[255]; uuid_unparse(cur.uuid,crdid); dform << "<option value=\"" << crdid << "\" >" Loading Loading @@ -1946,6 +2014,8 @@ namespace authdb { createGpo(curreq,tid,args); }else if(strncmp("listgpos",url,8)==0){ listGpos(curreq,tid,args); }else if(strncmp("removegpo",url,9)==0){ removeGPO(curreq,tid,args); }else{ URLNOTFOUND: uuid_t did; Loading src/authdb.cpp +1 −1 Changes for src/authdb.cpp: 1 added line, 1 removed line. Original line number Diff line number Diff line Loading @@ -520,7 +520,7 @@ int main(int argc, char *argv[]){ authdb::AuthDB authdb(backend,httpd.getServerSocket()); authdb.threads=2; // authdb.threads=2; authdb.runEventloop(); }catch(authdb::AuthBackendError &e){ std::cerr << e.what() << std::endl; Loading src/gpo.cpp +8 −2 Changes for src/gpo.cpp: 8 added lines, 2 removed lines. Original line number Diff line number Diff line Loading @@ -130,7 +130,7 @@ namespace authdb { memcpy(target->data,&value,target->datasize); } inline int getBoolGpoData(const AuthData *dat,AuthData::Record **varclass,const char *varname){ inline bool getBoolGpoData(const AuthData *dat,AuthData::Record **varclass,const char *varname){ if(*varclass && (*varclass)->data ){ return *(*varclass)->data; }else{ Loading @@ -139,7 +139,7 @@ namespace authdb { curdat->Data->type==DataType::PolicyData && strcmp(curdat->Data->fieldname,varname)==0){ *varclass=curdat->Data; int ret=-1; bool ret=false; memcpy(&ret,curdat->Data->data,sizeof(bool)); return ret; } Loading Loading @@ -232,12 +232,14 @@ void authdb::GpoData::getAlowed(Allow *allowed){ authdb::GpoData::GpoData(uuid_t gpid) : AuthData(gpid){ _Name=nullptr; _Desc=nullptr; _GpoDefault=nullptr; _Allowed=nullptr; } authdb::GpoData::GpoData(const GpoData& src) : AuthData(src){ _Name=nullptr; _Desc=nullptr; _GpoDefault=nullptr; _Allowed=nullptr; } Loading Loading @@ -296,6 +298,10 @@ void authdb::Gpo::create(AuthBackend& backend, class GpoData* dat){ } } void authdb::Gpo::remove(AuthBackend &backend,const uuid_t gpid){ delRecord(backend,gpid,DataType::PolicyData); } void authdb::Gpo::info(AuthBackend &backend, class GpoData& dat, size_t &pos){ size_t end=backend.end(); Loading src/gpo.h +1 −0 Changes for src/gpo.h: 1 added line, 0 removed lines. Original line number Diff line number Diff line Loading @@ -67,6 +67,7 @@ namespace authdb { public: bool exits(AuthBackend &backend,uuid_t *gpid,const char *name, int &ret); void create(AuthBackend& backend, class GpoData* dat); void remove(AuthBackend &backend,const uuid_t gpid); void info(AuthBackend &backend, class GpoData& dat, size_t &pos); }; }; Loading
src/admin.cpp +79 −9 Changes for src/admin.cpp: 79 added lines, 9 removed lines. Original line number Diff line number Diff line Loading @@ -106,7 +106,7 @@ namespace authdb { size_t upos=sizeof(authdb::AuthHeader); user.info(*backend,udat,upos); char cruid[20]; char cruid[255]; uuid_unparse(cur.uuid,cruid); userlist << "<tr><td class=\"list_username\">" << udat.getUsername() Loading Loading @@ -653,7 +653,7 @@ namespace authdb { size_t dpos=sizeof(authdb::AuthHeader); domain.info(_AdminBackend,ddat,dpos); char crdid[20]; char crdid[255]; uuid_unparse(cur.uuid,crdid); list << "<tr><td>" Loading Loading @@ -891,7 +891,7 @@ namespace authdb { size_t upos=sizeof(authdb::AuthHeader); group.info(*backend,gdat,upos); char cruid[20]; char cruid[255]; uuid_unparse(cur.uuid,cruid); grouplist << "<tr><td class=\"list_groupname\">" << gdat.getName() << "</td><td>" Loading Loading @@ -1687,7 +1687,7 @@ namespace authdb { if(!backend) throw AuthBackendError("createGroups: no backend seleted!"); libhtmlpp::HtmlElement root=_IndexElement,domel("ul"); libhtmlpp::HtmlElement root=_IndexElement,domel("table"); libhtmlpp::HtmlElement *content=root.getElementbyID("content"); libhtmlpp::HtmlString list,out; Loading @@ -1696,6 +1696,18 @@ namespace authdb { Gpo gpo; libhtmlpp::HtmlString gpoli; gpoli << "<tr>" << "<th>Policy ID</th>" << "<th>Policy Name</th>" << "<th>Policy Description</th>" << "<th>Policy Default</th>" << "<th>Policy Actions:</th>" << "</tr>"; domel.appendChild(gpoli.parse()); while(rd<end){ authdb::AuthData::Record cur; Loading @@ -1712,11 +1724,24 @@ namespace authdb { size_t upos=sizeof(authdb::AuthHeader); gpo.info(*backend,gdat,upos); libhtmlpp::HtmlString gpoli; char cruid[20]; char cruid[255]; uuid_unparse(cur.uuid,cruid); gpoli << "<li> " << gdat.getName() << "</li>"; gpoli.clear(); gpoli << "<tr><td>" << cruid << "</td>" << "<td>" << gdat.getName() << "</td>" << "<td>"; try{ gpoli << gdat.getDesc(); }catch(...){} gpoli << "</td>" << "<td>" << gdat.getGpoValue() <<"</td>" << "<td>" << "<a class=\"button\" href=\"" << "/settings/" << cdid <<"/removegpo/" << cruid <<"\">Delete</a>" << "</td>" << "</tr>"; domel.appendChild(gpoli.parse()); }catch(AuthBackendError &e){ std::cerr << e.what() << std::endl; Loading @@ -1737,6 +1762,49 @@ namespace authdb { rep.send(curreq,out.c_str(),out.size()); } void removeGPO(libhttppp::HttpRequest *curreq, const int tid, ULONG_PTR args){ char cdid[255],cgpid[255]; uuid_t did,gpid; uuid_clear(gpid); uuid_clear(did); if(sscanf(curreq->getRequestURL(),"/settings/%[^/]/removegpo/%s",cdid,cgpid)<0){ throw AuthBackendError("removeGPO: wrong url!"); } uuid_parse(cdid,did); uuid_parse(cgpid,gpid); DomainBackend dbackend(_AdminBackend); AuthBackend *backend=nullptr; if(strcmp(cdid,"admin") == 0 ){ backend=&_AdminBackend; }else if(uuid_parse(cdid,did) == 0 ){ backend=dbackend.data(did); }else{ throw AuthBackendError("removeGPO: could not parse uuid!"); } if(!backend) throw AuthBackendError("removeGPO: no backend seleted!"); Gpo gpo; gpo.remove(*backend,gpid); libhttppp::HttpResponse rep; rep.setState(HTTP303); rep.setVersion(HTTPVERSION(1.1)); std::string rurl="/settings/"; rurl +=cdid; rurl+="/listgpos"; rep.setHeaderData("Location")->push_back(rurl.c_str()); rep.setContentType("text/html"); rep.send(curreq,nullptr,0); } void login(libhttppp::HttpRequest *curreq, const int tid, ULONG_PTR args){ libhttppp::HttpForm form; Loading Loading @@ -1886,7 +1954,7 @@ namespace authdb { size_t dpos=sizeof(authdb::AuthHeader); domain.info(_AdminBackend,ddat,dpos); char crdid[20]; char crdid[255]; uuid_unparse(cur.uuid,crdid); dform << "<option value=\"" << crdid << "\" >" Loading Loading @@ -1946,6 +2014,8 @@ namespace authdb { createGpo(curreq,tid,args); }else if(strncmp("listgpos",url,8)==0){ listGpos(curreq,tid,args); }else if(strncmp("removegpo",url,9)==0){ removeGPO(curreq,tid,args); }else{ URLNOTFOUND: uuid_t did; Loading
src/authdb.cpp +1 −1 Changes for src/authdb.cpp: 1 added line, 1 removed line. Original line number Diff line number Diff line Loading @@ -520,7 +520,7 @@ int main(int argc, char *argv[]){ authdb::AuthDB authdb(backend,httpd.getServerSocket()); authdb.threads=2; // authdb.threads=2; authdb.runEventloop(); }catch(authdb::AuthBackendError &e){ std::cerr << e.what() << std::endl; Loading
src/gpo.cpp +8 −2 Changes for src/gpo.cpp: 8 added lines, 2 removed lines. Original line number Diff line number Diff line Loading @@ -130,7 +130,7 @@ namespace authdb { memcpy(target->data,&value,target->datasize); } inline int getBoolGpoData(const AuthData *dat,AuthData::Record **varclass,const char *varname){ inline bool getBoolGpoData(const AuthData *dat,AuthData::Record **varclass,const char *varname){ if(*varclass && (*varclass)->data ){ return *(*varclass)->data; }else{ Loading @@ -139,7 +139,7 @@ namespace authdb { curdat->Data->type==DataType::PolicyData && strcmp(curdat->Data->fieldname,varname)==0){ *varclass=curdat->Data; int ret=-1; bool ret=false; memcpy(&ret,curdat->Data->data,sizeof(bool)); return ret; } Loading Loading @@ -232,12 +232,14 @@ void authdb::GpoData::getAlowed(Allow *allowed){ authdb::GpoData::GpoData(uuid_t gpid) : AuthData(gpid){ _Name=nullptr; _Desc=nullptr; _GpoDefault=nullptr; _Allowed=nullptr; } authdb::GpoData::GpoData(const GpoData& src) : AuthData(src){ _Name=nullptr; _Desc=nullptr; _GpoDefault=nullptr; _Allowed=nullptr; } Loading Loading @@ -296,6 +298,10 @@ void authdb::Gpo::create(AuthBackend& backend, class GpoData* dat){ } } void authdb::Gpo::remove(AuthBackend &backend,const uuid_t gpid){ delRecord(backend,gpid,DataType::PolicyData); } void authdb::Gpo::info(AuthBackend &backend, class GpoData& dat, size_t &pos){ size_t end=backend.end(); Loading
src/gpo.h +1 −0 Changes for src/gpo.h: 1 added line, 0 removed lines. Original line number Diff line number Diff line Loading @@ -67,6 +67,7 @@ namespace authdb { public: bool exits(AuthBackend &backend,uuid_t *gpid,const char *name, int &ret); void create(AuthBackend& backend, class GpoData* dat); void remove(AuthBackend &backend,const uuid_t gpid); void info(AuthBackend &backend, class GpoData& dat, size_t &pos); }; };