From 3f721453cadfa5dee0465340405659fe9f35e714 Mon Sep 17 00:00:00 2001
From: antelle <dmitryvit@gmail.com>
Date: Sat, 2 Jan 2021 00:06:02 +0100
Subject: [PATCH] KeeWebHttp: fix #26: Firefox compatibility

---
 docs/plugins/keewebhttp/manifest.json |  6 +++---
 docs/plugins/keewebhttp/plugin.js     | 23 ++++++++++++++++-------
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/docs/plugins/keewebhttp/manifest.json b/docs/plugins/keewebhttp/manifest.json
index 91b214a..f786dae 100644
--- a/docs/plugins/keewebhttp/manifest.json
+++ b/docs/plugins/keewebhttp/manifest.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.1",
+  "version": "1.0.2",
   "manifestVersion": "0.1.0",
   "versionMin": "1.11.0",
   "name": "keewebhttp",
@@ -12,8 +12,8 @@
   "license": "MIT",
   "url": "https://plugins.keeweb.info/plugins/keewebhttp",
   "resources": {
-    "js": "eSZB8/wvbPI20d4w+Uls9+QE6r1qpwPnjCXgukIA5y2WoVd0qXn/QRf6Pu+3AJNwiFQMZRZyAsC9BJRbUC7vLyycHr+MQGdYEANe3idDYSlmObOf9EXhX179+/TQTVq+lMPSnPgg7Y9xhYCq91WjtUK0in1Ozy0x2EoQjSH8IhroBwY499CU1eaFOAB4JBtSJfm52x4mFpmH93Gg1yVzynYOXfqm5fis2yGElqPe1ePfreZdUWYmDlK9E8/sRlx6jxQ/fjvX8CJ30ZH+VwPseOrnfqejKqbQoE60hrtwhaDke2UZaksXlZJn5dKQin7M9T0Ig6PLx5EJOm12mrSEjA=="
+    "js": "LlPkehKQKbE9xZHoatfNHSx4TA4nZlzuu1ul1YVSJXW9FOmpY7FTVlU50Kl1sXBDwNNnj4sRmBpZ/SZbo7ALOx258iFZVUy+c2O2CSsQnxTmHBH0zoG3Pdse+ByxMszj/guH2Xeiq6q9wtjJszP3RwBNcxOxirjd3FFzNA4jS877Llu29MaadApOBZr+MCgHTzuFoNNU5DYnT5qCbxnW9U9FisiT5JIFsGagy+rEg1MMPtUnVdjFp27Fn8TtrrJr+BsVrQS+FjzV5EGHLqC+piBz5ljysl1yJDU3oFBytADDZjXQAgIjk/OvQDOIJ9/peOIm4NY43f6m8qYg9zVFqg=="
   },
   "publicKey": "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnRq2k3TTx0ewTe6wDr6QVeB5diwiIWzsJD+ApfZu1KNPedcAgslAfjpNsYF1if6cYsPMJH70xJ2np6RQBl1VPdwShOuxkD7m0BD5Hw/Aar8Hdp5cvAdOOMdBO+0DbGeUMy+z66s+oUCJmqVp19T6PkkxbhN08rgtT7v+aFvrbqbO/vlsskbJpH2K2io+e1XmRGPnSr9q4KSqfGbTfe5gLwDIOFd66Z4mb5Utb5wWpsy6Gjh06Yf257AccGD3A1bkTNOyeeX0tqciYBePWMk0icP/aZ6hnErfhnUKf3tOgPLppSHiGcaSKekhChZ2xLUs3U64JwrXSmwHj+TzdO3S0QIDAQAB",
   "desktop": true
-}
+}
\ No newline at end of file
diff --git a/docs/plugins/keewebhttp/plugin.js b/docs/plugins/keewebhttp/plugin.js
index 27a60f3..ac2bcf6 100644
--- a/docs/plugins/keewebhttp/plugin.js
+++ b/docs/plugins/keewebhttp/plugin.js
@@ -65,14 +65,23 @@ function run() {
         }
         server = http.createServer((req, res) => {
             const origin = req.headers.origin;
+            const userAgent = req.headers['user-agent'] || '';
             const referer = req.headers.referrer || req.headers.referer;
-            if (
-                req.method !== 'POST' ||
-                referer ||
-                (origin &&
-                    !origin.startsWith('chrome-extension://') &&
-                    !origin.startsWith('safari-extension://'))
-            ) {
+            let originIsValid;
+            if (origin) {
+                if (
+                    origin.startsWith('chrome-extension://') ||
+                    origin.startsWith('safari-extension://') ||
+                    // Firefox sends 'null' here, see https://github.com/keeweb/keeweb-plugins/pull/26
+                    (userAgent.includes('Firefox') && origin === 'null')
+                ) {
+                    originIsValid = true;
+                }
+            } else {
+                originIsValid = true;
+            }
+            const isAllowed = req.method === 'POST' && !referer && originIsValid;
+            if (!isAllowed) {
                 if (DebugMode) {
                     logger.debug('Request dropped', req.method, req.url, req.headers);
                 }