indymedia
/
epicyon
mirror of https://gitlab.com/bashrc2/epicyon
7
4
Fork 1
Code Issues 14 Releases Wiki Activity

Allow redirects

main
Bob Mottram 2023-08-25 22:01:51 +01:00
parent e389c8e7d3
commit cefd115170
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
session.py
View File

@ -81,7 +81,7 @@ def url_exists(session, url: str, timeout_sec: int = 3,
result = session.get(url, headers=session_headers, result = session.get(url, headers=session_headers,
params=session_params, params=session_params,
timeout=timeout_sec, timeout=timeout_sec,
allow_redirects=False) allow_redirects=True)
if result: if result:
if result.status_code in (200, 304): if result.status_code in (200, 304):
return True return True
@ -101,7 +101,7 @@ def _get_json_request(session, url: str, domain_full: str, session_headers: {},
try: try:
result = session.get(url, headers=session_headers, result = session.get(url, headers=session_headers,
params=session_params, timeout=timeout_sec, params=session_params, timeout=timeout_sec,
allow_redirects=False) allow_redirects=True)
if result.status_code != 200: if result.status_code != 200:
if result.status_code == 401: if result.status_code == 401:
print("WARN: get_json " + url + ' rejected by secure mode') print("WARN: get_json " + url + ' rejected by secure mode')
@ -330,7 +330,7 @@ def get_vcard(xml_format: bool,
try: try:
result = session.get(url, headers=session_headers, result = session.get(url, headers=session_headers,
params=session_params, timeout=timeout_sec, params=session_params, timeout=timeout_sec,
allow_redirects=False) allow_redirects=True)
if result.status_code != 200: if result.status_code != 200:
if result.status_code == 401: if result.status_code == 401:
print("WARN: get_vcard " + url + ' rejected by secure mode') print("WARN: get_vcard " + url + ' rejected by secure mode')
@ -775,7 +775,7 @@ def download_image(session, url: str, image_filename: str, debug: bool,
result = session.get(url, result = session.get(url,
headers=session_headers, headers=session_headers,
params=None, params=None,
allow_redirects=False) allow_redirects=True)
if result.status_code < 200 or \ if result.status_code < 200 or \
result.status_code > 202: result.status_code > 202:
if debug: if debug:
@ -823,7 +823,7 @@ def download_image_any_mime_type(session, url: str,
try: try:
result = session.get(url, headers=session_headers, result = session.get(url, headers=session_headers,
timeout=timeout_sec, timeout=timeout_sec,
allow_redirects=False) allow_redirects=True)
except requests.exceptions.RequestException as ex: except requests.exceptions.RequestException as ex:
print('EX: download_image_any_mime_type failed1: ' + print('EX: download_image_any_mime_type failed1: ' +
str(url) + ', ' + str(ex)) str(url) + ', ' + str(ex))

2
webapp_utils.py
View File

@ -384,7 +384,7 @@ def update_avatar_image_cache(signing_priv_key_pem: str,
result = session.get(avatar_url, result = session.get(avatar_url,
headers=session_headers, headers=session_headers,
params=None, params=None,
allow_redirects=False) allow_redirects=True)
if result.status_code < 200 or \ if result.status_code < 200 or \
result.status_code > 202: result.status_code > 202:
if debug: if debug: