codex-storage
/
deluge
mirror of https://github.com/codex-storage/deluge.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[#2790] Ensure base32 magnet hash is uppercase

This commit is contained in:
Calum Lind 2016-05-09 23:24:18 +01:00
parent f221ae53eb
commit ad58fca1f9
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
deluge/ui/gtkui/addtorrentdialog.py
View File

@ -253,7 +253,11 @@ class AddTorrentDialog(component.Component):
s = uri.split("&")[0][20:] s = uri.split("&")[0][20:]
info_hash = None info_hash = None
if len(s) == 32: if len(s) == 32:
info_hash = base64.b32decode(s).encode("hex") try:
info_hash = base64.b32decode(s.upper()).encode("hex")
except TypeError, ex:
log.debug("Invalid base32 magnet hash: %s, %s", s, ex)
continue
elif len(s) == 40: elif len(s) == 40:
info_hash = s info_hash = s
if info_hash is None: if info_hash is None:

6
deluge/ui/web/json_api.py
View File

@ -732,7 +732,11 @@ class WebApi(JSONComponent):
if param.startswith(xt_param): if param.startswith(xt_param):
xt_hash = param[len(xt_param):] xt_hash = param[len(xt_param):]
if len(xt_hash) == 32: if len(xt_hash) == 32:
info_hash = base64.b32decode(xt_hash).encode("hex") try:
info_hash = base64.b32decode(xt_hash.upper()).encode("hex")
except TypeError, ex:
log.debug("Invalid base32 magnet hash: %s, %s", xt_hash, ex)
break
elif len(xt_hash) == 40: elif len(xt_hash) == 40:
info_hash = xt_hash info_hash = xt_hash
else: else: