better usage (69512959) · Commits · tuxist / authdb

src/admin.cpp

+26 −28

Changes for src/admin.cpp: 26 added lines, 28 removed lines.
Original line number	Diff line number	Diff line
		@@ -118,14 +118,12 @@ namespace authdb {
		size_t upos=sizeof(authdb::AuthHeader);
		user.info(*backend,udat,upos);

		char cruid[255];
		cur->ruid=cruid;
		userlist << "<tr><td class=\"list_username\">"
		<< udat.getUsername()
		<< "</td></tr>"
		<< "<tr><td><img class=\"list_picture\" style=\"height:100px;\" src=\"" <<"/getavatar/" << cdid << "/" << cruid << ".jpg\" alt=\"avatar\">"
		<< "<tr><td><img class=\"list_picture\" style=\"height:100px;\" src=\"" <<"/getavatar/" << cdid << "/" << uuid(cur->ruid).c_str() << ".jpg\" alt=\"avatar\">"
		<< "</td><td><ul><li>"
		<< "uid: " << cruid
		<< "uid: " << uuid(cur->ruid).c_str()
		<< "</li>";
		try{
		userlist << "<li><span>Firstname:</span><span>" << udat.getFirstname() << "</span></li>"
		@@ -135,8 +133,8 @@ namespace authdb {
		std::cerr << e.what() << std::endl;
		}
		userlist << "</ul></td><td><ul class=\"usertoolbar\" >"
		<< "<li><a class=\"button\" href=\"/settings/"<< cdid << "/edituser/" << cruid << "\">EditUser</a></li>"
		<< "<li><a class=\"button\" href=\"/settings/" << cdid << "/removeuser/" << cruid << "\">RemoveUser</a></li>"
		<< "<li><a class=\"button\" href=\"/settings/"<< cdid << "/edituser/" << uuid(cur->ruid).c_str() << "\">EditUser</a></li>"
		<< "<li><a class=\"button\" href=\"/settings/" << cdid << "/removeuser/" << uuid(cur->ruid).c_str() << "\">RemoveUser</a></li>"
		<< "</ul></td></tr>";
		}catch(AuthBackendError &e){
		std::cerr << e.what() << std::endl;
		@@ -235,7 +233,7 @@ namespace authdb {
		struct AuthData::Record cudat;

		cudat.start=0xFE;
		cudat.ruid=uid;
		std::copy(&uid.value[0],&uid.value[16],&cudat.ruid[0]);

		cudat.type=UserData;
		cudat.storage=stortype;
		@@ -535,7 +533,7 @@ namespace authdb {
		backend->read((unsigned char*)cur.get(),sizeof(AuthData::Record));
		rd=backend->getPos()+cur->datasize;

		if(cur->ruid==uid && cur->type==UserData && cur->storage==TextStorage){
		if(uid==cur->ruid && cur->type==UserData && cur->storage==TextStorage){
		cur->data = new char[cur->datasize];
		backend->read((unsigned char*)cur->data,cur->datasize);
		try {
		@@ -614,8 +612,8 @@ namespace authdb {
		cur->data = new char[cur->datasize];
		backend.read((unsigned char*)cur->data,cur->datasize);

		dest << "<option value=\"" << cur->ruid.c_str() << "\" ";
		if ( strcmp(cdid,cur->ruid.c_str())==0 ){
		dest << "<option value=\"" << uuid(cur->ruid).c_str() << "\" ";
		if ( strcmp(cdid,uuid(cur->ruid).c_str())==0 ){
		dest << "selected";
		}
		dest << ">"
		@@ -661,12 +659,12 @@ namespace authdb {
		list << "<tr><td>"
		<< ddat.getDomainName()
		<< "</td><td><ul><li>"
		<< "Domainid: " << cur->ruid.c_str()
		<< "Domainid: " << uuid(cur->ruid).c_str()
		<< "</li>"
		<< "<li><span>Storagetype: </span><span>" << ddat.getStorageType() << "</span></li>"
		<< "<li><span>Storageoptions: </span><span>" << ddat.getStorageOptions() << "</span></li>"
		<< "</ul></td><td><ul class=\"usertoolbar\" >"
		<< "<li><a class=\"button\" href=\"/settings/" << cur->ruid.c_str() << "/removedomain\">RemoveDomain</a></li>"
		<< "<li><a class=\"button\" href=\"/settings/" << uuid(cur->ruid).c_str() << "/removedomain\">RemoveDomain</a></li>"
		<< "</ul></td></tr>";
		}catch(AuthBackendError &e){
		std::cerr << e.what() << std::endl;
		@@ -745,7 +743,7 @@ namespace authdb {
		struct AuthData::Record dodat;

		dodat.start=0xFE;
		dodat.ruid=uid;
		std::copy(&uid.value[0],&uid.value[16],&dodat.ruid[0]);

		dodat.type=DomainData;
		dodat.storage=stortype;
		@@ -896,14 +894,14 @@ namespace authdb {
		grouplist << "<tr><td class=\"list_groupname\">" << gdat.getName()
		<< "</td><td>"
		<< "<ul><li>"
		<< "uid: " << cur->ruid.c_str()
		<< "uid: " << uuid(cur->ruid).c_str()
		<< "</li>"
		<< "</ul></td><td><ul><li><a class=\"button\" href=\"/settings/"
		<< cur->ruid.c_str()
		<< "/removegroup/" << cur->ruid.c_str() << "\">Remove group</a></li>"
		<< uuid(cur->ruid).c_str()
		<< "/removegroup/" << uuid(cur->ruid).c_str() << "\">Remove group</a></li>"
		<< "<li><a class=\"button\" href=\"/settings/"
		<< cdid
		<< "/editgroup/" << cur->ruid.c_str() << "\">Edit group</a></li>"
		<< "/editgroup/" << uuid(cur->ruid).c_str() << "\">Edit group</a></li>"
		<< "</ul></td></tr>";
		}catch(AuthBackendError &e){
		std::cerr << e.what() << std::endl;
		@@ -1026,7 +1024,7 @@ namespace authdb {
		if(cur->type == UserData && strcmp(cur->fieldname,"username")==0){
		cur->data=new char[cur->datasize];
		backend->read((unsigned char*)cur.get(),cur->datasize);
		form << "<option value=\"" << cur->ruid.c_str() << "\">" << cur->data << "</option>";
		form << "<option value=\"" << uuid(cur->ruid).c_str() << "\">" << cur->data << "</option>";
		delete[] cur->data;
		}

		@@ -1279,7 +1277,7 @@ namespace authdb {
		curu->data = new char[curu->datasize];
		backend->read((unsigned char*)curu->data,curu->datasize);

		form << "<option value=\"" << curu->ruid.c_str() << "\" ";
		form << "<option value=\"" << uuid(curu->ruid).c_str() << "\" ";
		for(const uuid &mrec : mrecs){
		if(mrec == curu->ruid ){
		form << " selected ";
		@@ -1557,7 +1555,7 @@ namespace authdb {
		cur.data = new char[cur.datasize];
		backend->read((unsigned char*)cur.data,cur.datasize);

		form <<"<option value=\""<< cur.ruid.c_str() <<"\">" << cur.data << "</option>";
		form <<"<option value=\""<< uuid(cur.ruid).c_str() <<"\">" << cur.data << "</option>";
		delete[] cur.data;
		}
		}
		@@ -1730,7 +1728,7 @@ namespace authdb {

		libhtmlpp::TextElement optname(cur->data) ;

		opt.setAttribute("value",cur->ruid.c_str());
		opt.setAttribute("value",uuid(cur->ruid).c_str());

		opt.setAttribute("selected","");

		@@ -1838,7 +1836,7 @@ namespace authdb {

		gpoli.clear();

		gpoli << "<tr><td>" << cur->ruid.c_str() << "</td>"
		gpoli << "<tr><td>" << uuid(cur->ruid).c_str() << "</td>"
		<< "<td>" << gdat.getName() << "</td>"
		<< "<td>";
		try{
		@@ -1851,9 +1849,9 @@ namespace authdb {
		gpoli << "<td>Permitted</td>";
		gpoli << "<td>"
		<< "<a class=\"button\" href=\"" << "/settings/"
		<< cdid <<"/removegpo/" << cur->ruid.c_str() <<"\">Delete</a>"
		<< cdid <<"/removegpo/" << uuid(cur->ruid).c_str() <<"\">Delete</a>"
		<< "<a class=\"button\" href=\"" << "/settings/"
		<< cdid <<"/editgpo/" << cur->ruid.c_str() <<"\">Edit</a>"
		<< cdid <<"/editgpo/" << uuid(cur->ruid).c_str() <<"\">Edit</a>"
		<< "</td>"
		<< "</tr>";
		domel.appendChild(gpoli.parse());
		@@ -2184,11 +2182,11 @@ namespace authdb {

		libhtmlpp::HtmlString clistdata;

		clistdata << "<li>" << cur->ruid.c_str() << ": " << cdat.getName()
		clistdata << "<li>" << uuid(cur->ruid).c_str() << ": " << cdat.getName()
		<< "<a class=\"button\" href=\"/settings/" << cdid << "/"
		<< "editclient/" << cur->ruid.c_str() << "\">Edit</a>"
		<< "editclient/" << uuid(cur->ruid).c_str() << "\">Edit</a>"
		<< "<a class=\"button\" href=\"/settings/" << cdid << "/"
		<< "removeclient/" << cur->ruid.c_str() << "\">Delete</a>"
		<< "removeclient/" << uuid(cur->ruid).c_str() << "\">Delete</a>"
		<< "</li>";

		clist.appendChild(clistdata.parse());
		@@ -2413,7 +2411,7 @@ namespace authdb {
		size_t dpos=sizeof(authdb::AuthHeader);
		domain.info(_AdminBackend,ddat,dpos);

		*dform << "<option value=\"" << cur->ruid.c_str() << "\" >"
		*dform << "<option value=\"" << uuid(cur->ruid).c_str() << "\" >"
		<< ddat.getDomainName()
		<< "</option>";

src/authdb.h

+2 −2

Changes for src/authdb.h: 2 added lines, 2 removed lines.
Original line number	Diff line number	Diff line
		@@ -65,7 +65,7 @@ namespace authdb {

		struct Record {
		int start = 0xFE;
		uuid ruid;
		uuid_t ruid;
		int type = EmptyData;
		int storage = EmptyStorage;
		char fieldname[255] = {0};
		@@ -121,7 +121,7 @@ namespace authdb {
		}

		target->start=0xFE;
		target->ruid=gid;
		std::copy(&gid.value[0],&gid.value[16],target->ruid);
		target->type=type;
		target->storage=storage;
		memset(target->fieldname,0,255);

src/client.cpp

+2 −2

Changes for src/client.cpp: 2 added lines, 2 removed lines.
Original line number	Diff line number	Diff line
		@@ -106,7 +106,7 @@ bool authdb::Client::exits(AuthBackend& backend,const uuid &clid, const char* na
		ret=1;
		return true;

		}else if(!clid.empty() && cur.ruid==clid){
		}else if(!clid.empty() && clid==cur.ruid){
		delete[] cur.data;
		ret=2;
		return true;
		@@ -121,7 +121,7 @@ bool authdb::Client::exits(AuthBackend& backend,const uuid &clid, const char* na
		void authdb::Client::info(AuthBackend& backend, class ClientData& dat, size_t& pos){
		size_t end=backend.end();

		if(dat.Data.ruid.empty())
		if(uuid(dat.Data.ruid).empty())
		throw AuthBackendError("user info uid required!");

		while(pos<end){

src/data.cpp

+5 −5

Changes for src/data.cpp: 5 added lines, 5 removed lines.
Original line number	Diff line number	Diff line
		@@ -5,7 +5,7 @@

		namespace authdb {
		AuthData::AuthData(const uuid &id){
		Data.ruid=id;
		std::copy(&id.value[0],&id.value[16],&Data.ruid[0]);
		Data.start=0xFE;
		Data.storage=EmptyStorage;
		Data.type=DataType::EmptyData;
		@@ -97,7 +97,7 @@ namespace authdb {
		backend.setPos(rd);
		backend.read(reinterpret_cast<unsigned char*>(cur.get()),sizeof(AuthData::Record));
		rd=backend.getPos()+cur->datasize;
		if(cur->ruid==rec.Data.ruid && cur->type == type){
		if(uuid(cur->ruid)==rec.Data.ruid && cur->type == type){
		cur->data=new char[cur->datasize];
		backend.read(reinterpret_cast<unsigned char*>(cur->data),cur->datasize);
		rec.append(*cur);
		@@ -135,7 +135,7 @@ namespace authdb {
		continue;

		for(AuthData *olddat=&old; olddat; olddat=olddat->_next){
		if(olddat->Data.ruid==curdat->Data.ruid
		if(uuid(olddat->Data.ruid)==curdat->Data.ruid
		&& strcmp(olddat->Data.fieldname,curdat->Data.fieldname)==0
		){
		size_t end = olddat->Data.datasize;
		@@ -174,7 +174,7 @@ namespace authdb {
		std::shared_ptr<authdb::AuthData::Record> rdrec(new AuthData::Record);
		backend.setPos(rd);
		backend.read(reinterpret_cast<unsigned char*>(rdrec.get()),sizeof(AuthData::Record));
		if(rdrec->ruid==rec.Data.ruid && strcmp(rdrec->fieldname,chel->fieldname)==0){
		if(uuid(rdrec->ruid)==rec.Data.ruid && strcmp(rdrec->fieldname,chel->fieldname)==0){
		backend.setPos(backend.end());
		backend.write((const unsigned char*)chel,sizeof(AuthData::Record));
		backend.write((const unsigned char*)chel->data,chel->datasize);
		@@ -216,7 +216,7 @@ namespace authdb {
		cur->data=new char[dsize];
		memset(cur->data,0,dsize);
		memset(&cur->fieldname,0,255);
		memset(cur->ruid.value,0,sizeof(uuid_t));
		memset(cur->ruid,0,sizeof(uuid_t));
		cur->storage=StorageType::EmptyStorage;
		cur->type=DataType::EmptyData;
		cur->datasize=dsize;

src/domain.cpp

+3 −3

Changes for src/domain.cpp: 3 added lines, 3 removed lines.
Original line number	Diff line number	Diff line
		@@ -91,7 +91,7 @@ void authdb::Domain::remove(AuthBackend& backend, const uuid &uid){
		backend.setPos(rd);
		backend.read((unsigned char*)&cur,sizeof(AuthData::Record));
		rd=backend.getPos()+cur.datasize;
		if( cur.ruid==uid &&
		if( uid==cur.ruid &&
		cur.type==DataType::DomainData &&
		strcmp(cur.fieldname,"domainoptions")==0){

		@@ -125,7 +125,7 @@ bool authdb::Domain::exits(AuthBackend& backend,const uuid& did, const char* nam
		delete[] cur.data;
		ret=1;
		return true;
		}else if(!did.empty() && cur.ruid==did ){
		}else if(!did.empty() && did==cur.ruid ){
		delete[] cur.data;
		ret=2;
		return true;
		@@ -140,7 +140,7 @@ bool authdb::Domain::exits(AuthBackend& backend,const uuid& did, const char* nam
		void authdb::Domain::info(AuthBackend& backend, class DomainData& dat, size_t& pos){
		size_t end=backend.end();

		if(dat.Data.ruid.empty())
		if(uuid(dat.Data.ruid).empty())
		throw AuthBackendError("Domain info domainid required!");

		while(pos<end){