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

fixed

parent 5edc2d93
Loading
Loading
Loading
Loading
+7 −16
Changes for src/authdb.cpp: 7 added lines, 16 removed lines.
Original line number Diff line number Diff line
@@ -58,9 +58,6 @@ namespace authdb {

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

            _Backend.setPos(rd);


            libhtmlpp::HtmlString userlist,out;

            libhtmlpp::HtmlElement root=_IndexElement;
@@ -77,10 +74,7 @@ namespace authdb {

                _Backend.ReadAuthData(cur,rd);

                cur->data = new char[cur->datasize];
                _Backend.read((unsigned char*)cur->data,cur->datasize);

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

                uuid_t uid;
                uuid_parse(cur->uuid,uid);
@@ -88,16 +82,15 @@ namespace authdb {
                    try {
                        size_t upos=sizeof(authdb::AuthHeader);
                        user.info(_Backend,uid,udat,upos);
                        userlist << "<tr><td class=\"list_username\">";
                        std::copy(cur->data,cur->data+cur->datasize,std::back_inserter(userlist));
                        userlist << "</td></tr>"
                        userlist << "<tr><td class=\"list_username\">"
                        << udat.getUsername()
                        << "</td></tr>"
                        << "<tr><td><img class=\"list_picture\" style=\"height:100px;\" src=\"/admin/getavatar/" << cur->uuid << ".jpg\" alt=\"avatar\">"
                        << "</td><td><ul><li>"
                        << "uid: " << cur->uuid
                        << "</li>"
                        << "<li><span>Username:</span><span>" << udat.getUsername() << "</span></li>"
                        << "<li><span>Firstname:</span><span>" << udat.getFirstname() << "</span></li>"
                        << "<li><span>Lastname:</span><span>" << udat.getLastename() << "</span></li>"
                        << "<li><span>Lastname:</span><span>" << udat.getLastname() << "</span></li>"
                        << "<li><span>Email:</span><span>" << udat.getMail() << "</span></li>"
                        << "</ul></td><td><ul class=\"usertoolbar\" >"
                        << "<li><a class=\"button\" href=\"/admin/edituser/" << cur->uuid << "\">EditUser</a></li>"
@@ -107,7 +100,6 @@ namespace authdb {
                        std::cerr << e.what() << std::endl;
                    }
                }
                delete[] cur->data;
                delete cur;
            }

@@ -458,7 +450,6 @@ VALUEFOUND:
         Data = new AuthData;
         memset((void*)Data,0,sizeof(AuthData));
         Data->start=0xFE;
         Data->end=0xFF;
        _next=nullptr;
    }

@@ -493,7 +484,7 @@ VALUEFOUND:
            backend.ReadAuthData(cur,rd);
            rd=backend.getPos()+cur->datasize;
            if(strcmp(cur->uuid,plainid) == 0 && cur->type == type){
                memcpy(curec->Data,cur,sizeof(AuthHeader));
                memcpy(curec->Data,cur,sizeof(AuthData));
                curec->Data->data=new char[cur->datasize];
                backend.read((unsigned char*)curec->Data->data,cur->datasize);
                if(rd<backend.end()){
@@ -567,7 +558,6 @@ VALUEFOUND:
                    memset(rdrec,0,sizeof(AuthData));
                    rdrec->start = 0xFE;
                    rdrec->datasize=dsize;
                    rdrec->end=0xFF;
                    backend.WriteAuthData(rdrec,rd);
                    for(size_t i =0; i<rdrec->datasize; ++i){
                        backend.write(&zero,1);
@@ -605,6 +595,7 @@ VALUEFOUND:
                // std::cout << cur->uuid << std::endl;
                size_t dsize=cur->datasize;
                memset(cur,0,sizeof(AuthData));
                cur->start = 0xFE;
                cur->datasize=dsize;
                backend.WriteAuthData(cur,wr);
                const unsigned char zero=0;
+2 −4
Changes for src/authdb.h: 2 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -33,22 +33,20 @@

namespace authdb {
    struct AuthHeader{
        unsigned char start;
        char   start = 0xFE;
        char   domain[255];
        size_t Version;
        size_t Revesion;
        unsigned char end;
    };

    struct AuthData {
        unsigned char start;
        char   start = 0xFE;
        char   uuid[255];
        int    type;
        int    storage;
        char   fieldname[255];
        size_t datasize = 0;
        char  *data;
        unsigned char end;
    };

    int searchValue(authdb::AuthBackend &backend,const char*fieldname,const char *value);
+1 −4
Changes for src/backends/file.cpp: 1 added line, 4 removed lines.
Original line number Diff line number Diff line
@@ -52,12 +52,9 @@ authdb::File::File(const char* path,size_t version,const char *domain){
        AuthHeader head;

        memset(&head,0,sizeof(AuthHeader));

        head.start=0xFE;
        head.end=0XFF;

        head.Version=version;
        head.Revesion=0;
        head.start=0xFE;
        snprintf(head.domain,255,"%s",domain);

        if(_FileDes < 0 || ::write(_FileDes,&head,sizeof(head)) < 0){
+36 −33
Changes for src/user.cpp: 36 added lines, 33 removed lines.
Original line number Diff line number Diff line
@@ -53,7 +53,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){
               strcmp(curec->Data->fieldname,"firstname")==0
               && curec->Data->type == authdb::UserData){
                target=curec;
                break;
            }
@@ -79,11 +80,11 @@ void authdb::UserData::setFirstName(const char* src){
    target->Data->type=DataType::UserData;
    target->Data->storage=StorageType::TextStorage;

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

    firstname=target;
}
@@ -92,7 +93,7 @@ const char *authdb::UserData::getFirstname(){
    if(firstname && firstname->Data)
        return firstname->Data->data;
    else
        throw(authdb::AuthBackendError("data not found !"));
        throw(authdb::AuthBackendError("Firstname data not found !"));
}


@@ -102,7 +103,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){
               strcmp(curec->Data->fieldname,"lastname")==0
                && curec->Data->type == authdb::UserData){
                target=curec;
                break;
            }
@@ -128,20 +130,20 @@ void authdb::UserData::setLastName(const char* src){
    target->Data->type=DataType::UserData;
    target->Data->storage=StorageType::TextStorage;

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

    lastname=target;
}

const char * authdb::UserData::getLastename(){
const char * authdb::UserData::getLastname(){
    if(lastname && lastname->Data)
        return lastname->Data->data;
    else
        throw(authdb::AuthBackendError("data not found !"));
        throw(authdb::AuthBackendError("Lastname data not found !"));
}


@@ -151,7 +153,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){
               strcmp(curec->Data->fieldname,"mail")==0
                && curec->Data->type == authdb::UserData){
                target=curec;
                break;
            }
@@ -177,11 +180,11 @@ void authdb::UserData::setMail(const char* src){
    target->Data->type=DataType::UserData;
    target->Data->storage=StorageType::TextStorage;

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

    mail=target;
}
@@ -190,7 +193,7 @@ const char *authdb::UserData::getMail(){
    if(mail && mail->Data)
        return mail->Data->data;
    else
        throw(authdb::AuthBackendError("data not found !"));
        throw(authdb::AuthBackendError("Mail data not found !"));
}


@@ -200,7 +203,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){
               strcmp(curec->Data->fieldname,"password")==0
               && curec->Data->type == authdb::UserData){
                target=curec;
                break;
            }
@@ -226,11 +230,11 @@ void authdb::UserData::setPwHash(const char* src){
    target->Data->type=DataType::UserData;
    target->Data->storage=StorageType::TextStorage;

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

    pwhash=target;
}
@@ -239,7 +243,7 @@ const char * authdb::UserData::getPwHash(){
    if(pwhash && pwhash->Data)
        return pwhash->Data->data;
    else
        throw(authdb::AuthBackendError("data not found !"));
        throw(authdb::AuthBackendError("PwHash data not found !"));
}


@@ -249,7 +253,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){
               strcmp(curec->Data->fieldname,"username")==0
               && curec->Data->type == authdb::UserData){
                target=curec;
                break;
            }
@@ -275,11 +280,11 @@ void authdb::UserData::setUserName(const char* src){
    target->Data->type=DataType::UserData;
    target->Data->storage=StorageType::TextStorage;

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

    username=target;
}
@@ -288,7 +293,7 @@ const char * authdb::UserData::getUsername(){
    if(username && username->Data)
        return username->Data->data;
    else
        throw(authdb::AuthBackendError("data nout found !"));
        throw(authdb::AuthBackendError("Username data out found !"));
}

void authdb::UserData::setAvatar(const std::vector<char>& src){
@@ -297,7 +302,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,"avatar")==0){
               strcmp(curec->Data->fieldname,"avatar")==0
               && curec->Data->type == authdb::UserData){
                target=curec;
                break;
            }
@@ -337,7 +343,7 @@ void authdb::UserData::getAvatar(std::vector<char>& dest){
        std::copy(avatar->Data->data,avatar->Data->data+avatar->Data->datasize,
                  std::back_inserter(dest));
    else
        throw(authdb::AuthBackendError("data nout found !"));
        throw(authdb::AuthBackendError("Avatar data nout found !"));
}

void authdb::User::create(AuthBackend &backend,class UserData* dat){
@@ -355,7 +361,7 @@ void authdb::User::create(AuthBackend &backend,class UserData* dat){
        if(strcmp(cur->fieldname,"username")==0 ){
            cur->data=new char[cur->datasize];
            backend.read((unsigned char*)cur->data,cur->datasize);
            if(strncmp(cur->data,dat->username->Data->data,dat->username->Data->datasize) == 0){
            if(strcmp(cur->data,dat->username->Data->data) == 0){
                delete[] cur->data;
                delete cur;
                throw authdb::AuthBackendError("Create User: Username Exists aborting!");
@@ -385,7 +391,7 @@ void authdb::User::edit(AuthBackend &backend, uuid_t uid,class UserData& dat, si
void authdb::User::remove(AuthBackend &backend,const uuid_t uid){
    delRecord(backend,uid);
}

#include <iostream>
void authdb::User::info(AuthBackend &backend, uuid_t uid,class UserData& dat, size_t &pos){
    size_t end=backend.end();

@@ -401,14 +407,10 @@ void authdb::User::info(AuthBackend &backend, uuid_t uid,class UserData& dat, si
        backend.ReadAuthData(cur,pos);
        pos=backend.getPos()+cur->datasize;
        if(strcmp(cuid,cur->uuid) == 0){
            uuid_t uid;
            uuid_parse(cur->uuid,uid);
            backend.setPos(sizeof(AuthHeader));
            strcpy(dat.uid,cur->uuid);
            getRecord(backend,dat.Data,uid,DataType::UserData);

            std::copy(cur->uuid,cur->uuid+(strlen(cur->uuid)+1),dat.uid);

            for(AuthDataRecord *curec=dat.Data; curec; curec=curec->next()){
                std::cout  << curec->Data->datasize << std::endl;
                if(strcmp(curec->Data->fieldname,"username")==0){
                    dat.setUserName(curec->Data->data);
                }else if(strcmp(curec->Data->fieldname,"firstname")==0){
@@ -424,7 +426,7 @@ void authdb::User::info(AuthBackend &backend, uuid_t uid,class UserData& dat, si
                    std::copy(curec->Data->data,curec->Data->data+curec->Data->datasize,
                              std::back_inserter(tmp));
                    dat.setAvatar(tmp);
                }/*else{
                }else{
                    while(dat.Data->Data){
                        if(!dat.Data->_next){
                            dat.Data=dat.Data->_next;
@@ -437,7 +439,8 @@ void authdb::User::info(AuthBackend &backend, uuid_t uid,class UserData& dat, si
                    memcpy(dat.Data->Data,curec->Data,sizeof(authdb::AuthData));
                    dat.Data->Data->data=new char[curec->Data->datasize];
                    memcpy(dat.Data->Data->data,curec->Data->data,curec->Data->datasize);
                }*/
                }
                delete[] curec->Data->data;
            }
        }
        delete cur;
+1 −1
Changes for src/user.h: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ namespace authdb {
        const char *getFirstname();

        void setLastName(const char* src);
        const char *getLastename();
        const char *getLastname();

        void setMail(const char* src);
        const char *getMail();