Merge pull request #1274 from akto-api-security/hotfix/grpc_response_…

…encoding_fix response fix for grpc and ProtoBufUtils encoding handling for Integer…
akto-api-security · Jul 12, 2024 · 86aad3b · 86aad3b
2 parents 9dfec7a + 5dcb66e
commit 86aad3b
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 8 deletions.
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
@@ -153,7 +153,9 @@ private static void encodeMapToProto(Map<Object, Object> map, CodedOutputStream
 
             codedOutputStream.writeTag(number, getWireType(value));
 
-            if (value instanceof Long) {
+            if (value instanceof Integer) {
+                codedOutputStream.writeInt64NoTag((int) value);
+            } else if (value instanceof Long) {
                 codedOutputStream.writeInt64NoTag((Long) value);
             } else if (value instanceof Double) {
                 codedOutputStream.writeFixed64NoTag(Double.doubleToRawLongBits((Double) value));
@@ -172,7 +174,7 @@ private static void encodeMapToProto(Map<Object, Object> map, CodedOutputStream
     }
 
     private static int getWireType(Object value) {
-        if (value instanceof Long) {
+        if (value instanceof Long || value instanceof Integer) {
             return WireFormat.WIRETYPE_VARINT;
         } else if (value instanceof Double) {
             return WireFormat.WIRETYPE_FIXED64;

diff --git a/libs/utils/src/main/java/com/akto/testing/ApiExecutor.java b/libs/utils/src/main/java/com/akto/testing/ApiExecutor.java
@@ -10,13 +10,11 @@
 import com.akto.log.LoggerMaker;
 import com.akto.log.LoggerMaker.LogDb;
 import com.akto.util.Constants;
-
 import com.akto.util.HttpRequestResponseUtils;
 import com.akto.util.grpc.ProtoBufUtils;
 import kotlin.Pair;
 import okhttp3.*;
 import okio.BufferedSink;
-
 import org.apache.commons.lang3.StringUtils;
 
 import java.io.IOException;
@@ -94,8 +92,14 @@ private static OriginalHttpResponse common(Request request, boolean followRedire
         Headers headers = response.headers();
 
         Map<String, List<String>> responseHeaders = generateHeadersMapFromHeadersObject(headers);
-
-        return new OriginalHttpResponse(body, responseHeaders, statusCode);
+        OriginalHttpResponse originalHttpResponse = new OriginalHttpResponse(body, responseHeaders, statusCode);
+        if (requestProtocol != null && requestProtocol.contains(HttpRequestResponseUtils.GRPC_CONTENT_TYPE)) {//GRPC request
+            //body will be binary,
+            String responseBase64Encoded = Base64.getEncoder().encodeToString(body.getBytes());
+            loggerMaker.infoAndAddToDb("grpc response base64 encoded:" + responseBase64Encoded, LogDb.TESTING);
+            originalHttpResponse.setBody(HttpRequestResponseUtils.convertGRPCEncodedToJson(responseBase64Encoded));
+        }
+        return originalHttpResponse;
     }
 
     public static Map<String, List<String>> generateHeadersMapFromHeadersObject(Headers headers) {
@@ -336,16 +340,18 @@ private static OriginalHttpResponse sendWithRequestBody(OriginalHttpRequest requ
             if (!payload.startsWith("[") && !payload.startsWith("{")) payload = "{}";
         } else if (contentType.contains(HttpRequestResponseUtils.GRPC_CONTENT_TYPE)) {
             try {
+                loggerMaker.infoAndAddToDb("encoding to grpc payload:" + payload, LogDb.TESTING);
                 payload = ProtoBufUtils.base64EncodedJsonToProtobuf(payload);
             } catch (Exception e) {
-                loggerMaker.errorAndAddToDb("Unable to encode payload:" + payload, LogDb.RUNTIME);
+                loggerMaker.errorAndAddToDb("Unable to encode grpc payload:" + payload, LogDb.TESTING);
                 payload = request.getBody();
             }
             try {// trying decoding payload
                 byte[] payloadByteArray = Base64.getDecoder().decode(payload);
+                loggerMaker.infoAndAddToDb("Final base64 encoded payload:"+ payload, LogDb.TESTING);
                 body = RequestBody.create(payloadByteArray, MediaType.parse(contentType));
             } catch (Exception e) {
-                loggerMaker.errorAndAddToDb("Unable to decode payload:" + payload, LogDb.RUNTIME);
+                loggerMaker.errorAndAddToDb("Unable to decode grpc payload:" + payload, LogDb.TESTING);
             }
         }