Commit 638374a8 authored by jan.koester's avatar jan.koester
Browse files

fixed

parent ff637c61
Loading
Loading
Loading
Loading
Loading
+76 −30
Changes for src/authdb.cpp: 76 added lines, 30 removed lines.
Original line number Diff line number Diff line
@@ -1233,7 +1233,7 @@ namespace authdb {
            uuid_t gid;
            uuid_parse(cgid,gid);

            AuthData editrec(gid);
            class GroupData editrec(gid);

            bool data = false;

@@ -1241,6 +1241,34 @@ namespace authdb {

            curform.parse(curreq);

            if(curform.MultipartFormData.getFormData()){

                GroupData::MemberUids members;
                members.count=0;
                size_t count = 0;

                for (libhttppp::HttpForm::MultipartForm::Data* curformdat = curform.MultipartFormData.getFormData();
                     curformdat; curformdat = curformdat->nextData()) {

                    for(libhttppp::HttpForm::MultipartForm::Data::ContentDisposition *curdispo=curformdat->getDisposition();
                        curdispo; curdispo=curdispo->nextContentDisposition()
                    ){
                        if(curformdat->Value.empty() || !curdispo->getValue())
                             continue;

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

                        std::transform(key.begin(), key.end(), key.begin(),
                                       [](unsigned char c){ return std::tolower(c); });

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

                members.uid = new uuid_t[members.count];

                for (libhttppp::HttpForm::MultipartForm::Data* curformdat = curform.MultipartFormData.getFormData();
                          curformdat; curformdat = curformdat->nextData()) {
@@ -1253,19 +1281,12 @@ namespace authdb {
                     for(libhttppp::HttpForm::MultipartForm::Data::ContentDisposition *curdispo=curformdat->getDisposition();
                         curdispo; curdispo=curdispo->nextContentDisposition()
                     ){


                         if(curformdat->Value.empty() || !curdispo->getValue())
                             continue;

                        data = true;

                         std::string key;

                        if(curdispo->getKey())
                         key=curdispo->getKey();
                        else
                            continue;


                         std::transform(key.begin(), key.end(), key.begin(),
                                        [](unsigned char c){ return std::tolower(c); });
@@ -1295,9 +1316,14 @@ namespace authdb {
                             curec.Data->storage=TextStorage;
                     }



                    if(curec.Data->storage==TextStorage) {
                     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');
                         uuid_parse(curformdat->Value.data(),members.uid[count++]);
                     }else if(curec.Data->storage==TextStorage) {
                         curformdat->Value.push_back('\0');
                         curec.Data->datasize=curformdat->Value.size();
                         curec.Data->data=new char[curec.Data->datasize];
@@ -1326,10 +1352,12 @@ namespace authdb {
                         editrec.append(curec);
                         delete[] (int*)curec.Data->data;
                     }

                }

                if(data){
                    if(members.count>0){
                        editrec.addMember(members);
                    }
                    editRecord(*backend,editrec,GroupData);
                    libhttppp::HttpResponse rep;
                    rep.setState(HTTP307);
@@ -1341,6 +1369,7 @@ namespace authdb {
                    rep.send(curreq,nullptr,0);
                    return;
                }
            }
            libhtmlpp::HtmlPage page;

            libhtmlpp::HtmlString form,out;
@@ -1355,20 +1384,24 @@ namespace authdb {
                backend->read((unsigned char*)&cur,sizeof(AuthData::Record));
                rd=backend->getPos()+cur.datasize;

                if(uuid_compare(cur.uuid,gid)==0 && cur.type==GroupData && cur.storage==TextStorage){
                if(uuid_compare(cur.uuid,gid)==0 && cur.type==GroupData){

                    form  << "<tr><td><label for=\""<< cur.fieldname <<"\">" << cur.fieldname << "</label></td>";

                    if(cur.storage==TextStorage){
                        cur.data = new char[cur.datasize];
                        backend->read((unsigned char*)cur.data,cur.datasize);
                        try {
                        form  << "<tr><td><label for=\""<< cur.fieldname <<"\">" << cur.fieldname << "</label></td>"
                              << "<td><input type=\"text\" name=\"" << cur.fieldname << "\" value=\""
                              << cur.data <<"\"></td></tr>";
                            form   << "<td><input type=\"text\" name=\"" << cur.fieldname << "\" value=\""
                                   << cur.data <<"\"></td>";
                        }catch(AuthBackendError &e){
                            std::cerr << e.what() << std::endl;
                        }
                        delete[] cur.data;
                } else if(uuid_compare(cur.uuid,gid)==0 && cur.type==GroupData && cur.storage==BinaryStorage
                    && strcmp(cur.fieldname ,"groupmembers")==0
                ){
                    }else if(cur.storage==BinaryStorage && strcmp(cur.fieldname ,"groupmembers")==0){

                        form   << "<td><select name=\"" << cur.fieldname << "\" multiple>";

                        cur.data = new char[cur.datasize];
                        backend->read((unsigned char*)cur.data,cur.datasize);

@@ -1379,34 +1412,48 @@ namespace authdb {
                        memcpy(mrec.uid,cur.data+sizeof(GroupData::MemberUids),
                               (sizeof(uuid_t)*mrec.count));

                    for(size_t i=0; i<mrec.count; ++i ){

                        size_t urd=sizeof(AuthHeader),uend=backend->end();
                        while(urd<uend){
                            authdb::AuthData::Record curu;
                            backend->setPos(urd);
                            backend->read((unsigned char*)&curu,sizeof(AuthData::Record));
                            urd=backend->getPos()+curu.datasize;

                            if(curu.type == UserData && uuid_compare(mrec.uid[i],curu.uuid) == 0 &&
                                curu.storage==TextStorage && strcmp(curu.fieldname,"username")==0){
                            if(curu.type==UserData && curu.storage==TextStorage
                                && strcmp(curu.fieldname,"username")==0){

                                curu.data = new char[curu.datasize];
                                backend->read((unsigned char*)curu.data,curu.datasize);
                                std::cout << curu.data << std::endl;
                                delete[] curu.data;

                                char cuuid[255];
                                uuid_unparse(curu.uuid,cuuid);

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

                                for(size_t i=0; i<mrec.count; ++i ){
                                    if(uuid_compare(mrec.uid[i],curu.uuid) == 0){
                                        form << "selected";
                                        break;
                                    }
                                }

                                form << ">" << curu.data <<"</option>";

                                delete[] curu.data;
                            }
                        }

                        delete[] mrec.uid;
                }

                        form << "</select>";
                    }
                    form << "</td>";
                }
            }

            form  << "<tr><td></td><td><input type=\"submit\"></td></tr>"
                  << "</table>"
                  << "</form";
                  << "</form>";

            libhtmlpp::HtmlElement root=_IndexElement;
            libhtmlpp::HtmlElement *content=root.getElementbyID("content");
@@ -1534,8 +1581,7 @@ VALUEFOUND:
        _next=nullptr;
    }

    AuthData::AuthData(const AuthData &src){
        AuthData(src.Data->uuid);
    AuthData::AuthData(const AuthData &src) : AuthData(src.Data->uuid){
        AuthData *dest=this;

        for(const AuthData *cursrc=&src; cursrc; cursrc=cursrc->next()){