add microsoft edge (chromium), closes #41

smorks · smorks · commit 4d73f0ebd15e · 2020-01-15T22:45:44.000-06:00
diff --git a/KeePassNatMsg/NativeMessaging/BrowserSelectForm.Designer.cs b/KeePassNatMsg/NativeMessaging/BrowserSelectForm.Designer.cs
diff --git a/KeePassNatMsg/NativeMessaging/BrowserSelectForm.cs b/KeePassNatMsg/NativeMessaging/BrowserSelectForm.cs
@@ -22,13 +22,14 @@ public Browsers SelectedBrowsers
                 if (chkChromium.Checked) b |= Browsers.Chromium;
                 if (chkFirefox.Checked) b |= Browsers.Firefox;
                 if (chkVivaldi.Checked) b |= Browsers.Vivaldi;
+                if (chkMsEdge.Checked) b |= Browsers.Edge;
                 return b;
             }
         }
 
         private void btnOk_Click(object sender, System.EventArgs e)
         {
-            if (chkChrome.Checked || chkChromium.Checked || chkFirefox.Checked || chkVivaldi.Checked)
+            if (chkChrome.Checked || chkChromium.Checked || chkFirefox.Checked || chkVivaldi.Checked || chkMsEdge.Checked)
             {
                 DialogResult = DialogResult.OK;
                 Close();
@@ -61,6 +62,9 @@ private void BrowserSelectForm_Load(object sender, System.EventArgs e)
                     case Browsers.Vivaldi:
                         cb = chkVivaldi;
                         break;
+                    case Browsers.Edge:
+                        cb = chkMsEdge;
+                        break;
                 }
 
                 if (cb != null)
diff --git a/KeePassNatMsg/NativeMessaging/LinuxHost.cs b/KeePassNatMsg/NativeMessaging/LinuxHost.cs
@@ -8,7 +8,8 @@ public class LinuxHost : PosixHost
             ".config/google-chrome/NativeMessagingHosts",
             ".config/chromium/NativeMessagingHosts",
             ".mozilla/native-messaging-hosts",
-            ".config/vivaldi/NativeMessagingHosts"
+            ".config/vivaldi/NativeMessagingHosts",
+            ".config/microsoft edge/NativeMessagingHosts",
         };
     }
 }
diff --git a/KeePassNatMsg/NativeMessaging/MacOsxHost.cs b/KeePassNatMsg/NativeMessaging/MacOsxHost.cs
@@ -8,7 +8,8 @@ public class MacOsxHost : PosixHost
             "Library/Application Support/Google/Chrome/NativeMessagingHosts",
             "Library/Application Support/Chromium/NativeMessagingHosts",
             "Library/Application Support/Mozilla/NativeMessagingHosts",
-            "Library/Application Support/Vivaldi/NativeMessagingHosts"
+            "Library/Application Support/Vivaldi/NativeMessagingHosts",
+            "Library/Application Support/Microsoft Edge/NativeMessagingHosts"
         };
     }
 }
diff --git a/KeePassNatMsg/NativeMessaging/NativeMessagingHost.cs b/KeePassNatMsg/NativeMessaging/NativeMessagingHost.cs
@@ -11,11 +11,16 @@ namespace KeePassNatMsg.NativeMessaging
     public enum Browsers
     {
         None,
+
         [Description("Google Chrome")]
         Chrome,
+
         Chromium,
         Firefox = 4,
-        Vivaldi = 8
+        Vivaldi = 8,
+
+        [Description("Microsoft Edge")]
+        Edge = 16,
     }
 
     public enum BrowserStatus
@@ -66,9 +71,11 @@ protected string GetJsonData(Browsers b)
                 case Browsers.Chrome:
                 case Browsers.Chromium:
                 case Browsers.Vivaldi:
-                    return Properties.Resources.chrome_win;
+                    return Properties.Resources.chrome_json;
                 case Browsers.Firefox:
-                    return Properties.Resources.firefox_win;
+                    return Properties.Resources.firefox_json;
+                case Browsers.Edge:
+                    return Properties.Resources.edge_json;
             }
             return null;
         }
diff --git a/KeePassNatMsg/NativeMessaging/WindowsHost.cs b/KeePassNatMsg/NativeMessaging/WindowsHost.cs
@@ -7,7 +7,14 @@ namespace KeePassNatMsg.NativeMessaging
 {
     public class WindowsHost : NativeMessagingHost
     {
-        private string[] RegKeys = new[] { string.Empty, "Software\\Google\\Chrome", "Software\\Chromium", "Software\\Mozilla", "Software\\Vivaldi" };
+        private readonly string[] RegKeys = new[] {
+            string.Empty,
+            "Software\\Google\\Chrome",
+            "Software\\Chromium",
+            "Software\\Mozilla",
+            "Software\\Vivaldi",
+            "Software\\Microsoft\\Edge",
+        };
 
         public override string ProxyPath => Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "KeePassNatMsg");
 
diff --git a/KeePassNatMsg/Properties/Resources.Designer.cs b/KeePassNatMsg/Properties/Resources.Designer.cs
diff --git a/KeePassNatMsg/Properties/Resources.resx b/KeePassNatMsg/Properties/Resources.resx
@@ -117,7 +117,7 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="chrome_win" xml:space="preserve">
+  <data name="chrome_json" xml:space="preserve">
     <value>{{
   "name": "org.keepassxc.keepassxc_browser",
   "description": "KeepassXC integration with Native Messaging support",
@@ -133,7 +133,20 @@
   <data name="earth_lock" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\earth_lock.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="firefox_win" xml:space="preserve">
+  <data name="edge_json" xml:space="preserve">
+    <value>{{
+  "name": "org.keepassxc.keepassxc_browser",
+  "description": "KeepassXC integration with Native Messaging support",
+  "path" : "{0}",
+  "type": "stdio",
+  "allowed_origins": [
+    "chrome-extension://iopaggbpplllidnfmcghoonnokmjoicf/",
+    "chrome-extension://oboonakemofpalcgghocfoadofidjkkk/",
+    "chrome-extension://pdffhmdngciaglkoonimfcmckehcpafo/"
+  ]
+}}</value>
+  </data>
+  <data name="firefox_json" xml:space="preserve">
     <value>{{
   "name": "org.keepassxc.keepassxc_browser",
   "description": "KeepassXC integration with Firefox with Native Messaging support",

Original file line number	Diff line number	Diff line change
`@@ -22,13 +22,14 @@ public Browsers SelectedBrowsers`
`22`	`22`	`if (chkChromium.Checked) b \|= Browsers.Chromium;`
`23`	`23`	`if (chkFirefox.Checked) b \|= Browsers.Firefox;`
`24`	`24`	`if (chkVivaldi.Checked) b \|= Browsers.Vivaldi;`
	`25`	`+ if (chkMsEdge.Checked) b \|= Browsers.Edge;`
`25`	`26`	`return b;`
`26`	`27`	`}`
`27`	`28`	`}`
`28`	`29`
`29`	`30`	`private void btnOk_Click(object sender, System.EventArgs e)`
`30`	`31`	`{`
`31`		`- if (chkChrome.Checked \|\| chkChromium.Checked \|\| chkFirefox.Checked \|\| chkVivaldi.Checked)`
	`32`	`+ if (chkChrome.Checked \|\| chkChromium.Checked \|\| chkFirefox.Checked \|\| chkVivaldi.Checked \|\| chkMsEdge.Checked)`
`32`	`33`	`{`
`33`	`34`	`DialogResult = DialogResult.OK;`
`34`	`35`	`Close();`
`@@ -61,6 +62,9 @@ private void BrowserSelectForm_Load(object sender, System.EventArgs e)`
`61`	`62`	`case Browsers.Vivaldi:`
`62`	`63`	`cb = chkVivaldi;`
`63`	`64`	`break;`
	`65`	`+ case Browsers.Edge:`
	`66`	`+ cb = chkMsEdge;`
	`67`	`+ break;`
`64`	`68`	`}`
`65`	`69`
`66`	`70`	`if (cb != null)`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,8 @@ public class LinuxHost : PosixHost`
`8`	`8`	`".config/google-chrome/NativeMessagingHosts",`
`9`	`9`	`".config/chromium/NativeMessagingHosts",`
`10`	`10`	`".mozilla/native-messaging-hosts",`
`11`		`- ".config/vivaldi/NativeMessagingHosts"`
	`11`	`+ ".config/vivaldi/NativeMessagingHosts",`
	`12`	`+ ".config/microsoft edge/NativeMessagingHosts",`
`12`	`13`	`};`
`13`	`14`	`}`
`14`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,8 @@ public class MacOsxHost : PosixHost`
`8`	`8`	`"Library/Application Support/Google/Chrome/NativeMessagingHosts",`
`9`	`9`	`"Library/Application Support/Chromium/NativeMessagingHosts",`
`10`	`10`	`"Library/Application Support/Mozilla/NativeMessagingHosts",`
`11`		`- "Library/Application Support/Vivaldi/NativeMessagingHosts"`
	`11`	`+ "Library/Application Support/Vivaldi/NativeMessagingHosts",`
	`12`	`+ "Library/Application Support/Microsoft Edge/NativeMessagingHosts"`
`12`	`13`	`};`
`13`	`14`	`}`
`14`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,14 @@ namespace KeePassNatMsg.NativeMessaging`
`7`	`7`	`{`
`8`	`8`	`public class WindowsHost : NativeMessagingHost`
`9`	`9`	`{`
`10`		`- private string[] RegKeys = new[] { string.Empty, "Software\\Google\\Chrome", "Software\\Chromium", "Software\\Mozilla", "Software\\Vivaldi" };`
	`10`	`+ private readonly string[] RegKeys = new[] {`
	`11`	`+ string.Empty,`
	`12`	`+ "Software\\Google\\Chrome",`
	`13`	`+ "Software\\Chromium",`
	`14`	`+ "Software\\Mozilla",`
	`15`	`+ "Software\\Vivaldi",`
	`16`	`+ "Software\\Microsoft\\Edge",`
	`17`	`+ };`
`11`	`18`
`12`	`19`	`public override string ProxyPath => Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "KeePassNatMsg");`
`13`	`20`