Add AWS SDK user agent

Smjert · Oct 26, 2023 · dd9c1ab · dd9c1ab
1 parent 6629ae1
commit dd9c1ab
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/osquery/utils/aws/aws_util.cpp b/osquery/utils/aws/aws_util.cpp
@@ -220,10 +220,11 @@ std::shared_ptr<Aws::Http::HttpResponse> OsqueryHttpClient::MakeRequest(
   http::Request req(url);
 
   for (const auto& requestHeader : request.GetHeaders()) {
-    /* We don't want to set the AWS SDK user agent, lets skip it
-       and let the HTTP client use its default */
-    if (!boost::iequals(requestHeader.first, "User-Agent")) {
-      req << http::Request::Header(requestHeader.first, requestHeader.second);
+    // Prepend the osquery user agent to the AWS SDK agent
+    if (boost::iequals(requestHeader.first, "User-Agent")) {
+      req << http::Request::Header(
+          requestHeader.first,
+          FLAGS_http_user_agent + " " + requestHeader.second);
     }
   }