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

fixed session.cpp

parent 6ca0e023
Loading
Loading
Loading
Loading
Loading
+1 −0
Changes for src/CMakeLists.txt: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ list(APPEND authdbSrcs
    client.cpp
    hash.cpp
    api.cpp
    uuid.cpp
    hash/sha512.cpp
)

+17 −69
Changes for src/session.cpp: 17 added lines, 69 removed lines.
Original line number Diff line number Diff line
@@ -32,25 +32,18 @@
#include "group.h"
#include "types.h"
#include "authdb.h"
#include "uuid.h"

authdb::SessionData::SessionData(uuid_t sessionid, uuid_t userid, uuid_t domainid,
                                 uuid_t *group,size_t groupsize){
authdb::SessionData::SessionData(uuid_t sessionid, uuid_t userid, uuid_t domainid,std::vector<uuid> &members){
    uuid_copy(_sid,sessionid);
    uuid_copy(_uid,userid);
    uuid_copy(_did,domainid);

    _member.count = groupsize;
    _member.gid = new uuid_t[groupsize];

    for(size_t i =0; i<groupsize; ++i){
        uuid_copy(_member.gid[i],group[i]);
    }

    _members=members;;
    _next=nullptr;
}

authdb::SessionData::~SessionData(){
    delete[] _member.gid;
}

void authdb::SessionData::getUid(uuid_t& dest) const{
@@ -71,8 +64,8 @@ const char * authdb::SessionData::getUsername() const{


bool authdb::SessionData::isMemberOf(const uuid_t& gid){
    for(size_t i=0; i<_member.count; ++i){
        if(uuid_compare(_member.gid[i],gid)==0)
    for(auto member : _members){
        if(member==gid)
            return true;
    }
    return false;
@@ -94,11 +87,6 @@ authdb::Session::~Session(){

const authdb::SessionData * authdb::Session::addSession(AuthBackend &backend,uuid_t domainid,uuid_t userid){
    Group group;

    SessionData::Groups grpdat;

    grpdat.count=0;

    std::string username;

    size_t rd=sizeof(authdb::AuthHeader),end=backend.end();
@@ -120,21 +108,14 @@ const authdb::SessionData * authdb::Session::addSession(AuthBackend &backend,uui
            username=tmp;
            delete[] tmp;
        }

        if(cur.type == GroupData && strcmp(cur.fieldname,"groupname")==0){
            class GroupData grpi(cur.uuid);
            size_t upos=sizeof(authdb::AuthHeader);
            group.info(backend,grpi,upos);

            if(grpi.isMember(userid))
                ++grpdat.count;
    }
    }

    grpdat.gid = new uuid_t[grpdat.count];

    size_t count=0;

    std::vector<uuid> mbs;

    size_t mbs_pos=0;

    while(rd<end){
        authdb::AuthData::Record cur;

@@ -149,9 +130,9 @@ const authdb::SessionData * authdb::Session::addSession(AuthBackend &backend,uui
            class GroupData grpi(cur.uuid);
            size_t upos=sizeof(authdb::AuthHeader);
            group.info(backend,grpi,upos);

            if(grpi.isMember(userid))
                uuid_copy(grpdat.gid[count++],cur.uuid);
            if(grpi.isMember(cur.uuid)){
                mbs.push_back(uuid(cur.uuid));
            }
        }
    }

@@ -159,10 +140,10 @@ const authdb::SessionData * authdb::Session::addSession(AuthBackend &backend,uui
    uuid_generate(sid);

    if(!_firstData){
        _firstData=std::shared_ptr<SessionData>(new SessionData(sid,userid,domainid,grpdat.gid,grpdat.count));
        _firstData=std::shared_ptr<SessionData>(new SessionData(sid,userid,domainid,mbs));
        _lastData=_firstData;
    }else{
        _lastData->_next=std::shared_ptr<SessionData>(new SessionData(sid,userid,domainid,grpdat.gid,grpdat.count));
        _lastData->_next=std::shared_ptr<SessionData>(new SessionData(sid,userid,domainid,mbs));
        _lastData=_lastData->_next;
    }

@@ -203,10 +184,6 @@ void authdb::Session::remSession(uuid_t sessionid){
void authdb::Session::relSession(AuthBackend &backend,uuid_t sessionid){
    Group group;

    SessionData::Groups grpdat;

    grpdat.count=0;

    std::string username;

    std::shared_ptr<SessionData> cursess=nullptr;
@@ -221,6 +198,8 @@ void authdb::Session::relSession(AuthBackend &backend,uuid_t sessionid){
    if(!cursess)
        throw AuthBackendError("reload session: sessionid not found !");

    cursess->_members.clear();

    size_t rd=sizeof(authdb::AuthHeader),end=backend.end();
    while(rd<end){
        authdb::AuthData::Record cur;
@@ -247,40 +226,9 @@ void authdb::Session::relSession(AuthBackend &backend,uuid_t sessionid){
            group.info(backend,grpi,upos);

            if(grpi.isMember(cursess->_uid))
                ++grpdat.count;
                cursess->_members.push_back(uuid(cursess->_uid));
        }
    }

    grpdat.gid = new uuid_t[grpdat.count];

    size_t count=0;

    while(rd<end){
        authdb::AuthData::Record cur;

        cur.type=EmptyData;

        backend.setPos(rd);
        backend.read((unsigned char*)&cur,sizeof(AuthData::Record));

        rd=backend.getPos()+cur.datasize;

        if(cur.type == GroupData && strcmp(cur.fieldname,"groupname")==0){
            class GroupData grpi(cur.uuid);
            size_t upos=sizeof(authdb::AuthHeader);
            group.info(backend,grpi,upos);

            if(grpi.isMember(cursess->_uid))
                uuid_copy(grpdat.gid[count++],cur.uuid);
        }
    }

    if(grpdat.count<__UINTMAX_MAX__){
        cursess->_member.gid=new uuid_t[grpdat.count];
        for(size_t i=0; i<grpdat.count; ++i)
            uuid_copy(cursess->_member.gid[i],grpdat.gid[i]);
        cursess->_member.count=grpdat.count;
    }
}


+3 −7
Changes for src/session.h: 3 added lines, 7 removed lines.
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@
#include <string>
#include <memory>

#include <uuid/uuid.h>
#include "uuid.h"

#include "authdb.h"
#include "group.h"
@@ -52,17 +52,13 @@ namespace authdb {
        ~SessionData();

    private:
        SessionData(uuid_t sessionid,uuid_t userid,uuid_t domainid,
                    uuid_t *group,size_t groupsize);
        SessionData(uuid_t sessionid,uuid_t userid,uuid_t domainid,std::vector<uuid> &members);

        uuid_t                _uid;
        uuid_t                _sid;
        uuid_t                _did;

        struct Groups{
            size_t  count = 0;
            uuid_t *gid = nullptr;
        } _member;
        std::vector<uuid>            _members;

        std::string                  _username;

+13 −4
Changes for src/uuid.cpp: 13 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -27,14 +27,23 @@

#include "uuid.h"

void authdb::gen_uuid(uuid &cuuid){
authdb::uuid::uuid(){
    uuid_is_null(value);
}

authdb::uuid::uuid(const uuid& src){
    uuid_copy(value,src.value);
}

authdb::uuid::uuid(const uuid_t& src){
    uuid_copy(value,src);
}

void authdb::print_uuid(const uuid &cuuid,std::string &out){

authdb::uuid::~uuid(){
}

bool authdb::compare(const uuid &uuid1,const uuid &uuid2){
    return false;
bool authdb::uuid::operator==(const uuid_t &src) const{
    return uuid_compare(value,src);
}
+12 −10
Changes for src/uuid.h: 12 added lines, 10 removed lines.
Original line number Diff line number Diff line
@@ -28,18 +28,20 @@
#include <string>
#include <stdint.h>

#include <uuid/uuid.h>

#pragma once

namespace authdb{
   struct uuid{
        uint32_t data_1;
        uint16_t data_2;
        uint16_t data_3;
        uint8_t  data_4 [2];
        uint8_t  data_5 [6];
   };
   class uuid {
   public:
      uuid();
      uuid(const uuid &src);
      uuid(const uuid_t &src);
      ~uuid();

   void gen_uuid(uuid &cuuid);
   void print_uuid(const uuid &cuuid,std::string &out);
   bool compare(const uuid &uuid1,const uuid &uuid2);
      bool operator==(const uuid_t &src) const;
   private:
      uuid_t value;
   };
};