Changeset e12053

Timestamp:

07/08/2022 07:34:29 AM (3 years ago)

Author:

Calum Lind <calumlind+deluge@gmail.com>

Branches:

develop, master

Children:

b64084

Parents:

f52cf7

git-author:

Calum Lind <calumlind+deluge@gmail.com> (07/08/2022 07:29:18 AM)

git-committer:

Calum Lind <calumlind+deluge@gmail.com> (07/08/2022 07:34:29 AM)

Message:

Fix parsing magnet with tracker tiers

Magnets with trackers specified with tr.x param were not being unquoted
so unusable raw tracker string was being set.

Fixed by unquoting tracker and adding test

See-also: ​https://dev.deluge-torrent.org/ticket/2716

Location:

deluge

Files:

• common.py (modified) (3 diffs)
• tests/test_common.py (modified) (3 diffs)

deluge/common.py

@@ -735 +735 @@
 DN_PARAM = 'dn='
 TR_PARAM = 'tr='
+TR_TIER_PARAM = 'tr.'
+TR_TIER_REGEX = re.compile(r'^tr.(\d+)=(\S+)')
 
 
@@ -777 +779 @@
     """
 
-    tr0_param = 'tr.'
-    tr0_param_regex = re.compile(r'^tr.(\d+)=(\S+)')
     if not uri.startswith(MAGNET_SCHEME):
         return {}
@@ -806 +806 @@
             trackers[tracker] = tier
             tier += 1
-        elif param.startswith(tr0_param):
-            try:
-                tier, tracker = re.match(tr0_param_regex, param).groups()
-                trackers[tracker] = tier
-            except AttributeError:
-                pass
+        elif param.startswith(TR_TIER_PARAM):
+            tracker_match = re.match(TR_TIER_REGEX, param)
+            if not tracker_match:
+                continue
+
+            tier, tracker = tracker_match.groups()
+            tracker = unquote_plus(tracker)
+            trackers[tracker] = int(tier)
 
     if info_hash:

deluge/tests/test_common.py

@@ -8 +8 @@
 import sys
 import tarfile
+from urllib.parse import quote_plus
 
 import pytest
@@ -20 +21 @@
     fspeed,
     ftime,
+    get_magnet_info,
     get_path_size,
     is_infohash,
@@ -210 +212 @@
                     result = tar.extractfile(tar_info).read().decode()
                     assert result == 'test'
+
+    def test_get_magnet_info_tiers(self):
+        tracker1 = 'udp://tracker1.example.com'
+        tracker2 = 'udp://tracker2.example.com'
+        magnet = (
+            'magnet:?xt=urn:btih:SU5225URMTUEQLDXQWRB2EQWN6KLTYKN'
+            f'&tr.1={quote_plus(tracker1)}'
+            f'&tr.2={quote_plus(tracker2)}'
+        )
+        result = get_magnet_info(magnet)
+        assert result['info_hash'] == '953bad769164e8482c7785a21d12166f94b9e14d'
+        assert result['trackers'][tracker1] == 1
+        assert result['trackers'][tracker2] == 2