From 58546f70a76bc51fbc0bd38485ad341d8572d88a Mon Sep 17 00:00:00 2001 From: Hiral Singadia Date: Thu, 14 Nov 2024 11:26:17 -0800 Subject: [PATCH] Move ClientIdentifierHelper outside of detail namespace for uCache(KCB) and Axon Summary: Current implementation causes warning in ucache to not call our api since it was in `detail` namespace. Pulling it out of detail to make is usable by others (ucache for kcb and axon) Context: https://www.internalfb.com/diff/D63764022?dst_version_fbid=1581474779123809&transaction_fbid=27003760075938780 Reviewed By: edenzik, lenar-f Differential Revision: D65930007 fbshipit-source-id: bb48088564e7231449ad454eef40f3f98cfe57a5 --- mcrouter/ServerOnRequest.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/mcrouter/ServerOnRequest.h b/mcrouter/ServerOnRequest.h index 86fd30c1..35738e67 100644 --- a/mcrouter/ServerOnRequest.h +++ b/mcrouter/ServerOnRequest.h @@ -11,7 +11,7 @@ #include #include -#include "core_infra_security/thrift_authentication_module/detail/ClientIdentifierHelper.h" +#include "core_infra_security/thrift_authentication_module/ClientIdentifierHelper.h" #include "mcrouter/CarbonRouterClient.h" #include "mcrouter/RequestAclChecker.h" #include "mcrouter/config.h" @@ -170,8 +170,9 @@ class ServerOnRequest { if (FOLLY_UNLIKELY(enableKeyClientBinding_) && ctxRef.getThriftRequestContext()) { auto mayBeHashedIdentities = - core_infra_security::thrift_authentication_module::detail:: - getTlsClientIdentifier(*ctxRef.getThriftRequestContext()); + core_infra_security::thrift_authentication_module:: + ClientIdentifierHelper::getTlsClientIdentifier( + *ctxRef.getThriftRequestContext()); // if has valid hashed identity string, set it on the request if (mayBeHashedIdentities.hasValue() && std::holds_alternative(mayBeHashedIdentities.value())) {