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

initial chnages

parent e19b4cf8
Loading
Loading
Loading
Loading
+5 −0
Changes for CMakeLists.txt: 5 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -2,4 +2,9 @@ cmake_minimum_required(VERSION 3.18)

project(authdb)

find_package(libconfplus REQUIRED)
find_package(libcmdplus REQUIRED)
find_package(libnetplus REQUIRED)
find_package(libhttppp REQUIRED)

add_subdirectory(src)

data/config.yaml

0 → 100644
+4 −0
Changes for data/config.yaml: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line
AUTHDB:
    PORT: 9090
    ADMINDB:
        PATH: "./admin.db"
+2 −1
Changes for src/CMakeLists.txt: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -3,10 +3,11 @@ add_library(fback SHARED backends/file.cpp)
list(APPEND authdbSrcs
    authdb.cpp
    backend.cpp
    user.cpp
)

add_executable(
    authdb ${authdbSrcs}
)

target_link_libraries(authdb PUBLIC fback uuid)
target_link_libraries(authdb PUBLIC fback httppp::httppp netplus::netplus confplus::confplus cmdplus::cmdplus uuid)
+57 −34
Changes for src/authdb.cpp: 57 added lines, 34 removed lines.
Original line number Diff line number Diff line
@@ -27,55 +27,72 @@

#include <iostream>
#include <cstring>

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

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

void authdb::ReadAuthData(authdb::AuthBackend &backend,struct AuthData& adata,int pos){
    backend.lock();
    backend.setPos(pos);
    backend.read((unsigned char*)&adata,sizeof(adata));
    backend.setPos(pos+sizeof(adata));
    adata.data=new char[adata.datasize];
    backend.read((unsigned char*)adata.data,adata.datasize);
    backend.unlock();
}
int main(int argc, char *argv[]){
    cmdplus::CmdController &cmd=cmdplus::CmdController::getInstance();

    cmd.registerCmd("config",'c',true,nullptr,"Config Path");

    cmd.parseCmd(argc,argv);

void authdb::WriteAuthData(authdb::AuthBackend &backend,const struct AuthData &adata,int pos){
    backend.lock();
    backend.setPos(pos);
    backend.newRevesion();
    backend.write((unsigned char*)&adata,sizeof(adata));
    backend.write((unsigned char*)adata.data,adata.datasize);
    backend.unlock();
    if(!cmd.checkRequired()){
        std::cerr << "Config Path required !" << std::endl;
        cmd.printHelp();
        return -1;
    }

    confplus::Config config(cmd.getCmdbyKey("config")->getValue());

int main(int argc, char *argv[]){
    authdb::AuthBackend backend(authdb::AuthBackendType::File,"test.db","tuxist.de");
    authdb::AuthBackend backend(authdb::AuthBackendType::File,
                                config.getValue(config.getKey("/AUTHDB/ADMINDB/PATH"),0),
                                "admin.local"
                                );
    try {
        if(backend.end()<=sizeof(authdb::AuthHeader)){
                std::string username,password;

        if(strcmp(argv[1],"user")==0 ){
            if(strcmp(argv[2],"create")==0 ){
                authdb::AuthData user;
                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,pw;

                uuid_t id;
                uuid_generate(id);

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

                user.type=1;
                snprintf(user.fieldname,255,"%s",argv[3]);
                user.datasize=strlen(argv[4])+1;
                user.data = new char[strlen(argv[4])+1];
                snprintf(user.data,strlen(argv[4])+1,"%s",argv[4]);
                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;
                int rd=sizeof(authdb::AuthHeader);
                while(rd<backend.end()){
                    ReadAuthData(backend,euser,rd);
                    backend.ReadAuthData(euser,rd);
                    rd=backend.getPos();
                    if(strcmp(euser.fieldname,"username") == 0 && strcmp(euser.data,user.data)==0 ){
                        delete[] euser.data;
@@ -84,7 +101,13 @@ int main(int argc, char *argv[]){
                    delete[] euser.data;
                }

                WriteAuthData(backend,user,backend.end());
                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);

@@ -97,7 +120,7 @@ int main(int argc, char *argv[]){
                char uid[255];

                while(rd<backend.end()){
                    ReadAuthData(backend,euser,rd);
                    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);
@@ -108,21 +131,21 @@ int main(int argc, char *argv[]){
                        newattr.datasize=strlen(argv[4])+1;
                        newattr.data = new char[strlen(argv[5])+1];
                        snprintf(newattr.data,strlen(argv[5])+1,"%s",argv[5]);
                        WriteAuthData(backend,newattr,backend.end());
                        backend.WriteAuthData(newattr,backend.end());
                    }
                }
            }else if(strcmp(argv[2],"list")==0){
            }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()){
                    ReadAuthData(backend,user,rd);
                    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()){
                            ReadAuthData(backend,attr,rd2);
                            backend.ReadAuthData(attr,rd2);
                            if(strcmp(attr.fieldname,"username") != 0 &&
                                strcmp(attr.uuid,user.uuid)==0){
                                std::cout << "  " << attr.fieldname << ": " << attr.data << std::endl;
@@ -133,8 +156,8 @@ int main(int argc, char *argv[]){
                    }
                    delete[] user.data;
                }
            }
        }
           /* }
        }*/
    }catch(authdb::AuthBackendError &e){
        std::cerr << e.what() << std::endl;
    }
+4 −4
Changes for src/authdb.h: 4 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -31,20 +31,20 @@

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

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

    void WriteAuthData(authdb::AuthBackend &backend,const struct AuthData &adata,int pos);
    void ReadAuthData(authdb::AuthBackend &backend,struct AuthData &adata,int pos);

};
Loading