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

test is working

parent 09bdaf40
Loading
Loading
Loading
Loading
+15 −59
Changes for src/authdb.cpp: 15 added lines, 59 removed lines.
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ namespace authdb {
            std::string userlist="UserList:\r\n";

            while(rd<end){
                std::cout << rd << std::endl;
                _Backend.ReadAuthData(cur,rd);
                rd=_Backend.getPos();
                if(strcmp(cur->fieldname,"username")==0){
@@ -68,12 +69,12 @@ namespace authdb {
                    _Backend.setPos(sizeof(AuthHeader));
                    getRecord(_Backend,&rec,uid,1);
                    userlist+="User: ";
                    userlist+= cur->data;
                    std::copy(cur->data,cur->data+cur->datasize,std::back_inserter(userlist));
                    userlist+=" UID: ";
                    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 && curec->Data->data){
                            userlist+="  ";
                            userlist+=curec->Data->fieldname;
                            userlist+=": ";
@@ -113,14 +114,20 @@ namespace authdb {
                        if(curformdat->Value.empty() || !curdispo->getValue())
                            continue;

                        std::vector<char> tmp;
                        if(strcmp(curdispo->getValue(),"avatar")!=0){
                            std:copy(curformdat->Value.begin(),curformdat->Value.end(),std::back_inserter(tmp));
                            tmp.push_back('\0');
                        }

                        if(strcmp(curdispo->getValue(),"username")==0){
                            udat.setUserName(curformdat->Value.data());
                            udat.setUserName(tmp.data());
                        }else if(strcmp(curdispo->getValue(),"firstname")==0){
                            udat.setFirstName(curformdat->Value.data());
                            udat.setFirstName(tmp.data());
                        }else if(strcmp(curdispo->getValue(),"lastname")==0){
                            udat.setLastName(curformdat->Value.data());
                            udat.setLastName(tmp.data());
                        }else if(strcmp(curdispo->getValue(),"mail")==0){
                            udat.setMail(curformdat->Value.data());
                            udat.setMail(tmp.data());
                        }else if(strcmp(curdispo->getValue(),"avatar")==0){
                            udat.setAvatar(curformdat->Value);
                        }
@@ -203,6 +210,7 @@ namespace authdb {

    AuthDataRecord::AuthDataRecord(){
         Data = new AuthData;
         memset((void*)Data,0,sizeof(AuthData));
        _next=nullptr;
    }

@@ -237,7 +245,7 @@ namespace authdb {
            backend.ReadAuthData(cur,rd);
            rd=backend.getPos();
            if( strcmp(cur->uuid,plainid) == 0 && cur->type == type){
                memcpy(&curec->Data,cur,sizeof(AuthData));
                memcpy(curec->Data,cur,sizeof(authdb::AuthData));
                curec->Data->data=new char(cur->datasize);
                memcpy(curec->Data->data,cur->data,cur->datasize);
                if(rd<backend.end()){
@@ -276,59 +284,7 @@ int main(int argc, char *argv[]){
                                );
    try {
        if(backend.end()<=sizeof(authdb::AuthHeader)){
                std::string username,password;

                std::cerr << "Initial User not found !" << std::endl;
                std::cout << "Please Enter Username: ";
                std::cin >> username;
                std::cout << "Please Enter Password: ";
                std::cin >> password;

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

                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);

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

                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());


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

                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;
                        delete euser;
                        delete user;
                        delete pw;
                        throw authdb::AuthBackendError("Username already exits");
                    }
                    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
@@ -45,7 +45,7 @@ namespace authdb {
        char   uuid[255];
        int    type;
        char   fieldname[255];
        size_t datasize;
        size_t datasize = 0;
        char  *data;
        const  short end=0xFF;
    };
+35 −19
Changes for src/user.cpp: 35 added lines, 19 removed lines.
Original line number Diff line number Diff line
@@ -68,8 +68,10 @@ void authdb::UserData::setFirstName(const char* src){
                }
                target=target->next();
            };
            if(!target)
                target=new AuthDataRecord;
            if(!target){
                Data=new AuthDataRecord;
                target=Data;
            }
        }
    }
    target->Data->type=1;
@@ -105,8 +107,10 @@ void authdb::UserData::setLastName(const char* src){
                }
                target=target->next();
            };
            if(!target)
                target=new AuthDataRecord;
            if(!target){
                Data=new AuthDataRecord;
                target=Data;
            }
        }
    }
    target->Data->type=1;
@@ -142,8 +146,10 @@ void authdb::UserData::setMail(const char* src){
                }
                target=target->next();
            };
            if(!target)
                target=new AuthDataRecord;
            if(!target){
                Data=new AuthDataRecord;
                target=Data;
            }
        }
    }
    target->Data->type=1;
@@ -179,8 +185,10 @@ void authdb::UserData::setPwHash(const char* src){
                }
                target=target->next();
            };
            if(!target)
                target=new AuthDataRecord;
            if(!target){
                Data=new AuthDataRecord;
                target=Data;
            }
        }
    }
    target->Data->type=1;
@@ -216,8 +224,10 @@ void authdb::UserData::setUserName(const char* src){
                }
                target=target->next();
            };
            if(!target)
                target=new AuthDataRecord;
            if(!target){
                Data=new AuthDataRecord;
                target=Data;
            }
        }
    }

@@ -237,7 +247,7 @@ 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){
               strcmp(curec->Data->fieldname,"avatar")==0){
                target=curec;
                break;
            }
@@ -253,15 +263,17 @@ void authdb::UserData::setAvatar(const std::vector<char>& src){
                }
                target=target->next();
            };
            if(!target)
                target=new AuthDataRecord;
            if(!target){
                Data=new AuthDataRecord;
                target=Data;
            }
        }
    }

    target->Data->type=1;

    memcpy(target->Data->uuid,uid,strlen(uid)+1);
    snprintf(target->Data->fieldname,255,"%s","lastname");
    snprintf(target->Data->fieldname,255,"%s","avatar");
    target->Data->datasize=src.size();
    target->Data->data= new char[target->Data->datasize];
    memcpy(target->Data->data,src.data(),target->Data->datasize);
@@ -269,11 +281,11 @@ void authdb::UserData::setAvatar(const std::vector<char>& src){
    avatar=target;
}


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

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

    backend.setPos(rd);

@@ -293,13 +305,17 @@ void authdb::User::create(AuthBackend &backend,UserData* dat){
            throw authdb::AuthBackendError("Create User: UUID already Exists aborting!");
        }
        delete[] cur->data;
        delete cur;
    }
    delete cur;

    size_t wd=end;

    for(AuthDataRecord *curec=dat->Data; curec; curec=curec->next()){
         backend.WriteAuthData(curec->Data,backend.end());
        std::cout << curec->Data->fieldname << "pos: " << wd << std::endl;
         backend.WriteAuthData(curec->Data,wd);
         wd=backend.end();
    }
    delete cur;

}

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