diff options
| author | Paul Cristian Sarbu <paul.cristian.sarbu@huawei.com> | 2024-06-28 14:20:53 +0200 |
|---|---|---|
| committer | Paul Cristian Sarbu <paul.cristian.sarbu@huawei.com> | 2024-07-04 16:05:08 +0200 |
| commit | 217e31bf00c3437658033bd0829f31929f10a103 (patch) | |
| tree | 04c5ac014f72c6fd57e721efd0fc21123fce9b78 /src/buildtool/execution_api/execution_service | |
| parent | 9ab21a7f3d7e349b05ceaad5862d7e72a6d7e7b4 (diff) | |
| download | justbuild-217e31bf00c3437658033bd0829f31929f10a103.tar.gz | |
Use ApiBundle's Auth::TLS instance in serve and execute servers
Diffstat (limited to 'src/buildtool/execution_api/execution_service')
| -rw-r--r-- | src/buildtool/execution_api/execution_service/TARGETS | 1 | ||||
| -rw-r--r-- | src/buildtool/execution_api/execution_service/server_implementation.cpp | 8 |
2 files changed, 3 insertions, 6 deletions
diff --git a/src/buildtool/execution_api/execution_service/TARGETS b/src/buildtool/execution_api/execution_service/TARGETS index e77fb6bf..8bf4dc79 100644 --- a/src/buildtool/execution_api/execution_service/TARGETS +++ b/src/buildtool/execution_api/execution_service/TARGETS @@ -81,7 +81,6 @@ , ["src/buildtool/execution_api/remote", "config"] , ["src/buildtool/logging", "log_level"] , ["src/buildtool/logging", "logging"] - , ["src/buildtool/auth", "auth"] , ["@", "json", "", "json"] , ["@", "grpc", "", "grpc++"] , ["src/buildtool/execution_api/remote", "config"] diff --git a/src/buildtool/execution_api/execution_service/server_implementation.cpp b/src/buildtool/execution_api/execution_service/server_implementation.cpp index 30974d4f..4a9f23cf 100644 --- a/src/buildtool/execution_api/execution_service/server_implementation.cpp +++ b/src/buildtool/execution_api/execution_service/server_implementation.cpp @@ -26,7 +26,6 @@ #include "fmt/core.h" #include "grpcpp/grpcpp.h" #include "nlohmann/json.hpp" -#include "src/buildtool/auth/authentication.hpp" #include "src/buildtool/common/remote/port.hpp" #include "src/buildtool/compatibility/compatibility.hpp" #include "src/buildtool/execution_api/execution_service/ac_server.hpp" @@ -72,13 +71,12 @@ auto ServerImpl::Run(ApiBundle const& apis) -> bool { .RegisterService(&op); std::shared_ptr<grpc::ServerCredentials> creds; - if (Auth::Instance().GetAuthMethod() == AuthMethod::kTLS) { + if (apis.auth != nullptr) { auto tls_opts = grpc::SslServerCredentialsOptions{}; - tls_opts.pem_root_certs = Auth::TLS::Instance().CACert(); + tls_opts.pem_root_certs = apis.auth->CACert(); grpc::SslServerCredentialsOptions::PemKeyCertPair keycert = { - Auth::TLS::Instance().ServerKey(), - Auth::TLS::Instance().ServerCert()}; + apis.auth->ServerKey(), apis.auth->ServerCert()}; tls_opts.pem_key_cert_pairs.emplace_back(keycert); |