Merge pull request #1265 from akto-api-security/hotfix/grpc_logging

grpc logging and allowing replace body
akto-api-security · Jul 11, 2024 · 7809d35 · 7809d35
2 parents 6b4df80 + 1b830fd
commit 7809d35
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/apps/api-runtime/src/main/java/com/akto/parsers/HttpCallParser.java b/apps/api-runtime/src/main/java/com/akto/parsers/HttpCallParser.java
@@ -43,6 +43,7 @@
 import java.util.regex.Pattern;
 
 import static com.akto.runtime.RuntimeUtil.matchesDefaultPayload;
+import static com.akto.util.HttpRequestResponseUtils.GRPC_CONTENT_TYPE;
 
 public class HttpCallParser {
     private final int sync_threshold_count;
@@ -88,7 +89,8 @@ public HttpCallParser(String userIdentifier, int thresh, int sync_threshold_coun
         apiCatalogSync.buildFromDB(false, fetchAllSTI);
         this.dependencyAnalyser = new DependencyAnalyser(apiCatalogSync.dbState, !Main.isOnprem);
     }
-
+    private static int GRPC_DEBUG_COUNTER = 50;
+
     public static HttpResponseParams parseKafkaMessage(String message) throws Exception {
 
         //convert java object to JSON format
@@ -102,7 +104,16 @@ public static HttpResponseParams parseKafkaMessage(String message) throws Except
         String rawRequestPayload = (String) json.get("requestPayload");
         String requestPayload = HttpRequestResponseUtils.rawToJsonString(rawRequestPayload,requestHeaders);
 
-
+        if (GRPC_DEBUG_COUNTER > 0) {
+            String acceptableContentType = HttpRequestResponseUtils.getAcceptableContentType(requestHeaders);
+            if (acceptableContentType != null && rawRequestPayload.length() > 0) {
+                // only if request payload is of FORM_URL_ENCODED_CONTENT_TYPE we convert it to json
+                if (acceptableContentType.equals(GRPC_CONTENT_TYPE)) {
+                    loggerMaker.infoAndAddToDb("grpc kafka payload:" + message,LogDb.RUNTIME);
+                    GRPC_DEBUG_COUNTER--;
+                }
+            }
+        }
 
         String apiCollectionIdStr = json.getOrDefault("akto_vxlan_id", "0").toString();
         int apiCollectionId = 0;

diff --git a/libs/dao/src/main/java/com/akto/util/grpc/ProtoBufUtils.java b/libs/dao/src/main/java/com/akto/util/grpc/ProtoBufUtils.java
@@ -5,6 +5,7 @@
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.io.InvalidObjectException;
 import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
 import java.util.Base64;
@@ -103,12 +104,12 @@ private static Map<Object, Object> decodeProtoInput(CodedInputStream input, int
         return map;
     }
 
-    public static String base64EncodedJsonToProtobuf(String payload) throws IOException{
+    public static String base64EncodedJsonToProtobuf(String payload) throws Exception{
         Map<Object, Object> map = null;
         try {
             map = ProtoBufUtils.getInstance().mapper.readValue(payload, Map.class);
         } catch (Exception e) {
-            map = new HashMap<>();
+            throw new InvalidObjectException("Unable to parse payload");
         }
         return base64EncodedJsonToProtobuf(map);
     }

diff --git a/libs/utils/src/main/java/com/akto/testing/ApiExecutor.java b/libs/utils/src/main/java/com/akto/testing/ApiExecutor.java
@@ -337,6 +337,7 @@ private static OriginalHttpResponse sendWithRequestBody(OriginalHttpRequest requ
             try {
                 payload = ProtoBufUtils.base64EncodedJsonToProtobuf(payload);
             } catch (Exception e) {
+                loggerMaker.errorAndAddToDb("Unable to encode payload:" + payload, LogDb.RUNTIME);
                 payload = request.getBody();
             }
         }