Commit 660c971b authored by jan.koester's avatar jan.koester
Browse files

fixed

parent ae112e34
Loading
Loading
Loading
Loading
Loading
+2 −2
Changes for src/admin.cpp: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -1539,7 +1539,7 @@ namespace authdb {

                        }
                };
                if(gpodat){
                if(gpodat.get()){
                    std::vector<uuid> allow;
                    for (libhttppp::HttpForm::MultipartForm::Data* curformdat = GPOForm.MultipartFormData.getFormData();
                        curformdat; curformdat = curformdat->nextData()) {
@@ -2059,7 +2059,7 @@ namespace authdb {

                        libhttppp::HttpCookie cookie;
                        uuid sid;
                        const SessionData *cses=AuthSession.addSession(*backend,did,udat.uid);
                        const SessionData *cses=AuthSession.addSession(*backend,did,udat.Data.uuid);
                        cses->getSid(sid);

                        if(!cses->checkGPO("888cd19b-352d-11f0-a8cc-3cecefce9ac2")){
+2 −2
Changes for src/authdb.h: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -51,8 +51,8 @@ namespace authdb {
    struct AuthHeader{
        int      start = 0xFE;
        char   domain[255];
        size_t Version;
        size_t Revesion;
        size_t Version=0;
        size_t Revesion=0;
    };

    class AuthData {
+8 −8
Changes for src/data.cpp: 8 added lines, 8 removed lines.
Original line number Diff line number Diff line
@@ -93,16 +93,16 @@ namespace authdb {
        int rd=sizeof(authdb::AuthHeader),end=backend.end();

        while(rd<end){
            AuthData::Record cur;
            std::shared_ptr<AuthData::Record> cur=std::make_shared<AuthData::Record>();
            backend.setPos(rd);
            backend.read(reinterpret_cast<unsigned char*>(&cur),sizeof(AuthData::Record));
            rd=backend.getPos()+cur.datasize;
            if(uuid_compare(cur.uuid,rec.Data.uuid) == 0 && cur.type == type){
                cur.data=new char[cur.datasize];
                backend.read(reinterpret_cast<unsigned char*>(cur.data),cur.datasize);
                rec.append(cur);
            backend.read(reinterpret_cast<unsigned char*>(cur.get()),sizeof(AuthData::Record));
            rd=backend.getPos()+cur->datasize;
            if(uuid_compare(cur->uuid,rec.Data.uuid) == 0 && cur->type == type){
                cur->data=new char[cur->datasize];
                backend.read(reinterpret_cast<unsigned char*>(cur->data),cur->datasize);
                rec.append(*cur);
                found=true;
                delete[] cur.data;
                delete[] cur->data;
            }
        }

+0 −2
Changes for src/gpo.cpp: 0 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -97,8 +97,6 @@ void authdb::GpoData::getAlowed(std::vector<uuid> &allowed){
    if(asize==0)
        return;

    // allowed.resize(asize);

    asize*=sizeof(uuid_t);

    char *start=_Allowed->data+sizeof(size_t);
+5 −5
Changes for src/user.cpp: 5 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ authdb::UserData::UserData(uuid_t id) : AuthData(id){
    mail=nullptr;
    pwhash=nullptr;
    avatar=nullptr;
    uuid_copy(uid,id);
    uuid_copy(Data.uuid,id);
}

authdb::UserData::~UserData(){
@@ -103,7 +103,7 @@ void authdb::User::create(AuthBackend &backend,class UserData* dat){

    int exi=0;

    if(exits(backend,&dat->uid,dat->getUsername(),exi)){
    if(exits(backend,&dat->Data.uuid,dat->getUsername(),exi)){
       switch(exi){
           case 1:
                throw authdb::AuthBackendError("Create User: Username already Exists aborting!");
@@ -155,7 +155,7 @@ bool authdb::User::exits(AuthBackend& backend, uuid_t* uid, const char* name,int


void authdb::User::edit(AuthBackend &backend,class UserData& dat, size_t &pos){
    remove(backend,dat.uid);
    remove(backend,dat.Data.uuid);
    create(backend,&dat);
}

@@ -166,7 +166,7 @@ void authdb::User::remove(AuthBackend &backend,const uuid_t uid){
void authdb::User::info(AuthBackend &backend, class UserData& dat, size_t &pos){
    size_t end=backend.end();

    if(uuid_is_null(dat.uid))
    if(uuid_is_null(dat.Data.uuid))
        throw AuthBackendError("user info uid required!");

    while(pos<end){
@@ -174,7 +174,7 @@ void authdb::User::info(AuthBackend &backend, class UserData& dat, size_t &pos){
        backend.setPos(pos);
        backend.read(reinterpret_cast<unsigned char*>(cur.get()),sizeof(AuthData::Record));
        pos=backend.getPos()+cur->datasize;
        if(cur->type == UserData && uuid_compare(dat.uid,cur->uuid) == 0
        if(cur->type == UserData && uuid_compare(dat.Data.uuid,cur->uuid) == 0
            && strcmp(cur->fieldname,"username")==0
        ){

Loading