Commit a57d63c3 authored by jan.koester's avatar jan.koester
Browse files

Authdata is now parent

parent 78bc45ef
Loading
Loading
Loading
Loading
Loading
+7 −7
Changes for src/admin.cpp: 7 added lines, 7 removed lines.
Original line number Diff line number Diff line
@@ -236,7 +236,7 @@ namespace authdb {
                        memcpy(cudat.data,curformdat->Value.data(),
                               cudat.datasize);

                        udat.Data->append(cudat);
                        udat.append(cudat);
                        delete[] cudat.data;
                    }else if(cudat.storage==TextStorage){
                        if(strcmp(cudat.fieldname,"username")==0)
@@ -252,7 +252,7 @@ namespace authdb {
                            memcpy(cudat.data,pwhash.c_str(),pwhash.length());
                            cudat.data[pwhash.length()]='\0';

                            udat.Data->append(cudat);
                            udat.append(cudat);
                            delete[] cudat.data;
                        }else{
                            curformdat->Value.push_back('\0');
@@ -262,7 +262,7 @@ namespace authdb {
                            memcpy(cudat.data,curformdat->Value.data(),
                                    curformdat->Value.size());

                            udat.Data->append(cudat);
                            udat.append(cudat);
                            delete[] cudat.data;
                        }
                    }else if(cudat.storage==IntStorage){
@@ -273,7 +273,7 @@ namespace authdb {
                            memcpy(cudat.data,&val,
                                    curformdat->Value.size());

                            udat.Data->append(cudat);
                            udat.append(cudat);
                            delete[] cudat.data;
                    }

@@ -757,7 +757,7 @@ namespace authdb {
                        memcpy(dodat.data,curformdat->Value.data(),
                               curformdat->Value.size());

                        ddat.Data->append(dodat);
                        ddat.append(dodat);
                        delete[] dodat.data;
                    }else if(dodat.storage==IntStorage){
                        curformdat->Value.push_back('\0');
@@ -768,7 +768,7 @@ namespace authdb {
                        memcpy(dodat.data,&val,
                               dodat.datasize);

                        ddat.Data->append(dodat);
                        ddat.append(dodat);
                        delete (int*)dodat.data;
                    }else {
                        dodat.datasize=curformdat->Value.size();
@@ -776,7 +776,7 @@ namespace authdb {
                        memcpy(dodat.data,curformdat->Value.data(),
                               dodat.datasize);

                        ddat.Data->append(dodat);
                        ddat.append(dodat);
                        delete[] dodat.data;
                    }
                }
+15 −16
Changes for src/domain.cpp: 15 added lines, 16 removed lines.
Original line number Diff line number Diff line
@@ -160,9 +160,8 @@ namespace authdb {
    }
};

authdb::DomainData::DomainData(uuid_t uuid){
authdb::DomainData::DomainData(uuid_t uuid) :AuthData(uuid){
    uuid_copy(did,uuid);
    Data=new AuthData(did);
    _name=nullptr;
    _storageType=nullptr;
    _storageOptions=nullptr;
@@ -174,28 +173,28 @@ authdb::DomainData::~DomainData(){
}

void authdb::DomainData::setDomainName(const char* name){
    setDomainData(this->Data,&_name,"domainname",name);
    setDomainData(this,&_name,"domainname",name);
}

const char * authdb::DomainData::getDomainName(){
    return getDomainData(this->Data,&_name,"domainname");
    return getDomainData(this,&_name,"domainname");
}


void authdb::DomainData::setStorageType(int type){
    setDomainData(this->Data,&_storageType,"domainstorage",type);
    setDomainData(this,&_storageType,"domainstorage",type);
}

int authdb::DomainData::getStorageType(){
    return getIntDomainData(this->Data,&_storageType,"domainstorage");
    return getIntDomainData(this,&_storageType,"domainstorage");
}

void authdb::DomainData::setStorageOptions(const char *opts){
    setDomainData(this->Data,&_storageOptions,"domainoptions",opts);
    setDomainData(this,&_storageOptions,"domainoptions",opts);
}

const char * authdb::DomainData::getStorageOptions(){
    return getDomainData(this->Data,&_storageOptions,"domainoptions");
    return getDomainData(this,&_storageOptions,"domainoptions");
}

void authdb::Domain::create(authdb::AuthBackend& backend,class DomainData *data){
@@ -213,7 +212,7 @@ void authdb::Domain::create(authdb::AuthBackend& backend,class DomainData *data)

    size_t wd=backend.end();

    for(AuthData *curec=data->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));
@@ -290,15 +289,15 @@ void authdb::Domain::info(AuthBackend& backend, class DomainData& dat, size_t& p
        pos=backend.getPos()+cur->datasize;
        if(cur->type == DataType::DomainData && uuid_compare(dat.did,cur->uuid) == 0){

            if(!getRecord(backend,*dat.Data,DataType::DomainData))
            if(!getRecord(backend,dat,DataType::DomainData))
                continue;

            if(strcmp(dat.Data->Data->fieldname,"domainname")==0){
                dat._name=dat.Data->Data;
            }else if(strcmp(dat.Data->Data->fieldname,"domainstorage")==0){
                dat._storageType =dat.Data->Data;
            }else if(strcmp(dat.Data->Data->fieldname,"domainoptions")==0){
                dat._storageOptions=dat.Data->Data;
            if(strcmp(dat.Data->fieldname,"domainname")==0){
                dat._name=dat.Data;
            }else if(strcmp(dat.Data->fieldname,"domainstorage")==0){
                dat._storageType =dat.Data;
            }else if(strcmp(dat.Data->fieldname,"domainoptions")==0){
                dat._storageOptions=dat.Data;
            }
        }
        delete cur;
+1 −2
Changes for src/domain.h: 1 added line, 2 removed lines.
Original line number Diff line number Diff line
@@ -33,13 +33,12 @@
#pragma once

namespace authdb {
    class DomainData{
    class DomainData : public AuthData{
    public:
        DomainData(uuid_t uuid);
        ~DomainData();

        uuid_t      did;
        AuthData   *Data;
        DomainData *next();

        void setDomainName(const char *name);
+27 −30
Changes for src/user.cpp: 27 added lines, 30 removed lines.
Original line number Diff line number Diff line
@@ -92,9 +92,7 @@ namespace authdb {



authdb::UserData::UserData(uuid_t id){
    Data = new AuthData(id);
    Data->Data->type=authdb::UserData;
authdb::UserData::UserData(uuid_t id) : AuthData(id){
    username=nullptr;
    firstname=nullptr;
    lastname=nullptr;
@@ -105,57 +103,56 @@ authdb::UserData::UserData(uuid_t id){
}

authdb::UserData::~UserData(){
    delete Data;
}

void authdb::UserData::setFirstName(const char* src){
   setUserData(this->Data,&firstname,"firstname",src);
   setUserData(this,&firstname,"firstname",src);
}

const char *authdb::UserData::getFirstname(){
    return getUserData(this->Data,&firstname,"firstname");
    return getUserData(this,&firstname,"firstname");
}


void authdb::UserData::setLastName(const char* src){
    setUserData(this->Data,&lastname,"lastname",src);
    setUserData(this,&lastname,"lastname",src);
}

const char * authdb::UserData::getLastname(){
    return getUserData(this->Data,&lastname,"lastname");
    return getUserData(this,&lastname,"lastname");
}


void authdb::UserData::setMail(const char* src){
  setUserData(this->Data,&mail,"mail",src);
  setUserData(this,&mail,"mail",src);
}

const char *authdb::UserData::getMail(){
    return getUserData(this->Data,&mail,"mail");
    return getUserData(this,&mail,"mail");
}


void authdb::UserData::setPwHash(const char* src){
    setUserData(this->Data,&pwhash,"pwhash",src);
    setUserData(this,&pwhash,"pwhash",src);
}

const char * authdb::UserData::getPwHash(){
    return getUserData(this->Data,&pwhash,"pwhash");
    return getUserData(this,&pwhash,"pwhash");
}


void authdb::UserData::setUserName(const char* src){
    setUserData(this->Data,&username,"username",src);
    setUserData(this,&username,"username",src);
}

const char * authdb::UserData::getUsername(){
    return getUserData(this->Data,&username,"username");
    return getUserData(this,&username,"username");
}

void authdb::UserData::setAvatar(const std::vector<char>& src){
   AuthData::Record *target=avatar;

   AuthData *curec=Data;
   AuthData *curec=this;

   if(!target){
        while(curec){
@@ -176,7 +173,7 @@ void authdb::UserData::setAvatar(const std::vector<char>& src){

    if(!target){
      AuthData::Record newrec;
      target=Data->append(newrec)->Data;
      target=append(newrec)->Data;
    }


@@ -214,7 +211,7 @@ void authdb::User::create(AuthBackend &backend,class UserData* dat){

    size_t wd=backend.end();

    for(AuthData *curec=dat->Data; curec; curec=curec->next()){
    for(AuthData *curec=dat; curec; curec=curec->next()){
         curec->Data->type=UserData;
         backend.setPos(wd);
         backend.write((unsigned char*)curec->Data,sizeof(struct AuthData::Record));
@@ -274,21 +271,21 @@ void authdb::User::info(AuthBackend &backend, class UserData& dat, size_t &pos){
        pos=backend.getPos()+cur->datasize;
        if(cur->type == UserData && uuid_compare(dat.uid,cur->uuid) == 0){

            if(!getRecord(backend,*dat.Data,DataType::UserData))
            if(!getRecord(backend,dat,DataType::UserData))
                continue;

            if(strcmp(dat.Data->Data->fieldname,"username")==0){
                dat.username=dat.Data->Data;
            }else if(strcmp(dat.Data->Data->fieldname,"firstname")==0){
                dat.firstname=dat.Data->Data;
            }else if(strcmp(dat.Data->Data->fieldname,"lastname")==0){
                dat.lastname=dat.Data->Data;
            }else if(strcmp(dat.Data->Data->fieldname,"mail")==0){
                dat.mail=dat.Data->Data;
            }else if(strcmp(dat.Data->Data->fieldname,"pwhash")==0){
                dat.pwhash=dat.Data->Data;
            }else if(strcmp(dat.Data->Data->fieldname,"avatar")==0){
                dat.avatar=dat.Data->Data;
            if(strcmp(dat.Data->fieldname,"username")==0){
                dat.username=dat.Data;
            }else if(strcmp(dat.Data->fieldname,"firstname")==0){
                dat.firstname=dat.Data;
            }else if(strcmp(dat.Data->fieldname,"lastname")==0){
                dat.lastname=dat.Data;
            }else if(strcmp(dat.Data->fieldname,"mail")==0){
                dat.mail=dat.Data;
            }else if(strcmp(dat.Data->fieldname,"pwhash")==0){
                dat.pwhash=dat.Data;
            }else if(strcmp(dat.Data->fieldname,"avatar")==0){
                dat.avatar=dat.Data;
            }
        }
        delete cur;
+1 −2
Changes for src/user.h: 1 added line, 2 removed lines.
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@
#pragma once

namespace authdb {
    class UserData {
    class UserData : public AuthData{
    public:
        UserData(uuid_t id);

@@ -61,7 +61,6 @@ namespace authdb {
        void setAvatar(const std::vector<char> &src);
        void getAvatar(std::vector<char> &dest);

        AuthData        *Data;
        uuid_t           uid;
    private:
        AuthData::Record  *username;