Commit 0dfe7c68 authored by jan.koester's avatar jan.koester
Browse files

some fixes

parent 8f3e7123
Loading
Loading
Loading
Loading
Loading
+33 −29
Changes for src/authdb.cpp: 33 added lines, 29 removed lines.
Original line number Diff line number Diff line
@@ -344,18 +344,16 @@ VALUEFOUND:
    }

    AuthData::AuthData(const AuthData &src) : AuthData(src.Data.uuid){
        std::shared_ptr<AuthData> dest(this);

        for(std::shared_ptr<AuthData> cursrc=std::make_shared<AuthData>(src); cursrc!=nullptr;
            cursrc=cursrc->_next){
        AuthData *dest=this;

        for(AuthData* cursrc=dest; cursrc!=nullptr; cursrc=cursrc->next()){
            memcpy(&dest->Data,&cursrc->Data,sizeof(AuthData::Record));
            dest->Data.datasize=cursrc->Data.datasize;
            dest->Data.data=new char[dest->Data.datasize];
            memcpy(dest->Data.data,cursrc->Data.data,cursrc->Data.datasize);
            if(cursrc->next()){
                dest->_next=std::make_shared<AuthData>(cursrc->Data.uuid);
                dest=dest->_next;
                dest=dest->next();
            }
        }
    }
@@ -363,8 +361,8 @@ VALUEFOUND:
    AuthData::~AuthData(){
    }

    std::shared_ptr<AuthData> AuthData::next() const{
        return _next;
    AuthData *AuthData::next() const{
        return _next.get();
    };

    bool authdb::AuthData::empty(){
@@ -374,43 +372,49 @@ VALUEFOUND:
    };

    const authdb::AuthData& AuthData::append(const AuthData &src){
        std::shared_ptr<AuthData> curec(this),next(this);
        AuthData *curec=this,*next=this;
        if(!curec->_next && curec->Data.datasize==0){
            for(std::shared_ptr<AuthData> cursrc=std::make_shared<AuthData>(src); cursrc; cursrc=cursrc->next()){
                next=std::make_shared<AuthData>(next->append(cursrc->Data));
            for(const AuthData *cursrc=curec; cursrc; cursrc=cursrc->next()){
                *next=static_cast<AuthData>(next->append(static_cast<const AuthData::Record&>(cursrc->Data)));
            }
            return *curec;
        }

        while(curec){
            if(!curec->_next){
                curec->_next= std::make_shared<AuthData>(src);
                curec=curec->_next;
                curec->_next->append(src);
                curec=curec->next();
                break;
            }
            curec=curec->_next;
            curec=curec->next();
        };

        return *curec;
    }

    const authdb::AuthData& AuthData::append(const AuthData::Record &src){
        std::shared_ptr<AuthData> curec(this);

        if(!curec->_next && curec->Data.datasize==0){
            curec->Data=src;
        AuthData *curec=this;

        if(curec->Data.datasize==0){
            uuid_copy(curec->Data.uuid,src.uuid);
            curec->Data.count=src.count;
            snprintf(curec->Data.fieldname,255,"%s",src.fieldname);
            curec->Data.start=src.start;
            curec->Data.storage=src.storage;
            curec->Data.type=src.type;
            curec->Data.datasize=src.datasize;
            curec->Data.data=new char[curec->Data.datasize];
            memcpy(curec->Data.data,src.data,curec->Data.datasize);
            return *curec;
        }

        while(curec){
            if(!curec->_next){
                curec->_next=std::make_shared<AuthData>(curec->append(src));
                curec=curec->_next;
            if(curec->next()){
                curec->_next=std::shared_ptr<AuthData>( new AuthData(curec->Data.uuid));
                curec=curec->next();
                break;
            }
            curec=curec->_next;
            curec=curec->next();
        };

        return *curec;
@@ -421,16 +425,16 @@ VALUEFOUND:
        int rd=sizeof(authdb::AuthHeader),end=backend.end();

        while(rd<end){
            std::shared_ptr<AuthData::Record> cur(new AuthData::Record());
            AuthData::Record cur;
            backend.setPos(rd);
            backend.read(reinterpret_cast<unsigned char*>(cur.get()),sizeof(AuthData::Record));
            rd=backend.getPos()+cur->datasize;
            if(uuid_compare(cur->uuid,rec.Data.uuid) == 0 && cur->type == type){
                cur->data=new char[cur->datasize];
                backend.read(reinterpret_cast<unsigned char*>(cur->data),cur->datasize);
                rec.append(*cur);
            backend.read(reinterpret_cast<unsigned char*>(&cur),sizeof(AuthData::Record));
            rd=backend.getPos()+cur.datasize;
            if(uuid_compare(cur.uuid,rec.Data.uuid) == 0 && cur.type == type){
                cur.data=new char[cur.datasize];
                backend.read(reinterpret_cast<unsigned char*>(cur.data),cur.datasize);
                rec.append(cur);
                found=true;
                cur->data=nullptr;
                delete[] cur.data;
            }
        }

+25 −32
Changes for src/authdb.h: 25 added lines, 32 removed lines.
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ namespace authdb {

        ~AuthData();

        std::shared_ptr<AuthData> next() const;
        AuthData *next() const;

        struct Record {
            char   start = 0xFE;
@@ -70,8 +70,8 @@ namespace authdb {

        bool empty();

        const authdb::AuthData& append(const AuthData &src);
        const authdb::AuthData& append(const AuthData::Record &src);
        const AuthData& append(const AuthData &src);
        const AuthData& append(const AuthData::Record &src);

    protected:
        std::shared_ptr<AuthData> _next;
@@ -83,60 +83,53 @@ namespace authdb {
    };

    template<class T,class Y>
    void setAuthData(int type,int storage,AuthData *dat,std::shared_ptr<AuthData::Record> varclass,
    void setAuthData(int type,int storage,AuthData *dat,std::shared_ptr<AuthData::Record> &varclass,
                     const char *varname,const T *value,size_t count){
        std::shared_ptr<AuthData::Record> target(varclass);

        std::shared_ptr<AuthData> curec(dat);

        AuthData *curec=dat;
        uuid_t gid;
        uuid_copy(gid,dat->Data.uuid);

        if(!target){
        if(!varclass){
            while(curec){
                if(curec->Data.type == type &&
                    uuid_compare(curec->Data.uuid,gid)==0 &&
                    strcmp(curec->Data.fieldname,varname)==0
                ){

                    target=std::make_shared<AuthData::Record>(curec->Data);
                    target->datasize=0;
                    delete[] target->data;
                    target->data=nullptr;
                    varclass.reset(&curec->Data);
                    varclass->datasize=0;
                    delete[] varclass->data;
                    varclass->data=nullptr;
                    break;
                }
                curec=curec->next();
            }
        }

        if(!target){
        if(!varclass){
            AuthData::Record tmp;
            target=std::make_shared<AuthData::Record>(dat->append(tmp).Data);
            varclass=std::shared_ptr<AuthData::Record>(new AuthData::Record(dat->append(tmp).Data));
        }

        memset(target.get(),0,sizeof(AuthData::Record));

        target->start=0xFE;
        uuid_copy(target->uuid,gid);
        target->type=type;
        target->storage=storage;

        snprintf(target->fieldname,255,"%s",varname);
        target->datasize = sizeof(T)+(sizeof(Y)*count);
        target->data=new char[target->datasize];
        memset(target->data,0,target->datasize);
        memcpy(target->data,(char*)value,sizeof(T));
        varclass->start=0xFE;
        uuid_copy(varclass->uuid,gid);
        varclass->type=type;
        varclass->storage=storage;
        memset(varclass->fieldname,0,255);
        snprintf(varclass->fieldname,255,"%s",varname);
        varclass->datasize = sizeof(T)+(sizeof(Y)*count);
        varclass->data=new char[varclass->datasize];
        memset(varclass->data,0,varclass->datasize);
        memcpy(varclass->data,(char*)value,sizeof(T));

        char *start= (char*) target->data+sizeof(T)-sizeof(Y);
        char *start= (char*) varclass->data+sizeof(T)-sizeof(Y);

        char *vstart = (char*) value+(sizeof(T)-sizeof(Y));

        for(int i=0; i< count; ++i){
            memcpy(start+(sizeof(Y)*i),vstart+(sizeof(Y)*i),sizeof(Y));
        }


        varclass=target;
    }

    template<class T>
@@ -144,10 +137,10 @@ namespace authdb {
        if(varclass !=nullptr && varclass->data ){
            return (T*)varclass->data;
        }else{
            for(std::shared_ptr<AuthData> curdat(dat); curdat; curdat=curdat->next()){
            for(AuthData *curdat=dat; curdat; curdat=curdat->next()){
                if(curdat->Data.type==type && curdat->Data.storage==storage
                    && strcmp(curdat->Data.fieldname,varname)==0){
                    varclass=std::make_shared<AuthData::Record>(curdat->Data);
                    varclass.reset(&curdat->Data);
                    return (T*)curdat->Data.data;
                }
            }
+1 −1
Changes for src/client.cpp: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ void authdb::Client::create(AuthBackend& backend, class ClientData* data){

    size_t wd=backend.end();

    for(std::shared_ptr<AuthData> curec(data); curec; curec=curec->next()){
    for(AuthData *curec=data; curec; curec=curec->next()){
        curec->Data.type=ClientData;
        backend.setPos(wd);
        backend.write(reinterpret_cast<unsigned char*>(&curec->Data),sizeof(struct AuthData::Record));
+1 −1
Changes for src/domain.cpp: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ void authdb::Domain::create(authdb::AuthBackend& backend,class DomainData *data)

    size_t wd=backend.end();

    for(std::shared_ptr<AuthData> curec(data); curec; curec=curec->next()){
    for(AuthData *curec=data; curec; curec=curec->next()){
         curec->Data.type=DataType::DomainData;
         backend.setPos(wd);
         backend.write((unsigned char*)&curec->Data,sizeof(struct AuthData::Record));
+3 −3
Changes for src/gpo.cpp: 3 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ bool authdb::GpoData::getGpoValue(){
}

void authdb::GpoData::setAllowed(Allow *allowed){
        std::shared_ptr<AuthData> curec(this);
        AuthData *curec=this;
        uuid_t fuuid;

        uuid_copy(fuuid,Data.uuid);
@@ -107,7 +107,7 @@ void authdb::GpoData::setAllowed(Allow *allowed){

void authdb::GpoData::getAlowed(Allow *allowed){
    if(!_Allowed){
        for(std::shared_ptr<AuthData> curdat(this); curdat; curdat=curdat->next()){
        for(AuthData *curdat=this; curdat; curdat=curdat->next()){
            if(
                curdat->Data.storage==StorageType::BinaryStorage &&
                curdat->Data.type==DataType::PolicyData &&
@@ -195,7 +195,7 @@ void authdb::Gpo::create(AuthBackend& backend, class GpoData* dat){

    backend.setPos(backend.end());

    for(std::shared_ptr<AuthData> curec(dat); curec; curec=curec->next()){
    for(AuthData *curec=dat; curec; curec=curec->next()){
        backend.write(reinterpret_cast<unsigned char*>(&curec->Data),sizeof(struct AuthData::Record));
        backend.write(reinterpret_cast<unsigned char*>(curec->Data.data),curec->Data.datasize);
    }
Loading