11from __future__ import annotations
22
33import json
4- from typing import TYPE_CHECKING , Any
4+ from typing import TYPE_CHECKING , Any , cast
55
66import urllib3
7- from urllib3 .connection import HTTPConnection
7+ from urllib3 .poolmanager import pool_classes_by_scheme
88
99from aws_lambda_powertools .utilities .auth_alpha ._internal .deadline import Deadline , RequestError
10+ from aws_lambda_powertools .utilities .auth_alpha ._internal .transport import (
11+ DeadlineHTTPSConnectionPool ,
12+ response_deadline ,
13+ )
1014
1115if TYPE_CHECKING :
1216 from collections .abc import Mapping
1317
18+ from urllib3 .connectionpool import HTTPConnectionPool
19+
1420_MAX_JSON_BYTES = 1024 * 1024
1521
1622
@@ -19,6 +25,27 @@ class HTTPClient:
1925
2026 def __init__ (self ) -> None :
2127 self .pool = urllib3 .PoolManager (cert_reqs = "CERT_REQUIRED" )
28+ self .pool .pool_classes_by_scheme = pool_classes_by_scheme .copy ()
29+ pool_classes = cast ("dict[str, type[HTTPConnectionPool]]" , self .pool .pool_classes_by_scheme )
30+ pool_classes ["https" ] = DeadlineHTTPSConnectionPool
31+
32+ def _open_response (
33+ self ,
34+ method : str ,
35+ url : str ,
36+ deadline : Deadline ,
37+ ** options : Any ,
38+ ) -> urllib3 .response .BaseHTTPResponse :
39+ with response_deadline (deadline ):
40+ return self .pool .request (
41+ method ,
42+ url ,
43+ timeout = urllib3 .Timeout (total = deadline .remaining ()),
44+ retries = False ,
45+ redirect = False ,
46+ preload_content = False ,
47+ ** options ,
48+ )
2249
2350 def json_request (
2451 self ,
@@ -31,15 +58,12 @@ def json_request(
3158 ) -> tuple [int , dict [str , Any ]]:
3259 response = None
3360 try :
34- response = self .pool . request (
61+ response = self ._open_response (
3562 method ,
3663 url ,
64+ deadline ,
3765 body = body ,
3866 headers = headers ,
39- timeout = urllib3 .Timeout (total = deadline .remaining ()),
40- retries = False ,
41- redirect = False ,
42- preload_content = False ,
4367 )
4468 if response .status != 200 :
4569 deadline .remaining ()
@@ -55,23 +79,67 @@ def json_request(
5579
5680 @staticmethod
5781 def _read_json (response : urllib3 .response .BaseHTTPResponse , deadline : Deadline ) -> dict [str , Any ]:
82+ content = HTTPClient ._read_body (response , deadline , limit = _MAX_JSON_BYTES , decode_content = False )
83+ try :
84+ data = json .loads (content )
85+ except (ValueError , UnicodeError , RecursionError ):
86+ raise RequestError () from None
87+ if not isinstance (data , dict ):
88+ raise RequestError ()
89+ return data
90+
91+ def request (
92+ self ,
93+ method : str ,
94+ url : str ,
95+ deadline : Deadline ,
96+ * ,
97+ headers : Mapping [str , str ],
98+ ** options : Any ,
99+ ) -> urllib3 .response .HTTPResponse :
100+ """Buffer an authenticated response within one network time budget."""
101+ response = None
102+ try :
103+ response = self ._open_response (
104+ method ,
105+ url ,
106+ deadline ,
107+ headers = headers ,
108+ ** options ,
109+ )
110+ content = self ._read_body (response , deadline )
111+ return urllib3 .HTTPResponse (
112+ body = content ,
113+ status = response .status ,
114+ headers = response .headers ,
115+ reason = response .reason ,
116+ version = response .version ,
117+ request_method = method ,
118+ request_url = url ,
119+ decode_content = False ,
120+ )
121+ finally :
122+ if response is not None :
123+ response .close ()
124+ response .release_conn ()
125+
126+ @staticmethod
127+ def _read_body (
128+ response : urllib3 .response .BaseHTTPResponse ,
129+ deadline : Deadline ,
130+ * ,
131+ limit : int | None = None ,
132+ decode_content : bool = True ,
133+ ) -> bytes :
58134 chunks = bytearray ()
59135 while True :
60- remaining = deadline .remaining ()
61- connection = response .connection
62- if isinstance (connection , HTTPConnection ) and connection .sock is not None :
63- connection .sock .settimeout (remaining )
64- chunk = response .read1 (min (65536 , _MAX_JSON_BYTES + 1 - len (chunks )), decode_content = False )
136+ deadline .remaining ()
137+ size = 65536 if limit is None else min (65536 , limit + 1 - len (chunks ))
138+ chunk = response .read1 (size , decode_content = decode_content )
65139 deadline .remaining ()
66140 if not chunk :
67141 break
68142 chunks .extend (chunk )
69- if len (chunks ) > _MAX_JSON_BYTES :
143+ if limit is not None and len (chunks ) > limit :
70144 raise RequestError ()
71- try :
72- data = json .loads (chunks )
73- except (ValueError , UnicodeError , RecursionError ):
74- raise RequestError () from None
75- if not isinstance (data , dict ):
76- raise RequestError ()
77- return data
145+ return bytes (chunks )
0 commit comments