From 13c8de9622664359721bb7c5f9d425e225cd2fea Mon Sep 17 00:00:00 2001
From: ZuzooVn <zuzoovn@gmail.com>
Date: Wed, 29 Jan 2025 23:23:33 +0700
Subject: [PATCH] fix: SSRF proxy file descriptor leak in concurrent requests
---
api/core/helper/ssrf_proxy.py | 15 +++++----------
1 file changed, 5 insertions(+), 10 deletions(-)
diff --git a/api/core/helper/ssrf_proxy.py b/api/core/helper/ssrf_proxy.py
index 424983a819ec28..af1e527eb55a12 100644
--- a/api/core/helper/ssrf_proxy.py
+++ b/api/core/helper/ssrf_proxy.py
@@ -11,15 +11,6 @@
SSRF_DEFAULT_MAX_RETRIES = dify_config.SSRF_DEFAULT_MAX_RETRIES
-proxy_mounts = (
- {
- "http://": httpx.HTTPTransport(proxy=dify_config.SSRF_PROXY_HTTP_URL),
- "https://": httpx.HTTPTransport(proxy=dify_config.SSRF_PROXY_HTTPS_URL),
- }
- if dify_config.SSRF_PROXY_HTTP_URL and dify_config.SSRF_PROXY_HTTPS_URL
- else None
-)
-
BACKOFF_FACTOR = 0.5
STATUS_FORCELIST = [429, 500, 502, 503, 504]
@@ -51,7 +42,11 @@ def make_request(method, url, max_retries=SSRF_DEFAULT_MAX_RETRIES, **kwargs):
if dify_config.SSRF_PROXY_ALL_URL:
with httpx.Client(proxy=dify_config.SSRF_PROXY_ALL_URL) as client:
response = client.request(method=method, url=url, **kwargs)
- elif proxy_mounts:
+ elif dify_config.SSRF_PROXY_HTTP_URL and dify_config.SSRF_PROXY_HTTPS_URL:
+ proxy_mounts = {
+ "http://": httpx.HTTPTransport(proxy=dify_config.SSRF_PROXY_HTTP_URL),
+ "https://": httpx.HTTPTransport(proxy=dify_config.SSRF_PROXY_HTTPS_URL),
+ }
with httpx.Client(mounts=proxy_mounts) as client:
response = client.request(method=method, url=url, **kwargs)
else: