Commit 49c6445f authored by jan.koester's avatar jan.koester
Browse files

use external uuid now

parent 949902d2

CMakeLists.txt

+1 −0
Changes for CMakeLists.txt: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ find_package(libnetplus REQUIRED) 
find_package(libhttppp REQUIRED)

find_package(libhtmlpp REQUIRED)

find_package(json-c REQUIRED)

find_package(libuuidp REQUIRED)



find_path(LIBUUID_INCLUDE_DIR uuid.h PATH_SUFFIXES uuid REQUIRED)

find_library(LIBUUID_LIBRARY libuuid.so REQUIRED)

client/CMakeLists.txt

+2 −2
Changes for client/CMakeLists.txt: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -10,9 +10,9 @@ add_library(client SHARED client.cpp ) 


add_library(client-static STATIC client.cpp)



target_link_libraries(client PRIVATE $<TARGET_OBJECTS:authobj> PUBLIC confplus::confplus netplus::netplus json-c::json-c httppp::httppp fback ${LIBUUID_LIBRARY})

target_link_libraries(client PRIVATE $<TARGET_OBJECTS:authobj> PUBLIC uuidp::uuidp confplus::confplus netplus::netplus json-c::json-c httppp::httppp fback ${LIBUUID_LIBRARY})



target_link_libraries(client-static PRIVATE $<TARGET_OBJECTS:authobj> PUBLIC confplus::confplus netplus::netplus json-c::json-c httppp::httppp fback ${LIBUUID_LIBRARY})

target_link_libraries(client-static PRIVATE $<TARGET_OBJECTS:authobj> PUBLIC uuidp::uuidp confplus::confplus netplus::netplus json-c::json-c httppp::httppp fback ${LIBUUID_LIBRARY})



set_target_properties(client PROPERTIES

  INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/include/authdb"

client/client.cpp

+8 −8
Changes for client/client.cpp: 8 added lines, 8 removed lines.
Original line number Diff line number Diff line
@@ -62,15 +62,15 @@ void authdb::client::ClientConnection::setUserPassword(const std::string &passwo 
    _UserPassword=password;

}



const authdb::uuid &authdb::client::ClientConnection::getClientId(){

const uuid::uuid &authdb::client::ClientConnection::getClientId(){

    return _ClientId;

}



const authdb::uuid &authdb::client::ClientConnection::getSessionID(){

const uuid::uuid &authdb::client::ClientConnection::getSessionID(){

    return _SessionID;

}



void authdb::client::ClientConnection::setSessionID(const uuid& sid){

void authdb::client::ClientConnection::setSessionID(const ::uuid::uuid& sid){

    _SessionID=sid;

}
@@ -374,7 +374,7 @@ void authdb::client::Client::changeUserPw(const std::string& oldpw,const std::st 
    resp.push_back('\0');

}



void authdb::client::Client::getAvatar(const uuid &did,const uuid& uid,libhttppp::HttpRequest &resq,libhttppp::HttpResponse& resp){

void authdb::client::Client::getAvatar(const ::uuid::uuid &did,const ::uuid::uuid& uid,libhttppp::HttpRequest &resq,libhttppp::HttpResponse& resp){

    std::stringstream url;

    url << "/getavatar/" << did.c_str() << "/" << uid.c_str() << ".jpg";
@@ -387,7 +387,7 @@ void authdb::client::Client::getAvatar(const uuid &did,const uuid& uid,libhttppp 
    resp.send(resq,avatar,avatar.size());

}



bool authdb::client::Client::GPOcheck(class uuid gpoid){

bool authdb::client::Client::GPOcheck(class ::uuid::uuid gpoid){



    json_object *jresponse = json_object_new_object();

    json_object *cmd=json_object_new_array();
@@ -478,7 +478,7 @@ void authdb::client::Client::addConnection(const std::string &clientname,const s 


}



void authdb::client::Client::remConnection(const uuid& clientid){

void authdb::client::Client::remConnection(const uuid::uuid& clientid){

    json_object *jresponse = json_object_new_object();

    json_object *cmd=json_object_new_array();

    json_object *obj=json_object_new_object();
@@ -507,7 +507,7 @@ void authdb::client::Client::remConnection(const uuid& clientid){ 
    resp.push_back('\0');

}



void authdb::client::Client::editConnection(const uuid& clientid,const std::string &clientname,const std::string &cltsecret){

void authdb::client::Client::editConnection(const uuid::uuid& clientid,const std::string &clientname,const std::string &cltsecret){

    json_object *jresponse = json_object_new_object();

    json_object *cmd=json_object_new_array();

    json_object *obj=json_object_new_object();
@@ -538,7 +538,7 @@ void authdb::client::Client::editConnection(const uuid& clientid,const std::stri 
    resp.push_back('\0');

}



bool authdb::client::Client::GPOexits(class uuid gpoid){

bool authdb::client::Client::GPOexits(class uuid::uuid gpoid){

    json_object *jresponse = json_object_new_object();

    json_object *cmd=json_object_new_array();

    json_object *obj=json_object_new_object();

client/client.h

+11 −11
Changes for client/client.h: 11 added lines, 11 removed lines.
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
 *******************************************************************************/



#include <string>

#include <uuid.h>

#include <uuidp.h>



#include "session.h"

#include "user.h"
@@ -48,10 +48,10 @@ namespace authdb { 
            void setUsername(const std::string &username);

            void setUserPassword(const std::string &password);



            const uuid &getClientId();

            const uuid &getSessionID();

            const uuid::uuid &getClientId();

            const uuid::uuid &getSessionID();



            void setSessionID(const uuid &sid);

            void setSessionID(const uuid::uuid &sid);

        private:

            libhttppp::HttpUrl _Url;

            std::string _CltName;
@@ -60,8 +60,8 @@ namespace authdb { 
            std::string _UserPassword;



            libhttppp::HttpClient *_Client;

            uuid                            _SessionID;

            uuid                            _ClientId;

            uuid::uuid             _SessionID;

            uuid::uuid             _ClientId;

            friend class Client;

        };
@@ -74,19 +74,19 @@ namespace authdb { 
            bool ClientAuth();



            void addConnection(const std::string &clientname,const std::string &cltsecret);

            void remConnection(const uuid &clientid);

            void editConnection(const uuid& clientid,const std::string &clientname,const std::string &cltsecret);

            void remConnection(const uuid::uuid &clientid);

            void editConnection(const uuid::uuid& clientid,const std::string &clientname,const std::string &cltsecret);



            void SessionInfo(class SessionData &sdat);

            bool remSession();



            bool GPOcheck(class uuid gpoid);

            bool GPOexits(class uuid gpoid);

            bool GPOcheck(class ::uuid::uuid gpoid);

            bool GPOexits(class ::uuid::uuid gpoid);



            void UserInfo(class UserData &udat);

            void changeUserPw(const std::string& oldpw,const std::string& newpw);



            void getAvatar(const uuid &did,const uuid &uid,libhttppp::HttpRequest &resq, libhttppp::HttpResponse &resp);

            void getAvatar(const ::uuid::uuid &did,const ::uuid::uuid &uid,libhttppp::HttpRequest &resq, libhttppp::HttpResponse &resp);

        private:

            ClientConnection &_Con;

            friend class Session;

src/CMakeLists.txt

+1 −2
Changes for src/CMakeLists.txt: 1 added line, 2 removed lines.
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ list(APPEND authdbSrcs 
    gpo.cpp

    client.cpp

    hash.cpp

    uuid.cpp

    hash/sha512.cpp

)
@@ -33,7 +32,7 @@ add_executable(authdb 
    $<TARGET_OBJECTS:authobj>

)



target_link_libraries(authdb PUBLIC fback json-c::json-c httppp::httppp netplus::netplus confplus::confplus cmdplus::cmdplus htmlpp::htmlpp ${LIBUUID_LIBRARY})

target_link_libraries(authdb PUBLIC fback uuidp::uuidp json-c::json-c httppp::httppp netplus::netplus confplus::confplus cmdplus::cmdplus htmlpp::htmlpp ${LIBUUID_LIBRARY})



install(FILES uuid.h session.h authdb.h backend.h types.h group.h user.h DESTINATION include/authdb)