Loading api/checkgpo.json +3 −3 Changes for api/checkgpo.json: 3 added lines, 3 removed lines. Original line number Diff line number Diff line { "commands" : [ { "clientsession" : "cbd3165a-b99c-4968-ad86-dddfa93cac33", "sessionid" : "81fb1832-8cdc-431c-9134-5ce3343524f1", "checkgpo" : "c839330a-68fe-46de-8c40-92141e8fc018" "clientsession" : "$clientsession", "usersession" : "$sessionid", "checkgpo" : "$gpoid" } ] } api/login.json→api/clientlogin.json +2 −2 Changes for api/clientlogin.json: 2 added lines, 2 removed lines. Original line number Diff line number Diff line Loading @@ -3,8 +3,8 @@ { "login" : { "type" : "client", "name" : "dibsi", "key" : "matrix" "name" : "$clientname", "key" : "$clientkey" } } ] Loading api/curl.sh 0 → 100755 +28 −0 Changes for api/curl.sh: 28 added lines, 0 removed lines. Original line number Diff line number Diff line #!/bin/sh . ./$1 clientlogin=$(sed -e 's/$clientname/'$(echo $clientname)'/g' -e 's/$clientkey/'$(echo $clientsecret)'/g' clientlogin.json) ret=$(curl -d "$(echo $clientlogin)" "http://$host:$port/api/$domainid" -s --output - ) conid=$(echo $ret | grep -oP '"connectionid"\s*:\s*"\K[^"]*' ) userlogin=$(sed -e 's/$username/'$(echo $username)'/g' -e 's/$userpassword/'$(echo $userpassword)'/g' -e 's/$clientsession/'$(echo $conid)'/g' userlogin.json) ret=$(curl -d "$(echo $userlogin)" "http://$host:$port/api/$domainid" -s --output - ) echo $ret sessionid=$(echo $ret | grep -oP '"sessionid"\s*:\s*"\K[^"]*' ) echo "conid:" $conid echo "sessionid:" $sessionid if [ $2 = 'checkgpo' ] then checkgpo=$(sed -e 's/$clientsession/'$(echo $conid)'/g' -e 's/$sessionid/'$(echo $sessionid)'/g' -e 's/$gpoid/'$(echo $3)'/g' checkgpo.json) echo $checkgpo ret=$(curl -d "$(echo $checkgpo)" "http://$host:$port/api/$domainid" -s --output - ) echo $ret fi api/userlogin.json +3 −3 Changes for api/userlogin.json: 3 added lines, 3 removed lines. Original line number Diff line number Diff line { "commands" : [ { "clientsession" : "7be76140-38aa-4b86-b461-222616d6e219" , "clientsession" : "$clientsession" , "login" : { "type" : "user", "name" : "jan.koester", "key" : "matrix" "name" : "$username", "key" : "$userpassword" } } ] Loading src/api.cpp +33 −2 Changes for src/api.cpp: 33 added lines, 2 removed lines. Original line number Diff line number Diff line Loading @@ -41,6 +41,7 @@ #include "user.h" #include "client.h" #include "session.h" #include "gpo.h" namespace authdb { Loading @@ -57,13 +58,37 @@ namespace authdb { if(!cmd) throw(AuthBackendError("Invalid Api Commands")); SessionData ses=userLogin(request,response); 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,"checkgpo")==0){ const char *id=json_object_get_string(val); Gpo gpo; GpoData gpdat(id); size_t spos=sizeof(AuthHeader); gpo.info(_Backend,gpdat,spos); GpoData::Allow allow; bool alowed = false; gpdat.getAlowed(&allow); for(size_t ii =0; ii<allow.count; ++ii ){ if(uuid(id)==allow.uid[ii]){ alowed=true; } } alowed = (alowed & !gpdat.getGpoValue()); json_object *respid=json_object_new_object(); json_object *value=json_object_new_object(); json_object_object_add(value,id,json_object_new_boolean(alowed)); json_object_object_add(respid,"gpo",value); json_object_array_add(response,respid); } } } Loading Loading @@ -143,6 +168,8 @@ namespace authdb { }else if(strcmp(okey,"key")==0){ pw=json_object_get_string(oval); } if(!pw.empty() && !name.empty()) break; } } Loading Loading @@ -306,6 +333,10 @@ namespace authdb { _SessionData=userLogin(jrequest,jresponse); } if(_SessionData){ checkGPO(jrequest,jresponse); } size_t outsize=0; const char *out=json_object_to_json_string_length(jresponse,0,&outsize); Loading Loading
api/checkgpo.json +3 −3 Changes for api/checkgpo.json: 3 added lines, 3 removed lines. Original line number Diff line number Diff line { "commands" : [ { "clientsession" : "cbd3165a-b99c-4968-ad86-dddfa93cac33", "sessionid" : "81fb1832-8cdc-431c-9134-5ce3343524f1", "checkgpo" : "c839330a-68fe-46de-8c40-92141e8fc018" "clientsession" : "$clientsession", "usersession" : "$sessionid", "checkgpo" : "$gpoid" } ] }
api/login.json→api/clientlogin.json +2 −2 Changes for api/clientlogin.json: 2 added lines, 2 removed lines. Original line number Diff line number Diff line Loading @@ -3,8 +3,8 @@ { "login" : { "type" : "client", "name" : "dibsi", "key" : "matrix" "name" : "$clientname", "key" : "$clientkey" } } ] Loading
api/curl.sh 0 → 100755 +28 −0 Changes for api/curl.sh: 28 added lines, 0 removed lines. Original line number Diff line number Diff line #!/bin/sh . ./$1 clientlogin=$(sed -e 's/$clientname/'$(echo $clientname)'/g' -e 's/$clientkey/'$(echo $clientsecret)'/g' clientlogin.json) ret=$(curl -d "$(echo $clientlogin)" "http://$host:$port/api/$domainid" -s --output - ) conid=$(echo $ret | grep -oP '"connectionid"\s*:\s*"\K[^"]*' ) userlogin=$(sed -e 's/$username/'$(echo $username)'/g' -e 's/$userpassword/'$(echo $userpassword)'/g' -e 's/$clientsession/'$(echo $conid)'/g' userlogin.json) ret=$(curl -d "$(echo $userlogin)" "http://$host:$port/api/$domainid" -s --output - ) echo $ret sessionid=$(echo $ret | grep -oP '"sessionid"\s*:\s*"\K[^"]*' ) echo "conid:" $conid echo "sessionid:" $sessionid if [ $2 = 'checkgpo' ] then checkgpo=$(sed -e 's/$clientsession/'$(echo $conid)'/g' -e 's/$sessionid/'$(echo $sessionid)'/g' -e 's/$gpoid/'$(echo $3)'/g' checkgpo.json) echo $checkgpo ret=$(curl -d "$(echo $checkgpo)" "http://$host:$port/api/$domainid" -s --output - ) echo $ret fi
api/userlogin.json +3 −3 Changes for api/userlogin.json: 3 added lines, 3 removed lines. Original line number Diff line number Diff line { "commands" : [ { "clientsession" : "7be76140-38aa-4b86-b461-222616d6e219" , "clientsession" : "$clientsession" , "login" : { "type" : "user", "name" : "jan.koester", "key" : "matrix" "name" : "$username", "key" : "$userpassword" } } ] Loading
src/api.cpp +33 −2 Changes for src/api.cpp: 33 added lines, 2 removed lines. Original line number Diff line number Diff line Loading @@ -41,6 +41,7 @@ #include "user.h" #include "client.h" #include "session.h" #include "gpo.h" namespace authdb { Loading @@ -57,13 +58,37 @@ namespace authdb { if(!cmd) throw(AuthBackendError("Invalid Api Commands")); SessionData ses=userLogin(request,response); 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,"checkgpo")==0){ const char *id=json_object_get_string(val); Gpo gpo; GpoData gpdat(id); size_t spos=sizeof(AuthHeader); gpo.info(_Backend,gpdat,spos); GpoData::Allow allow; bool alowed = false; gpdat.getAlowed(&allow); for(size_t ii =0; ii<allow.count; ++ii ){ if(uuid(id)==allow.uid[ii]){ alowed=true; } } alowed = (alowed & !gpdat.getGpoValue()); json_object *respid=json_object_new_object(); json_object *value=json_object_new_object(); json_object_object_add(value,id,json_object_new_boolean(alowed)); json_object_object_add(respid,"gpo",value); json_object_array_add(response,respid); } } } Loading Loading @@ -143,6 +168,8 @@ namespace authdb { }else if(strcmp(okey,"key")==0){ pw=json_object_get_string(oval); } if(!pw.empty() && !name.empty()) break; } } Loading Loading @@ -306,6 +333,10 @@ namespace authdb { _SessionData=userLogin(jrequest,jresponse); } if(_SessionData){ checkGPO(jrequest,jresponse); } size_t outsize=0; const char *out=json_object_to_json_string_length(jresponse,0,&outsize); Loading