1
0
Fork 0
mirror of https://github.com/gorhill/uMatrix.git synced 2024-06-16 09:15:03 +12:00

Compare commits

...

15 commits

Author SHA1 Message Date
Raymond Hill 59d918356b
Remove obsolete assets 2021-07-20 13:57:06 -04:00
Raymond Hill 9d97748772
Fix fetching of assets at build time 2021-07-19 11:58:09 -04:00
Raymond Hill 8f8234dfae
New revision for dev build 2021-07-19 11:57:31 -04:00
Raymond Hill 1603b33b27
Fix infinite recursion with maliciously crafted URL
Related issue:
- https://github.com/vtriolet/writings/blob/main/posts/2021/ublock_origin_and_umatrix_denial_of_service.adoc
2021-07-19 11:56:15 -04:00
Raymond Hill 0bcb7669e7
Fix exception thrown when a stock asset is removed
Related feedback:
- https://www.reddit.com/r/uMatrix/comments/ftebgz/
2020-04-02 10:39:31 -04:00
Raymond Hill 89b7e026c3
Revert "Remove hpHosts from stock hosts files"
This reverts commit ba0dfe5d9b.

Related feedback:
- https://www.reddit.com/r/uMatrix/comments/ftebgz/
2020-04-02 08:46:09 -04:00
Raymond Hill ba0dfe5d9b
Remove hpHosts from stock hosts files
Related issue:
- https://github.com/uBlockOrigin/uBlock-issues/issues/971
2020-04-01 07:52:37 -04:00
Raymond Hill 57eb9fc150
Expect that IntersectionObserver API may not be available
Related issue:
- https://github.com/uBlockOrigin/uMatrix-issues/issues/235

The popup-resize functionality won't be available if the
IntersectionObserver API is not available. The purpose
of the popup-resize code is to adjust the matrix visuals
on small display -- i.e. on mobile or when the popup panel
is used in the overflow menu in Firefox.
2020-03-08 11:12:47 -04:00
Raymond Hill e0800f89df
Make Firefox dev build auto-update 2020-02-24 16:25:58 -05:00
Raymond Hill b26b3bb960
New revision for dev build 2020-02-24 16:20:15 -05:00
Raymond Hill 2d8e32c61b
Minor style changes 2020-02-24 16:18:57 -05:00
Raymond Hill 41133dffd2
Fix remnants of uBO code in cache storage manager
Related feedback:
- https://github.com/uBlockOrigin/uMatrix-issues/issues/227#issuecomment-590543891
2020-02-24 16:16:06 -05:00
Saitama a1ec20423c
mvps host list secure protocol http => https (#1014) 2020-02-23 06:59:20 -05:00
Raymond Hill e3ebfdfba4
Fix improper initial value for suspendTabsUntilReady 2020-02-02 08:49:24 -05:00
Raymond Hill 43cd137fff
Make Firefox dev build auto-update 2020-01-03 08:56:04 -05:00
12 changed files with 46 additions and 47 deletions

View file

@ -16,25 +16,6 @@
"assets/thirdparties/publicsuffix.org/list/effective_tld_names.dat" "assets/thirdparties/publicsuffix.org/list/effective_tld_names.dat"
] ]
}, },
"malware-0": {
"content": "filters",
"title": "Malware Domain List",
"contentURL": [
"https://www.malwaredomainlist.com/hostslist/hosts.txt",
"assets/thirdparties/www.malwaredomainlist.com/hostslist/hosts.txt"
]
},
"malware-1": {
"content": "filters",
"title": "Malware domains",
"contentURL": [
"https://mirror.cedia.org.ec/malwaredomains/justdomains",
"https://mirror1.malwaredomains.com/files/justdomains",
"assets/thirdparties/mirror1.malwaredomains.com/files/justdomains",
"assets/thirdparties/mirror1.malwaredomains.com/files/justdomains.txt"
],
"supportURL": "http://www.malwaredomains.com/"
},
"dpollock-0": { "dpollock-0": {
"content": "filters", "content": "filters",
"updateAfter": 11, "updateAfter": 11,
@ -45,25 +26,15 @@
], ],
"supportURL": "https://someonewhocares.org/hosts/" "supportURL": "https://someonewhocares.org/hosts/"
}, },
"hphosts": {
"content": "filters",
"updateAfter": 11,
"title": "hpHosts Ad and tracking servers",
"contentURL": [
"https://hosts-file.net/.%5Cad_servers.txt",
"assets/thirdparties/hosts-file.net/ad_servers.txt"
],
"supportURL": "https://hosts-file.net/"
},
"mvps-0": { "mvps-0": {
"content": "filters", "content": "filters",
"updateAfter": 11, "updateAfter": 11,
"title": "MVPS HOSTS", "title": "MVPS HOSTS",
"contentURL": [ "contentURL": [
"http://winhelp2002.mvps.org/hosts.txt", "https://winhelp2002.mvps.org/hosts.txt",
"assets/thirdparties/winhelp2002.mvps.org/hosts.txt" "assets/thirdparties/winhelp2002.mvps.org/hosts.txt"
], ],
"supportURL": "http://winhelp2002.mvps.org/" "supportURL": "https://winhelp2002.mvps.org/"
}, },
"plowe-0": { "plowe-0": {
"content": "filters", "content": "filters",

View file

@ -3,10 +3,10 @@
"uMatrix@raymondhill.net": { "uMatrix@raymondhill.net": {
"updates": [ "updates": [
{ {
"version": "1.4.1.4", "version": "1.4.1.6",
"browser_specific_settings": { "gecko": { "strict_min_version": "56" } }, "browser_specific_settings": { "gecko": { "strict_min_version": "56" } },
"update_info_url": "https://github.com/gorhill/uMatrix/releases/tag/1.4.1b4", "update_info_url": "https://github.com/gorhill/uMatrix/releases/tag/1.4.1b6",
"update_link": "https://github.com/gorhill/uMatrix/releases/download/1.4.1b4/uMatrix_1.4.1b4.firefox.signed.xpi" "update_link": "https://github.com/gorhill/uMatrix/releases/download/1.4.1b6/uMatrix_1.4.1b6.firefox.signed.xpi"
} }
] ]
} }

2
dist/version vendored
View file

@ -1 +1 @@
1.4.1.5 1.4.3.0

View file

@ -57,6 +57,8 @@ const rawSettingsDefault = {
assetFetchBypassBrowserCache: false, assetFetchBypassBrowserCache: false,
assetFetchTimeout: 30, assetFetchTimeout: 30,
autoUpdateAssetFetchPeriod: 120, autoUpdateAssetFetchPeriod: 120,
cacheStorageAPI: 'unset',
cacheStorageCompression: true,
cnameIgnoreList: 'unset', cnameIgnoreList: 'unset',
cnameIgnore1stParty: true, cnameIgnore1stParty: true,
cnameIgnoreExceptions: true, cnameIgnoreExceptions: true,
@ -124,7 +126,7 @@ const rawSettingsDefault = {
'</body></html>' '</body></html>'
].join(''), ].join(''),
framePlaceholderBackground: 'default', framePlaceholderBackground: 'default',
suspendTabsUntilReady: false suspendTabsUntilReady: 'unset'
}; };
/******************************************************************************/ /******************************************************************************/

View file

@ -119,7 +119,7 @@
disconnect(); disconnect();
}, },
Math.max( Math.max(
µMatrix.hiddenSettings.autoUpdateAssetFetchPeriod * 2 * 1000, µMatrix.rawSettings.autoUpdateAssetFetchPeriod * 2 * 1000,
180000 180000
) )
); );
@ -296,7 +296,7 @@
const promises = [ getDb() ]; const promises = [ getDb() ];
const entries = []; const entries = [];
const dontCompress = const dontCompress =
µMatrix.hiddenSettings.cacheStorageCompression !== true; µMatrix.rawSettings.cacheStorageCompression !== true;
const handleEncodingResult = result => { const handleEncodingResult = result => {
entries.push({ key: result.key, value: result.data }); entries.push({ key: result.key, value: result.data });
}; };

View file

@ -23,7 +23,7 @@
'use strict'; 'use strict';
CodeMirror.defineMode("raw-settings", function() { CodeMirror.defineMode('raw-settings', function() {
return { return {
token: function(stream) { token: function(stream) {
if ( stream.sol() ) { if ( stream.sol() ) {

View file

@ -26,7 +26,7 @@
// https://github.com/hackademix/noscript/commit/6e80d3f130773fc9a9123c5c4c2e97d63e90fa2a // https://github.com/hackademix/noscript/commit/6e80d3f130773fc9a9123c5c4c2e97d63e90fa2a
(function() { (function() {
let html = document.documentElement; const html = document.documentElement;
if ( html instanceof HTMLElement === false ) { return; } if ( html instanceof HTMLElement === false ) { return; }
let meta; let meta;
@ -45,8 +45,8 @@
// //
// The CSP directive is enforced as soon as the meta tag is inserted: // The CSP directive is enforced as soon as the meta tag is inserted:
// > Enforce the policy policy. // > Enforce the policy policy.
let head = document.head, const head = document.head;
parent = head; let parent = head;
if ( parent === null ) { if ( parent === null ) {
parent = document.createElement('head'); parent = document.createElement('head');
html.appendChild(parent); html.appendChild(parent);

View file

@ -87,7 +87,7 @@ uDom('.what').text(details.url);
return s; return s;
}; };
const renderParams = function(parentNode, rawURL) { const renderParams = function(parentNode, rawURL, depth = 0) {
const a = document.createElement('a'); const a = document.createElement('a');
a.href = rawURL; a.href = rawURL;
if ( a.search.length === 0 ) { return false; } if ( a.search.length === 0 ) { return false; }
@ -109,9 +109,9 @@ uDom('.what').text(details.url);
const name = safeDecodeURIComponent(param.slice(0, pos)); const name = safeDecodeURIComponent(param.slice(0, pos));
const value = safeDecodeURIComponent(param.slice(pos + 1)); const value = safeDecodeURIComponent(param.slice(pos + 1));
const li = liFromParam(name, value); const li = liFromParam(name, value);
if ( reURL.test(value) ) { if ( depth < 2 && reURL.test(value) ) {
const ul = document.createElement('ul'); const ul = document.createElement('ul');
renderParams(ul, value); renderParams(ul, value, depth + 1);
li.appendChild(ul); li.appendChild(ul);
} }
parentNode.appendChild(li); parentNode.appendChild(li);

View file

@ -77,6 +77,11 @@ const resizePopup = (( ) => {
// The purpose of `xobserver` is to initiate the resize handler only // The purpose of `xobserver` is to initiate the resize handler only
// when the popup panel is actually visible. // when the popup panel is actually visible.
// https://github.com/uBlockOrigin/uMatrix-issues/issues/235
if ( self.IntersectionObserver instanceof Object === false ) {
return ( ) => { };
}
let xobserver = new IntersectionObserver(intersections => { let xobserver = new IntersectionObserver(intersections => {
if ( intersections.length === 0 ) { return; } if ( intersections.length === 0 ) { return; }
if ( intersections[0].isIntersecting === false ) { return; } if ( intersections[0].isIntersecting === false ) { return; }

View file

@ -32,6 +32,11 @@
]); ]);
log.info(`User settings ready ${Date.now()-vAPI.T0} ms after launch`); log.info(`User settings ready ${Date.now()-vAPI.T0} ms after launch`);
const cacheBackend = await µm.cacheStorage.select(
µm.rawSettings.cacheStorageAPI
);
log.info(`Backend storage for cache will be ${cacheBackend}`);
const shouldWASM = const shouldWASM =
vAPI.canWASM === true && vAPI.canWASM === true &&
µm.rawSettings.disableWebAssembly !== true; µm.rawSettings.disableWebAssembly !== true;

View file

@ -496,9 +496,19 @@ self.addEventListener('rawSettingsChanged', ( ) => {
const addedCount = this.ubiquitousBlacklistRef.addedCount; const addedCount = this.ubiquitousBlacklistRef.addedCount;
const addCount = this.ubiquitousBlacklistRef.addCount; const addCount = this.ubiquitousBlacklistRef.addCount;
this.mergeHostsFileContent(details.content); // https://www.reddit.com/r/uMatrix/comments/ftebgz/
// Be ready to deal with a removed asset.
if ( typeof details.content === 'string' && details.content !== '' ) {
this.mergeHostsFileContent(details.content);
}
const hostsFileMeta = this.liveHostsFiles.get(details.assetKey); const hostsFileMeta = this.liveHostsFiles.get(details.assetKey);
if ( hostsFileMeta === undefined ) {
this.liveHostsFiles.delete(details.assetKey);
return;
}
hostsFileMeta.entryCount = hostsFileMeta.entryCount =
this.ubiquitousBlacklistRef.addCount - addCount; this.ubiquitousBlacklistRef.addCount - addCount;
hostsFileMeta.entryUsedCount = hostsFileMeta.entryUsedCount =

View file

@ -14,11 +14,14 @@ cp ./assets/assets.json $DES/
if [ -n "${TRAVIS_TAG}" ]; then if [ -n "${TRAVIS_TAG}" ]; then
pushd .. > /dev/null pushd .. > /dev/null
git clone --depth 1 https://github.com/uBlockOrigin/uAssets.git git clone --depth 1 https://github.com/uBlockOrigin/uAssets.git
git checkout 84dc2761abb4193bb34290aa6d90266610f735f6
popd > /dev/null popd > /dev/null
fi fi
mkdir $DES/thirdparties mkdir $DES/thirdparties
cp -R ../uAssets/thirdparties/hosts-file.net $DES/thirdparties/ pushd ../uAssets
git checkout 84dc2761abb4193bb34290aa6d90266610f735f6
popd
cp -R ../uAssets/thirdparties/mirror1.malwaredomains.com $DES/thirdparties/ cp -R ../uAssets/thirdparties/mirror1.malwaredomains.com $DES/thirdparties/
cp -R ../uAssets/thirdparties/pgl.yoyo.org $DES/thirdparties/ cp -R ../uAssets/thirdparties/pgl.yoyo.org $DES/thirdparties/
cp -R ../uAssets/thirdparties/publicsuffix.org $DES/thirdparties/ cp -R ../uAssets/thirdparties/publicsuffix.org $DES/thirdparties/
@ -27,5 +30,8 @@ cp -R ../uAssets/thirdparties/winhelp2002.mvps.org $DES/thirdparties/
cp -R ../uAssets/thirdparties/www.malwaredomainlist.com $DES/thirdparties/ cp -R ../uAssets/thirdparties/www.malwaredomainlist.com $DES/thirdparties/
mkdir $DES/umatrix mkdir $DES/umatrix
cp -R ../uAssets/recipes/* $DES/umatrix/ cp -R ../uAssets/recipes/* $DES/umatrix/
pushd ../uAssets
git checkout master
popd
echo "done." echo "done."