Merge pull request #5769 from Countly/SER-1568

[SER-1568] Exporting incoming data logs results in "Incorrect parameter \"data\" error

Author: ArtursKadikis

CHANGELOG.md

@@ -3,6 +3,7 @@ Fixes:
 - [script] Fixing bug with "delete_old_members" script that led to malformed requests
 - [core] Fixed bug where changing passwords results in the loss of the "Global Admin" role
 - [crash] Fixed bug in crash ingestion for scenarios where the "app version" is not a string.
+- [core] Fixed bug where exporting incoming data logs could result in "Incorrect parameter \"data\" error
 
 ## Version 24.05.17
 Fixes:

plugins/logger/frontend/public/javascripts/countly.views.js

@@ -130,6 +130,44 @@
             formatExportFunction: function() {
                 var tableData = this.logsData;
                 var table = [];
+                var sanitizeQueryData = function(data) {
+                    try {
+                        // If data is already a string, parse it first
+                        let queryObject = typeof data === 'string' ? JSON.parse(data) : data;
+
+                        // Handle nested JSON strings within the object
+                        Object.keys(queryObject).forEach(key => {
+                            if (typeof queryObject[key] === 'string') {
+                                // Try to parse if it looks like JSON
+                                if (queryObject[key].startsWith('{') || queryObject[key].startsWith('[')) {
+                                    try {
+                                        queryObject[key] = JSON.parse(queryObject[key]);
+                                        if (typeof queryObject[key] === 'object' && queryObject[key] !== null) {
+                                            queryObject[key] = sanitizeQueryData(queryObject[key]);
+                                        }
+                                    }
+                                    catch (e) {
+                                        // If parsing fails, keep decoded string
+                                    }
+                                }
+                                queryObject[key] = countlyCommon.unescapeHtml(queryObject[key]);
+                            }
+                            else if (typeof queryObject[key] === 'object' && queryObject[key] !== null) {
+                                // Recursively handle nested objects
+                                Object.keys(queryObject[key]).forEach(nestedKey => {
+                                    if (typeof queryObject[key][nestedKey] === 'string') {
+                                        queryObject[key][nestedKey] = countlyCommon.unescapeHtml(queryObject[key][nestedKey]);
+                                    }
+                                });
+                            }
+                        });
+                        return JSON.stringify(queryObject);
+                    }
+                    catch (err) {
+                        return data; // Return original data if processing fails
+                    }
+                };
+
                 for (var i = 0; i < tableData.length; i++) {
                     var item = {};
                     item[CV.i18n('logger.requests').toUpperCase()] = countlyCommon.formatTimeAgoText(tableData[i].reqts).text;
@@ -152,16 +190,15 @@
                     }
                     if (tableData[i].q) {
                         try {
-                            item[CV.i18n('logger.request-query').toUpperCase()] = JSON.stringify(tableData[i].q);
+                            item[CV.i18n('logger.request-query').toUpperCase()] = sanitizeQueryData(tableData[i].q);
                         }
                         catch (err) {
                             item[CV.i18n('logger.request-header').toUpperCase()] = "-";
                         }
                     }
                     if (tableData[i].h) {
                         try {
-                            var stringifiedHeader = JSON.stringify(tableData[i].h);
-                            item["REQUEST HEADER"] = stringifiedHeader.replace(/&quot;/g, '"');
+                            item["REQUEST HEADER"] = sanitizeQueryData(tableData[i].h);
                         }
                         catch (err) {
                             item["REQUEST HEADER"] = "-";