diff --git a/CHANGES/5686.bugfix b/CHANGES/5686.bugfix new file mode 100644 index 0000000000..5fa34c4310 --- /dev/null +++ b/CHANGES/5686.bugfix @@ -0,0 +1 @@ +Implemented a more robust URL encoding mechanism that only encodes the path portion of the URL, ensuring that special characters are processed correctly without double encoding. diff --git a/pulpcore/download/http.py b/pulpcore/download/http.py index 1c5c5dfa46..4cae3ed581 100644 --- a/pulpcore/download/http.py +++ b/pulpcore/download/http.py @@ -3,6 +3,7 @@ import aiohttp import asyncio import backoff +import urllib.parse from .base import BaseDownloader, DownloadResult from pulpcore.exceptions import ( @@ -49,6 +50,14 @@ def http_giveup_handler(exc): return False +def encode_url(url): + """Helper function to encode only the path part of the URL.""" + parsed_url = urllib.parse.urlparse(url) + encoded_path = urllib.parse.quote(parsed_url.path) + encoded_url = parsed_url._replace(path=encoded_path).geturl() + return encoded_url + + class HttpDownloader(BaseDownloader): """ An HTTP/HTTPS Downloader built on `aiohttp`. @@ -284,8 +293,9 @@ async def _run(self, extra_data=None): """ if self.download_throttler: await self.download_throttler.acquire() + encoded_url = encode_url(self.url) async with self.session.get( - self.url, proxy=self.proxy, proxy_auth=self.proxy_auth, auth=self.auth + encoded_url, proxy=self.proxy, proxy_auth=self.proxy_auth, auth=self.auth ) as response: self.raise_for_status(response) to_return = await self._handle_response(response)