Merge branch 'whitelist-extensions'

Author: benma

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.4.0
+
+- Whitelist Chrome and Firefox extensions
+
 ## 1.3.1
 
 - Fix a bug where the bridge crashes if a connected USB devices contains unicode in the HID device info

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "bitbox-bridge"
-version = "1.3.1"
+version = "1.4.0"
 authors = ["Niklas Claesson <[email protected]>"]
 edition = "2018"
 license = "Apache-2.0"

bitbox-bridge/Cargo.toml

@@ -2,7 +2,7 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
 
   <!-- ProductCode should change with every release -->
-  <?define ProductCode = "{f75f2097-6bad-4bd5-b6d7-352c048df6ae}"?>
+  <?define ProductCode = "{ddf4b648-48b7-4855-9945-6e9e81c4951b}"?>
   <!-- UpgradeCode should stay the same foverever (this is the real ID of the app)-->
   <?define UpgradeCode = "{dfe7eecb-5dc0-4c30-ba78-a9eff36efa31}"?>
 

bitbox-bridge/release/windows/wix/Product.wxs

@@ -200,9 +200,15 @@ pub fn create(
     // Use untuple_one at the end to get rid of the "unit" return value
     let check_origin = warp::header::optional("origin")
         .and_then(|origin: Option<hyper::Uri>| {
-            debug!("{:?}", origin);
+            debug!("Origin: {:?}", origin);
             async move {
                 if let Some(origin) = origin {
+                    let scheme_str = origin.scheme_str();
+                    if scheme_str == Some("chrome-extension") || scheme_str == Some("moz-extension")
+                    {
+                        debug!("Allow Chrome/Firefox extension");
+                        return Ok(());
+                    }
                     match origin.host() {
                         Some(host) => {
                             if !is_valid_origin(host) {