Proxy authentication exception catch reworked

Author: aKlimau

pulpcore/download/http.py

@@ -3,6 +3,7 @@
 import aiohttp
 import asyncio
 import backoff
+import socket
 
 from .base import BaseDownloader, DownloadResult
 from pulpcore.exceptions import (
@@ -272,7 +273,7 @@ async def download_wrapper():
                             e.message,
                         )
                     )
-                    raise e
+                    raise ProxyAuthenticationRequiredError(self.proxy)
 
             return await download_wrapper()
 
@@ -299,10 +300,11 @@ async def _run(self, extra_data=None):
                 self.raise_for_status(response)
                 to_return = await self._handle_response(response)
                 await response.release()
-        except aiohttp.ClientConnectorDNSError:
-            raise DnsDomainNameException(self.url)
-        except aiohttp.ClientHttpProxyError:
-            raise ProxyAuthenticationRequiredError(self.proxy)
+        except aiohttp.ClientConnectorError as e:
+            # Check if this is a DNS error
+            if isinstance(e.os_error, socket.gaierror):
+                raise DnsDomainNameException(self.url)
+            raise
         if self._close_session_on_finalize:
             await self.session.close()
         return to_return

pulpcore/tasking/tasks.py

@@ -82,8 +82,10 @@ def _execute_task(task):
         except Exception:
             exc_type, exc, tb = sys.exc_info()
             log_task_failed(task, exc_type, exc, tb, domain)
-            # Generic exception for user
-            safe_exc = Exception("An internal error occured.")
+            # Generic exception for user (temporarily including debug info)
+            safe_exc = Exception(
+                f"An internal error occured. " f"[DEBUG: {exc_type.__name__}: {str(exc)}]"
+            )
             task.set_failed(safe_exc)
             send_task_notification(task)
         else:
@@ -114,8 +116,10 @@ async def _aexecute_task(task):
         except Exception:
             exc_type, exc, tb = sys.exc_info()
             log_task_failed(task, exc_type, exc, tb, domain)
-            # Generic exception for user
-            safe_exc = Exception("An internal error occured.")
+            # Generic exception for user (temporarily including debug info)
+            safe_exc = Exception(
+                f"An internal error occured. " f"[DEBUG: {exc_type.__name__}: {str(exc)}]"
+            )
             await sync_to_async(task.set_failed)(safe_exc)
             send_task_notification(task)
         else: