From 5d69b5fdc5b5cca458e5ca4e657a14b2de9dfa79 Mon Sep 17 00:00:00 2001 From: Nick Touran Date: Mon, 9 Oct 2023 15:34:34 -0700 Subject: [PATCH 1/3] Apply tls_verify and tls_cacerts config to ImageDownloader (#11715) --- sphinx/transforms/post_transforms/images.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sphinx/transforms/post_transforms/images.py b/sphinx/transforms/post_transforms/images.py index e220df0a891..cbcb8dc8fdf 100644 --- a/sphinx/transforms/post_transforms/images.py +++ b/sphinx/transforms/post_transforms/images.py @@ -75,7 +75,10 @@ def handle(self, node: nodes.image) -> None: timestamp: float = ceil(os.stat(path).st_mtime) headers['If-Modified-Since'] = epoch_to_rfc1123(timestamp) - r = requests.get(node['uri'], headers=headers) + r = requests.get( + node['uri'], headers=headers, + _user_agent=self.app.config.user_agent, + _tls_info=(self.app.config.tls_verify, self.app.config.tls_cacerts)) if r.status_code >= 400: logger.warning(__('Could not fetch remote image: %s [%d]') % (node['uri'], r.status_code)) From 0c7293422467c2ee80eee6fafca58fbf0adbcbfb Mon Sep 17 00:00:00 2001 From: Nick Touran Date: Wed, 11 Oct 2023 18:32:55 -0700 Subject: [PATCH 2/3] Update CHANGES. --- CHANGES.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGES.rst b/CHANGES.rst index 7f80c70f20c..31c6aa5ad94 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -43,6 +43,9 @@ Bugs fixed Patch by James Addison. * #11678: Fix a possible ``ZeroDivisionError`` in ``sphinx.ext.coverage``. Patch by Stephen Finucane. +* #11715: Apply ``tls_verify`` and ``tls_cacerts`` config to + ``ImageDownloader``. + Patch by Nick Touran Testing ------- From b2214ffae98b95410aff58958b278d41da0986b1 Mon Sep 17 00:00:00 2001 From: Adam Turner <9087854+aa-turner@users.noreply.github.com> Date: Mon, 8 Jan 2024 20:05:03 +0000 Subject: [PATCH 3/3] style --- CHANGES.rst | 2 +- sphinx/transforms/post_transforms/images.py | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 012eb480831..471d99626f0 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -52,7 +52,7 @@ Bugs fixed Patch by Bénédikt Tran. * #11715: Apply ``tls_verify`` and ``tls_cacerts`` config to ``ImageDownloader``. - Patch by Nick Touran + Patch by Nick Touran. Testing ------- diff --git a/sphinx/transforms/post_transforms/images.py b/sphinx/transforms/post_transforms/images.py index 678a4c3da74..561dcfc3824 100644 --- a/sphinx/transforms/post_transforms/images.py +++ b/sphinx/transforms/post_transforms/images.py @@ -75,10 +75,12 @@ def handle(self, node: nodes.image) -> None: timestamp: float = ceil(os.stat(path).st_mtime) headers['If-Modified-Since'] = epoch_to_rfc1123(timestamp) + config = self.app.config r = requests.get( node['uri'], headers=headers, - _user_agent=self.app.config.user_agent, - _tls_info=(self.app.config.tls_verify, self.app.config.tls_cacerts)) + _user_agent=config.user_agent, + _tls_info=(config.tls_verify, config.tls_cacerts), + ) if r.status_code >= 400: logger.warning(__('Could not fetch remote image: %s [%d]') % (node['uri'], r.status_code))