fix(isMagnetURI): update validation regex - #1730

Merged
profnandaa merged 3 commits into
validatorjs:masterfrom
tux-tn:hotfix/isMagnet
Sep 21, 2021
Merged

fix(isMagnetURI): update validation regex#1730
profnandaa merged 3 commits into
validatorjs:masterfrom
tux-tn:hotfix/isMagnet

Conversation

@tux-tn

@tux-tntux-tn commented Sep 20, 2021•
edited
Loading

Copy link
Copy Markdown
Member

This PR updates the isMagnetURI validator regex:

  • Fix ReDOS in old regex (thanks to @yetingli for discovering the vulnerability and @JamieSlome for reporting it)
  • Validate only exact xt topics (btih,sha1,...) based on this list
  • Validate only 32 or 40 hashes (Old regex was validating length between 32 and 40 even if only 32 (md5 and sha1) and 40 (btih, ed2k,...) character hashes are valid )
  • Make tr and dn parameters optional (Magnet URI definition doesn't specify if other parameters than xt are required
  • Allow passing multiple xt urn using the standard xt.1 and xt.2,... (URI is valid even if only xt.1 is passed)
  • Allow any other parameter (protocol allow passing non standard parameters)
  • Use placeholder hashes in tests
  • Add new tests

All the changes are based on the Magnet URI scheme definition here , there is no IETF RFC concerning magnet URI.

Checklist

  • PR contains only changes related; no stray files, etc.
  • Tests written (where applicable)

@tux-tn
fix(isMagnetURI): update validation regex
e263b32
- Validate only exact xn topics (btih,sha1,...)
- Validate only 32 or 40 hashes
- Make tr and dn parameters optional
- Allow any other parameter (protocol allow passing non standard parameters)
- Use placeholder hashes in tests - Fix ReDOS in old regex
- Add new tests
@codecov

codecovBot commented Sep 20, 2021•
edited
Loading

Copy link
Copy Markdown

Codecov Report

Merging #1730 (90a51c2) into master (8c4b3b3) will not change coverage.
The diff coverage is 100.00%.

Impacted file tree graph

@@ Coverage Diff @@## master #1730 +/- ##
=========================================
Coverage 100.00% 100.00% =========================================
Files 101 101 Lines 2005 2005 Branches 452 452 =========================================
Hits 2005 2005
Impacted FilesCoverage Δ
src/lib/isMagnetURI.js100.00% <100.00%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 8c4b3b3...90a51c2. Read the comment docs.

ezkemboi
ezkemboi previously approved these changes Sep 20, 2021
View reviewed changes
profnandaa
profnandaa previously approved these changes Sep 20, 2021
View reviewed changes

@profnandaaprofnandaa left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks for the fix.

profnandaa
profnandaa reviewed Sep 20, 2021
View reviewed changes
Comment threadsrc/lib/isMagnetURI.js Outdated
@tux-tn
tux-tn dismissed stale reviews from profnandaa and ezkemboi via 3c4157aSeptember 20, 2021 17:47
@profnandaa
profnandaa merged commit 7376945 into validatorjs:masterSep 21, 2021
@profnandaa

profnandaa commented Sep 21, 2021

Copy link
Copy Markdown
Member

@tux-tn@ezkemboi -- let me do a release this weekend. You can help complete reviews of the remaining PRs.

@ezkemboi

ezkemboi commented Sep 21, 2021

Copy link
Copy Markdown
Member

Thanks, @profnandaa.
We will do that.

@tux-tn
tux-tn deleted the hotfix/isMagnet branch September 21, 2021 09:30
@tux-tn

tux-tn commented Sep 21, 2021

Copy link
Copy Markdown
MemberAuthor

Thank you @profnandaa

@profnandaaprofnandaa mentioned this pull request Oct 31, 2021
Closed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@profnandaaprofnandaaprofnandaa approved these changes
@ezkemboiezkemboiezkemboi left review comments

Assignees

No one assigned

Labels

needs-more-review

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@tux-tn@profnandaa@ezkemboi
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
fix(isMagnetURI): update validation regex - #1730
Merged
profnandaa merged 3 commits into
validatorjs:masterfrom 
tux-tn:hotfix/isMagnet
Sep 21, 2021
Merged
fix(isMagnetURI): update validation regex#1730
profnandaa merged 3 commits into
validatorjs:masterfrom 
tux-tn:hotfix/isMagnet
Conversation
@tux-tn
@tux-tntux-tn
commented
Sep 20, 2021•

edited

Loading

Copy link


Copy Markdown

Member
This PR updates the isMagnetURI validator regex:
  • Fix ReDOS in old regex (thanks to @yetingli for discovering the vulnerability and @JamieSlome for reporting it)
  • Validate only exact xt topics (btih,sha1,...) based on this list
  • Validate only 32 or 40 hashes (Old regex was validating length between 32 and 40 even if only 32 (md5 and sha1) and 40 (btih, ed2k,...) character hashes are valid )
  • Make tr and dn parameters optional (Magnet URI definition doesn't specify if other parameters than xt are required
  • Allow passing multiple xt urn using the standard xt.1 and xt.2,... (URI is valid even if only xt.1 is passed)
  • Allow any other parameter (protocol allow passing non standard parameters)
  • Use placeholder hashes in tests
  • Add new tests
All the changes are based on the Magnet URI scheme definition here , there is no IETF RFC concerning magnet URI.
Checklist
  •  PR contains only changes related; no stray files, etc.
  •  Tests written (where applicable)
@tux-tn
fix(isMagnetURI): update validation regex
e263b32
- Validate only exact xn topics (btih,sha1,...)
- Validate only 32 or 40 hashes
- Make tr and dn parameters optional
- Allow any other parameter (protocol allow passing non standard parameters)
- Use placeholder hashes in tests - Fix ReDOS in old regex
- Add new tests
@codecov
codecovBot
commented
Sep 20, 2021•

edited

Loading

Copy link


Copy Markdown

Codecov Report
Merging #1730 (90a51c2) into master (8c4b3b3) will not change coverage.

The diff coverage is 100.00%.
Impacted file tree graph
@@ Coverage Diff @@## master #1730 +/- ##
=========================================
Coverage 100.00% 100.00% =========================================
Files 101 101 Lines 2005 2005 Branches 452 452 =========================================
Hits 2005 2005 
Impacted FilesCoverage Δ
src/lib/isMagnetURI.js100.00% <100.00%> (ø)
Continue to review full report at Codecov.
Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data

Powered by Codecov. Last update 8c4b3b3...90a51c2. Read the comment docs.
ezkemboi
ezkemboi
previously approved these changes
Sep 20, 2021
View reviewed changes
profnandaa
profnandaa
previously approved these changes
Sep 20, 2021
View reviewed changes
@profnandaaprofnandaa
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks for the fix.
profnandaa
profnandaa
reviewed
Sep 20, 2021
View reviewed changes
Comment threadsrc/lib/isMagnetURI.js
Outdated

@tux-tn
tux-tn
dismissed stale reviews from profnandaa and ezkemboi
via
3c4157aSeptember 20, 2021 17:47
@profnandaa
profnandaa
merged commit 7376945
into
validatorjs:masterSep 21, 2021
@profnandaa
profnandaa
commented
Sep 21, 2021

Copy link


Copy Markdown

Member
@tux-tn@ezkemboi -- let me do a release this weekend. You can help complete reviews of the remaining PRs.
@ezkemboi
ezkemboi
commented
Sep 21, 2021

Copy link


Copy Markdown

Member
Thanks, @profnandaa.

We will do that.
@tux-tn
tux-tn
deleted the

hotfix/isMagnet

branch
September 21, 2021 09:30
@tux-tn
tux-tn
commented
Sep 21, 2021

Copy link


Copy Markdown

MemberAuthor
Thank you @profnandaa
@profnandaaprofnandaa
mentioned this pull request
Oct 31, 2021
 Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@profnandaaprofnandaaprofnandaa approved these changes
@ezkemboiezkemboiezkemboi left review comments

Assignees


No one assigned


Labels

needs-more-review

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

3 participants

@tux-tn@profnandaa@ezkemboi

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix(isMagnetURI): update validation regex - #1730
Merged
profnandaa merged 3 commits into
validatorjs:masterfrom 
tux-tn:hotfix/isMagnet
Sep 21, 2021
Merged
fix(isMagnetURI): update validation regex#1730
profnandaa merged 3 commits into
validatorjs:masterfrom 
tux-tn:hotfix/isMagnet
Conversation
@tux-tn
@tux-tntux-tn
commented
Sep 20, 2021•

edited

Loading

Copy link


Copy Markdown

Member
This PR updates the isMagnetURI validator regex:
  • Fix ReDOS in old regex (thanks to @yetingli for discovering the vulnerability and @JamieSlome for reporting it)
  • Validate only exact xt topics (btih,sha1,...) based on this list
  • Validate only 32 or 40 hashes (Old regex was validating length between 32 and 40 even if only 32 (md5 and sha1) and 40 (btih, ed2k,...) character hashes are valid )
  • Make tr and dn parameters optional (Magnet URI definition doesn't specify if other parameters than xt are required
  • Allow passing multiple xt urn using the standard xt.1 and xt.2,... (URI is valid even if only xt.1 is passed)
  • Allow any other parameter (protocol allow passing non standard parameters)
  • Use placeholder hashes in tests
  • Add new tests
All the changes are based on the Magnet URI scheme definition here , there is no IETF RFC concerning magnet URI.
Checklist
  •  PR contains only changes related; no stray files, etc.
  •  Tests written (where applicable)
@tux-tn
fix(isMagnetURI): update validation regex
e263b32
- Validate only exact xn topics (btih,sha1,...)
- Validate only 32 or 40 hashes
- Make tr and dn parameters optional
- Allow any other parameter (protocol allow passing non standard parameters)
- Use placeholder hashes in tests - Fix ReDOS in old regex
- Add new tests
@codecov
codecovBot
commented
Sep 20, 2021•

edited

Loading

Copy link


Copy Markdown

Codecov Report
Merging #1730 (90a51c2) into master (8c4b3b3) will not change coverage.

The diff coverage is 100.00%.
Impacted file tree graph
@@ Coverage Diff @@## master #1730 +/- ##
=========================================
Coverage 100.00% 100.00% =========================================
Files 101 101 Lines 2005 2005 Branches 452 452 =========================================
Hits 2005 2005 
Impacted FilesCoverage Δ
src/lib/isMagnetURI.js100.00% <100.00%> (ø)
Continue to review full report at Codecov.
Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data

Powered by Codecov. Last update 8c4b3b3...90a51c2. Read the comment docs.
ezkemboi
ezkemboi
previously approved these changes
Sep 20, 2021
View reviewed changes
profnandaa
profnandaa
previously approved these changes
Sep 20, 2021
View reviewed changes
@profnandaaprofnandaa
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks for the fix.
profnandaa
profnandaa
reviewed
Sep 20, 2021
View reviewed changes
Comment threadsrc/lib/isMagnetURI.js
Outdated

@tux-tn
tux-tn
dismissed stale reviews from profnandaa and ezkemboi
via
3c4157aSeptember 20, 2021 17:47
@profnandaa
profnandaa
merged commit 7376945
into
validatorjs:masterSep 21, 2021
@profnandaa
profnandaa
commented
Sep 21, 2021

Copy link


Copy Markdown

Member
@tux-tn@ezkemboi -- let me do a release this weekend. You can help complete reviews of the remaining PRs.
@ezkemboi
ezkemboi
commented
Sep 21, 2021

Copy link


Copy Markdown

Member
Thanks, @profnandaa.

We will do that.
@tux-tn
tux-tn
deleted the

hotfix/isMagnet

branch
September 21, 2021 09:30
@tux-tn
tux-tn
commented
Sep 21, 2021

Copy link


Copy Markdown

MemberAuthor
Thank you @profnandaa
@profnandaaprofnandaa
mentioned this pull request
Oct 31, 2021
 Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@profnandaaprofnandaaprofnandaa approved these changes
@ezkemboiezkemboiezkemboi left review comments

Assignees


No one assigned


Labels

needs-more-review

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

3 participants

@tux-tn@profnandaa@ezkemboi

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix(isMagnetURI): update validation regex - #1730
Merged
profnandaa merged 3 commits into
validatorjs:masterfrom 
tux-tn:hotfix/isMagnet
Sep 21, 2021
Merged
fix(isMagnetURI): update validation regex#1730
profnandaa merged 3 commits into
validatorjs:masterfrom 
tux-tn:hotfix/isMagnet
Conversation
@tux-tn
@tux-tntux-tn
commented
Sep 20, 2021•

edited

Loading

Copy link


Copy Markdown

Member
This PR updates the isMagnetURI validator regex:
  • Fix ReDOS in old regex (thanks to @yetingli for discovering the vulnerability and @JamieSlome for reporting it)
  • Validate only exact xt topics (btih,sha1,...) based on this list
  • Validate only 32 or 40 hashes (Old regex was validating length between 32 and 40 even if only 32 (md5 and sha1) and 40 (btih, ed2k,...) character hashes are valid )
  • Make tr and dn parameters optional (Magnet URI definition doesn't specify if other parameters than xt are required
  • Allow passing multiple xt urn using the standard xt.1 and xt.2,... (URI is valid even if only xt.1 is passed)
  • Allow any other parameter (protocol allow passing non standard parameters)
  • Use placeholder hashes in tests
  • Add new tests
All the changes are based on the Magnet URI scheme definition here , there is no IETF RFC concerning magnet URI.
Checklist
  •  PR contains only changes related; no stray files, etc.
  •  Tests written (where applicable)
@tux-tn
fix(isMagnetURI): update validation regex
e263b32
- Validate only exact xn topics (btih,sha1,...)
- Validate only 32 or 40 hashes
- Make tr and dn parameters optional
- Allow any other parameter (protocol allow passing non standard parameters)
- Use placeholder hashes in tests - Fix ReDOS in old regex
- Add new tests
@codecov
codecovBot
commented
Sep 20, 2021•

edited

Loading

Copy link


Copy Markdown

Codecov Report
Merging #1730 (90a51c2) into master (8c4b3b3) will not change coverage.

The diff coverage is 100.00%.
Impacted file tree graph
@@ Coverage Diff @@## master #1730 +/- ##
=========================================
Coverage 100.00% 100.00% =========================================
Files 101 101 Lines 2005 2005 Branches 452 452 =========================================
Hits 2005 2005 
Impacted FilesCoverage Δ
src/lib/isMagnetURI.js100.00% <100.00%> (ø)
Continue to review full report at Codecov.
Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data

Powered by Codecov. Last update 8c4b3b3...90a51c2. Read the comment docs.
ezkemboi
ezkemboi
previously approved these changes
Sep 20, 2021
View reviewed changes
profnandaa
profnandaa
previously approved these changes
Sep 20, 2021
View reviewed changes
@profnandaaprofnandaa
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks for the fix.
profnandaa
profnandaa
reviewed
Sep 20, 2021
View reviewed changes
Comment threadsrc/lib/isMagnetURI.js
Outdated

@tux-tn
tux-tn
dismissed stale reviews from profnandaa and ezkemboi
via
3c4157aSeptember 20, 2021 17:47
@profnandaa
profnandaa
merged commit 7376945
into
validatorjs:masterSep 21, 2021
@profnandaa
profnandaa
commented
Sep 21, 2021

Copy link


Copy Markdown

Member
@tux-tn@ezkemboi -- let me do a release this weekend. You can help complete reviews of the remaining PRs.
@ezkemboi
ezkemboi
commented
Sep 21, 2021

Copy link


Copy Markdown

Member
Thanks, @profnandaa.

We will do that.
@tux-tn
tux-tn
deleted the

hotfix/isMagnet

branch
September 21, 2021 09:30
@tux-tn
tux-tn
commented
Sep 21, 2021

Copy link


Copy Markdown

MemberAuthor
Thank you @profnandaa
@profnandaaprofnandaa
mentioned this pull request
Oct 31, 2021
 Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@profnandaaprofnandaaprofnandaa approved these changes
@ezkemboiezkemboiezkemboi left review comments

Assignees


No one assigned


Labels

needs-more-review

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

3 participants

@tux-tn@profnandaa@ezkemboi

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
fix(isMagnetURI): update validation regex - #1730
Merged
profnandaa merged 3 commits into
validatorjs:masterfrom 
tux-tn:hotfix/isMagnet
Sep 21, 2021
Merged
fix(isMagnetURI): update validation regex#1730
profnandaa merged 3 commits into
validatorjs:masterfrom 
tux-tn:hotfix/isMagnet
Conversation
@tux-tn
@tux-tntux-tn
commented
Sep 20, 2021•

edited

Loading

Copy link


Copy Markdown

Member
This PR updates the isMagnetURI validator regex:
  • Fix ReDOS in old regex (thanks to @yetingli for discovering the vulnerability and @JamieSlome for reporting it)
  • Validate only exact xt topics (btih,sha1,...) based on this list
  • Validate only 32 or 40 hashes (Old regex was validating length between 32 and 40 even if only 32 (md5 and sha1) and 40 (btih, ed2k,...) character hashes are valid )
  • Make tr and dn parameters optional (Magnet URI definition doesn't specify if other parameters than xt are required
  • Allow passing multiple xt urn using the standard xt.1 and xt.2,... (URI is valid even if only xt.1 is passed)
  • Allow any other parameter (protocol allow passing non standard parameters)
  • Use placeholder hashes in tests
  • Add new tests
All the changes are based on the Magnet URI scheme definition here , there is no IETF RFC concerning magnet URI.
Checklist
  •  PR contains only changes related; no stray files, etc.
  •  Tests written (where applicable)
@tux-tn
fix(isMagnetURI): update validation regex
e263b32
- Validate only exact xn topics (btih,sha1,...)
- Validate only 32 or 40 hashes
- Make tr and dn parameters optional
- Allow any other parameter (protocol allow passing non standard parameters)
- Use placeholder hashes in tests - Fix ReDOS in old regex
- Add new tests
@codecov
codecovBot
commented
Sep 20, 2021•

edited

Loading

Copy link


Copy Markdown

Codecov Report
Merging #1730 (90a51c2) into master (8c4b3b3) will not change coverage.

The diff coverage is 100.00%.
Impacted file tree graph
@@ Coverage Diff @@## master #1730 +/- ##
=========================================
Coverage 100.00% 100.00% =========================================
Files 101 101 Lines 2005 2005 Branches 452 452 =========================================
Hits 2005 2005 
Impacted FilesCoverage Δ
src/lib/isMagnetURI.js100.00% <100.00%> (ø)
Continue to review full report at Codecov.
Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data

Powered by Codecov. Last update 8c4b3b3...90a51c2. Read the comment docs.
ezkemboi
ezkemboi
previously approved these changes
Sep 20, 2021
View reviewed changes
profnandaa
profnandaa
previously approved these changes
Sep 20, 2021
View reviewed changes
@profnandaaprofnandaa
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks for the fix.
profnandaa
profnandaa
reviewed
Sep 20, 2021
View reviewed changes
Comment threadsrc/lib/isMagnetURI.js
Outdated

@tux-tn
tux-tn
dismissed stale reviews from profnandaa and ezkemboi
via
3c4157aSeptember 20, 2021 17:47
@profnandaa
profnandaa
merged commit 7376945
into
validatorjs:masterSep 21, 2021
@profnandaa
profnandaa
commented
Sep 21, 2021

Copy link


Copy Markdown

Member
@tux-tn@ezkemboi -- let me do a release this weekend. You can help complete reviews of the remaining PRs.
@ezkemboi
ezkemboi
commented
Sep 21, 2021

Copy link


Copy Markdown

Member
Thanks, @profnandaa.

We will do that.
@tux-tn
tux-tn
deleted the

hotfix/isMagnet

branch
September 21, 2021 09:30
@tux-tn
tux-tn
commented
Sep 21, 2021

Copy link


Copy Markdown

MemberAuthor
Thank you @profnandaa
@profnandaaprofnandaa
mentioned this pull request
Oct 31, 2021
 Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@profnandaaprofnandaaprofnandaa approved these changes
@ezkemboiezkemboiezkemboi left review comments

Assignees


No one assigned


Labels

needs-more-review

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

3 participants

@tux-tn@profnandaa@ezkemboi

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix(isMagnetURI): update validation regex - #1730
Merged
profnandaa merged 3 commits into
validatorjs:masterfrom 
tux-tn:hotfix/isMagnet
Sep 21, 2021
Merged
fix(isMagnetURI): update validation regex#1730
profnandaa merged 3 commits into
validatorjs:masterfrom 
tux-tn:hotfix/isMagnet
Conversation
@tux-tn
@tux-tntux-tn
commented
Sep 20, 2021•

edited

Loading

Copy link


Copy Markdown

Member
This PR updates the isMagnetURI validator regex:
  • Fix ReDOS in old regex (thanks to @yetingli for discovering the vulnerability and @JamieSlome for reporting it)
  • Validate only exact xt topics (btih,sha1,...) based on this list
  • Validate only 32 or 40 hashes (Old regex was validating length between 32 and 40 even if only 32 (md5 and sha1) and 40 (btih, ed2k,...) character hashes are valid )
  • Make tr and dn parameters optional (Magnet URI definition doesn't specify if other parameters than xt are required
  • Allow passing multiple xt urn using the standard xt.1 and xt.2,... (URI is valid even if only xt.1 is passed)
  • Allow any other parameter (protocol allow passing non standard parameters)
  • Use placeholder hashes in tests
  • Add new tests
All the changes are based on the Magnet URI scheme definition here , there is no IETF RFC concerning magnet URI.
Checklist
  •  PR contains only changes related; no stray files, etc.
  •  Tests written (where applicable)
@tux-tn
fix(isMagnetURI): update validation regex
e263b32
- Validate only exact xn topics (btih,sha1,...)
- Validate only 32 or 40 hashes
- Make tr and dn parameters optional
- Allow any other parameter (protocol allow passing non standard parameters)
- Use placeholder hashes in tests - Fix ReDOS in old regex
- Add new tests
@codecov
codecovBot
commented
Sep 20, 2021•

edited

Loading

Copy link


Copy Markdown

Codecov Report
Merging #1730 (90a51c2) into master (8c4b3b3) will not change coverage.

The diff coverage is 100.00%.
Impacted file tree graph
@@ Coverage Diff @@## master #1730 +/- ##
=========================================
Coverage 100.00% 100.00% =========================================
Files 101 101 Lines 2005 2005 Branches 452 452 =========================================
Hits 2005 2005 
Impacted FilesCoverage Δ
src/lib/isMagnetURI.js100.00% <100.00%> (ø)
Continue to review full report at Codecov.
Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data

Powered by Codecov. Last update 8c4b3b3...90a51c2. Read the comment docs.
ezkemboi
ezkemboi
previously approved these changes
Sep 20, 2021
View reviewed changes
profnandaa
profnandaa
previously approved these changes
Sep 20, 2021
View reviewed changes
@profnandaaprofnandaa
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks for the fix.
profnandaa
profnandaa
reviewed
Sep 20, 2021
View reviewed changes
Comment threadsrc/lib/isMagnetURI.js
Outdated

@tux-tn
tux-tn
dismissed stale reviews from profnandaa and ezkemboi
via
3c4157aSeptember 20, 2021 17:47
@profnandaa
profnandaa
merged commit 7376945
into
validatorjs:masterSep 21, 2021
@profnandaa
profnandaa
commented
Sep 21, 2021

Copy link


Copy Markdown

Member
@tux-tn@ezkemboi -- let me do a release this weekend. You can help complete reviews of the remaining PRs.
@ezkemboi
ezkemboi
commented
Sep 21, 2021

Copy link


Copy Markdown

Member
Thanks, @profnandaa.

We will do that.
@tux-tn
tux-tn
deleted the

hotfix/isMagnet

branch
September 21, 2021 09:30
@tux-tn
tux-tn
commented
Sep 21, 2021

Copy link


Copy Markdown

MemberAuthor
Thank you @profnandaa
@profnandaaprofnandaa
mentioned this pull request
Oct 31, 2021
 Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@profnandaaprofnandaaprofnandaa approved these changes
@ezkemboiezkemboiezkemboi left review comments

Assignees


No one assigned


Labels

needs-more-review

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

3 participants

@tux-tn@profnandaa@ezkemboi

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix(isMagnetURI): update validation regex - #1730
Merged
profnandaa merged 3 commits into
validatorjs:masterfrom 
tux-tn:hotfix/isMagnet
Sep 21, 2021
Merged
fix(isMagnetURI): update validation regex#1730
profnandaa merged 3 commits into
validatorjs:masterfrom 
tux-tn:hotfix/isMagnet
Conversation
@tux-tn
@tux-tntux-tn
commented
Sep 20, 2021•

edited

Loading

Copy link


Copy Markdown

Member
This PR updates the isMagnetURI validator regex:
  • Fix ReDOS in old regex (thanks to @yetingli for discovering the vulnerability and @JamieSlome for reporting it)
  • Validate only exact xt topics (btih,sha1,...) based on this list
  • Validate only 32 or 40 hashes (Old regex was validating length between 32 and 40 even if only 32 (md5 and sha1) and 40 (btih, ed2k,...) character hashes are valid )
  • Make tr and dn parameters optional (Magnet URI definition doesn't specify if other parameters than xt are required
  • Allow passing multiple xt urn using the standard xt.1 and xt.2,... (URI is valid even if only xt.1 is passed)
  • Allow any other parameter (protocol allow passing non standard parameters)
  • Use placeholder hashes in tests
  • Add new tests
All the changes are based on the Magnet URI scheme definition here , there is no IETF RFC concerning magnet URI.
Checklist
  •  PR contains only changes related; no stray files, etc.
  •  Tests written (where applicable)
@tux-tn
fix(isMagnetURI): update validation regex
e263b32
- Validate only exact xn topics (btih,sha1,...)
- Validate only 32 or 40 hashes
- Make tr and dn parameters optional
- Allow any other parameter (protocol allow passing non standard parameters)
- Use placeholder hashes in tests - Fix ReDOS in old regex
- Add new tests
@codecov
codecovBot
commented
Sep 20, 2021•

edited

Loading

Copy link


Copy Markdown

Codecov Report
Merging #1730 (90a51c2) into master (8c4b3b3) will not change coverage.

The diff coverage is 100.00%.
Impacted file tree graph
@@ Coverage Diff @@## master #1730 +/- ##
=========================================
Coverage 100.00% 100.00% =========================================
Files 101 101 Lines 2005 2005 Branches 452 452 =========================================
Hits 2005 2005 
Impacted FilesCoverage Δ
src/lib/isMagnetURI.js100.00% <100.00%> (ø)
Continue to review full report at Codecov.
Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data

Powered by Codecov. Last update 8c4b3b3...90a51c2. Read the comment docs.
ezkemboi
ezkemboi
previously approved these changes
Sep 20, 2021
View reviewed changes
profnandaa
profnandaa
previously approved these changes
Sep 20, 2021
View reviewed changes
@profnandaaprofnandaa
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks for the fix.
profnandaa
profnandaa
reviewed
Sep 20, 2021
View reviewed changes
Comment threadsrc/lib/isMagnetURI.js
Outdated

@tux-tn
tux-tn
dismissed stale reviews from profnandaa and ezkemboi
via
3c4157aSeptember 20, 2021 17:47
@profnandaa
profnandaa
merged commit 7376945
into
validatorjs:masterSep 21, 2021
@profnandaa
profnandaa
commented
Sep 21, 2021

Copy link


Copy Markdown

Member
@tux-tn@ezkemboi -- let me do a release this weekend. You can help complete reviews of the remaining PRs.
@ezkemboi
ezkemboi
commented
Sep 21, 2021

Copy link


Copy Markdown

Member
Thanks, @profnandaa.

We will do that.
@tux-tn
tux-tn
deleted the

hotfix/isMagnet

branch
September 21, 2021 09:30
@tux-tn
tux-tn
commented
Sep 21, 2021

Copy link


Copy Markdown

MemberAuthor
Thank you @profnandaa
@profnandaaprofnandaa
mentioned this pull request
Oct 31, 2021
 Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@profnandaaprofnandaaprofnandaa approved these changes
@ezkemboiezkemboiezkemboi left review comments

Assignees


No one assigned


Labels

needs-more-review

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

3 participants

@tux-tn@profnandaa@ezkemboi

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
fix(isMagnetURI): update validation regex - #1730
Merged
profnandaa merged 3 commits into
validatorjs:masterfrom 
tux-tn:hotfix/isMagnet
Sep 21, 2021
Merged
fix(isMagnetURI): update validation regex#1730
profnandaa merged 3 commits into
validatorjs:masterfrom 
tux-tn:hotfix/isMagnet
Conversation
@tux-tn
@tux-tntux-tn
commented
Sep 20, 2021•

edited

Loading

Copy link


Copy Markdown

Member
This PR updates the isMagnetURI validator regex:
  • Fix ReDOS in old regex (thanks to @yetingli for discovering the vulnerability and @JamieSlome for reporting it)
  • Validate only exact xt topics (btih,sha1,...) based on this list
  • Validate only 32 or 40 hashes (Old regex was validating length between 32 and 40 even if only 32 (md5 and sha1) and 40 (btih, ed2k,...) character hashes are valid )
  • Make tr and dn parameters optional (Magnet URI definition doesn't specify if other parameters than xt are required
  • Allow passing multiple xt urn using the standard xt.1 and xt.2,... (URI is valid even if only xt.1 is passed)
  • Allow any other parameter (protocol allow passing non standard parameters)
  • Use placeholder hashes in tests
  • Add new tests
All the changes are based on the Magnet URI scheme definition here , there is no IETF RFC concerning magnet URI.
Checklist
  •  PR contains only changes related; no stray files, etc.
  •  Tests written (where applicable)
@tux-tn
fix(isMagnetURI): update validation regex
e263b32
- Validate only exact xn topics (btih,sha1,...)
- Validate only 32 or 40 hashes
- Make tr and dn parameters optional
- Allow any other parameter (protocol allow passing non standard parameters)
- Use placeholder hashes in tests - Fix ReDOS in old regex
- Add new tests
@codecov
codecovBot
commented
Sep 20, 2021•

edited

Loading

Copy link


Copy Markdown

Codecov Report
Merging #1730 (90a51c2) into master (8c4b3b3) will not change coverage.

The diff coverage is 100.00%.
Impacted file tree graph
@@ Coverage Diff @@## master #1730 +/- ##
=========================================
Coverage 100.00% 100.00% =========================================
Files 101 101 Lines 2005 2005 Branches 452 452 =========================================
Hits 2005 2005 
Impacted FilesCoverage Δ
src/lib/isMagnetURI.js100.00% <100.00%> (ø)
Continue to review full report at Codecov.
Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data

Powered by Codecov. Last update 8c4b3b3...90a51c2. Read the comment docs.
ezkemboi
ezkemboi
previously approved these changes
Sep 20, 2021
View reviewed changes
profnandaa
profnandaa
previously approved these changes
Sep 20, 2021
View reviewed changes
@profnandaaprofnandaa
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks for the fix.
profnandaa
profnandaa
reviewed
Sep 20, 2021
View reviewed changes
Comment threadsrc/lib/isMagnetURI.js
Outdated

@tux-tn
tux-tn
dismissed stale reviews from profnandaa and ezkemboi
via
3c4157aSeptember 20, 2021 17:47
@profnandaa
profnandaa
merged commit 7376945
into
validatorjs:masterSep 21, 2021
@profnandaa
profnandaa
commented
Sep 21, 2021

Copy link


Copy Markdown

Member
@tux-tn@ezkemboi -- let me do a release this weekend. You can help complete reviews of the remaining PRs.
@ezkemboi
ezkemboi
commented
Sep 21, 2021

Copy link


Copy Markdown

Member
Thanks, @profnandaa.

We will do that.
@tux-tn
tux-tn
deleted the

hotfix/isMagnet

branch
September 21, 2021 09:30
@tux-tn
tux-tn
commented
Sep 21, 2021

Copy link


Copy Markdown

MemberAuthor
Thank you @profnandaa
@profnandaaprofnandaa
mentioned this pull request
Oct 31, 2021
 Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@profnandaaprofnandaaprofnandaa approved these changes
@ezkemboiezkemboiezkemboi left review comments

Assignees


No one assigned


Labels

needs-more-review

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

3 participants

@tux-tn@profnandaa@ezkemboi