diff options
author | Calum Lind <calumlind+deluge@gmail.com> | 2019-06-11 12:19:21 +0100 |
---|---|---|
committer | Calum Lind <calumlind+deluge@gmail.com> | 2019-06-11 20:14:11 +0100 |
commit | 4dd1f63b8b92481f00697efc035d1e6015f0abfa (patch) | |
tree | 28b9c0e406e054d83dc7bba056fedf0ea3058aa9 | |
parent | fc134cdffb5211e7ce82c98db5bf900083ed5e0f (diff) | |
download | deluge-4dd1f63b8b92481f00697efc035d1e6015f0abfa.tar.gz deluge-4dd1f63b8b92481f00697efc035d1e6015f0abfa.tar.bz2 deluge-4dd1f63b8b92481f00697efc035d1e6015f0abfa.zip |
[Web] Fix TypeError with reverse proxy x-deluge-base header
The request header needs decoded otherwise string comparisons fail.
Fixes: #3260
-rw-r--r-- | CHANGELOG.md | 1 | ||||
-rw-r--r-- | deluge/ui/web/server.py | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index c1d5a135e..8d2edd9cf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ ### Web UI - Fix TypeError in Peers Tab setting country flag. +- Fix reverse proxy header TypeError (#3260). ### Documentation diff --git a/deluge/ui/web/server.py b/deluge/ui/web/server.py index 3dceaf6ba..c2a0df12d 100644 --- a/deluge/ui/web/server.py +++ b/deluge/ui/web/server.py @@ -571,7 +571,7 @@ class TopLevel(resource.Resource): def getChildWithDefault(self, path, request): # NOQA: N802 # Calculate the request base header = request.getHeader(b'x-deluge-base') - base = header if header else component.get('DelugeWeb').base + base = header.decode('utf-8') if header else component.get('DelugeWeb').base # validate the base parameter if not base: |