Commit 09379e54 authored by jan.koester's avatar jan.koester
Browse files

actualize sessiondata

parent 768fa444
Loading
Loading
Loading
Loading
Loading
+13 −4
Changes for client/client.cpp: 13 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -261,7 +261,6 @@ void authdb::client::Client::SessionInfo(class SessionData& sdat){

}

#include <iostream>
bool authdb::client::Client::remSession(){
    json_object *jresponse = json_object_new_object();
    json_object *cmd=json_object_new_array();
@@ -282,14 +281,11 @@ bool authdb::client::Client::remSession(){

    std::copy(tmp,tmp+outsize,std::back_inserter(out));

    std::cout << tmp << std::endl;

    std::vector<char> resp(_Con._Client->Post(_Con._Url.getPath(),"text/json",out));

    resp.push_back('\0');

    std::cout << resp.data() <<std::endl;

    json_object_put(jresponse);

    json_object *jrequest;
@@ -320,3 +316,16 @@ bool authdb::client::Client::remSession(){
    json_tokener_free(jtok);
    return false;
}

void authdb::client::Client::changeUserPw(const std::string& pw){
    json_object *jresponse = json_object_new_object();
    json_object *cmd=json_object_new_array();
    json_object *obj=json_object_new_object();

    json_object_object_add(obj,"usersession", json_object_new_string(_Con.getSessionID().c_str()));
    json_object_object_add(obj,"remsession",json_object_new_string(_Con.getSessionID().c_str()));

    json_object_array_add(cmd,obj);

    json_object_object_add(jresponse,"commands",cmd);
}
+1 −1
Changes for client/client.h: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ namespace authdb {
            bool GPOcheck(class uuid gpoid);

            void UserInfo(class UserData &udat);

            void changeUserPw(const std::string &pw);
        private:
            ClientConnection &_Con;
            friend class Session;
+33 −11
Changes for src/api.cpp: 33 added lines, 11 removed lines.
Original line number Diff line number Diff line
@@ -94,6 +94,8 @@ namespace authdb {
            if(!cmd || json_object_get_type(cmd)!=json_type::json_type_array)
                throw(AuthBackendError("Invalid Api Commands"));

            _SessionData=nullptr;

            int fcount = json_object_array_length(cmd);
            for(int i =0; i<fcount; ++i) {
                json_object_object_foreach(json_object_array_get_idx(cmd,i), key, val) {
@@ -102,7 +104,8 @@ namespace authdb {
                            uuid cid;
                            if(cid.parse(id)!=0)
                                return nullptr;
                            return AuthSession.getSession(cid);
                            _SessionData=AuthSession.getSession(cid);
                            return _SessionData;
                    }
                }
            }
@@ -174,6 +177,8 @@ namespace authdb {

                                size_t rd=sizeof(authdb::AuthHeader),end=_Backend.end();

                                _SessionData=nullptr;

                                while(rd<end){
                                        authdb::AuthData::Record cur;
                                        cur.type=EmptyData;
@@ -189,13 +194,13 @@ namespace authdb {

                                            if(name==udat.getUsername()){
                                                if(pwsalt==udat.getPwHash()){
                                                    const SessionData *sdat=AuthSession.addSession(_Backend,_Did.value,cur.uuid);
                                                    _SessionData=AuthSession.addSession(_Backend,_Did.value,cur.uuid);
                                                    json_object *respid=json_object_new_object();
                                                    uuid sessid;
                                                    sdat->getSid(sessid);
                                                    _SessionData->getSid(sessid);
                                                    json_object_object_add(respid,"sessionid",json_object_new_string(sessid.c_str()));
                                                    json_object_array_add(response,respid);
                                                    return sdat;
                                                    return _SessionData;
                                                }
                                                return nullptr;
                                            }
@@ -377,21 +382,37 @@ namespace authdb {
            for(int i =0; i<fcount; ++i) {
                json_object_object_foreach(json_object_array_get_idx(cmd,i), key, val) {
                    if(strcmp(key,"remsession")==0){
                        uuid tmp,stmp;
                        uuid tmp;
                        tmp.parse(json_object_get_string(val));
                        _SessionData->getUid(stmp);
                        std::cout << tmp.c_str() << ": " << stmp.c_str() << std::endl;
                        if(tmp==stmp){
                        AuthSession.remSession(tmp);
                        json_object *slogoff=json_object_new_object();
                        json_object_object_add(slogoff,"remsession", json_object_new_string(tmp.c_str()));
                        json_object_array_add(response,slogoff);
                        return;
                        }else{
                    }
                }
            }
        }


        void changeUserPw(json_object *request,json_object *response){
            std::lock_guard<std::mutex> lock(AuthClientLock);
            json_object *cmd=json_object_object_get(request,"commands");

            if(!cmd || json_object_get_type(cmd)!=json_type::json_type_array)
                throw(AuthBackendError("Invalid Api Commands"));

            int fcount = json_object_array_length(cmd);
            for(int i =0; i<fcount; ++i) {
                json_object_object_foreach(json_object_array_get_idx(cmd,i), key, val) {
                    if(strcmp(key,"changeuserpw")==0){
                        uuid tmp;
                        tmp.parse(json_object_get_string(val));
                        AuthSession.remSession(tmp);
                        json_object *slogoff=json_object_new_object();
                            json_object_object_add(slogoff,"remsession", json_object_new_string("failed"));
                        json_object_object_add(slogoff,"remsession", json_object_new_string(tmp.c_str()));
                        json_object_array_add(response,slogoff);
                        }
                        return;
                    }
                }
            }
@@ -463,6 +484,7 @@ namespace authdb {
            }

            if(_SessionData){
                changeUserPw(jrequest,jresponse);
                checkGPO(jrequest,jresponse);
            }