From 88a6392c87fce8388e20e79abc8804b7c4b92e99 Mon Sep 17 00:00:00 2001
From: dinesh-murugiah <dinesh.murugiah@freshworks.com>
Date: Mon, 7 Oct 2024 23:19:56 +0530
Subject: [PATCH] add client remote ip in log when errenous command executed

---
 .../network/common/redis/supported_commands.h      |  2 +-
 .../network/redis_proxy/command_splitter_impl.cc   | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/source/extensions/filters/network/common/redis/supported_commands.h b/source/extensions/filters/network/common/redis/supported_commands.h
index 5ba4d1f602e9..92984f7af417 100644
--- a/source/extensions/filters/network/common/redis/supported_commands.h
+++ b/source/extensions/filters/network/common/redis/supported_commands.h
@@ -113,7 +113,7 @@ struct SupportedCommands {
   * @return client sub commands thats supported 
   */
   static const absl::flat_hash_set<std::string>& clientSubCommands() {
-    CONSTRUCT_ON_FIRST_USE(absl::flat_hash_set<std::string>, "getname", "list","setname");
+    CONSTRUCT_ON_FIRST_USE(absl::flat_hash_set<std::string>, "getname","setname");
   }
 
     /**
diff --git a/source/extensions/filters/network/redis_proxy/command_splitter_impl.cc b/source/extensions/filters/network/redis_proxy/command_splitter_impl.cc
index ef07e7bd3bbd..a86c0c7bac39 100644
--- a/source/extensions/filters/network/redis_proxy/command_splitter_impl.cc
+++ b/source/extensions/filters/network/redis_proxy/command_splitter_impl.cc
@@ -1842,19 +1842,19 @@ SplitRequestPtr InstanceImpl::makeRequest(Common::Redis::RespValuePtr&& request,
                                           const StreamInfo::StreamInfo& stream_info) {
   // Validate request type and contents.
   if ((request->type() != Common::Redis::RespType::Array) || request->asArray().empty()) {
-    ENVOY_LOG(error,"invalid request - not an array or empty");
+    ENVOY_LOG(error,"invalid request - not an array or empty,sent from remote client ip '{}'",stream_info.downstreamAddressProvider().remoteAddress()->asString());
     onInvalidRequest(callbacks);
     return nullptr;
   }
 
   for (const Common::Redis::RespValue& value : request->asArray()) {
     if (value.type() != Common::Redis::RespType::BulkString) {
-      ENVOY_LOG(error,"invalid request - not an array of bulk strings");
+      ENVOY_LOG(error,"invalid request - not an array of bulk strings,sent from remote client ip '{}' ",stream_info.downstreamAddressProvider().remoteAddress()->asString());
       onInvalidRequest(callbacks);
       return nullptr;
     }
   }
-  ENVOY_LOG(info, "command to process '{}'", request->toString());
+  ENVOY_LOG(info, "command to process '{}'- sent from remote client ip '{}'", request->toString(),stream_info.downstreamAddressProvider().remoteAddress()->asString());
   // Extract command name
   std::string command_name = absl::AsciiStrToLower(request->asArray()[0].asString());
 
@@ -1867,7 +1867,7 @@ SplitRequestPtr InstanceImpl::makeRequest(Common::Redis::RespValuePtr&& request,
   // Handle AUTH command
   if (command_name == Common::Redis::SupportedCommands::auth()) {
     if (request->asArray().size() < 2) {
-      ENVOY_LOG(error,"invalid request - not enough arguments for auth command");
+      ENVOY_LOG(error,"invalid request - not enough arguments for auth command  - sent from remote client ip '{}'",stream_info.downstreamAddressProvider().remoteAddress()->asString());
       onInvalidRequest(callbacks);
       return nullptr;
     }
@@ -1944,7 +1944,7 @@ SplitRequestPtr InstanceImpl::makeRequest(Common::Redis::RespValuePtr&& request,
 
       } else {
       // Commands other than PING, TIME and transaction commands all have at least two arguments.
-      ENVOY_LOG(error,"invalid request - not enough arguments for command: '{}'", command_name);
+      ENVOY_LOG(error,"invalid request - not enough arguments for command: '{}' - sent from remote client ip '{}'", command_name,stream_info.downstreamAddressProvider().remoteAddress()->asString());
       onInvalidRequest(callbacks);
       return nullptr;
     }
@@ -1955,7 +1955,7 @@ SplitRequestPtr InstanceImpl::makeRequest(Common::Redis::RespValuePtr&& request,
     std::string sub_command = absl::AsciiStrToLower(request->asArray()[1].asString());
     if (Common::Redis::SupportedCommands::clientSubCommands().count(sub_command) == 0) {
       stats_.unsupported_command_.inc();
-      ENVOY_LOG(error, "unsupported command '{}' '{}'",command_name, sub_command);
+      ENVOY_LOG(error, "unsupported command '{}' '{}'- sent from remote client ip '{}'",command_name, sub_command,stream_info.downstreamAddressProvider().remoteAddress()->asString());
       callbacks.onResponse(Common::Redis::Utility::makeError(
           fmt::format("unsupported command '{}' '{}'",command_name, sub_command)));
       return nullptr;
@@ -1998,7 +1998,7 @@ SplitRequestPtr InstanceImpl::makeRequest(Common::Redis::RespValuePtr&& request,
 
     }else{
       stats_.unsupported_command_.inc();
-      ENVOY_LOG(error, "unsupported command '{}'", request->asArray()[0].asString());
+      ENVOY_LOG(error, "unsupported command '{}', sent from remote client ip '{}'", request->asArray()[0].asString(), stream_info.downstreamAddressProvider().remoteAddress()->asString());
       callbacks.onResponse(Common::Redis::Utility::makeError(
         fmt::format("unsupported command '{}'", request->asArray()[0].asString())));
       return nullptr;