mirror of
https://github.com/gorhill/uMatrix.git
synced 2024-09-29 16:51:13 +13:00
Compare commits
No commits in common. "master" and "1.4.1b5" have entirely different histories.
12 changed files with 47 additions and 46 deletions
|
@ -16,6 +16,25 @@
|
||||||
"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,
|
||||||
|
@ -26,15 +45,25 @@
|
||||||
],
|
],
|
||||||
"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": [
|
||||||
"https://winhelp2002.mvps.org/hosts.txt",
|
"http://winhelp2002.mvps.org/hosts.txt",
|
||||||
"assets/thirdparties/winhelp2002.mvps.org/hosts.txt"
|
"assets/thirdparties/winhelp2002.mvps.org/hosts.txt"
|
||||||
],
|
],
|
||||||
"supportURL": "https://winhelp2002.mvps.org/"
|
"supportURL": "http://winhelp2002.mvps.org/"
|
||||||
},
|
},
|
||||||
"plowe-0": {
|
"plowe-0": {
|
||||||
"content": "filters",
|
"content": "filters",
|
||||||
|
|
6
dist/firefox/updates.json
vendored
6
dist/firefox/updates.json
vendored
|
@ -3,10 +3,10 @@
|
||||||
"uMatrix@raymondhill.net": {
|
"uMatrix@raymondhill.net": {
|
||||||
"updates": [
|
"updates": [
|
||||||
{
|
{
|
||||||
"version": "1.4.1.6",
|
"version": "1.4.1.4",
|
||||||
"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.1b6",
|
"update_info_url": "https://github.com/gorhill/uMatrix/releases/tag/1.4.1b4",
|
||||||
"update_link": "https://github.com/gorhill/uMatrix/releases/download/1.4.1b6/uMatrix_1.4.1b6.firefox.signed.xpi"
|
"update_link": "https://github.com/gorhill/uMatrix/releases/download/1.4.1b4/uMatrix_1.4.1b4.firefox.signed.xpi"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
2
dist/version
vendored
2
dist/version
vendored
|
@ -1 +1 @@
|
||||||
1.4.3.0
|
1.4.1.5
|
||||||
|
|
|
@ -57,8 +57,6 @@ 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,
|
||||||
|
@ -126,7 +124,7 @@ const rawSettingsDefault = {
|
||||||
'</body></html>'
|
'</body></html>'
|
||||||
].join(''),
|
].join(''),
|
||||||
framePlaceholderBackground: 'default',
|
framePlaceholderBackground: 'default',
|
||||||
suspendTabsUntilReady: 'unset'
|
suspendTabsUntilReady: false
|
||||||
};
|
};
|
||||||
|
|
||||||
/******************************************************************************/
|
/******************************************************************************/
|
||||||
|
|
|
@ -119,7 +119,7 @@
|
||||||
disconnect();
|
disconnect();
|
||||||
},
|
},
|
||||||
Math.max(
|
Math.max(
|
||||||
µMatrix.rawSettings.autoUpdateAssetFetchPeriod * 2 * 1000,
|
µMatrix.hiddenSettings.autoUpdateAssetFetchPeriod * 2 * 1000,
|
||||||
180000
|
180000
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
|
@ -296,7 +296,7 @@
|
||||||
const promises = [ getDb() ];
|
const promises = [ getDb() ];
|
||||||
const entries = [];
|
const entries = [];
|
||||||
const dontCompress =
|
const dontCompress =
|
||||||
µMatrix.rawSettings.cacheStorageCompression !== true;
|
µMatrix.hiddenSettings.cacheStorageCompression !== true;
|
||||||
const handleEncodingResult = result => {
|
const handleEncodingResult = result => {
|
||||||
entries.push({ key: result.key, value: result.data });
|
entries.push({ key: result.key, value: result.data });
|
||||||
};
|
};
|
||||||
|
|
2
src/js/codemirror/mode/raw-settings.js
vendored
2
src/js/codemirror/mode/raw-settings.js
vendored
|
@ -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() ) {
|
||||||
|
|
|
@ -26,7 +26,7 @@
|
||||||
// https://github.com/hackademix/noscript/commit/6e80d3f130773fc9a9123c5c4c2e97d63e90fa2a
|
// https://github.com/hackademix/noscript/commit/6e80d3f130773fc9a9123c5c4c2e97d63e90fa2a
|
||||||
|
|
||||||
(function() {
|
(function() {
|
||||||
const html = document.documentElement;
|
let 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.
|
||||||
const head = document.head;
|
let head = document.head,
|
||||||
let parent = head;
|
parent = head;
|
||||||
if ( parent === null ) {
|
if ( parent === null ) {
|
||||||
parent = document.createElement('head');
|
parent = document.createElement('head');
|
||||||
html.appendChild(parent);
|
html.appendChild(parent);
|
||||||
|
|
|
@ -87,7 +87,7 @@ uDom('.what').text(details.url);
|
||||||
return s;
|
return s;
|
||||||
};
|
};
|
||||||
|
|
||||||
const renderParams = function(parentNode, rawURL, depth = 0) {
|
const renderParams = function(parentNode, rawURL) {
|
||||||
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 ( depth < 2 && reURL.test(value) ) {
|
if ( reURL.test(value) ) {
|
||||||
const ul = document.createElement('ul');
|
const ul = document.createElement('ul');
|
||||||
renderParams(ul, value, depth + 1);
|
renderParams(ul, value);
|
||||||
li.appendChild(ul);
|
li.appendChild(ul);
|
||||||
}
|
}
|
||||||
parentNode.appendChild(li);
|
parentNode.appendChild(li);
|
||||||
|
|
|
@ -77,11 +77,6 @@ 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; }
|
||||||
|
|
|
@ -32,11 +32,6 @@
|
||||||
]);
|
]);
|
||||||
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;
|
||||||
|
|
|
@ -496,19 +496,9 @@ self.addEventListener('rawSettingsChanged', ( ) => {
|
||||||
const addedCount = this.ubiquitousBlacklistRef.addedCount;
|
const addedCount = this.ubiquitousBlacklistRef.addedCount;
|
||||||
const addCount = this.ubiquitousBlacklistRef.addCount;
|
const addCount = this.ubiquitousBlacklistRef.addCount;
|
||||||
|
|
||||||
// https://www.reddit.com/r/uMatrix/comments/ftebgz/
|
this.mergeHostsFileContent(details.content);
|
||||||
// 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 =
|
||||||
|
|
|
@ -14,14 +14,11 @@ 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
|
||||||
pushd ../uAssets
|
cp -R ../uAssets/thirdparties/hosts-file.net $DES/thirdparties/
|
||||||
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/
|
||||||
|
@ -30,8 +27,5 @@ 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."
|
||||||
|
|
Loading…
Reference in a new issue