From f8a3065147aecef3685a486989e78f1d0791cad9 Mon Sep 17 00:00:00 2001 From: Eric Lawrence Date: Wed, 4 Jan 2023 17:45:28 -0600 Subject: [PATCH] v1.3.4.2 - When renaming Transfer-Encoding/Chunk-Encoding headers, set Content-Length to enhance AutoResponder playback - Update info link to point to my blog - Update copyright to 2023 --- FiddlerImportNetlog/FiddlerInterface.cs | 4 ++-- FiddlerImportNetlog/Importer.cs | 7 +++++++ FiddlerImportNetlog/Properties/AssemblyInfo.cs | 15 +++++++++++++-- installer/Addon.ver | 2 +- installer/FiddlerImportNetLog.nsi | 2 +- 5 files changed, 24 insertions(+), 6 deletions(-) diff --git a/FiddlerImportNetlog/FiddlerInterface.cs b/FiddlerImportNetlog/FiddlerInterface.cs index bb7acf4..4c71c92 100644 --- a/FiddlerImportNetlog/FiddlerInterface.cs +++ b/FiddlerImportNetlog/FiddlerInterface.cs @@ -8,8 +8,8 @@ namespace FiddlerImportNetlog { - [ProfferFormat("NetLog JSON", - "Chromium's JSON-based event log format (v1.3.4.1). See https://dev.chromium.org/for-testers/providing-network-details for more details.", + [ProfferFormat("NetLog JSON", + "Chromium's JSON-based event log format (v1.3.4.2). See https://textslashplain.com/2020/01/17/capture-network-logs-from-edge-and-chrome/ for more info.", // We handle import of JSON files, whether uncompressed, or compressed with ZIP or GZ. I'm not completely sure I remember the implications // of declaring .gz here, nor why .zip isn't mentioned. Is this about the drag/drop import feature? ".json;.gz" diff --git a/FiddlerImportNetlog/Importer.cs b/FiddlerImportNetlog/Importer.cs index 0990858..e95c758 100644 --- a/FiddlerImportNetlog/Importer.cs +++ b/FiddlerImportNetlog/Importer.cs @@ -1538,6 +1538,7 @@ private void BuildAndAddSession(ref SessionFlags oSF, HTTPRequestHeaders oRQH, H { oRQH = Fiddler.Parser.ParseRequest(sMethod + " " + sURL + " HTTP/1.1\r\nMissing-Data: Request Headers not captured in NetLog\r\n\r\n"); } + if (msResponseBody.Length < 1 && cbDroppedResponseBody > 0) { dictSessionFlags["X-RESPONSEBODYTRANSFERLENGTH"] = cbDroppedResponseBody.ToString("N0"); @@ -1550,6 +1551,12 @@ private void BuildAndAddSession(ref SessionFlags oSF, HTTPRequestHeaders oRQH, H // headers so we can use this session for AutoResponder playback, etc. oRPH.RenameHeaderItems("Content-Encoding", "X-Netlog-Removed-Content-Encoding"); oRPH.RenameHeaderItems("Transfer-Encoding", "X-Netlog-Removed-Transfer-Encoding"); + string sOriginalCL = oRPH["Content-Length"]; + oRPH["Content-Length"] = msResponseBody.Length.ToString(); + if (!String.IsNullOrEmpty(sOriginalCL) && oRPH["Content-Length"] != sOriginalCL) + { + oRPH["X-Netlog-Original-Content-Length"] = sOriginalCL; + } } Session oS = Session.BuildFromData(false, diff --git a/FiddlerImportNetlog/Properties/AssemblyInfo.cs b/FiddlerImportNetlog/Properties/AssemblyInfo.cs index 06569e7..bb9c8c4 100644 --- a/FiddlerImportNetlog/Properties/AssemblyInfo.cs +++ b/FiddlerImportNetlog/Properties/AssemblyInfo.cs @@ -3,10 +3,10 @@ [assembly: AssemblyTitle("FiddlerImportNetlog")] [assembly: AssemblyDescription("Import Chromium NetLog events to Fiddler")] -[assembly: AssemblyCopyright("Copyright ©2021 Eric Lawrence")] +[assembly: AssemblyCopyright("Copyright ©2023 Eric Lawrence")] [assembly: System.Resources.NeutralResourcesLanguage("en-US")] [assembly: ComVisible(false)] -[assembly: AssemblyVersion("1.3.4.1")] // ALWAYS UPDATE THE VERSION in the [ProfferFormat] attribute in FiddlerInterface.cs to match! +[assembly: AssemblyVersion("1.3.4.2")] // ALWAYS UPDATE THE VERSION in the [ProfferFormat] attribute in FiddlerInterface.cs to match! [assembly: Fiddler.RequiredVersion("4.6.0.0")] @@ -20,6 +20,17 @@ HTTP_STREAM_JOB has a binding between the request and the socket. Hook them up s --> source_dependency = 1701 (URL_REQUEST) */ +// v1.3.4.2 +// When renaming Transfer-Encoding/Chunk-Encoding headers, set Content-Length to enhance AutoResponder playback +// Update copyright to 2023 + +// v1.3.4.1 +// Fix parsing of TLS/1.3 sigscheme list + +// v1.3.4.0 +// Parse certificaterequest message properly on TLS/1.3 connections +// Add smartscreen to net annotations + // v1.3.3.0 // Add ClientHello and ServerHello to SecureSocket list diff --git a/installer/Addon.ver b/installer/Addon.ver index 30fc710..eaeb90c 100644 --- a/installer/Addon.ver +++ b/installer/Addon.ver @@ -1 +1 @@ -1.2.3.0 +1.3.4.2 diff --git a/installer/FiddlerImportNetLog.nsi b/installer/FiddlerImportNetLog.nsi index 92acd46..9a5eb35 100644 --- a/installer/FiddlerImportNetLog.nsi +++ b/installer/FiddlerImportNetLog.nsi @@ -16,7 +16,7 @@ VIProductVersion "${VER_ADDON}" VIAddVersionKey "FileVersion" "${VER_ADDON}" VIAddVersionKey "ProductName" "Fiddler NetLog Importer" VIAddVersionKey "Comments" "https://textslashplain.com/" -VIAddVersionKey "LegalCopyright" "©2019 Eric Lawrence" +VIAddVersionKey "LegalCopyright" "©2023 Eric Lawrence" VIAddVersionKey "CompanyName" "Eric Lawrence" VIAddVersionKey "FileDescription" "Installer for Fiddler Fiddler NetLog Importer"