From d1542bba0ee34e7f3545d1c93abef942a197ca4b Mon Sep 17 00:00:00 2001 From: Martii Date: Mon, 1 Jul 2019 19:12:25 -0600 Subject: [PATCH] Repair some meta and relax detection a bit. * Chromium 75.0.3770.90 started spewing this out and it's not in *mime-db* dep (yet?)... Relates to `/install//.meta.js`. Don't think it has an extension spec based off skimming doc * Relaxing is temporary atm in lieu of more aggressive re Post #1633 #1632 #944 and applies to #1548 #432 --- controllers/scriptStorage.js | 11 ++++++++++- libs/modelParser.js | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/controllers/scriptStorage.js b/controllers/scriptStorage.js index 4e980d7bb..1ff618087 100644 --- a/controllers/scriptStorage.js +++ b/controllers/scriptStorage.js @@ -92,6 +92,15 @@ if (!mediaDB['image/jxr']) { }); } +// Allow some Chromium based browsers to test +if (!mediaDB['application/signed-exchange']) { + mediaDB = _.extend(mediaDB, { + 'application/signed-exchange' : { + source: 'google', + extensions: [] + } + }); +} if (!mediaDB['*/*']) { mediaDB = _.extend(mediaDB, {'*/*' : { source: 'iana'}}); @@ -550,7 +559,7 @@ exports.sendScript = function (aReq, aRes, aNext) { let matches = null; let rAnyLocalMetaUrl = new RegExp( '^' + patternHasSameOrigin + - '/(?:meta|install|src/scripts)/(.+?)/(.+?)\.meta\.js$' + '/(?:meta|install|src/scripts)/(.+?)/(.+?)\.(?:meta|user)\.js$' ); let hasAlternateLocalUpdateURL = false; diff --git a/libs/modelParser.js b/libs/modelParser.js index ef92ab08b..f074f97a3 100644 --- a/libs/modelParser.js +++ b/libs/modelParser.js @@ -233,7 +233,7 @@ var parseScript = function (aScript) { ); var rAnyLocalMetaUrl = new RegExp( '^' + patternHasSameOrigin + - '/(?:meta|install|src/scripts)/(.+?)/(.+?)\.meta\.js$' + '/(?:meta|install|src/scripts)/(.+?)/(.+?)\.(?:meta|user)\.js$' ); var rSameOrigin = new RegExp(