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

use the fenrirds client (fenrirds::client, <fenrirds/client.h>) 

Co-Authored-By: default avatarClaude Opus 5.5 <noreply@anthropic.com>
parent c8731353

CMakeLists.txt

+1 −1
Changes for CMakeLists.txt: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ find_package(libhttppp REQUIRED) 
find_package(libcmdplus REQUIRED)

find_package(libconfplus REQUIRED)

find_package(libdbpp REQUIRED)

find_package(authdb REQUIRED)

find_package(fenrirds REQUIRED)

find_package(json-c REQUIRED)

find_package(smtpclient REQUIRED)

find_package(libuuidp REQUIRED)

editor/CMakeLists.txt

+2 −2
Changes for editor/CMakeLists.txt: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ if(NOT TARGET blogidev) 
    find_package(json-c REQUIRED)

    find_package(tinyxml2 REQUIRED)

    find_package(libuuidp REQUIRED)

    find_package(authdb REQUIRED)

    find_package(fenrirds REQUIRED)

    find_package(smtpclient REQUIRED)

    find_package(paritypp REQUIRED)

    find_package(ZLIB REQUIRED)
@@ -74,7 +74,7 @@ else() 
        json-c::json-c

        tinyxml2::tinyxml2

        uuidp::uuidp

        authdb::client

        fenrirds::client

        ZLIB::ZLIB

        dl

    )

editor/src/webedit_server.cpp

+3 −3
Changes for editor/src/webedit_server.cpp: 3 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ webedit::Server::Server(std::vector<netplus::socket*> serversocket, 
    // Create connection pools for each auth source

    for (size_t i = 0; i < _config.getAuthSourceCount(); ++i) {

        const auto &src = _config.getAuthSource(i);

        auto pool = std::make_unique<authdb::client::ConnectionPool>(

        auto pool = std::make_unique<fenrirds::client::ConnectionPool>(

            src.url, src.clientName, src.clientSecret, 4);

        // ConnectionPool opens its HTTP client on the first acquire(), so the

        // source's TLS policy must be applied to the pool beforehand.
@@ -417,7 +417,7 @@ void webedit::Server::ensureSessionFromAuthid(const std::string &authid, 
                !pooled.client().GPOcheck(loginGpoId))

                continue;



            authdb::SessionData sdat;

            fenrirds::SessionData sdat;

            pooled.client().SessionInfo(sdat);



            std::string displayname = sdat.getUsername();
@@ -540,7 +540,7 @@ void webedit::Server::handleLogin(libhttppp::HttpRequest &curreq, 
        _session.addData(sessionid, "authid", authid);



        // Get user info and store in session

        authdb::SessionData sdat;

        fenrirds::SessionData sdat;

        pooled.client().SessionInfo(sdat);



        std::string displayname = sdat.getUsername();

editor/src/webedit_server.h

+2 −2
Changes for editor/src/webedit_server.h: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
#include <vector>

#include <httppp/httpd.h>

#include <httppp/http.h>

#include <authdb/client.h>

#include <fenrirds/client.h>



#include "plugin.h"

#include "webedit_config.h"
@@ -86,7 +86,7 @@ namespace webedit { 
        blogi::webedit::EditPluginLoad &_plugins;



        // Connection pools per auth source (indexed same as _config auth sources)

        std::vector<std::unique_ptr<authdb::client::ConnectionPool>> _authPools;

        std::vector<std::unique_ptr<fenrirds::client::ConnectionPool>> _authPools;



        // Short-lived cache for isAuthenticated results (60s TTL) to avoid

        // authdb pool exhaustion when many concurrent media preview requests arrive.

editor/widgets/CMakeLists.txt

+1 −1
Changes for editor/widgets/CMakeLists.txt: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ if(NOT TARGET blogidev) 
        json-c::json-c

        tinyxml2::tinyxml2

        confplus::confplus

        authdb::client

        fenrirds::client

    )

    if(NOT ${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Windows")

        target_compile_options(editor_plugin_base PUBLIC -fPIC)