From 733e7be1b3cb774c1d4589f9085593d6b7f0d5da Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Tue, 3 Mar 2020 14:37:17 +0100 Subject: [PATCH] set F-Droid HTTP Headers globally --- fdroidserver/net.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/fdroidserver/net.py b/fdroidserver/net.py index b9ddf72b..3f497999 100644 --- a/fdroidserver/net.py +++ b/fdroidserver/net.py @@ -17,16 +17,17 @@ # along with this program. If not, see . import os - import requests +HEADERS = {'User-Agent': 'F-Droid'} + def download_file(url, local_filename=None, dldir='tmp'): filename = url.split('/')[-1] if local_filename is None: local_filename = os.path.join(dldir, filename) # the stream=True parameter keeps memory usage low - r = requests.get(url, stream=True, allow_redirects=True) + r = requests.get(url, stream=True, allow_redirects=True, headers=HEADERS) r.raise_for_status() with open(local_filename, 'wb') as f: for chunk in r.iter_content(chunk_size=1024): @@ -48,16 +49,15 @@ def http_get(url, etag=None, timeout=600): - The raw content that was downloaded or None if it did not change - The new eTag as returned by the HTTP request """ - headers = {'User-Agent': 'F-Droid'} # TODO disable TLS Session IDs and TLS Session Tickets # (plain text cookie visible to anyone who can see the network traffic) if etag: - r = requests.head(url, headers=headers, timeout=timeout) + r = requests.head(url, headers=HEADERS, timeout=timeout) r.raise_for_status() if 'ETag' in r.headers and etag == r.headers['ETag']: return None, etag - r = requests.get(url, headers=headers, timeout=timeout) + r = requests.get(url, headers=HEADERS, timeout=timeout) r.raise_for_status() new_etag = None