Commit 85d8e800 authored by jan.koester's avatar jan.koester
Browse files

used shared ptrs

parent f3c7ccc3
Loading
Loading
Loading
Loading
Loading
+1 −1
Changes for CMakeLists.txt: 1 added line, 1 removed line.
Original line number Diff line number Diff line
cmake_minimum_required(VERSION 3.18)

set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -Wall -Wextra --warn-no-unused-parameter")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -Wall -Wextra --warn-no-unused-parameter -Wstack-usage=1000")

project(authdb)

+13 −13
Changes for src/admin.cpp: 13 added lines, 13 removed lines.
Original line number Diff line number Diff line
@@ -92,23 +92,23 @@ namespace authdb {
            userlist <<"<div><p>UserList:</p><table class=\"userlist\">";

            while(rd<end){
                authdb::AuthData::Record cur;
                std::shared_ptr<authdb::AuthData::Record> cur=std::make_shared<authdb::AuthData::Record>();

                cur.type=EmptyData;
                cur->type=EmptyData;

                backend->setPos(rd);
                backend->read((unsigned char*)&cur,sizeof(AuthData::Record));
                backend->read((unsigned char*)cur.get(),sizeof(AuthData::Record));

                rd=backend->getPos()+cur.datasize;
                rd=backend->getPos()+cur->datasize;

                if(cur.type == UserData && strcmp(cur.fieldname,"username")==0){
                    class UserData udat(cur.uuid);
                if(cur->type == UserData && strcmp(cur->fieldname,"username")==0){
                    class UserData udat(cur->uuid);
                    try {
                        size_t upos=sizeof(authdb::AuthHeader);
                        user.info(*backend,udat,upos);

                        char cruid[255];
                        uuid_unparse(cur.uuid,cruid);
                        uuid_unparse(cur->uuid,cruid);
                        userlist << "<tr><td class=\"list_username\">"
                                 << udat.getUsername()
                                 << "</td></tr>"
@@ -2066,17 +2066,17 @@ namespace authdb {
            size_t rd=sizeof(authdb::AuthHeader),end=backend->end();

            while(rd<end){
                authdb::AuthData::Record cur;
                std::shared_ptr<authdb::AuthData::Record> cur=std::make_shared<authdb::AuthData::Record>();

                cur.type=EmptyData;
                cur->type=EmptyData;

                backend->setPos(rd);
                backend->read((unsigned char*)&cur,sizeof(AuthData::Record));
                backend->read((unsigned char*)cur.get(),sizeof(AuthData::Record));

                rd=backend->getPos()+cur.datasize;
                rd=backend->getPos()+cur->datasize;

                if(cur.type == UserData && strcmp(cur.fieldname,"username")==0){
                    class UserData udat(cur.uuid);
                if(cur->type == UserData && strcmp(cur->fieldname,"username")==0){
                    class UserData udat(cur->uuid);
                    size_t upos=sizeof(authdb::AuthHeader);
                    user.info(*backend,udat,upos);

+1 −0
Changes for src/authdb.cpp: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -233,6 +233,7 @@ namespace authdb {
                    rep.send(curreq,e.what(),strlen(e.what()));
                }
                _AdminBackend.unlock();
                return;
            }if(curreq->getRequestURL().compare(0,4,"/api",4)==0){
                _AdminBackend.lock();

+18 −17
Changes for src/group.cpp: 18 added lines, 17 removed lines.
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@
 *******************************************************************************/

#include <cstring>
#include <memory>

#include "authdb.h"
#include "types.h"
@@ -134,28 +135,28 @@ bool authdb::GroupData::isMember(const uuid uid){


bool authdb::Group::exits(AuthBackend& backend, uuid_t* gid, const char* name, int& ret){
    authdb::AuthData::Record cur;
    std::shared_ptr<authdb::AuthData::Record> cur=std::make_shared<authdb::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(cur.type == DataType::GroupData &&
            strcmp(cur.fieldname,"groupname")==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(cur->type == DataType::GroupData &&
            strcmp(cur->fieldname,"groupname")==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(gid && uuid_compare(cur.uuid,*gid)==0){
                delete[] cur.data;
            }else if(gid && uuid_compare(cur->uuid,*gid)==0){
                delete[] cur->data;
                ret=2;
                return true;
            }
            delete[] cur.data;
            delete[] cur->data;
        }
    }
    ret=-1;
@@ -192,12 +193,12 @@ void authdb::Group::info(AuthBackend &backend, class GroupData& dat, size_t &pos
        throw AuthBackendError("group info gid required!");

    while(pos<end){
        authdb::AuthData::Record cur;
        std::shared_ptr<authdb::AuthData::Record> cur=std::make_shared<authdb::AuthData::Record>();
        backend.setPos(pos);
        backend.read((unsigned char*)&cur,sizeof(AuthData::Record));
        pos=backend.getPos()+cur.datasize;
        if(cur.type == GroupData && uuid_compare(dat.Data.uuid,cur.uuid) == 0
            && strcmp(cur.fieldname,"groupname")==0
        backend.read((unsigned char*)cur.get(),sizeof(AuthData::Record));
        pos=backend.getPos()+cur->datasize;
        if(cur->type == GroupData && uuid_compare(dat.Data.uuid,cur->uuid) == 0
            && strcmp(cur->fieldname,"groupname")==0
        ){
            dat._Name=&dat.Data;

+30 −30
Changes for src/session.cpp: 30 added lines, 30 removed lines.
Original line number Diff line number Diff line
@@ -173,20 +173,20 @@ const authdb::SessionData *authdb::Session::addSession(AuthBackend &backend,uuid

    size_t rd=sizeof(authdb::AuthHeader),end=backend.end();
    while(rd<end){
        authdb::AuthData::Record cur;
       std::shared_ptr<authdb::AuthData::Record> cur=std::make_shared<authdb::AuthData::Record>();

        cur.type=EmptyData;
        cur->type=EmptyData;

        backend.setPos(rd);
        backend.read(reinterpret_cast<unsigned char*>(&cur),sizeof(AuthData::Record));
        backend.read(reinterpret_cast<unsigned char*>(cur.get()),sizeof(AuthData::Record));

        rd=backend.getPos()+cur.datasize;
        rd=backend.getPos()+cur->datasize;

        if(cur.type == UserData && strcmp(cur.fieldname,"username")==0
            && userid==cur.uuid){
        if(cur->type == UserData && strcmp(cur->fieldname,"username")==0
            && userid==cur->uuid){

            unsigned char *tmp = new unsigned char[cur.datasize];
            backend.read(tmp,cur.datasize);
            unsigned char *tmp = new unsigned char[cur->datasize];
            backend.read(tmp,cur->datasize);
            username=reinterpret_cast<char*>(tmp);
            delete[] tmp;
        }
@@ -197,20 +197,20 @@ const authdb::SessionData *authdb::Session::addSession(AuthBackend &backend,uuid
    rd=sizeof(authdb::AuthHeader);

    while(rd<end){
        authdb::AuthData::Record cur;
        std::shared_ptr<authdb::AuthData::Record> cur=std::make_shared<authdb::AuthData::Record>();

        backend.setPos(rd);
        backend.read(reinterpret_cast<unsigned char*>(&cur),sizeof(AuthData::Record));
        backend.read(reinterpret_cast<unsigned char*>(cur.get()),sizeof(AuthData::Record));

        rd=backend.getPos()+cur.datasize;
        rd=backend.getPos()+cur->datasize;

        if(cur.type == GroupData && strcmp(cur.fieldname,"groupname")==0){
        if(cur->type == GroupData && strcmp(cur->fieldname,"groupname")==0){
            Group group;
            class GroupData grpi(cur.uuid);
            class GroupData grpi(cur->uuid);
            size_t upos=sizeof(authdb::AuthHeader);
            group.info(backend,grpi,upos);
            if(grpi.isMember(userid)){
                mbs.emplace_back(cur.uuid);
                mbs.emplace_back(cur->uuid);
            }
        }
    }
@@ -233,23 +233,23 @@ const authdb::SessionData *authdb::Session::addSession(AuthBackend &backend,uuid
    rd=sizeof(authdb::AuthHeader);

    while(rd<end){
        authdb::AuthData::Record cur;
        std::shared_ptr<authdb::AuthData::Record> cur=std::make_shared<authdb::AuthData::Record>();

        backend.setPos(rd);
        backend.read(reinterpret_cast<unsigned char*>(&cur),sizeof(AuthData::Record));
        backend.read(reinterpret_cast<unsigned char*>(cur.get()),sizeof(AuthData::Record));

        rd=backend.getPos()+cur.datasize;
        rd=backend.getPos()+cur->datasize;

        if(cur.type == PolicyData && strcmp(cur.fieldname,"gponame")==0){
        if(cur->type == PolicyData && strcmp(cur->fieldname,"gponame")==0){
            Gpo gpo;
            class GpoData gpodat(cur.uuid);
            class GpoData gpodat(cur->uuid);
            size_t upos=sizeof(authdb::AuthHeader);
            gpo.info(backend,gpodat,upos);
            if(!gpores->GPOId.empty()){
                gpores->next=new SessionData::GPOResult();
                gpores=gpores->next;
            }
            gpores->GPOId=cur.uuid;
            gpores->GPOId=cur->uuid;
            gpores->GPORes=gpodat.getGpoValue();


@@ -323,25 +323,25 @@ void authdb::Session::relSession(AuthBackend &backend,uuid sessionid){

    size_t rd=sizeof(authdb::AuthHeader),end=backend.end();
    while(rd<end){
        authdb::AuthData::Record cur;
        std::shared_ptr<authdb::AuthData::Record> cur=std::make_shared<authdb::AuthData::Record>();

        cur.type=EmptyData;
        cur->type=EmptyData;

        backend.setPos(rd);
        backend.read(reinterpret_cast<unsigned char*>(&cur),sizeof(AuthData::Record));
        backend.read(reinterpret_cast<unsigned char*>(cur.get()),sizeof(AuthData::Record));

        rd=backend.getPos()+cur.datasize;
        rd=backend.getPos()+cur->datasize;

        if(cur.type == UserData && strcmp(cur.fieldname,"username")==0
            && uuid_compare(cur.uuid,cursess->_uid.value)==0){
        if(cur->type == UserData && strcmp(cur->fieldname,"username")==0
            && uuid_compare(cur->uuid,cursess->_uid.value)==0){

            const std::shared_ptr<unsigned char[]>tmp(new unsigned char[cur.datasize]);
            backend.read(tmp.get(),cur.datasize);
            const std::shared_ptr<unsigned char[]>tmp(new unsigned char[cur->datasize]);
            backend.read(tmp.get(),cur->datasize);
            username=reinterpret_cast<char*>(tmp.get());
        }

        if(cur.type == GroupData && strcmp(cur.fieldname,"groupname")==0){
            class GroupData grpi(cur.uuid);
        if(cur->type == GroupData && strcmp(cur->fieldname,"groupname")==0){
            class GroupData grpi(cur->uuid);
            size_t upos=sizeof(authdb::AuthHeader);
            group.info(backend,grpi,upos);

Loading