Fix sensitive data filtering

Author: serradura

lib/solid/process/event_logs/json_logger_listener.rb

@@ -16,9 +16,9 @@ class JsonLoggerListener
     self.backtrace_cleaner = backtrace__cleaner
 
     def on_finish(event_logs:)
-      serialized_attributes = filter_and_serialize_attributes(event_logs)
+      serialized_event_logs = filter_and_serialize(event_logs)
 
-      json_data = {event_logs: serialized_attributes}
+      json_data = {event_logs: serialized_event_logs}
 
       logger.info(json_data.to_json)
     end
@@ -30,21 +30,19 @@ def before_interruption(exception:, event_logs:)
         backtrace: backtrace_cleaner.clean(exception.backtrace).join("; ")
       }
 
-      serialized_attributes = filter_and_serialize_attributes(event_logs)
+      serialized_event_logs = filter_and_serialize(event_logs)
 
-      json_data = {event_logs: serialized_attributes, exception: exception_data}
+      json_data = {event_logs: serialized_event_logs, exception: exception_data}
 
       logger.error(json_data.to_json)
     end
 
     private
 
-    def filter_and_serialize_attributes(event_logs)
-      filter_and_serialize(event_logs).attributes(main_records_only: true)
-    end
-
     def filter_and_serialize(event_logs)
-      records = event_logs[:records].map do
+      serialized_attributes = Serialization::Model.serialize(event_logs).attributes(main_records_only: true)
+
+      records = serialized_attributes[:records].map do
         result = _1[:result]
         result_value = parameter_filter.filter(result[:value].dup)
         result_filtered = result.merge(value: result_value)
@@ -56,9 +54,7 @@ def filter_and_serialize(event_logs)
         _1.merge(result: result_filtered, and_then: and_then_filtered || and_then)
       end
 
-      filtered_event_logs = event_logs.merge(records: records)
-
-      Serialization::Model.serialize(filtered_event_logs)
+      serialized_attributes.merge(records: records)
     end
   end
 end

lib/solid/process/event_logs/record/listener.rb

@@ -47,23 +47,23 @@ def create_record(event_logs, exception_data: nil, caller: nil)
 
     def create_record!(event_logs, exception_data:)
       ::Rails.error.record do
-        serializad_event_logs = filter_and_serialize(event_logs)
-
-        record_attributes = serializad_event_logs.attributes
+        serialized_event_logs = filter_and_serialize(event_logs)
 
         if exception_data
-          record_attributes[:category] = "error"
-          record_attributes[:exception_class] = exception_data[:class]
-          record_attributes[:exception_message] = exception_data[:message]
-          record_attributes[:exception_backtrace] = exception_data[:backtrace]
+          serialized_event_logs[:category] = "error"
+          serialized_event_logs[:exception_class] = exception_data[:class]
+          serialized_event_logs[:exception_message] = exception_data[:message]
+          serialized_event_logs[:exception_backtrace] = exception_data[:backtrace]
         end
 
-        Record.create!(record_attributes)
+        Record.create!(serialized_event_logs)
       end
     end
 
     def filter_and_serialize(event_logs)
-      records = event_logs[:records].map do
+      serialized_attributes = Serialization::Model.serialize(event_logs).attributes
+
+      records = serialized_attributes[:records].map do
         result = _1[:result]
         result_value = parameter_filter.filter(result[:value].dup)
         result_filtered = result.merge(value: result_value)
@@ -75,9 +75,7 @@ def filter_and_serialize(event_logs)
         _1.merge(result: result_filtered, and_then: and_then_filtered || and_then)
       end
 
-      filtered_event_logs = event_logs.merge(records: records)
-
-      Serialization::Model.serialize(filtered_event_logs)
+      serialized_attributes.merge(records: records)
     end
   end
 end