diff --git a/dtable_events/dtable_io/__init__.py b/dtable_events/dtable_io/__init__.py index c792cad6..54ab569e 100644 --- a/dtable_events/dtable_io/__init__.py +++ b/dtable_events/dtable_io/__init__.py @@ -39,6 +39,7 @@ from dtable_events.utils.dtable_server_api import DTableServerAPI, BaseExceedsException from dtable_events.utils.dtable_web_api import DTableWebAPI from dtable_events.utils.exception import ExcelFormatError +from dtable_events.utils.seafile import check_seafile_url, request_seafile from dtable_events.utils.email_sender import toggle_send_email from dtable_events.dtable_io.utils import clear_tmp_dir, clear_tmp_file, clear_tmp_files_and_dirs, \ SDOC_IMAGES_DIR, get_seadoc_download_link, gen_seadoc_base_dir, export_sdoc_prepare_images_folder,\ @@ -735,6 +736,7 @@ def append_excel_csv_to_table(username, file_name, dtable_uuid, table_name, file def _get_upload_link_to_seafile(seafile_server_url, access_token, parent_dir="/"): + check_seafile_url(seafile_server_url) upload_link_api_url = "%s%s" % (seafile_server_url.rstrip('/'), '/api/v2.1/via-repo-token/upload-link/') headers = { 'authorization': 'Token ' + access_token @@ -742,14 +744,14 @@ def _get_upload_link_to_seafile(seafile_server_url, access_token, parent_dir="/" params = { 'path': parent_dir } - response = requests.get(upload_link_api_url, headers=headers, params=params) + response = request_seafile('GET', upload_link_api_url, headers=headers, params=params) return response.json() def _upload_to_seafile(seafile_server_url, access_token, files, parent_dir="/", relative_path="", replace=None): upload_url = _get_upload_link_to_seafile(seafile_server_url, access_token, parent_dir) files_tuple_list = [('file', open(file, 'rb')) for file in files] files = files_tuple_list + [('parent_dir', parent_dir), ('relative_path', relative_path), ('replace', replace)] - response = requests.post(upload_url, files=files) + response = request_seafile('POST', upload_url, files=files) return response def get_dtable_transfer_asset_files(username, repo_id, dtable_uuid, files, task_id, files_map, parent_dir, relative_path, replace, repo_api_token, seafile_server_url): diff --git a/dtable_events/utils/seafile.py b/dtable_events/utils/seafile.py new file mode 100644 index 00000000..c465492f --- /dev/null +++ b/dtable_events/utils/seafile.py @@ -0,0 +1,94 @@ +import ipaddress +import os +import socket +from urllib.parse import unquote, urlsplit + +import requests +from requests.adapters import HTTPAdapter +from urllib3.connectionpool import HTTPConnectionPool, HTTPSConnectionPool +from urllib3.exceptions import ConnectTimeoutError, ReadTimeoutError + + +def check_seafile_url(url, base=True): + """Validate a Seafile URL and all resolved IPs, returning socket addresses. + + Base URLs cannot contain queries; full request/upload URLs use base=False. + Raise ValueError for invalid or disallowed destinations. Private networks + remain allowed for internal Seafile installations. + """ + if not isinstance(url, str) or not url or '\\' in url: + raise ValueError('Invalid Seafile URL') + if any(ord(char) <= 32 or ord(char) == 127 for char in url): + raise ValueError('Invalid Seafile URL') + parsed = urlsplit(url) + if (parsed.scheme not in ('http', 'https') or not parsed.hostname + or parsed.username is not None or parsed.password is not None + or '%' in parsed.hostname or parsed.netloc.endswith(':') + or '#' in url or '..' in unquote(parsed.path).split('/')): + raise ValueError('Invalid Seafile URL') + if base and '?' in url: + raise ValueError('Seafile base URL must not contain a query') + port = parsed.port + if port is None: + port = 443 if parsed.scheme == 'https' else 80 + if not 1 <= port <= 65535: + raise ValueError('Invalid Seafile port') + # Resolve the same normalized hostname Requests will use, including IDNA. + host = urlsplit(requests.Request('GET', url).prepare().url).hostname + try: + addresses = socket.getaddrinfo(host, port, type=socket.SOCK_STREAM) + except (OSError, UnicodeError) as error: + raise ValueError('Seafile destination did not resolve') from error + if not addresses: + raise ValueError('Seafile destination did not resolve') + for family, _, _, _, sockaddr in addresses: + if family not in (socket.AF_INET, socket.AF_INET6): + raise ValueError('Invalid Seafile address family') + address = ipaddress.ip_address(sockaddr[0].split('%')[0]) + if isinstance(address, ipaddress.IPv6Address): + address = address.ipv4_mapped or address + # Preserve support for private-network Seafile installations. + if (address.is_loopback or address.is_link_local or address.is_unspecified + or address.is_multicast or address.is_reserved): + raise ValueError('Seafile destination is not allowed') + return addresses + + +def request_seafile(method, url, headers=None, params=None, files=None, data=None, timeout=None): + """Send to validated IPs while preserving TLS identity and refusing redirects.""" + addresses = check_seafile_url(url, base=False) + request_headers = requests.utils.default_headers() + request_headers.update(headers or {}) + request = requests.Request(method, url, headers=request_headers, params=params, + files=files, data=data).prepare() + parsed = urlsplit(request.url) + request.headers['Host'] = parsed.netloc + + pool_class = HTTPConnectionPool + pool_options = {} + if parsed.scheme == 'https': + pool_class = HTTPSConnectionPool + ca_path = (os.environ.get('REQUESTS_CA_BUNDLE') or os.environ.get('CURL_CA_BUNDLE') + or requests.certs.where()) + pool_options = {'server_hostname': parsed.hostname, 'assert_hostname': parsed.hostname, + 'cert_reqs': 'CERT_REQUIRED'} + pool_options['ca_cert_dir' if os.path.isdir(ca_path) else 'ca_certs'] = ca_path + + for index, (_, _, _, _, sockaddr) in enumerate(addresses): + # Connect only to validated IPs, never resolving the URL hostname again. + with pool_class(sockaddr[0], sockaddr[1], **pool_options) as pool: + try: + raw = pool.urlopen(request.method, request.path_url, body=request.body, + headers=request.headers, timeout=timeout, retries=False, + redirect=False, assert_same_host=False, preload_content=False) + except ConnectTimeoutError: + if index == len(addresses) - 1: + raise + continue + except ReadTimeoutError as error: + raise requests.exceptions.ReadTimeout(error) from error + response = HTTPAdapter().build_response(request, raw) + _ = response.content + if 300 <= response.status_code < 400: + raise requests.exceptions.HTTPError('Seafile redirects are not allowed', response=response) + return response