Prep for 1.0.0.1 release

Author: ericlaw1979

nmf-view/Properties/AssemblyInfo.cs

@@ -11,5 +11,4 @@
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.0.0.1")]

nmf-view/Utilities.cs

@@ -1,4 +1,5 @@
 using Microsoft.Win32;
+using System;
 using System.Diagnostics;
 using System.Runtime.InteropServices;
 using System.Windows.Forms;
@@ -30,5 +31,21 @@ internal static void OpenRegeditTo(string registryKeyPath)
                 /* User may abort */
             }
         }
+
+        /// <summary>
+        /// Open Windows Explorer with the specified file selected.
+        /// </summary>
+        /// <param name="manifestFilename"></param>
+        internal static void OpenExplorerTo(string manifestFilename)
+        {
+            try
+            {
+                Process.Start("explorer.exe", $"/select,\"{manifestFilename}\"");
+            }
+            catch
+            {
+                /* User may abort */
+            }
+        }
     }
 }

nmf-view/frmMain.Designer.cs

@@ -190,6 +190,7 @@ private async Task MessageShufflerForExtension()
                             string sNewBody = await response.Content.ReadAsStringAsync();
                             if (!sNewBody.Contains("Fiddler Echo"))
                             {
+                                log("Replacing message body with overridden text from Fiddler.");
                                 sMessage = sNewBody;
                             }
                         }
@@ -199,11 +200,13 @@ private async Task MessageShufflerForExtension()
                         log($"Call to Fiddler failed: {e.Message}");
                     }
                 }
+
                 if (oSettings.bReflectToExtension &&
                     (sMessage.Length < (1024 * 1024)))    // Don't reflect messages over 1mb. They're illegal!
                 {
                     await WriteToExtension(sMessage);
                 }
+
                 if (null != oSettings.strmToApp)
                 {
                     await WriteToApp(sMessage);
@@ -281,6 +284,7 @@ private async Task MessageShufflerForApp()
                             string sNewBody = await response.Content.ReadAsStringAsync();
                             if (!sNewBody.Contains("Fiddler Echo"))
                             {
+                                log("Replacing message body with overridden text from Fiddler.");
                                 sMessage = sNewBody;
                             }
                         }
@@ -290,6 +294,7 @@ private async Task MessageShufflerForApp()
                         log($"Call to Fiddler failed: {e.Message}");
                     }
                 }
+
                 if (null != oSettings.strmToExt)
                 {
                     await WriteToExtension(sMessage);
@@ -352,6 +357,10 @@ private void frmMain_Load(object sender, EventArgs e)
                   );
                 tcApp.SelectedTab = pageAbout;
             }
+            else
+            {
+                log($"extension: {oSettings.sExtensionID}");
+            }
             if (arrArgs.Length > 2)
             {
                 // The parent-window value is only non-zero when the calling context is not a background script.
@@ -368,9 +377,11 @@ private void frmMain_Load(object sender, EventArgs e)
             toolTip1.SetToolTip(pbApp, $"Click to set the ClientHandler to another instance of this app.");
             log("Listening for messages...");
 
-            // clbOptions.SetItemChecked(1, true); Fiddler
-            clbOptions.SetItemChecked(2, true);
-            clbOptions.SetItemChecked(3, true);
+            clbOptions.SetItemChecked(2, true); // Propagate closures
+            clbOptions.SetItemChecked(3, true); // Record bodies
+            string sCurrentExe = Application.ExecutablePath;
+            if (sCurrentExe.Contains(".fiddler.")) clbOptions.SetItemChecked(1, true);
+            if (sCurrentExe.Contains(".log.")) clbOptions.SetItemChecked(4, true);
 
             if (oSettings.sExtensionID != "unknown") ConnectMostLikelyApp();
             WaitForMessages();
@@ -425,8 +436,9 @@ private void pbApp_Click(object sender, EventArgs e)
         private bool ConnectMostLikelyApp()
         {
             // If we are RealHost.proxy.exe, then see whether RealHost.exe exists, and if so, use that.
-            string sCurrentExe = Application.ExecutablePath;
-            if (sCurrentExe.IndexOf("proxy.", StringComparison.OrdinalIgnoreCase) > -1)
+            // Remove any option flags in the command line.
+            string sCurrentExe = Application.ExecutablePath.Replace(".log", string.Empty).Replace(".fiddler", string.Empty);
+            if (sCurrentExe.Contains(".proxy"))
             {
                 string sCandidate = sCurrentExe.Replace(".proxy", string.Empty);
                 log($"Checking for {sCandidate}...");
@@ -688,18 +700,30 @@ private void lvHosts_KeyDown(object sender, KeyEventArgs e)
                 (sender as HostListView).SelectAll();
                 return;
             }
+            if ((e.Modifiers == Keys.Alt) && e.KeyCode == Keys.Enter)
+            {
+                e.SuppressKeyPress = true;
+                ShowSelectedManifestInExplorer();
+                return;
+            }
         }
 
         private void lvHosts_MouseDoubleClick(object sender, MouseEventArgs e)
         {
             if ((Control.ModifierKeys == Keys.Alt) && (lvHosts.SelectedItems.Count == 1))
             {
-                ListViewItem oLVI = lvHosts.SelectedItems[0];
-                RegisteredHosts.HostEntry oHE = (RegisteredHosts.HostEntry)oLVI.Tag;
-                Utilities.OpenRegeditTo(oHE.RegistryKeyPath);
+                ShowSelectedManifestInExplorer();
             }
         }
 
+        private void ShowSelectedManifestInExplorer()
+        {
+            ListViewItem oLVI = lvHosts.SelectedItems[0];
+            RegisteredHosts.HostEntry oHE = (RegisteredHosts.HostEntry)oLVI.Tag;
+            Utilities.OpenExplorerTo(oHE.ManifestFilename);
+            // Utilities.OpenRegeditTo(oHE.RegistryKeyPath);
+        }
+
         private void frmMain_FormClosed(object sender, FormClosedEventArgs e)
         {
             detachApp();

nmf-view/frmMain.cs

@@ -190,9 +190,6 @@
   <data name="lblQuickStart.Text" xml:space="preserve">
     <value>QuickStart: Native Messaging allows a web browser extension to send and receive messages from an application running outside of the browser's sandbox. To do so, the browser extension calls connectNative() to launch the application. After the application is launched, the extension and application can communicate by passing length-prefixed UTF-8 JSON-encoded messages between each other. This Meddler application can inject itself into that process, such that the browser will create it instead of the Native Message Host application. This app with then spawn that app and shuffle messages back and forth between the extension and the app, logging each message and optionally modifying it.</value>
   </data>
-  <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAABAAQAMDAAAAEAIACoJQAARgAAACAgAAABACAAqBAAAO4lAAAYGAAAAQAgAIgJAACWNgAAEBAAAAEA

nmf-view/frmMain.resx

@@ -68,6 +68,7 @@
     <Compile Include="Utilities.cs" />
     <EmbeddedResource Include="frmMain.resx">
       <DependentUpon>frmMain.cs</DependentUpon>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>

nmf-view/nmf-view.csproj

@@ -1,13 +1,9 @@
 {
   "name": "com.bayden.nmf.demo",
-  "hack_name": "com.microsoft.browsercore",
   "description": "NativeMessaging Meddler Demo Extension",
   "path": "c:\\src\\nm\\nmf-view\\bin\\release\\RealNMHostApp.proxy.exe",
   "type": "stdio",
   "allowed_origins": [
-    "chrome-extension://aalonnpchfmkpopkohiccmghgkipcjcb/",
-    "chrome-extension://ppnbnpeolgkicgegkbkbjmhlideopiji/",
-    "chrome-extension://ndjpnladcallmjemlbaebfadecfhkepb/",
-    "chrome-extension://gggmmkjegpiggikcnhidnjjhmicpibll/"
+    "chrome-extension://aalonnpchfmkpopkohiccmghgkipcjcb/"
   ]
 }