Loading src/admin.cpp +38 −38 Changes for src/admin.cpp: 38 added lines, 38 removed lines. Original line number Diff line number Diff line Loading @@ -91,9 +91,10 @@ namespace authdb { userlist <<"<div><p>UserList:</p><table class=\"userlist\">"; while(rd<end){ std::shared_ptr<authdb::AuthData::Record> cur=std::make_shared<authdb::AuthData::Record>(); while(rd<end){ cur->type=EmptyData; backend->setPos(rd); Loading Loading @@ -388,7 +389,7 @@ namespace authdb { uuid_t uid; uuid_parse(cuid,uid); AuthData editrec(uid); std::shared_ptr<authdb::AuthData> editrec=std::make_shared<authdb::AuthData>(uid); bool data = false; Loading @@ -396,14 +397,13 @@ namespace authdb { curform.parse(curreq); std::shared_ptr<authdb::AuthData> curec=std::make_shared<authdb::AuthData>(uid); for (libhttppp::HttpForm::MultipartForm::Data* curformdat = curform.MultipartFormData.getFormData(); curformdat; curformdat = curformdat->nextData()) { AuthData curec(uid); curec.Data.type=UserData; curec.Data.storage=EmptyStorage; curec->Data.type=UserData; curec->Data.storage=EmptyStorage; for(libhttppp::HttpForm::MultipartForm::Data::ContentDisposition *curdispo=curformdat->getDisposition(); curdispo; curdispo=curdispo->nextContentDisposition() Loading @@ -426,15 +426,15 @@ namespace authdb { [](unsigned char c){ return std::tolower(c); }); if(key=="name"){ strcpy(curec.Data.fieldname,curdispo->getValue()); strcpy(curec->Data.fieldname,curdispo->getValue()); } if(key=="filename"){ curec.Data.storage=BinaryStorage; curec->Data.storage=BinaryStorage; } } if(curec.Data.storage==EmptyStorage){ if(curec->Data.storage==EmptyStorage){ bool numeric=true; for(auto t : curformdat->Value){ Loading @@ -445,61 +445,61 @@ namespace authdb { } if(numeric) curec.Data.storage=IntStorage; curec->Data.storage=IntStorage; else curec.Data.storage=TextStorage; curec->Data.storage=TextStorage; } if(curec.Data.storage==TextStorage) { if(curec->Data.storage==TextStorage) { curformdat->Value.push_back('\0'); if(strcmp(curec.Data.fieldname,"pwhash")==0){ if(strcmp(curec->Data.fieldname,"pwhash")==0){ Hash hash; std::string pwhash,inpw; std::copy(curformdat->Value.begin(),curformdat->Value.end(), std::back_inserter(inpw)); hash.hash(inpw,pwhash); curec.Data.datasize=pwhash.length()+1; curec.Data.data=new char[curec.Data.datasize]; std::copy(pwhash.begin(),pwhash.end(),curec.Data.data); curec.Data.data[pwhash.length()]='\0'; editrec.append(curec); delete[] curec.Data.data; curec->Data.datasize=pwhash.length()+1; curec->Data.data=new char[curec->Data.datasize]; std::copy(pwhash.begin(),pwhash.end(),curec->Data.data); curec->Data.data[pwhash.length()]='\0'; editrec->append(*curec); delete[] curec->Data.data; }else{ curec.Data.datasize=curformdat->Value.size(); curec.Data.data=new char[curec.Data.datasize]; curec->Data.datasize=curformdat->Value.size(); curec->Data.data=new char[curec->Data.datasize]; std::copy(curformdat->Value.begin(), curformdat->Value.end(),curec.Data.data); curformdat->Value.end(),curec->Data.data); editrec.append(curec); delete[] curec.Data.data; editrec->append(*curec); delete[] curec->Data.data; } }else if(curec.Data.storage==BinaryStorage){ curec.Data.datasize=curformdat->Value.size(); curec.Data.data=new char[curec.Data.datasize]; memcpy(curec.Data.data,curformdat->Value.data(), }else if(curec->Data.storage==BinaryStorage){ curec->Data.datasize=curformdat->Value.size(); curec->Data.data=new char[curec->Data.datasize]; memcpy(curec->Data.data,curformdat->Value.data(), curformdat->Value.size()); editrec.append(curec); delete[] curec.Data.data; }else if(curec.Data.storage==IntStorage){ editrec->append(*curec); delete[] curec->Data.data; }else if(curec->Data.storage==IntStorage){ curformdat->Value.push_back('\0'); curec.Data.datasize=sizeof(int); curec.Data.data=(char*)new int; curec->Data.datasize=sizeof(int); curec->Data.data=(char*)new int; int val=atoi(curformdat->Value.data()); memcpy(curec.Data.data,&val, curec.Data.datasize); memcpy(curec->Data.data,&val, curec->Data.datasize); editrec.append(curec); delete[] (int*)curec.Data.data; editrec->append(*curec); delete[] (int*)curec->Data.data; } } if(data){ editRecord(*backend,editrec,UserData); editRecord(*backend,*editrec,UserData); libhttppp::HttpResponse rep; rep.setState(HTTP307); rep.setVersion(HTTPVERSION(1.1)); Loading src/api.cpp +7 −9 Changes for src/api.cpp: 7 added lines, 9 removed lines. Original line number Diff line number Diff line Loading @@ -58,13 +58,10 @@ namespace authdb { if(strcmp(key,"checkgpo")==0){ const char *id=json_object_get_string(val); uuid gpoid; gpoid.parse(id); json_object *respid=json_object_new_object(); json_object *value=json_object_new_object(); json_object_object_add(value,id,json_object_new_boolean(_SessionData->checkGPO(gpoid))); json_object_object_add(value,id,json_object_new_boolean(_SessionData->checkGPO(id))); json_object_object_add(respid,"gpo",value); json_object_array_add(response,respid); Loading Loading @@ -156,8 +153,9 @@ namespace authdb { _SessionData=nullptr; while(rd<end){ std::shared_ptr<authdb::AuthData::Record> cur=std::make_shared<authdb::AuthData::Record>(); while(rd<end){ cur->type=EmptyData; _Backend.setPos(rd); Loading @@ -165,12 +163,12 @@ namespace authdb { rd=_Backend.getPos()+cur->datasize; if(cur->type == UserData && strcmp(cur->fieldname,"username")==0 ){ class User user; class UserData udat(cur->uuid); std::shared_ptr<class UserData> udat=std::make_shared<class UserData>(cur->uuid); size_t upos = sizeof(AuthHeader); user.info(_Backend,udat,upos); user.info(_Backend,*udat,upos); if(name==udat.getUsername()){ if(pwsalt==udat.getPwHash()){ if(name==udat->getUsername()){ if(pwsalt==udat->getPwHash()){ const SessionData *sdat=AuthSession.addSession(_Backend,_Did.value,cur->uuid); json_object *respid=json_object_new_object(); uuid sessid; Loading src/gpo.cpp +14 −14 Changes for src/gpo.cpp: 14 added lines, 14 removed lines. Original line number Diff line number Diff line Loading @@ -25,6 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *******************************************************************************/ #include <memory> #include <cstring> #include "types.h" Loading Loading @@ -130,28 +131,28 @@ authdb::GpoData::Allow::~Allow(){ bool authdb::Gpo::exits(AuthBackend& backend, uuid gpid, const char* name, int& ret){ authdb::AuthData::Record cur; std::shared_ptr<authdb::AuthData::Record> cur=std::make_shared<AuthData::Record>(); size_t rd=sizeof(authdb::AuthHeader),end=backend.end(); while(rd<end){ backend.setPos(rd); backend.read((unsigned char*)&cur,sizeof(AuthData::Record)); rd=backend.getPos()+cur.datasize; if(strcmp(cur.fieldname,"gponame")==0 ){ cur.data=new char[cur.datasize]; backend.read((unsigned char*)cur.data,cur.datasize); if(name && strcmp(cur.data,name) == 0){ delete[] cur.data; backend.read((unsigned char*)cur.get(),sizeof(AuthData::Record)); rd=backend.getPos()+cur->datasize; if(strcmp(cur->fieldname,"gponame")==0 ){ cur->data=new char[cur->datasize]; backend.read((unsigned char*)cur->data,cur->datasize); if(name && strcmp(cur->data,name) == 0){ delete[] cur->data; ret=1; return true; }else if(gpid==cur.uuid){ delete[] cur.data; }else if(gpid==cur->uuid){ delete[] cur->data; ret=2; return true; } delete[] cur.data; delete[] cur->data; } } ret=-1; Loading Loading @@ -192,9 +193,9 @@ void authdb::Gpo::info(AuthBackend &backend, class GpoData& dat, size_t &pos){ throw AuthBackendError("gpo info gpoid required!"); while(pos<end){ authdb::AuthData::Record *cur=new AuthData::Record; std::shared_ptr<authdb::AuthData::Record> cur=std::make_shared<AuthData::Record>(); backend.setPos(pos); backend.read((unsigned char*)cur,sizeof(AuthData::Record)); backend.read((unsigned char*)cur.get(),sizeof(AuthData::Record)); pos=backend.getPos()+cur->datasize; if(cur->type == PolicyData && uuid_compare(dat.Data.uuid,cur->uuid)==0 && strcmp(cur->fieldname,"gponame")==0 Loading @@ -203,6 +204,5 @@ void authdb::Gpo::info(AuthBackend &backend, class GpoData& dat, size_t &pos){ if(!getRecord(backend,dat,DataType::PolicyData)) continue; } delete cur; } } src/hash/sha512.cpp +2 −1 Changes for src/hash/sha512.cpp: 2 added lines, 1 removed line. Original line number Diff line number Diff line Loading @@ -171,9 +171,10 @@ void authdb::sha512::hash(const std::string input, std::string& output) ctx.update((unsigned char*)input.c_str(), input.length()); ctx.final(digest); char buf[2*authdb::sha512::DIGEST_SIZE+1]; char *buf= new char[2*authdb::sha512::DIGEST_SIZE+1]; buf[2*authdb::sha512::DIGEST_SIZE] = 0; for (int i = 0; i < (int)authdb::sha512::DIGEST_SIZE; i++) sprintf(buf+i*2, "%02x", digest[i]); output=buf; delete[] buf; } Loading
src/admin.cpp +38 −38 Changes for src/admin.cpp: 38 added lines, 38 removed lines. Original line number Diff line number Diff line Loading @@ -91,9 +91,10 @@ namespace authdb { userlist <<"<div><p>UserList:</p><table class=\"userlist\">"; while(rd<end){ std::shared_ptr<authdb::AuthData::Record> cur=std::make_shared<authdb::AuthData::Record>(); while(rd<end){ cur->type=EmptyData; backend->setPos(rd); Loading Loading @@ -388,7 +389,7 @@ namespace authdb { uuid_t uid; uuid_parse(cuid,uid); AuthData editrec(uid); std::shared_ptr<authdb::AuthData> editrec=std::make_shared<authdb::AuthData>(uid); bool data = false; Loading @@ -396,14 +397,13 @@ namespace authdb { curform.parse(curreq); std::shared_ptr<authdb::AuthData> curec=std::make_shared<authdb::AuthData>(uid); for (libhttppp::HttpForm::MultipartForm::Data* curformdat = curform.MultipartFormData.getFormData(); curformdat; curformdat = curformdat->nextData()) { AuthData curec(uid); curec.Data.type=UserData; curec.Data.storage=EmptyStorage; curec->Data.type=UserData; curec->Data.storage=EmptyStorage; for(libhttppp::HttpForm::MultipartForm::Data::ContentDisposition *curdispo=curformdat->getDisposition(); curdispo; curdispo=curdispo->nextContentDisposition() Loading @@ -426,15 +426,15 @@ namespace authdb { [](unsigned char c){ return std::tolower(c); }); if(key=="name"){ strcpy(curec.Data.fieldname,curdispo->getValue()); strcpy(curec->Data.fieldname,curdispo->getValue()); } if(key=="filename"){ curec.Data.storage=BinaryStorage; curec->Data.storage=BinaryStorage; } } if(curec.Data.storage==EmptyStorage){ if(curec->Data.storage==EmptyStorage){ bool numeric=true; for(auto t : curformdat->Value){ Loading @@ -445,61 +445,61 @@ namespace authdb { } if(numeric) curec.Data.storage=IntStorage; curec->Data.storage=IntStorage; else curec.Data.storage=TextStorage; curec->Data.storage=TextStorage; } if(curec.Data.storage==TextStorage) { if(curec->Data.storage==TextStorage) { curformdat->Value.push_back('\0'); if(strcmp(curec.Data.fieldname,"pwhash")==0){ if(strcmp(curec->Data.fieldname,"pwhash")==0){ Hash hash; std::string pwhash,inpw; std::copy(curformdat->Value.begin(),curformdat->Value.end(), std::back_inserter(inpw)); hash.hash(inpw,pwhash); curec.Data.datasize=pwhash.length()+1; curec.Data.data=new char[curec.Data.datasize]; std::copy(pwhash.begin(),pwhash.end(),curec.Data.data); curec.Data.data[pwhash.length()]='\0'; editrec.append(curec); delete[] curec.Data.data; curec->Data.datasize=pwhash.length()+1; curec->Data.data=new char[curec->Data.datasize]; std::copy(pwhash.begin(),pwhash.end(),curec->Data.data); curec->Data.data[pwhash.length()]='\0'; editrec->append(*curec); delete[] curec->Data.data; }else{ curec.Data.datasize=curformdat->Value.size(); curec.Data.data=new char[curec.Data.datasize]; curec->Data.datasize=curformdat->Value.size(); curec->Data.data=new char[curec->Data.datasize]; std::copy(curformdat->Value.begin(), curformdat->Value.end(),curec.Data.data); curformdat->Value.end(),curec->Data.data); editrec.append(curec); delete[] curec.Data.data; editrec->append(*curec); delete[] curec->Data.data; } }else if(curec.Data.storage==BinaryStorage){ curec.Data.datasize=curformdat->Value.size(); curec.Data.data=new char[curec.Data.datasize]; memcpy(curec.Data.data,curformdat->Value.data(), }else if(curec->Data.storage==BinaryStorage){ curec->Data.datasize=curformdat->Value.size(); curec->Data.data=new char[curec->Data.datasize]; memcpy(curec->Data.data,curformdat->Value.data(), curformdat->Value.size()); editrec.append(curec); delete[] curec.Data.data; }else if(curec.Data.storage==IntStorage){ editrec->append(*curec); delete[] curec->Data.data; }else if(curec->Data.storage==IntStorage){ curformdat->Value.push_back('\0'); curec.Data.datasize=sizeof(int); curec.Data.data=(char*)new int; curec->Data.datasize=sizeof(int); curec->Data.data=(char*)new int; int val=atoi(curformdat->Value.data()); memcpy(curec.Data.data,&val, curec.Data.datasize); memcpy(curec->Data.data,&val, curec->Data.datasize); editrec.append(curec); delete[] (int*)curec.Data.data; editrec->append(*curec); delete[] (int*)curec->Data.data; } } if(data){ editRecord(*backend,editrec,UserData); editRecord(*backend,*editrec,UserData); libhttppp::HttpResponse rep; rep.setState(HTTP307); rep.setVersion(HTTPVERSION(1.1)); Loading
src/api.cpp +7 −9 Changes for src/api.cpp: 7 added lines, 9 removed lines. Original line number Diff line number Diff line Loading @@ -58,13 +58,10 @@ namespace authdb { if(strcmp(key,"checkgpo")==0){ const char *id=json_object_get_string(val); uuid gpoid; gpoid.parse(id); json_object *respid=json_object_new_object(); json_object *value=json_object_new_object(); json_object_object_add(value,id,json_object_new_boolean(_SessionData->checkGPO(gpoid))); json_object_object_add(value,id,json_object_new_boolean(_SessionData->checkGPO(id))); json_object_object_add(respid,"gpo",value); json_object_array_add(response,respid); Loading Loading @@ -156,8 +153,9 @@ namespace authdb { _SessionData=nullptr; while(rd<end){ std::shared_ptr<authdb::AuthData::Record> cur=std::make_shared<authdb::AuthData::Record>(); while(rd<end){ cur->type=EmptyData; _Backend.setPos(rd); Loading @@ -165,12 +163,12 @@ namespace authdb { rd=_Backend.getPos()+cur->datasize; if(cur->type == UserData && strcmp(cur->fieldname,"username")==0 ){ class User user; class UserData udat(cur->uuid); std::shared_ptr<class UserData> udat=std::make_shared<class UserData>(cur->uuid); size_t upos = sizeof(AuthHeader); user.info(_Backend,udat,upos); user.info(_Backend,*udat,upos); if(name==udat.getUsername()){ if(pwsalt==udat.getPwHash()){ if(name==udat->getUsername()){ if(pwsalt==udat->getPwHash()){ const SessionData *sdat=AuthSession.addSession(_Backend,_Did.value,cur->uuid); json_object *respid=json_object_new_object(); uuid sessid; Loading
src/gpo.cpp +14 −14 Changes for src/gpo.cpp: 14 added lines, 14 removed lines. Original line number Diff line number Diff line Loading @@ -25,6 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *******************************************************************************/ #include <memory> #include <cstring> #include "types.h" Loading Loading @@ -130,28 +131,28 @@ authdb::GpoData::Allow::~Allow(){ bool authdb::Gpo::exits(AuthBackend& backend, uuid gpid, const char* name, int& ret){ authdb::AuthData::Record cur; std::shared_ptr<authdb::AuthData::Record> cur=std::make_shared<AuthData::Record>(); size_t rd=sizeof(authdb::AuthHeader),end=backend.end(); while(rd<end){ backend.setPos(rd); backend.read((unsigned char*)&cur,sizeof(AuthData::Record)); rd=backend.getPos()+cur.datasize; if(strcmp(cur.fieldname,"gponame")==0 ){ cur.data=new char[cur.datasize]; backend.read((unsigned char*)cur.data,cur.datasize); if(name && strcmp(cur.data,name) == 0){ delete[] cur.data; backend.read((unsigned char*)cur.get(),sizeof(AuthData::Record)); rd=backend.getPos()+cur->datasize; if(strcmp(cur->fieldname,"gponame")==0 ){ cur->data=new char[cur->datasize]; backend.read((unsigned char*)cur->data,cur->datasize); if(name && strcmp(cur->data,name) == 0){ delete[] cur->data; ret=1; return true; }else if(gpid==cur.uuid){ delete[] cur.data; }else if(gpid==cur->uuid){ delete[] cur->data; ret=2; return true; } delete[] cur.data; delete[] cur->data; } } ret=-1; Loading Loading @@ -192,9 +193,9 @@ void authdb::Gpo::info(AuthBackend &backend, class GpoData& dat, size_t &pos){ throw AuthBackendError("gpo info gpoid required!"); while(pos<end){ authdb::AuthData::Record *cur=new AuthData::Record; std::shared_ptr<authdb::AuthData::Record> cur=std::make_shared<AuthData::Record>(); backend.setPos(pos); backend.read((unsigned char*)cur,sizeof(AuthData::Record)); backend.read((unsigned char*)cur.get(),sizeof(AuthData::Record)); pos=backend.getPos()+cur->datasize; if(cur->type == PolicyData && uuid_compare(dat.Data.uuid,cur->uuid)==0 && strcmp(cur->fieldname,"gponame")==0 Loading @@ -203,6 +204,5 @@ void authdb::Gpo::info(AuthBackend &backend, class GpoData& dat, size_t &pos){ if(!getRecord(backend,dat,DataType::PolicyData)) continue; } delete cur; } }
src/hash/sha512.cpp +2 −1 Changes for src/hash/sha512.cpp: 2 added lines, 1 removed line. Original line number Diff line number Diff line Loading @@ -171,9 +171,10 @@ void authdb::sha512::hash(const std::string input, std::string& output) ctx.update((unsigned char*)input.c_str(), input.length()); ctx.final(digest); char buf[2*authdb::sha512::DIGEST_SIZE+1]; char *buf= new char[2*authdb::sha512::DIGEST_SIZE+1]; buf[2*authdb::sha512::DIGEST_SIZE] = 0; for (int i = 0; i < (int)authdb::sha512::DIGEST_SIZE; i++) sprintf(buf+i*2, "%02x", digest[i]); output=buf; delete[] buf; }