Commit 09bdaf40 authored by jan.koester's avatar jan.koester
Browse files

test

parent f5a2be36
Loading
Loading
Loading
Loading
+53 −38
Changes for src/authdb.cpp: 53 added lines, 38 removed lines.
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ namespace authdb {
        void listUsers(libhttppp::HttpRequest *curreq, const int tid, ULONG_PTR args){
            _Backend.lock();

            authdb::AuthData cur;
            authdb::AuthData *cur=new AuthData;;

            size_t rd=sizeof(authdb::AuthHeader),end=_Backend.end();

@@ -61,23 +61,23 @@ namespace authdb {
            while(rd<end){
                _Backend.ReadAuthData(cur,rd);
                rd=_Backend.getPos();
                if(strcmp(cur.fieldname,"username")==0){
                if(strcmp(cur->fieldname,"username")==0){
                    AuthDataRecord rec;
                    uuid_t uid;
                    uuid_parse(cur.uuid,uid);
                    uuid_parse(cur->uuid,uid);
                    _Backend.setPos(sizeof(AuthHeader));
                    getRecord(_Backend,&rec,uid,1);
                    userlist+="User: ";
                    userlist+= cur.data;
                    userlist+= cur->data;
                    userlist+=" UID: ";
                    userlist+= cur.uuid;
                    userlist+= cur->uuid;
                    userlist+= "\r\n";
                    for(AuthDataRecord *curec=&rec; curec; curec=curec->next()){
                        if(strcmp(curec->Data.fieldname,"username")!=0){
                        if(strcmp(curec->Data->fieldname,"username")!=0){
                            userlist+="  ";
                            userlist+=curec->Data.fieldname;
                            userlist+=curec->Data->fieldname;
                            userlist+=": ";
                            std::copy(curec->Data.data,curec->Data.data+curec->Data.datasize,
                            std::copy(curec->Data->data,curec->Data->data+curec->Data->datasize,
                                      std::back_inserter(userlist));
                            userlist+= "\r\n";
                        }
@@ -85,6 +85,8 @@ namespace authdb {
                }
            }

            delete cur;

            _Backend.unlock();

            libhttppp::HttpResponse rep;
@@ -180,35 +182,39 @@ namespace authdb {
    };

    int searchValue(authdb::AuthBackend &backend,const char*fieldname,const char *value){
        authdb::AuthData user,attr;
        authdb::AuthData *user=new AuthData;
        int rd=sizeof(authdb::AuthHeader),brd=rd;
        while(rd>backend.end()){
            backend.ReadAuthData(user,rd);
            rd=backend.getPos();
            if(strcmp(user.fieldname,fieldname) == 0){
                if(strcmp(user.data,value) == 0){
                    delete[] user.data;
            if(strcmp(user->fieldname,fieldname) == 0){
                if(strcmp(user->data,value) == 0){
                    delete[] user->data;
                    delete user;
                    return brd;
                }
            }
            brd=rd;
            delete[] user.data;
            delete[] user->data;
        }
        delete user;
        return -1;
    }

    AuthDataRecord::AuthDataRecord(){
         Data = new AuthData;
        _next=nullptr;
    }

    AuthDataRecord::AuthDataRecord(const AuthDataRecord &src){
        Data = new AuthData;
        memcpy(&Data,&src.Data,sizeof(src.Data));
        memcpy(Data.data,src.Data.data,src.Data.datasize);
        memcpy(Data->data,src.Data->data,src.Data->datasize);
        _next=nullptr;
    }

    AuthDataRecord::~AuthDataRecord(){

        delete Data;
    }

    AuthDataRecord *AuthDataRecord::next(){
@@ -218,7 +224,7 @@ namespace authdb {

    bool getRecord(authdb::AuthBackend &backend,AuthDataRecord *dest,uuid_t id,int type){
        bool found=false;
        authdb::AuthData cur;
        AuthData *cur=new AuthData;
        int rd=sizeof(authdb::AuthHeader),end=backend.end();

        char plainid[255];
@@ -230,18 +236,21 @@ namespace authdb {
        while(rd<end){
            backend.ReadAuthData(cur,rd);
            rd=backend.getPos();
            if( strcmp(cur.uuid,plainid) == 0 && cur.type == type){
                memcpy(&curec->Data,&cur,sizeof(AuthData));
                curec->Data.data=new char(cur.datasize);
                memcpy(curec->Data.data,cur.data,cur.datasize);
            if( strcmp(cur->uuid,plainid) == 0 && cur->type == type){
                memcpy(&curec->Data,cur,sizeof(AuthData));
                curec->Data->data=new char(cur->datasize);
                memcpy(curec->Data->data,cur->data,cur->datasize);
                if(rd<backend.end()){
                    curec->_next=new AuthDataRecord;
                    curec=curec->_next;
                }
                found=true;
            }
            delete[] cur.data;
            delete[] cur->data;
        }

        delete cur;

        return found;
    }
};
@@ -277,43 +286,49 @@ int main(int argc, char *argv[]){

                std::cout << "Creating User !";

                authdb::AuthData user,pw;
                authdb::AuthData *user=new authdb::AuthData,*pw=new authdb::AuthData;

                uuid_t id;
                uuid_generate(id);

                uuid_unparse(id,user.uuid);
                uuid_unparse(id,pw.uuid);
                uuid_unparse(id,user->uuid);
                uuid_unparse(id,pw->uuid);

                user.type=1;
                snprintf(user.fieldname,255,"%s","username");
                user->type=1;
                snprintf(user->fieldname,255,"%s","username");

                pw.type=1;
                snprintf(pw.fieldname,255,"%s","password");
                pw->type=1;
                snprintf(pw->fieldname,255,"%s","password");

                user.datasize=username.length()+1;
                user.data = new char[user.datasize];
                snprintf(user.data,user.datasize,"%s",username.c_str());
                user->datasize=username.length()+1;
                user->data = new char[user->datasize];
                snprintf(user->data,user->datasize,"%s",username.c_str());


                pw.datasize=password.length()+1;
                pw.data = new char[pw.datasize];
                snprintf(pw.data,pw.datasize,"%s",password.c_str());
                pw->datasize=password.length()+1;
                pw->data = new char[pw->datasize];
                snprintf(pw->data,pw->datasize,"%s",password.c_str());

                authdb::AuthData euser;
                authdb::AuthData *euser = new authdb::AuthData;
                int rd=sizeof(authdb::AuthHeader);
                while(rd<backend.end()){
                    backend.ReadAuthData(euser,rd);
                    rd=backend.getPos();
                    if(strcmp(euser.fieldname,"username") == 0 && strcmp(euser.data,user.data)==0 ){
                        delete[] euser.data;
                    if(strcmp(euser->fieldname,"username") == 0 && strcmp(euser->data,user->data)==0 ){
                        delete[] euser->data;
                        delete euser;
                        delete user;
                        delete pw;
                        throw authdb::AuthBackendError("Username already exits");
                    }
                    delete[] euser.data;
                    delete[] euser->data;
                }

                delete euser;
                backend.WriteAuthData(user,backend.end());
                backend.WriteAuthData(pw,backend.end());
                delete user;
                delete pw;
        }

        libhttppp::HttpD httpd(
+1 −1
Changes for src/authdb.h: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ namespace authdb {

        AuthDataRecord *next();

        AuthData Data;
        AuthData *Data;

        AuthDataRecord    *_next;
        friend bool getRecord(authdb::AuthBackend &backend,AuthDataRecord *dest,uuid_t id,int type);
+59 −52
Changes for src/user.cpp: 59 added lines, 52 removed lines.
Original line number Diff line number Diff line
@@ -51,8 +51,8 @@ void authdb::UserData::setFirstName(const char* src){

    if(!target){
        for(AuthDataRecord *curec=Data; curec; curec=curec->next()){
            if(strcmp(curec->Data.uuid,uid)==0 &&
               strcmp(curec->Data.fieldname,"firstname")==0){
            if(strcmp(curec->Data->uuid,uid)==0 &&
               strcmp(curec->Data->fieldname,"firstname")==0){
                target=curec;
                break;
            }
@@ -72,13 +72,13 @@ void authdb::UserData::setFirstName(const char* src){
                target=new AuthDataRecord;
        }
    }
    target->Data.type=1;
    target->Data->type=1;

    memcpy(target->Data.uuid,uid,strlen(uid)+1);
    snprintf(target->Data.fieldname,255,"%s","firstname");
    target->Data.datasize=strlen(src);
    target->Data.data= new char[target->Data.datasize];
    memcpy(target->Data.data,src,target->Data.datasize);
    memcpy(target->Data->uuid,uid,strlen(uid)+1);
    snprintf(target->Data->fieldname,255,"%s","firstname");
    target->Data->datasize=strlen(src);
    target->Data->data= new char[target->Data->datasize];
    memcpy(target->Data->data,src,target->Data->datasize);

    firstname=target;
}
@@ -88,8 +88,8 @@ void authdb::UserData::setLastName(const char* src){

    if(!target){
        for(AuthDataRecord *curec=Data; curec; curec=curec->next()){
            if(strcmp(curec->Data.uuid,uid)==0 &&
               strcmp(curec->Data.fieldname,"lastname")==0){
            if(strcmp(curec->Data->uuid,uid)==0 &&
               strcmp(curec->Data->fieldname,"lastname")==0){
                target=curec;
                break;
            }
@@ -109,13 +109,13 @@ void authdb::UserData::setLastName(const char* src){
                target=new AuthDataRecord;
        }
    }
    target->Data.type=1;
    target->Data->type=1;

    memcpy(target->Data.uuid,uid,strlen(uid)+1);
    snprintf(target->Data.fieldname,255,"%s","lastname");
    target->Data.datasize=strlen(src);
    target->Data.data= new char[target->Data.datasize];
    memcpy(target->Data.data,src,target->Data.datasize);
    memcpy(target->Data->uuid,uid,strlen(uid)+1);
    snprintf(target->Data->fieldname,255,"%s","lastname");
    target->Data->datasize=strlen(src);
    target->Data->data= new char[target->Data->datasize];
    memcpy(target->Data->data,src,target->Data->datasize);

    lastname=target;
}
@@ -125,8 +125,8 @@ void authdb::UserData::setMail(const char* src){

    if(!target){
        for(AuthDataRecord *curec=Data; curec; curec=curec->next()){
            if(strcmp(curec->Data.uuid,uid)==0 &&
               strcmp(curec->Data.fieldname,"mail")==0){
            if(strcmp(curec->Data->uuid,uid)==0 &&
               strcmp(curec->Data->fieldname,"mail")==0){
                target=curec;
                break;
            }
@@ -146,13 +146,13 @@ void authdb::UserData::setMail(const char* src){
                target=new AuthDataRecord;
        }
    }
    target->Data.type=1;
    target->Data->type=1;

    memcpy(target->Data.uuid,uid,strlen(uid)+1);
    snprintf(target->Data.fieldname,255,"%s","mail");
    target->Data.datasize=strlen(src);
    target->Data.data= new char[target->Data.datasize];
    memcpy(target->Data.data,src,target->Data.datasize);
    memcpy(target->Data->uuid,uid,strlen(uid)+1);
    snprintf(target->Data->fieldname,255,"%s","mail");
    target->Data->datasize=strlen(src);
    target->Data->data= new char[target->Data->datasize];
    memcpy(target->Data->data,src,target->Data->datasize);

    mail=target;
}
@@ -162,8 +162,8 @@ void authdb::UserData::setPwHash(const char* src){

    if(!target){
        for(AuthDataRecord *curec=Data; curec; curec=curec->next()){
            if(strcmp(curec->Data.uuid,uid)==0 &&
               strcmp(curec->Data.fieldname,"password")==0){
            if(strcmp(curec->Data->uuid,uid)==0 &&
               strcmp(curec->Data->fieldname,"password")==0){
                target=curec;
                break;
            }
@@ -183,13 +183,13 @@ void authdb::UserData::setPwHash(const char* src){
                target=new AuthDataRecord;
        }
    }
    target->Data.type=1;
    target->Data->type=1;

    memcpy(target->Data.uuid,uid,strlen(uid)+1);
    snprintf(target->Data.fieldname,255,"%s","password");
    target->Data.datasize=strlen(src);
    target->Data.data= new char[target->Data.datasize];
    memcpy(target->Data.data,src,target->Data.datasize);
    memcpy(target->Data->uuid,uid,strlen(uid)+1);
    snprintf(target->Data->fieldname,255,"%s","password");
    target->Data->datasize=strlen(src);
    target->Data->data= new char[target->Data->datasize];
    memcpy(target->Data->data,src,target->Data->datasize);

    pwhash=target;
}
@@ -199,8 +199,8 @@ void authdb::UserData::setUserName(const char* src){

    if(!target){
        for(AuthDataRecord *curec=Data; curec; curec=curec->next()){
            if(strcmp(curec->Data.uuid,uid)==0 &&
               strcmp(curec->Data.fieldname,"username")==0){
            if(strcmp(curec->Data->uuid,uid)==0 &&
               strcmp(curec->Data->fieldname,"username")==0){
                target=curec;
                break;
            }
@@ -221,12 +221,12 @@ void authdb::UserData::setUserName(const char* src){
        }
    }

    target->Data.type=1;
    memcpy(target->Data.uuid,uid,strlen(uid)+1);
    snprintf(target->Data.fieldname,255,"%s","username");
    target->Data.datasize=strlen(src);
    target->Data.data= new char[target->Data.datasize];
    memcpy(target->Data.data,src,target->Data.datasize);
    target->Data->type=1;
    memcpy(target->Data->uuid,uid,strlen(uid)+1);
    snprintf(target->Data->fieldname,255,"%s","username");
    target->Data->datasize=strlen(src);
    target->Data->data= new char[target->Data->datasize];
    memcpy(target->Data->data,src,target->Data->datasize);

    username=target;
}
@@ -236,8 +236,8 @@ void authdb::UserData::setAvatar(const std::vector<char>& src){

    if(!target){
        for(AuthDataRecord *curec=Data; curec; curec=curec->next()){
            if(strcmp(curec->Data.uuid,uid)==0 &&
               strcmp(curec->Data.fieldname,"lastname")==0){
            if(strcmp(curec->Data->uuid,uid)==0 &&
               strcmp(curec->Data->fieldname,"lastname")==0){
                target=curec;
                break;
            }
@@ -258,20 +258,20 @@ void authdb::UserData::setAvatar(const std::vector<char>& src){
        }
    }

    target->Data.type=1;
    target->Data->type=1;

    memcpy(target->Data.uuid,uid,strlen(uid)+1);
    snprintf(target->Data.fieldname,255,"%s","lastname");
    target->Data.datasize=src.size();
    target->Data.data= new char[target->Data.datasize];
    memcpy(target->Data.data,src.data(),target->Data.datasize);
    memcpy(target->Data->uuid,uid,strlen(uid)+1);
    snprintf(target->Data->fieldname,255,"%s","lastname");
    target->Data->datasize=src.size();
    target->Data->data= new char[target->Data->datasize];
    memcpy(target->Data->data,src.data(),target->Data->datasize);

    avatar=target;
}


void authdb::User::create(AuthBackend &backend,UserData* dat){
    authdb::AuthData cur;
    authdb::AuthData *cur=new AuthData;

    size_t rd=sizeof(authdb::AuthHeader),end=backend.end();

@@ -282,17 +282,24 @@ void authdb::User::create(AuthBackend &backend,UserData* dat){
    while(rd<end){
        backend.ReadAuthData(cur,rd);
        rd=backend.getPos();
        if(strcmp(cur.fieldname,"username")==0 &&
            strncmp(cur.data,dat->username->Data.data,dat->username->Data.datasize) == 0){
        if(strcmp(cur->fieldname,"username")==0 &&
            strncmp(cur->data,dat->username->Data->data,dat->username->Data->datasize) == 0){
            delete[] cur->data;
            delete cur;
            throw authdb::AuthBackendError("Create User: Username Exists aborting!");
        }else if(strcmp(cur.uuid,dat->username->Data.uuid)==0){
        }else if(strcmp(cur->uuid,dat->username->Data->uuid)==0){
            delete[] cur->data;
            delete cur;
            throw authdb::AuthBackendError("Create User: UUID already Exists aborting!");
        }
        delete[] cur->data;
        delete cur;
    }

    for(AuthDataRecord *curec=dat->Data; curec; curec=curec->next()){
         backend.WriteAuthData(curec->Data,backend.end());
    }
    delete cur;
}

void authdb::User::edit(AuthBackend &backend, uuid_t uid,UserData& dat, size_t pos){