Commit 237c271c authored by jan.koester's avatar jan.koester
Browse files

user setter finished

parent dc6e0dcc
Loading
Loading
Loading
Loading
+2 −0
Changes for data/config.yaml: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
AUTHDB:
    PORT: 9090
    BIND: "0.0.0.0"
    MAXCONN: 1024
    ADMINDB:
        PATH: "./admin.db"
+135 −51
Changes for src/authdb.cpp: 135 added lines, 51 removed lines.
Original line number Diff line number Diff line
@@ -27,14 +27,140 @@

#include <iostream>
#include <cstring>
#include <sstream>

#include <uuid/uuid.h>
#include <cmdplus/cmdplus.h>
#include <confplus/conf.h>

#include <httppp/httpd.h>

#include "backend.h"
#include "authdb.h"

namespace authdb {
    class AuthDB : public libhttppp::HttpEvent{
    public:
        AuthDB(authdb::AuthBackend &backend,netplus::socket *ssock) : HttpEvent(ssock), _Backend(backend){

        };

        void RequestEvent(libhttppp::HttpRequest *curreq, const int tid, ULONG_PTR args){
                _Backend.lock();

                authdb::AuthData cur;

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

                _Backend.setPos(rd);

                std::string userlist="UserList:\r\n";

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

                _Backend.unlock();

                libhttppp::HttpResponse rep;
                rep.setContentType("text/txt");
                rep.setContentLength(userlist.length());
                rep.send(curreq,userlist.c_str(),userlist.length());
        };
    private:
        authdb::AuthBackend &_Backend;
    };

    int searchValue(authdb::AuthBackend &backend,const char*fieldname,const char *value){
        authdb::AuthData user,attr;
        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;
                    return brd;
                }
            }
            brd=rd;
            delete[] user.data;
        }
        return -1;
    }

    AuthDataRecord::AuthDataRecord(){
        _next=nullptr;
    }

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

    AuthDataRecord::~AuthDataRecord(){

    }

    AuthDataRecord *AuthDataRecord::next(){
            return _next;
    };


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

        char plainid[255];

        uuid_unparse(id,plainid);

        AuthDataRecord *curec=dest;

        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(rd<backend.end()){
                    curec->_next=new AuthDataRecord;
                    curec=curec->_next;
                }
                found=true;
            }
            delete[] cur.data;
        }
        return found;
    }
};

int main(int argc, char *argv[]){
    cmdplus::CmdController &cmd=cmdplus::CmdController::getInstance();

@@ -104,60 +230,18 @@ int main(int argc, char *argv[]){
                backend.WriteAuthData(user,backend.end());
                backend.WriteAuthData(pw,backend.end());
        }
        /*
        if(strcmp(argv[1],"user")==0 ){
            if(strcmp(argv[2],"create")==0 ){

            }else if(strcmp(argv[2],"edit")==0 ){
                int rd=sizeof(authdb::AuthHeader);

                if(strcmp(argv[4],"username")==0){
                    throw authdb::AuthBackendError("Username not editable");
                }

                authdb::AuthData euser;
        libhttppp::HttpD httpd(
            config.getValue(config.getKey("/AUTHDB/BIND"),0),
            config.getIntValue(config.getKey("/AUTHDB/PORT"),0),
            config.getIntValue(config.getKey("/AUTHDB/MAXCONN"),0),
            nullptr,
            nullptr
        );

                char uid[255];
        authdb::AuthDB authdb(backend,httpd.getServerSocket());

                while(rd<backend.end()){
                    backend.ReadAuthData(euser,rd);
                    rd=backend.getPos();
                    if(strcmp(euser.fieldname,"username") == 0 && strcmp(euser.data,argv[3])==0 ){
                        memcpy(uid,euser.uuid,strlen(euser.uuid)+1);
                        authdb::AuthData newattr;
                        newattr.type=1;
                        memcpy(newattr.uuid,uid,strlen(uid)+1);
                        memcpy(newattr.fieldname,argv[4],strlen(argv[4])+1);
                        newattr.datasize=strlen(argv[4])+1;
                        newattr.data = new char[strlen(argv[5])+1];
                        snprintf(newattr.data,strlen(argv[5])+1,"%s",argv[5]);
                        backend.WriteAuthData(newattr,backend.end());
                    }
                }
            }else if(strcmp(argv[2],"list")==0){*/
                authdb::AuthData user,attr;
                int rd=sizeof(authdb::AuthHeader),rd2=rd;
                std::cout << "Revesion :" << backend.getRevesion() << std::endl;
                while(rd<backend.end()){
                    backend.ReadAuthData(user,rd);
                    rd=backend.getPos();
                    if(strcmp(user.fieldname,"username") == 0){
                        std::cout << user.fieldname  << ": " << user.data << std::endl;
                        std::cout << "  id: " << user.uuid << std::endl;
                        while(rd2<backend.end()){
                            backend.ReadAuthData(attr,rd2);
                            if(strcmp(attr.fieldname,"username") != 0 &&
                                strcmp(attr.uuid,user.uuid)==0){
                                std::cout << "  " << attr.fieldname << ": " << attr.data << std::endl;
                            }
                            rd2=backend.getPos();
                        }
                        rd2=sizeof(authdb::AuthHeader);
                    }
                    delete[] user.data;
                }
           /* }
        }*/
        authdb.runEventloop();
    }catch(authdb::AuthBackendError &e){
        std::cerr << e.what() << std::endl;
    }
+25 −2
Changes for src/authdb.h: 25 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -25,6 +25,8 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 *******************************************************************************/

#include <uuid/uuid.h>

#pragma once

#define VERSION 1
@@ -35,7 +37,7 @@ namespace authdb {
        char   domain[255];
        size_t Version;
        size_t Revesion;
        const  short end=0xFE;
        const  short end=0xFF;
    };

    struct AuthData {
@@ -45,6 +47,27 @@ namespace authdb {
        char   fieldname[255];
        size_t datasize;
        char  *data;
        const  short end=0xFE;
        const  short end=0xFF;
    };

    int searchValue(authdb::AuthBackend &backend,const char*fieldname,const char *value);

    class AuthDataRecord {
    public:
        AuthDataRecord();

        AuthDataRecord(const AuthDataRecord &src);

        ~AuthDataRecord();

        AuthDataRecord *next();

        AuthData Data;
    protected:
        AuthDataRecord    *_next;
        friend bool getRecord(authdb::AuthBackend &backend,AuthDataRecord *dest,uuid_t id,int type);
    };

    bool getRecord(authdb::AuthBackend &backend,AuthDataRecord *dest,uuid_t id,int type);

};

src/db.h

deleted100644 → 0
+0 −1
Changes for src/db.h: 0 added lines, 1 removed line.
Original line number Diff line number Diff line
 
+232 −7
Changes for src/user.cpp: 232 added lines, 7 removed lines.
Original line number Diff line number Diff line
@@ -27,26 +27,251 @@

#include "user.h"

void authdb::User::create(struct UserData* dat){
authdb::UserData::UserData(uuid_t id){
    Data=new AuthDataRecord;
    char uid[255];

    uuid_unparse(id,uid);
    memcpy(Data->Data.uuid,id,strlen(uid)+1);

    Data->Data.type=-1;

}

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


void authdb::UserData::setFirstName(const char* src){
    AuthDataRecord *target=firstname;

    if(!target){
        for(AuthDataRecord *curec=Data; curec; curec=curec->next()){
            if(strcmp(curec->Data.fieldname,"firstname")==0){
                target=curec;
                break;
            }
        }

        if(!target){
            if(Data->Data.type!=-1){
                while(!target){
                    target=target->next();
                };
                target=new AuthDataRecord;
            }
        }
    }
    target->Data.type=1;

    memcpy(target->Data.uuid,Data->Data.uuid,strlen(Data->Data.uuid)+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;
}

void authdb::UserData::setLastName(const char* src){
    AuthDataRecord *target=lastname;

    if(!target){
        for(AuthDataRecord *curec=Data; curec; curec=curec->next()){
            if(strcmp(curec->Data.fieldname,"lastname")==0){
                target=curec;
                break;
            }
        }

        if(!target){
            if(Data->Data.type!=-1){
                while(!target){
                    target=target->next();
                };
                target=new AuthDataRecord;
            }
        }
    }
    target->Data.type=1;

    memcpy(target->Data.uuid,Data->Data.uuid,strlen(Data->Data.uuid)+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;
}

void authdb::UserData::setMail(const char* src){
    AuthDataRecord *target=mail;

    if(!target){
        for(AuthDataRecord *curec=Data; curec; curec=curec->next()){
            if(strcmp(curec->Data.fieldname,"mail")==0){
                target=curec;
                break;
            }
        }

        if(!target){
            if(Data->Data.type!=-1){
                while(!target){
                    target=target->next();
                };
                target=new AuthDataRecord;
            }
        }
    }
    target->Data.type=1;

    memcpy(target->Data.uuid,Data->Data.uuid,strlen(Data->Data.uuid)+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;
}

void authdb::UserData::setPwHash(const char* src){
    AuthDataRecord *target=pwhash;

    if(!target){
        for(AuthDataRecord *curec=Data; curec; curec=curec->next()){
            if(strcmp(curec->Data.fieldname,"password")==0){
                target=curec;
                break;
            }
        }

        if(!target){
            if(Data->Data.type!=-1){
                while(!target){
                    target=target->next();
                };
                target=new AuthDataRecord;
            }
        }
    }
    target->Data.type=1;

    memcpy(target->Data.uuid,Data->Data.uuid,strlen(Data->Data.uuid)+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;
}

void authdb::UserData::setUserName(const char* src){
    AuthDataRecord *target=username;

    if(!target){
        for(AuthDataRecord *curec=Data; curec; curec=curec->next()){
            if(strcmp(curec->Data.fieldname,"username")==0){
                target=curec;
                break;
            }
        }

        if(!target){
            if(Data->Data.type!=-1){
                while(!target){
                    target=target->next();
                };
                target=new AuthDataRecord;
            }
        }
    }
    target->Data.type=1;

    memcpy(target->Data.uuid,Data->Data.uuid,strlen(Data->Data.uuid)+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;
}

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

    if(!target){
        for(AuthDataRecord *curec=Data; curec; curec=curec->next()){
            if(strcmp(curec->Data.fieldname,"lastname")==0){
                target=curec;
                break;
            }
        }

        if(!target){
            if(Data->Data.type!=-1){
                while(!target){
                    target=target->next();
                };
                target=new AuthDataRecord;
            }
        }
    }
    target->Data.type=1;

    memcpy(target->Data.uuid,Data->Data.uuid,strlen(Data->Data.uuid)+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, class UserData* dat){
    authdb::AuthData cur;

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

    backend.setPos(rd);

    std::string userlist="UserList:\r\n";

    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){
            throw authdb::AuthBackendError("Create User: Username Exists aborting!");
        }else if(strcmp(cur.uuid,dat->username->Data.uuid)==0){
            throw authdb::AuthBackendError("Create User: UUID already Exists aborting!");
        }
    }

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

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

void authdb::User::remove(uuid_t uid){
void authdb::User::remove(AuthBackend &backend, uuid_t uid){
}

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

void authdb::User::getAdditional(uuid_t uid, struct AuthData& data, size_t pos){
void authdb::User::getAdditional(AuthBackend &backend, uuid_t uid, struct AuthData& data, size_t pos){
}

void authdb::User::editAdditional(uuid_t uid, struct AuthData& data, const char* fieldname){
void authdb::User::editAdditional(AuthBackend &backend, uuid_t uid, struct AuthData& data, const char* fieldname){
}

void authdb::User::remAdditional(uuid_t uid, const char* fieldname){
void authdb::User::remAdditional(AuthBackend &backend, uuid_t uid, const char* fieldname){
}


Loading