diff --git a/osquery/utils/aws/aws_util.cpp b/osquery/utils/aws/aws_util.cpp index ba6484d..8bf74e6 100644 --- a/osquery/utils/aws/aws_util.cpp +++ b/osquery/utils/aws/aws_util.cpp @@ -132,7 +132,7 @@ OsqueryHttpClientFactory::CreateHttpRequest( } std::shared_ptr OsqueryHttpClient::MakeRequest( - Aws::Http::HttpRequest& request, + const std::shared_ptr& request, Aws::Utils::RateLimits::RateLimiterInterface* readLimiter, Aws::Utils::RateLimits::RateLimiterInterface* writeLimiter) const { // AWS allows rate limiters to be passed around, but we are doing rate @@ -141,21 +141,21 @@ std::shared_ptr OsqueryHttpClient::MakeRequest( LOG(WARNING) << "Read/write limiters are unsupported"; } - Aws::Http::URI uri = request.GetUri(); + Aws::Http::URI uri = request->GetUri(); uri.SetPath(Aws::Http::URI::URLEncodePath(uri.GetPath())); Aws::String url = uri.GetURIString(); http::Client client(TLSTransport().getInternalOptions()); http::Request req(url); - for (const auto& requestHeader : request.GetHeaders()) { + for (const auto& requestHeader : request->GetHeaders()) { req << http::Request::Header(requestHeader.first, requestHeader.second); } std::string body; - if (request.GetContentBody()) { + if (request->GetContentBody()) { std::stringstream ss; - ss << request.GetContentBody()->rdbuf(); + ss << request->GetContentBody()->rdbuf(); body = ss.str(); } @@ -163,15 +163,15 @@ std::shared_ptr OsqueryHttpClient::MakeRequest( try { http::Response resp; - switch (request.GetMethod()) { + switch (request->GetMethod()) { case Aws::Http::HttpMethod::HTTP_GET: resp = client.get(req); break; case Aws::Http::HttpMethod::HTTP_POST: - resp = client.post(req, body, request.GetContentType()); + resp = client.post(req, body, request->GetContentType()); break; case Aws::Http::HttpMethod::HTTP_PUT: - resp = client.put(req, body, request.GetContentType()); + resp = client.put(req, body, request->GetContentType()); break; case Aws::Http::HttpMethod::HTTP_HEAD: resp = client.head(req); @@ -185,7 +185,7 @@ std::shared_ptr OsqueryHttpClient::MakeRequest( break; default: LOG(ERROR) << "Unrecognized HTTP Method used: " - << static_cast(request.GetMethod()); + << static_cast(request->GetMethod()); return nullptr; break; } @@ -212,13 +212,6 @@ std::shared_ptr OsqueryHttpClient::MakeRequest( return response; } -std::shared_ptr OsqueryHttpClient::MakeRequest( - const std::shared_ptr& request, - Aws::Utils::RateLimits::RateLimiterInterface* readLimiter, - Aws::Utils::RateLimits::RateLimiterInterface* writeLimiter) const { - return MakeRequest(*request, readLimiter, writeLimiter); -} - Aws::Auth::AWSCredentials OsqueryFlagsAWSCredentialsProvider::GetAWSCredentials() { // Note that returning empty credentials means the provider chain will just diff --git a/osquery/utils/aws/aws_util.h b/osquery/utils/aws/aws_util.h index 2afa2fb..894df6a 100644 --- a/osquery/utils/aws/aws_util.h +++ b/osquery/utils/aws/aws_util.h @@ -73,11 +73,6 @@ class OsqueryHttpClient : public Aws::Http::HttpClient { public: OsqueryHttpClient() : HttpClient() {} - std::shared_ptr MakeRequest( - Aws::Http::HttpRequest& request, - Aws::Utils::RateLimits::RateLimiterInterface* readLimiter = nullptr, - Aws::Utils::RateLimits::RateLimiterInterface* writeLimiter = - nullptr) const override; std::shared_ptr MakeRequest( const std::shared_ptr& request, Aws::Utils::RateLimits::RateLimiterInterface* readLimiter,