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

hurray group are working

parent 638374a8
Loading
Loading
Loading
Loading
Loading
+17 −18
Changes for src/authdb.cpp: 17 added lines, 18 removed lines.
Original line number Diff line number Diff line
@@ -1076,7 +1076,7 @@ namespace authdb {
                        std::transform(tmp.begin(), tmp.end(), tmp.begin(),
                                       [](unsigned char c){ return std::tolower(c); });

                        if(tmp=="name" && strcmp(curdispo->getValue(),"members")==0){
                        if(tmp=="name" && strcmp(curdispo->getValue(),"groupmembers")==0){
                            ++gcount;
                        }

@@ -1110,9 +1110,10 @@ namespace authdb {
                        std::transform(tmp.begin(), tmp.end(), tmp.begin(),
                                       [](unsigned char c){ return std::tolower(c); });

                        if(tmp=="name" && strcmp(curdispo->getValue(),"members")==0){
                            uuid_parse(curformdat->Value.data(),member.uid[git]);
                            ++git;
                        if(tmp=="name" && strcmp(curdispo->getValue(),"groupmembers")==0){
                            curformdat->Value.push_back('\0');
                            if(uuid_parse(curformdat->Value.data(),member.uid[git++])!=0)
                                throw AuthBackendError("Creategroup: cannot parse uuid!");
                        }
                    }

@@ -1133,7 +1134,7 @@ namespace authdb {
                  << "<tr><td><label for=\"groupname\">groupname:</label></td>"
                  << "<td><input type=\"text\" name=\"groupname\"></td></tr>"
                  << "<tr><td>Members:</td>"
                  << "<td><select name=\"members\" multiple>";
                  << "<td><select name=\"groupmembers\" multiple>";
            while(rd<end){
                authdb::AuthData::Record cur;

@@ -1245,6 +1246,8 @@ namespace authdb {

                GroupData::MemberUids members;
                members.count=0;
                members.uid = nullptr;

                size_t count = 0;

                for (libhttppp::HttpForm::MultipartForm::Data* curformdat = curform.MultipartFormData.getFormData();
@@ -1263,7 +1266,6 @@ namespace authdb {

                        if( key=="name" && strcmp(curdispo->getValue(),"groupmembers")==0){
                            ++members.count;
                            std::cout << members.count << std::endl;
                        }
                    }
                }
@@ -1286,7 +1288,7 @@ namespace authdb {

                         std::string key;
                         key=curdispo->getKey();

                         data=true;

                         std::transform(key.begin(), key.end(), key.begin(),
                                        [](unsigned char c){ return std::tolower(c); });
@@ -1318,7 +1320,6 @@ namespace authdb {

                     if(curec.Data->storage==TextStorage &&
                         strcmp(curec.Data->fieldname,"groupmembers")==0){
                         std::cerr<< members.count << std::endl;
                         if(count >= members.count)
                            throw AuthBackendError("Edit groups to much entries !");
                         curformdat->Value.push_back('\0');
@@ -1357,6 +1358,7 @@ namespace authdb {
                if(data){
                    if(members.count>0){
                        editrec.addMember(members);
                        delete[] members.uid;
                    }
                    editRecord(*backend,editrec,GroupData);
                    libhttppp::HttpResponse rep;
@@ -1370,6 +1372,7 @@ namespace authdb {
                    return;
                }
            }

            libhtmlpp::HtmlPage page;

            libhtmlpp::HtmlString form,out;
@@ -1405,13 +1408,9 @@ namespace authdb {
                        cur.data = new char[cur.datasize];
                        backend->read((unsigned char*)cur.data,cur.datasize);

                        GroupData::MemberUids mrec;
                        memcpy(&mrec,cur.data,sizeof(GroupData::MemberUids));

                        mrec.uid=new uuid_t[mrec.count];
                        memcpy(mrec.uid,cur.data+sizeof(GroupData::MemberUids),
                               (sizeof(uuid_t)*mrec.count));
                        GroupData::MemberUids *mrec;

                        mrec = (GroupData::MemberUids *)cur.data;

                        size_t urd=sizeof(AuthHeader),uend=backend->end();
                        while(urd<uend){
@@ -1430,8 +1429,8 @@ namespace authdb {

                                form << "<option value=\"" << cuuid << "\" ";

                                for(size_t i=0; i<mrec.count; ++i ){
                                    if(uuid_compare(mrec.uid[i],curu.uuid) == 0){
                                for(size_t i=0; i<mrec->count; ++i ){
                                    if(uuid_compare(mrec->uid[i],curu.uuid) == 0){
                                        form << "selected";
                                        break;
                                    }
@@ -1443,7 +1442,7 @@ namespace authdb {
                            }
                        }

                        delete[] mrec.uid;
                        delete[] cur.data;

                        form << "</select>";
                    }
@@ -1614,7 +1613,7 @@ VALUEFOUND:
        AuthData *curec=this,*next=this;
        if(!curec->_next && curec->Data->datasize==0){
            for(const AuthData *cursrc=&src; cursrc; cursrc=cursrc->next()){
                next=next->append(*src.Data);
                next=next->append(*cursrc->Data);
            }
            return curec;
        }
+14 −13
Changes for src/group.cpp: 14 added lines, 13 removed lines.
Original line number Diff line number Diff line
@@ -103,6 +103,8 @@ authdb::GroupData::GroupData(uuid_t gid) : AuthData(gid){
}

authdb::GroupData::GroupData(const GroupData& src) : AuthData(src){
    _Name=nullptr;
    _Members=nullptr;
}


@@ -120,6 +122,9 @@ const char* authdb::GroupData::getName(){
void authdb::GroupData::addMember(const MemberUids &uid){
        AuthData *curec=this;

        uuid_t gid;
        uuid_copy(gid,Data->uuid);

        if(!_Members){
            while(curec){
                if(curec->Data->type == authdb::GroupData &&
@@ -137,26 +142,25 @@ void authdb::GroupData::addMember(const MemberUids &uid){
        }

        if(!_Members){
            _Members=new AuthData::Record;
            _Members=append(*_Members)->Data;
            AuthData::Record rec;
            _Members=append(rec)->Data;
        }

        size_t mtsize=sizeof(GroupData::MemberUids)+(sizeof(uuid_t)*uid.count);

        memset(_Members,0,sizeof(AuthData::Record));

        _Members->start=0xFE;
        uuid_copy(_Members->uuid,Data->uuid);
        uuid_copy(_Members->uuid,gid);
        _Members->type=DataType::GroupData;
        _Members->storage=StorageType::BinaryStorage;

        snprintf(_Members->fieldname,255,"%s","groupmembers");
        _Members->datasize = sizeof(GroupData::MemberUids)+mtsize;
        _Members->datasize = sizeof(uid);
        _Members->data=new char [_Members->datasize];
        memcpy(_Members->data,&uid,sizeof(GroupData::MemberUids));
        memcpy(_Members->data+sizeof(GroupData::MemberUids),uid.uid,(sizeof(uuid_t)*uid.count));


        ((GroupData::MemberUids*)_Members->data)->uid = new uuid_t[uid.count];
        for(int i=0; i< uid.count; ++i){
            uuid_copy(((GroupData::MemberUids*)_Members->data)->uid[i],uid.uid[i]);
        }
}


@@ -204,14 +208,11 @@ void authdb::Group::create(AuthBackend& backend, class GroupData* dat){
       }
    }

    size_t wd=backend.end();
    backend.setPos(backend.end());

    for(AuthData *curec=dat; curec; curec=curec->next()){
         curec->Data->type=GroupData;
         backend.setPos(wd);
         backend.write((unsigned char*)curec->Data,sizeof(struct AuthData::Record));
         backend.write((unsigned char*)curec->Data->data,curec->Data->datasize);
         wd=backend.end();
    }
}