diff --git a/src/lib/isMagnetURI.js b/src/lib/isMagnetURI.js index e00ee3c32..017fa0087 100644 --- a/src/lib/isMagnetURI.js +++ b/src/lib/isMagnetURI.js @@ -1,6 +1,6 @@ import assertString from './util/assertString'; -const magnetURIComponent = /(?:^magnet:\?|[^?&]&)xt(?:\.1)?=urn:(?:(?:aich|bitprint|btih|ed2k|ed2khash|kzhash|md5|sha1|tree:tiger):[a-z0-9]{32}(?:[a-z0-9]{8})?|btmh:1220[a-z0-9]{64})(?:$|&)/i; +const magnetURIComponent = /(?:^magnet:\?|[^?&]&)xt(?:\.1)?=urn:(?:(?:aich|bitprint|btih|ed2k|ed2khash|kzhash|md5|sha1|tree:tiger):[a-z0-9]{32}(?:[a-z0-9]{8})?|btmh:1220[a-f0-9]{64})(?:$|&)/i; export default function isMagnetURI(url) { assertString(url); diff --git a/test/validators.test.js b/test/validators.test.js index 98d2a12ff..d2cd64740 100644 --- a/test/validators.test.js +++ b/test/validators.test.js @@ -12771,6 +12771,23 @@ describe('Validators', () => { }); + it('should require hexadecimal BitTorrent v2 magnet hashes', () => { + const hash = '0123456789abcdef'.repeat(4); + test({ + validator: 'isMagnetURI', + valid: [ + `magnet:?xt=urn:btmh:1220${hash}`, + `magnet:?xt=urn:btmh:1220${hash.toUpperCase()}`, + `magnet:?dn=example&xt.1=urn:btmh:1220${hash}&tr=udp://example.com`, + ], + invalid: [ + `magnet:?xt=urn:btmh:1220g${hash.slice(1)}`, + `magnet:?xt=urn:btmh:1220${hash.slice(0, -1)}Z`, + `magnet:?dn=example&xt.1=urn:btmh:1220${hash.slice(0, 32)}g${hash.slice(33)}&dn=test`, + ], + }); + }); + it('should validate LatLong', () => { test({ validator: 'isLatLong',