open.source/stylus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix incorrect USO md5Url (#523)

Browse Source
This commit is contained in:
Rob Garrison 2018-10-24 14:05:51 -05:00
parent 100e1dc28d
commit 8e47152ff8
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
background/storage.js
View File

@ -264,6 +264,15 @@ function filterStyles({
} }
// The md5Url provided by USO includes a duplicate "update" subdomain (see #523),
// This fixes any already installed styles containing this error
function fixUsoMd5Issue(style) {
if (style && style.md5Url && style.md5Url.includes('update.update.userstyles')) {
style.md5Url = style.md5Url.replace('update.update.userstyles', 'update.userstyles');
}
return style;
}
function filterStylesInternal({ function filterStylesInternal({
// js engines don't like big functions (V8 often deoptimized the original filterStyles) // js engines don't like big functions (V8 often deoptimized the original filterStyles)
// it also makes sense to extract the less frequently executed code // it also makes sense to extract the less frequently executed code
@ -297,7 +306,7 @@ function filterStylesInternal({
const matchUrlBase = matchUrl && matchUrl.includes('#') && matchUrl.split('#', 1)[0]; const matchUrlBase = matchUrl && matchUrl.includes('#') && matchUrl.split('#', 1)[0];
let style; let style;
for (let i = 0; (style = styles[i]); i++) { for (let i = 0; (style = fixUsoMd5Issue(styles[i])); i++) {
if ((enabled === null || style.enabled === enabled) if ((enabled === null || style.enabled === enabled)
&& (md5Url === null || style.md5Url === md5Url) && (md5Url === null || style.md5Url === md5Url)
&& (id === null || style.id === id)) { && (id === null || style.id === id)) {
@ -350,6 +359,8 @@ function saveStyle(style) {
let existed; let existed;
let codeIsUpdated; let codeIsUpdated;
style = fixUsoMd5Issue(style);
return maybeCalcDigest() return maybeCalcDigest()
.then(maybeImportFix) .then(maybeImportFix)
.then(decide); .then(decide);

9
content/install-hook-userstyles.js
View File

@ -238,6 +238,14 @@
}); });
} }
// USO providing md5Url as "https://update.update.userstyles.org/#####.md5"
// instead of "https://update.userstyles.org/#####.md5"
function tryFixMd5(style) {
if (style && style.md5Url && style.md5Url.includes('update.update')) {
style.md5Url = style.md5Url.replace('update.update', 'update');
}
return style;
}
function getStyleJson() { function getStyleJson() {
return getResource(getStyleURL(), {responseType: 'json'}) return getResource(getStyleURL(), {responseType: 'json'})
@ -256,6 +264,7 @@
}); });
})); }));
}) })
.then(tryFixMd5)
.catch(() => null); .catch(() => null);
} }