11from __future__ import annotations
22
33import json
4- from typing import TYPE_CHECKING , Any
4+ from io import BytesIO
5+ from typing import TYPE_CHECKING , Any , cast
56
67import urllib3
7- from urllib3 .connection import HTTPConnection
8+ from urllib3 .poolmanager import pool_classes_by_scheme
89
910from aws_lambda_powertools .utilities .auth_alpha ._internal .deadline import Deadline , RequestError
11+ from aws_lambda_powertools .utilities .auth_alpha ._internal .transport import (
12+ DeadlineHTTPSConnectionPool ,
13+ response_deadline ,
14+ )
1015
1116if TYPE_CHECKING :
1217 from collections .abc import Mapping
1318
19+ from urllib3 .connectionpool import HTTPConnectionPool
20+
1421_MAX_JSON_BYTES = 1024 * 1024
1522
1623
@@ -19,6 +26,27 @@ class HTTPClient:
1926
2027 def __init__ (self ) -> None :
2128 self .pool = urllib3 .PoolManager (cert_reqs = "CERT_REQUIRED" )
29+ self .pool .pool_classes_by_scheme = pool_classes_by_scheme .copy ()
30+ pool_classes = cast ("dict[str, type[HTTPConnectionPool]]" , self .pool .pool_classes_by_scheme )
31+ pool_classes ["https" ] = DeadlineHTTPSConnectionPool
32+
33+ def _open_response (
34+ self ,
35+ method : str ,
36+ url : str ,
37+ deadline : Deadline ,
38+ ** options : Any ,
39+ ) -> urllib3 .response .BaseHTTPResponse :
40+ with response_deadline (deadline ):
41+ return self .pool .request (
42+ method ,
43+ url ,
44+ timeout = urllib3 .Timeout (total = deadline .remaining ()),
45+ retries = False ,
46+ redirect = False ,
47+ preload_content = False ,
48+ ** options ,
49+ )
2250
2351 def json_request (
2452 self ,
@@ -31,15 +59,12 @@ def json_request(
3159 ) -> tuple [int , dict [str , Any ]]:
3260 response = None
3361 try :
34- response = self .pool . request (
62+ response = self ._open_response (
3563 method ,
3664 url ,
65+ deadline ,
3766 body = body ,
3867 headers = headers ,
39- timeout = urllib3 .Timeout (total = deadline .remaining ()),
40- retries = False ,
41- redirect = False ,
42- preload_content = False ,
4368 )
4469 if response .status != 200 :
4570 deadline .remaining ()
@@ -55,23 +80,67 @@ def json_request(
5580
5681 @staticmethod
5782 def _read_json (response : urllib3 .response .BaseHTTPResponse , deadline : Deadline ) -> dict [str , Any ]:
83+ content = HTTPClient ._read_body (response , deadline , limit = _MAX_JSON_BYTES , decode_content = False )
84+ try :
85+ data = json .loads (content )
86+ except (ValueError , UnicodeError , RecursionError ):
87+ raise RequestError () from None
88+ if not isinstance (data , dict ):
89+ raise RequestError ()
90+ return data
91+
92+ def request (
93+ self ,
94+ method : str ,
95+ url : str ,
96+ deadline : Deadline ,
97+ * ,
98+ headers : Mapping [str , str ],
99+ ** options : Any ,
100+ ) -> urllib3 .response .HTTPResponse :
101+ """Buffer an authenticated response within one network time budget."""
102+ response = None
103+ try :
104+ response = self ._open_response (
105+ method ,
106+ url ,
107+ deadline ,
108+ headers = headers ,
109+ ** options ,
110+ )
111+ content = self ._read_body (response , deadline )
112+ return urllib3 .HTTPResponse (
113+ body = BytesIO (content ),
114+ status = response .status ,
115+ headers = response .headers ,
116+ reason = response .reason ,
117+ version = response .version ,
118+ request_method = method ,
119+ request_url = url ,
120+ decode_content = False ,
121+ )
122+ finally :
123+ if response is not None :
124+ response .close ()
125+ response .release_conn ()
126+
127+ @staticmethod
128+ def _read_body (
129+ response : urllib3 .response .BaseHTTPResponse ,
130+ deadline : Deadline ,
131+ * ,
132+ limit : int | None = None ,
133+ decode_content : bool = True ,
134+ ) -> bytes :
58135 chunks = bytearray ()
59136 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 )
137+ deadline .remaining ()
138+ size = 65536 if limit is None else min (65536 , limit + 1 - len (chunks ))
139+ chunk = response .read1 (size , decode_content = decode_content )
65140 deadline .remaining ()
66141 if not chunk :
67142 break
68143 chunks .extend (chunk )
69- if len (chunks ) > _MAX_JSON_BYTES :
144+ if limit is not None and len (chunks ) > limit :
70145 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
146+ return bytes (chunks )
0 commit comments