Loading CMakeLists.txt +2 −0 Changes for CMakeLists.txt: 2 added lines, 0 removed lines. Original line number Diff line number Diff line cmake_minimum_required(VERSION 3.18) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra --warn-no-unused-parameter") project(authdb) find_package(libconfplus REQUIRED) Loading src/admin.cpp +16 −23 Changes for src/admin.cpp: 16 added lines, 23 removed lines. Original line number Diff line number Diff line Loading @@ -222,7 +222,6 @@ namespace authdb { continue; struct AuthData::Record cudat; memset(&cudat,0,sizeof(AuthData::Record)); cudat.start=0xFE; uuid_copy(cudat.uuid,uid); Loading Loading @@ -326,7 +325,7 @@ namespace authdb { } void removeuser(libhttppp::HttpRequest *curreq, const int tid, ULONG_PTR args){ char cdid[255],uid[255]; char cdid[128],uid[255]; uuid_t did; if(sscanf(curreq->getRequestURL(),"/settings/%[^/]/removeuser/%s",cdid,uid)<0){ Loading Loading @@ -357,14 +356,14 @@ namespace authdb { rep.setState(HTTP307); rep.setVersion(HTTPVERSION(1.1)); char rurl[255]; snprintf(rurl,255,"/settings/%s/listusers",cdid); snprintf(rurl,255,"/settings/%s[128]/listusers",cdid); rep.setHeaderData("Location")->push_back(rurl); rep.setContentType("text/html"); rep.send(curreq,nullptr,0); } void editUser(libhttppp::HttpRequest *curreq, const int tid, ULONG_PTR args){ char cdid[255],cuid[255]; char cdid[128],cuid[255]; uuid_t did; if(sscanf(curreq->getRequestURL(),"/settings/%[^/]/edituser/%s",cdid,cuid)<0){ Loading Loading @@ -505,7 +504,7 @@ namespace authdb { rep.setState(HTTP307); rep.setVersion(HTTPVERSION(1.1)); char rurl[255]; snprintf(rurl,255,"/settings/%s/listusers",cdid); snprintf(rurl,255,"/settings/%s[128]/listusers",cdid); rep.setHeaderData("Location")->push_back(rurl); rep.setContentType("text/html"); rep.send(curreq,nullptr,0); Loading Loading @@ -562,8 +561,8 @@ namespace authdb { libhttppp::HttpForm form; form.parse(curreq); char cdid[255],suburl[255]; if(sscanf(url,"/settings/%[^/]/%s",cdid,suburl)<0) char cdid[255],suburl[128]; if(sscanf(url,"/settings/%[^/]/%s[128]",cdid,suburl)<0) cdid[0]='\0'; for (libhttppp::HttpForm::UrlcodedForm::Data* cururlform = form.UrlFormData.getFormData(); cururlform; Loading @@ -571,7 +570,7 @@ namespace authdb { if( strcmp(cururlform->getKey(),"domaindid")==0){ if(strcmp(cdid,cururlform->getValue())!=0){ char rurl[255]; snprintf(rurl,255,"/settings/%s/%s",cururlform->getValue(),suburl); snprintf(rurl,255,"/settings/%s[100]/%s[100]",cururlform->getValue(),suburl); libhttppp::HttpResponse rep; rep.setState(HTTP307); rep.setVersion(HTTPVERSION(1.1)); Loading Loading @@ -601,8 +600,6 @@ namespace authdb { rd=backend.getPos()+cur.datasize; if(cur.type == DataType::DomainData && strcmp(cur.fieldname,"domainname")==0){ size_t dpos=sizeof(authdb::AuthHeader); cur.data = new char[cur.datasize]; backend.read((unsigned char*)cur.data,cur.datasize); Loading Loading @@ -741,7 +738,6 @@ namespace authdb { continue; struct AuthData::Record dodat; memset(&dodat,0,sizeof(AuthData::Record)); dodat.start=0xFE; uuid_copy(dodat.uuid,uid); Loading Loading @@ -1028,7 +1024,6 @@ namespace authdb { grp.create(*backend,&grpdat); delete[] member.uid; } size_t rd=sizeof(authdb::AuthHeader),end=backend->end(); Loading Loading @@ -1076,7 +1071,7 @@ namespace authdb { } void removeGroup(libhttppp::HttpRequest *curreq, const int tid, ULONG_PTR args){ char cdid[255],gid[255]; char cdid[128],gid[255]; uuid_t did; if(sscanf(curreq->getRequestURL(),"/settings/%[^/]/removegroup/%s",cdid,gid)<0){ Loading Loading @@ -1107,14 +1102,14 @@ namespace authdb { rep.setState(HTTP307); rep.setVersion(HTTPVERSION(1.1)); char rurl[255]; snprintf(rurl,255,"/settings/%s/listgroups",cdid); snprintf(rurl,255,"/settings/%s[128]/listgroups",cdid); rep.setHeaderData("Location")->push_back(rurl); rep.setContentType("text/html"); rep.send(curreq,nullptr,0); } void editGroup(libhttppp::HttpRequest *curreq, const int tid, ULONG_PTR args){ char cdid[255],cgid[255]; char cdid[128],cgid[255]; uuid_t did; if(sscanf(curreq->getRequestURL(),"/settings/%[^/]/editgroup/%s",cdid,cgid)<0){ Loading Loading @@ -1268,7 +1263,7 @@ namespace authdb { rep.setState(HTTP307); rep.setVersion(HTTPVERSION(1.1)); char rurl[255]; snprintf(rurl,255,"/settings/%s/listgroups",cdid); snprintf(rurl,255,"/settings/%s[128]/listgroups",cdid); rep.setHeaderData("Location")->push_back(rurl); rep.setContentType("text/html"); rep.send(curreq,nullptr,0); Loading Loading @@ -1455,12 +1450,12 @@ namespace authdb { } void reloadSession(libhttppp::HttpRequest *curreq, const int tid, ULONG_PTR args){ char csid[255],cdid[255]; char csid[128],cdid[128]; uuid_t sid,did; uuid_clear(sid); if(sscanf(curreq->getRequestURL(),"/settings/%[^/]/reloadsession/%s",cdid,csid)<0){ if(sscanf(curreq->getRequestURL(),"/settings/%[^/]/reloadsession/%s[128]",cdid,csid)<0){ throw AuthBackendError("removeSession: wrong url!"); } Loading @@ -1481,7 +1476,7 @@ namespace authdb { AuthSession.relSession(*backend,sid); char rurl[255]; snprintf(rurl,255,"/settings/%s/listsessions",cdid); snprintf(rurl,255,"/settings/%s[128]/listsessions",cdid); libhttppp::HttpResponse rep; rep.setState(HTTP303); Loading Loading @@ -1591,7 +1586,6 @@ namespace authdb { Gpo gpo; gpo.create(*backend,gpodat); delete[] allow.uid; delete gpodat; libhttppp::HttpResponse rep; Loading Loading @@ -1762,7 +1756,6 @@ namespace authdb { gpodat.setAllowed(allow); gpo.create(*backend,&gpodat); delete[] allow.uid; libhttppp::HttpResponse rep; rep.setState(HTTP307); Loading Loading @@ -2612,13 +2605,13 @@ URLNOTFOUND: if(!sdat) sdat->getDid(did); char url[255],cdid[255]; char url[255],cdid[128]; if(uuid_is_null(did.value)==1){ snprintf(url,255,"/settings/admin/listusers"); }else{ uuid_unparse(did.value,cdid); snprintf(url,255,"/settings/%s/listusers",cdid); snprintf(url,255,"/settings/%s[128]/listusers",cdid); } libhttppp::HttpResponse rep; rep.setState(HTTP307); Loading src/api.cpp +1 −1 Changes for src/api.cpp: 1 added line, 1 removed line. Original line number Diff line number Diff line Loading @@ -309,7 +309,7 @@ namespace authdb { jresponse = json_object_new_array(); const ClientConnections *curcon=nullptr; const SessionData *sessiondat=nullptr; // const SessionData *sessiondat=nullptr; if(! (curcon=checkConnection(jrequest,jresponse)) ){ if(! (curcon=ClientLogin(jrequest,jresponse)) ){ Loading src/authdb.cpp +1 −4 Changes for src/authdb.cpp: 1 added line, 4 removed lines. Original line number Diff line number Diff line Loading @@ -132,7 +132,7 @@ namespace authdb { authdb::GroupData::MemberUids muid; muid.count=1; muid.uid=&adminid; muid.addUid(adminid); gdat.addMember(muid); Loading Loading @@ -357,7 +357,6 @@ VALUEFOUND: } AuthData::AuthData(const uuid_t id){ memset(&Data,0,sizeof(AuthData::Record)); uuid_copy(Data.uuid,id); Data.start=0xFE; Data.storage=EmptyStorage; Loading Loading @@ -520,7 +519,6 @@ VALUEFOUND: backend.write((const unsigned char*)chel,sizeof(AuthData::Record)); backend.write((const unsigned char*)chel->data,chel->datasize); size_t dsize=rdrec->datasize; memset(rdrec.get(),0,sizeof(AuthData::Record)); rdrec->start = 0xFE; rdrec->datasize=dsize; backend.setPos(rd); Loading Loading @@ -554,7 +552,6 @@ VALUEFOUND: rd=backend.getPos()+cur->datasize; if(uuid_compare(uid,cur->uuid) == 0 && type == cur->type){ size_t dsize=cur->datasize; memset(cur.get(),0,sizeof(AuthData::Record)); cur->start = 0xFE; cur->datasize=dsize; backend.setPos(wr); Loading src/authdb.h +1 −3 Changes for src/authdb.h: 1 added line, 3 removed lines. Original line number Diff line number Diff line Loading @@ -93,7 +93,7 @@ namespace authdb { friend void delRecord(authdb::AuthBackend &backend,const uuid_t uid,int type); }; template<class T> template<typename T> void setAuthData(int type,int storage,AuthData *dat,AuthData::Record **varclass, const char *varname,T *source,size_t sourcelen){ AuthData::Record *target=*varclass; Loading Loading @@ -124,8 +124,6 @@ namespace authdb { target=&dat->append(tmp).Data; } memset(target,0,sizeof(AuthData::Record)); target->start=0xFE; uuid_copy(target->uuid,gid); target->type=type; Loading Loading
CMakeLists.txt +2 −0 Changes for CMakeLists.txt: 2 added lines, 0 removed lines. Original line number Diff line number Diff line cmake_minimum_required(VERSION 3.18) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra --warn-no-unused-parameter") project(authdb) find_package(libconfplus REQUIRED) Loading
src/admin.cpp +16 −23 Changes for src/admin.cpp: 16 added lines, 23 removed lines. Original line number Diff line number Diff line Loading @@ -222,7 +222,6 @@ namespace authdb { continue; struct AuthData::Record cudat; memset(&cudat,0,sizeof(AuthData::Record)); cudat.start=0xFE; uuid_copy(cudat.uuid,uid); Loading Loading @@ -326,7 +325,7 @@ namespace authdb { } void removeuser(libhttppp::HttpRequest *curreq, const int tid, ULONG_PTR args){ char cdid[255],uid[255]; char cdid[128],uid[255]; uuid_t did; if(sscanf(curreq->getRequestURL(),"/settings/%[^/]/removeuser/%s",cdid,uid)<0){ Loading Loading @@ -357,14 +356,14 @@ namespace authdb { rep.setState(HTTP307); rep.setVersion(HTTPVERSION(1.1)); char rurl[255]; snprintf(rurl,255,"/settings/%s/listusers",cdid); snprintf(rurl,255,"/settings/%s[128]/listusers",cdid); rep.setHeaderData("Location")->push_back(rurl); rep.setContentType("text/html"); rep.send(curreq,nullptr,0); } void editUser(libhttppp::HttpRequest *curreq, const int tid, ULONG_PTR args){ char cdid[255],cuid[255]; char cdid[128],cuid[255]; uuid_t did; if(sscanf(curreq->getRequestURL(),"/settings/%[^/]/edituser/%s",cdid,cuid)<0){ Loading Loading @@ -505,7 +504,7 @@ namespace authdb { rep.setState(HTTP307); rep.setVersion(HTTPVERSION(1.1)); char rurl[255]; snprintf(rurl,255,"/settings/%s/listusers",cdid); snprintf(rurl,255,"/settings/%s[128]/listusers",cdid); rep.setHeaderData("Location")->push_back(rurl); rep.setContentType("text/html"); rep.send(curreq,nullptr,0); Loading Loading @@ -562,8 +561,8 @@ namespace authdb { libhttppp::HttpForm form; form.parse(curreq); char cdid[255],suburl[255]; if(sscanf(url,"/settings/%[^/]/%s",cdid,suburl)<0) char cdid[255],suburl[128]; if(sscanf(url,"/settings/%[^/]/%s[128]",cdid,suburl)<0) cdid[0]='\0'; for (libhttppp::HttpForm::UrlcodedForm::Data* cururlform = form.UrlFormData.getFormData(); cururlform; Loading @@ -571,7 +570,7 @@ namespace authdb { if( strcmp(cururlform->getKey(),"domaindid")==0){ if(strcmp(cdid,cururlform->getValue())!=0){ char rurl[255]; snprintf(rurl,255,"/settings/%s/%s",cururlform->getValue(),suburl); snprintf(rurl,255,"/settings/%s[100]/%s[100]",cururlform->getValue(),suburl); libhttppp::HttpResponse rep; rep.setState(HTTP307); rep.setVersion(HTTPVERSION(1.1)); Loading Loading @@ -601,8 +600,6 @@ namespace authdb { rd=backend.getPos()+cur.datasize; if(cur.type == DataType::DomainData && strcmp(cur.fieldname,"domainname")==0){ size_t dpos=sizeof(authdb::AuthHeader); cur.data = new char[cur.datasize]; backend.read((unsigned char*)cur.data,cur.datasize); Loading Loading @@ -741,7 +738,6 @@ namespace authdb { continue; struct AuthData::Record dodat; memset(&dodat,0,sizeof(AuthData::Record)); dodat.start=0xFE; uuid_copy(dodat.uuid,uid); Loading Loading @@ -1028,7 +1024,6 @@ namespace authdb { grp.create(*backend,&grpdat); delete[] member.uid; } size_t rd=sizeof(authdb::AuthHeader),end=backend->end(); Loading Loading @@ -1076,7 +1071,7 @@ namespace authdb { } void removeGroup(libhttppp::HttpRequest *curreq, const int tid, ULONG_PTR args){ char cdid[255],gid[255]; char cdid[128],gid[255]; uuid_t did; if(sscanf(curreq->getRequestURL(),"/settings/%[^/]/removegroup/%s",cdid,gid)<0){ Loading Loading @@ -1107,14 +1102,14 @@ namespace authdb { rep.setState(HTTP307); rep.setVersion(HTTPVERSION(1.1)); char rurl[255]; snprintf(rurl,255,"/settings/%s/listgroups",cdid); snprintf(rurl,255,"/settings/%s[128]/listgroups",cdid); rep.setHeaderData("Location")->push_back(rurl); rep.setContentType("text/html"); rep.send(curreq,nullptr,0); } void editGroup(libhttppp::HttpRequest *curreq, const int tid, ULONG_PTR args){ char cdid[255],cgid[255]; char cdid[128],cgid[255]; uuid_t did; if(sscanf(curreq->getRequestURL(),"/settings/%[^/]/editgroup/%s",cdid,cgid)<0){ Loading Loading @@ -1268,7 +1263,7 @@ namespace authdb { rep.setState(HTTP307); rep.setVersion(HTTPVERSION(1.1)); char rurl[255]; snprintf(rurl,255,"/settings/%s/listgroups",cdid); snprintf(rurl,255,"/settings/%s[128]/listgroups",cdid); rep.setHeaderData("Location")->push_back(rurl); rep.setContentType("text/html"); rep.send(curreq,nullptr,0); Loading Loading @@ -1455,12 +1450,12 @@ namespace authdb { } void reloadSession(libhttppp::HttpRequest *curreq, const int tid, ULONG_PTR args){ char csid[255],cdid[255]; char csid[128],cdid[128]; uuid_t sid,did; uuid_clear(sid); if(sscanf(curreq->getRequestURL(),"/settings/%[^/]/reloadsession/%s",cdid,csid)<0){ if(sscanf(curreq->getRequestURL(),"/settings/%[^/]/reloadsession/%s[128]",cdid,csid)<0){ throw AuthBackendError("removeSession: wrong url!"); } Loading @@ -1481,7 +1476,7 @@ namespace authdb { AuthSession.relSession(*backend,sid); char rurl[255]; snprintf(rurl,255,"/settings/%s/listsessions",cdid); snprintf(rurl,255,"/settings/%s[128]/listsessions",cdid); libhttppp::HttpResponse rep; rep.setState(HTTP303); Loading Loading @@ -1591,7 +1586,6 @@ namespace authdb { Gpo gpo; gpo.create(*backend,gpodat); delete[] allow.uid; delete gpodat; libhttppp::HttpResponse rep; Loading Loading @@ -1762,7 +1756,6 @@ namespace authdb { gpodat.setAllowed(allow); gpo.create(*backend,&gpodat); delete[] allow.uid; libhttppp::HttpResponse rep; rep.setState(HTTP307); Loading Loading @@ -2612,13 +2605,13 @@ URLNOTFOUND: if(!sdat) sdat->getDid(did); char url[255],cdid[255]; char url[255],cdid[128]; if(uuid_is_null(did.value)==1){ snprintf(url,255,"/settings/admin/listusers"); }else{ uuid_unparse(did.value,cdid); snprintf(url,255,"/settings/%s/listusers",cdid); snprintf(url,255,"/settings/%s[128]/listusers",cdid); } libhttppp::HttpResponse rep; rep.setState(HTTP307); Loading
src/api.cpp +1 −1 Changes for src/api.cpp: 1 added line, 1 removed line. Original line number Diff line number Diff line Loading @@ -309,7 +309,7 @@ namespace authdb { jresponse = json_object_new_array(); const ClientConnections *curcon=nullptr; const SessionData *sessiondat=nullptr; // const SessionData *sessiondat=nullptr; if(! (curcon=checkConnection(jrequest,jresponse)) ){ if(! (curcon=ClientLogin(jrequest,jresponse)) ){ Loading
src/authdb.cpp +1 −4 Changes for src/authdb.cpp: 1 added line, 4 removed lines. Original line number Diff line number Diff line Loading @@ -132,7 +132,7 @@ namespace authdb { authdb::GroupData::MemberUids muid; muid.count=1; muid.uid=&adminid; muid.addUid(adminid); gdat.addMember(muid); Loading Loading @@ -357,7 +357,6 @@ VALUEFOUND: } AuthData::AuthData(const uuid_t id){ memset(&Data,0,sizeof(AuthData::Record)); uuid_copy(Data.uuid,id); Data.start=0xFE; Data.storage=EmptyStorage; Loading Loading @@ -520,7 +519,6 @@ VALUEFOUND: backend.write((const unsigned char*)chel,sizeof(AuthData::Record)); backend.write((const unsigned char*)chel->data,chel->datasize); size_t dsize=rdrec->datasize; memset(rdrec.get(),0,sizeof(AuthData::Record)); rdrec->start = 0xFE; rdrec->datasize=dsize; backend.setPos(rd); Loading Loading @@ -554,7 +552,6 @@ VALUEFOUND: rd=backend.getPos()+cur->datasize; if(uuid_compare(uid,cur->uuid) == 0 && type == cur->type){ size_t dsize=cur->datasize; memset(cur.get(),0,sizeof(AuthData::Record)); cur->start = 0xFE; cur->datasize=dsize; backend.setPos(wr); Loading
src/authdb.h +1 −3 Changes for src/authdb.h: 1 added line, 3 removed lines. Original line number Diff line number Diff line Loading @@ -93,7 +93,7 @@ namespace authdb { friend void delRecord(authdb::AuthBackend &backend,const uuid_t uid,int type); }; template<class T> template<typename T> void setAuthData(int type,int storage,AuthData *dat,AuthData::Record **varclass, const char *varname,T *source,size_t sourcelen){ AuthData::Record *target=*varclass; Loading Loading @@ -124,8 +124,6 @@ namespace authdb { target=&dat->append(tmp).Data; } memset(target,0,sizeof(AuthData::Record)); target->start=0xFE; uuid_copy(target->uuid,gid); target->type=type; Loading