ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-04-08 03:14:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't use a custom parser.

Browse Source
This commit is contained in:
Itamar Turner-Trauring 2022-03-14 11:01:09 -04:00
parent b8ab3dd6a7
commit 1e108f8445
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/allmydata/storage/http_client.py
View File

@ -32,6 +32,7 @@ import attr
from cbor2 import loads, dumps
from collections_extended import RangeMap
from werkzeug.datastructures import Range, ContentRange
from werkzeug.http import parse_options_header
from twisted.web.http_headers import Headers
from twisted.web import http
from twisted.internet.defer import inlineCallbacks, returnValue, fail, Deferred
@ -58,7 +59,10 @@ class ClientException(Exception):
def _decode_cbor(response):
"""Given HTTP response, return decoded CBOR body."""
if response.code > 199 and response.code < 300:
if response.headers.getRawHeaders("content-type") == ["application/cbor"]:
content_type = parse_options_header(
(response.headers.getRawHeaders("content-type") or [None])[0]
)[0]
if content_type == "application/cbor":
# TODO limit memory usage
# https://tahoe-lafs.org/trac/tahoe-lafs/ticket/3872
return treq.content(response).addCallback(loads)