Mirrors/aqtinstall
1
0
Fork 0
mirror of https://github.com/miurahr/aqtinstall.git synced 2025-12-18 13:14:37 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Better redirection handling

Browse Source 
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
This commit is contained in:
Hiroshi Miura
2021-05-23 15:39:20 +09:00
parent fb088cac05
commit df7222dd34
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
aqt/helper.py
View File

@@ -29,6 +29,7 @@ import os
import sys import sys
import xml.etree.ElementTree as ElementTree import xml.etree.ElementTree as ElementTree
from typing import List, Optional from typing import List, Optional
from urllib.parse import urlparse
import requests import requests
import requests.adapters import requests.adapters
@@ -52,9 +53,10 @@ def getUrl(url: str, timeout, logger) -> str:
session.mount("https://", adapter) session.mount("https://", adapter)
try: try:
r = requests.get(url, allow_redirects=False, timeout=timeout) r = requests.get(url, allow_redirects=False, timeout=timeout)
if r.status_code == 302: if 300 < r.status_code < 309:
logger.info("Asked to redirect({}) to: {}".format(r.status_code, r.headers["Location"]))
newurl = altlink(r.url, r.headers["Location"], logger=logger) newurl = altlink(r.url, r.headers["Location"], logger=logger)
logger.info("Redirected URL: {}".format(newurl)) logger.info("Redirected: {}".format(urlparse(newurl).hostname))
r = session.get(newurl, stream=True, timeout=timeout) r = session.get(newurl, stream=True, timeout=timeout)
except ( except (
ConnectionResetError, ConnectionResetError,
@@ -82,9 +84,10 @@ def downloadBinaryFile(url: str, out: str, hash_algo: str, exp: str, timeout, lo
session.mount("https://", adapter) session.mount("https://", adapter)
try: try:
r = session.get(url, allow_redirects=False, stream=True, timeout=timeout) r = session.get(url, allow_redirects=False, stream=True, timeout=timeout)
if r.status_code == 302: if 300 < r.status_code < 309:
logger.info("Asked to redirect({}) to: {}".format(r.status_code, r.headers["Location"]))
newurl = altlink(r.url, r.headers["Location"], logger=logger) newurl = altlink(r.url, r.headers["Location"], logger=logger)
logger.info("Redirected URL: {}".format(newurl)) logger.info("Redirected: {}".format(urlparse(newurl).hostname))
r = session.get(newurl, stream=True, timeout=timeout) r = session.get(newurl, stream=True, timeout=timeout)
except requests.exceptions.ConnectionError as e: except requests.exceptions.ConnectionError as e:
logger.error("Connection error: %s" % e.args) logger.error("Connection error: %s" % e.args)