From b6f787dadb33c0f4d0a2540b5c44f889814a8415 Mon Sep 17 00:00:00 2001 From: emeric Date: Mon, 10 Feb 2025 17:38:12 +0100 Subject: [PATCH] Use make_address instead of from_string to fix build --- src/libs/subsonic/impl/SubsonicResource.cpp | 2 +- src/lms/ui/Auth.cpp | 4 ++-- src/lms/ui/common/PasswordValidator.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/libs/subsonic/impl/SubsonicResource.cpp b/src/libs/subsonic/impl/SubsonicResource.cpp index 6a38fae0..c041406d 100644 --- a/src/libs/subsonic/impl/SubsonicResource.cpp +++ b/src/libs/subsonic/impl/SubsonicResource.cpp @@ -448,7 +448,7 @@ namespace lms::api::subsonic if (!apiKey && !password) throw RequiredParameterMissingError{ "apiKey" }; - const auto clientAddress{ boost::asio::ip::address::from_string(request.clientAddress()) }; + const auto clientAddress{ boost::asio::ip::make_address(request.clientAddress()) }; const std::string authToken{ apiKey ? *apiKey : decodePasswordIfNeeded(*password) }; const auto authResult{ core::Service::get()->processAuthToken("subsonic", clientAddress, authToken) }; diff --git a/src/lms/ui/Auth.cpp b/src/lms/ui/Auth.cpp index 850f66d4..1ffac05b 100644 --- a/src/lms/ui/Auth.cpp +++ b/src/lms/ui/Auth.cpp @@ -107,7 +107,7 @@ namespace lms::ui if (field == PasswordField) { const auto checkResult{ _passwordService.checkUserPassword( - boost::asio::ip::address::from_string(LmsApp->environment().clientAddress()), + boost::asio::ip::make_address(LmsApp->environment().clientAddress()), valueText(LoginNameField).toUTF8(), valueText(PasswordField).toUTF8()) }; switch (checkResult.state) @@ -153,7 +153,7 @@ namespace lms::ui const std::string hashedCookie{ Wt::Auth::SHA1HashFunction{}.compute(*authCookie, authCookieSalt) }; - const auto res{ core::Service::get()->processAuthToken(authTokenDomain, boost::asio::ip::address::from_string(env.clientAddress()), hashedCookie) }; + const auto res{ core::Service::get()->processAuthToken(authTokenDomain, boost::asio::ip::make_address(env.clientAddress()), hashedCookie) }; switch (res.state) { case auth::IAuthTokenService::AuthTokenProcessResult::State::Denied: diff --git a/src/lms/ui/common/PasswordValidator.cpp b/src/lms/ui/common/PasswordValidator.cpp index 690a8e1d..fe106c43 100644 --- a/src/lms/ui/common/PasswordValidator.cpp +++ b/src/lms/ui/common/PasswordValidator.cpp @@ -100,7 +100,7 @@ namespace lms::ui return Wt::WValidator::validate(input); const auto checkResult{ _passwordService.checkUserPassword( - boost::asio::ip::address::from_string(LmsApp->environment().clientAddress()), + boost::asio::ip::make_address(LmsApp->environment().clientAddress()), LmsApp->getUserLoginName(), input.toUTF8()) }; switch (checkResult.state)