Fix theWebUI.getTrackerName to reject invalid announcelist items #2641
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
In public trackers with long announce-lists, there can be a rather
large number of valid and invalid trackers. Examples of trackers
seen in the wild include "0", "announce", "dht" (rather than "dht://")
which rtorrent discards as invalid.
The regex already had a group checking for the division between
protocol and domain "://" but it was marked as optional.
By making it mandatory so that malformed announce urls are skipped
as expected, we can parse invalid names without errors.
Without this fix, the trackerlabels plugin stops working if any
torrent contains a seriously malformed domain.
These lines demonstrate the problem:
```js
announce = "dht";
// Note this is the old regex
parts = announce.match(/^(?:([^:\/?#]+):)?(?:\/\/((?:(([^:@]*):?([^:@]*))?@)?([^:\/?#]*)(?::(\d*))?))?((((?:[^?#\/]*\/)*)([^?#]*))(?:\?([^#]*))?(?:#(.*))?)/);
if(parts && (parts.length>6))
{
domain = parts[6];
// Error "domain is undefined", because parts[6] was undefined
domain.match(/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/);
}
```
|
LTGM. Thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In public trackers with long announce-lists, there can be a rather large number of valid and invalid trackers. Examples of trackers seen in the wild include "0", "announce", "dht" (rather than "dht://") which rtorrent discards as invalid.
The regex already had a group checking for the division between protocol and domain "://" but it was marked as optional.
By making it mandatory so that malformed announce urls are skipped as expected, we can parse invalid names without errors.
Without this fix, the trackerlabels plugin stops working if any torrent contains a seriously malformed domain.
These lines demonstrate the problem: