Skip to content

Commit 70cecb2

Browse files
illia-villia-v
authored
Fix Scorecard issues related to vulnerable dev dependencies (#3755)
* Upgrade filelock with `uv sync --upgrade-package filelock` * Upgrade h2 with `uv sync --upgrade-package h2` * Upgrade werkzeug with `uv sync --upgrade-package werkzeug` * Add other changes uv wants to make to the lock file * Fix mypy errors after upgrading h2 * Make Scorecard ignore dev dependencies
1 parent 41f249a commit 70cecb2

4 files changed

Lines changed: 87 additions & 61 deletions

File tree

‎osv-scanner.toml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# https://google.github.io/osv-scanner/configuration/#override-packages
2+
[[PackageOverrides]]
3+
vulnerability.ignore = true
4+
reason = "Vulnerabilities in dev dependencies should not affect our OpenSSF score."

‎src/urllib3/http2/connection.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
import types
77
import typing
88

9-
import h2.config # type: ignore[import-untyped]
10-
import h2.connection # type: ignore[import-untyped]
11-
import h2.events # type: ignore[import-untyped]
9+
import h2.config
10+
import h2.connection
11+
import h2.events
1212

1313
from .._base_connection import _TYPE_BODY
1414
from .._collections import HTTPHeaderDict

‎test/test_http2_connection.py‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -121,9 +121,9 @@ def test_send_bytes(self) -> None:
121121
conn.sock = mock.MagicMock(
122122
sendall=mock.Mock(return_value=None),
123123
)
124-
conn._h2_conn._obj.data_to_send = mock.Mock(return_value=b"bar")
125-
conn._h2_conn._obj.send_data = mock.Mock(return_value=None)
126-
conn._h2_conn._obj.get_next_available_stream_id = mock.Mock(return_value=1)
124+
conn._h2_conn._obj.data_to_send = mock.Mock(return_value=b"bar") # type: ignore[method-assign]
125+
conn._h2_conn._obj.send_data = mock.Mock(return_value=None) # type: ignore[method-assign]
126+
conn._h2_conn._obj.get_next_available_stream_id = mock.Mock(return_value=1) # type: ignore[method-assign]
127127

128128
conn.putrequest("GET", "/")
129129
conn.endheaders()
@@ -138,9 +138,9 @@ def test_send_str(self) -> None:
138138
conn.sock = mock.MagicMock(
139139
sendall=mock.Mock(return_value=None),
140140
)
141-
conn._h2_conn._obj.data_to_send = mock.Mock(return_value=b"bar")
142-
conn._h2_conn._obj.send_data = mock.Mock(return_value=None)
143-
conn._h2_conn._obj.get_next_available_stream_id = mock.Mock(return_value=1)
141+
conn._h2_conn._obj.data_to_send = mock.Mock(return_value=b"bar") # type: ignore[method-assign]
142+
conn._h2_conn._obj.send_data = mock.Mock(return_value=None) # type: ignore[method-assign]
143+
conn._h2_conn._obj.get_next_available_stream_id = mock.Mock(return_value=1) # type: ignore[method-assign]
144144

145145
conn.putrequest("GET", "/")
146146
conn.endheaders(message_body=b"foo")
@@ -155,10 +155,10 @@ def test_send_iter(self) -> None:
155155
conn.sock = mock.MagicMock(
156156
sendall=mock.Mock(return_value=None),
157157
)
158-
conn._h2_conn._obj.data_to_send = mock.Mock(return_value=b"baz")
159-
conn._h2_conn._obj.send_data = mock.Mock(return_value=None)
160-
conn._h2_conn._obj.get_next_available_stream_id = mock.Mock(return_value=1)
161-
conn._h2_conn._obj.end_stream = mock.Mock(return_value=None)
158+
conn._h2_conn._obj.data_to_send = mock.Mock(return_value=b"baz") # type: ignore[method-assign]
159+
conn._h2_conn._obj.send_data = mock.Mock(return_value=None) # type: ignore[method-assign]
160+
conn._h2_conn._obj.get_next_available_stream_id = mock.Mock(return_value=1) # type: ignore[method-assign]
161+
conn._h2_conn._obj.end_stream = mock.Mock(return_value=None) # type: ignore[method-assign]
162162

163163
conn.putrequest("GET", "/")
164164
conn.endheaders(message_body=[b"foo", b"bar"])
@@ -191,10 +191,10 @@ def test_send_file_str(self) -> None:
191191
conn.sock = mock.MagicMock(
192192
sendall=mock.Mock(return_value=None),
193193
)
194-
conn._h2_conn._obj.data_to_send = mock.Mock(return_value=b"foo")
195-
conn._h2_conn._obj.send_data = mock.Mock(return_value=None)
196-
conn._h2_conn._obj.get_next_available_stream_id = mock.Mock(return_value=1)
197-
conn._h2_conn._obj.end_stream = mock.Mock(return_value=None)
194+
conn._h2_conn._obj.data_to_send = mock.Mock(return_value=b"foo") # type: ignore[method-assign]
195+
conn._h2_conn._obj.send_data = mock.Mock(return_value=None) # type: ignore[method-assign]
196+
conn._h2_conn._obj.get_next_available_stream_id = mock.Mock(return_value=1) # type: ignore[method-assign]
197+
conn._h2_conn._obj.end_stream = mock.Mock(return_value=None) # type: ignore[method-assign]
198198

199199
with open("foo") as body:
200200
conn.putrequest("GET", "/")
@@ -215,10 +215,10 @@ def test_send_file_bytes(self) -> None:
215215
conn.sock = mock.MagicMock(
216216
sendall=mock.Mock(return_value=None),
217217
)
218-
conn._h2_conn._obj.data_to_send = mock.Mock(return_value=b"foo")
219-
conn._h2_conn._obj.send_data = mock.Mock(return_value=None)
220-
conn._h2_conn._obj.get_next_available_stream_id = mock.Mock(return_value=1)
221-
conn._h2_conn._obj.end_stream = mock.Mock(return_value=None)
218+
conn._h2_conn._obj.data_to_send = mock.Mock(return_value=b"foo") # type: ignore[method-assign]
219+
conn._h2_conn._obj.send_data = mock.Mock(return_value=None) # type: ignore[method-assign]
220+
conn._h2_conn._obj.get_next_available_stream_id = mock.Mock(return_value=1) # type: ignore[method-assign]
221+
conn._h2_conn._obj.end_stream = mock.Mock(return_value=None) # type: ignore[method-assign]
222222

223223
body = open("foo", "rb")
224224
conn.putrequest("GET", "/")
@@ -244,11 +244,11 @@ def test_request_GET(self) -> None:
244244
sendall=mock.Mock(return_value=None),
245245
)
246246
sendall = conn.sock.sendall
247-
data_to_send = conn._h2_conn._obj.data_to_send = mock.Mock(return_value=b"foo")
248-
send_headers = conn._h2_conn._obj.send_headers = mock.Mock(return_value=None)
249-
conn._h2_conn._obj.send_data = mock.Mock(return_value=None)
250-
conn._h2_conn._obj.get_next_available_stream_id = mock.Mock(return_value=1)
251-
close_connection = conn._h2_conn._obj.close_connection = mock.Mock(
247+
data_to_send = conn._h2_conn._obj.data_to_send = mock.Mock(return_value=b"foo") # type: ignore[method-assign]
248+
send_headers = conn._h2_conn._obj.send_headers = mock.Mock(return_value=None) # type: ignore[method-assign]
249+
conn._h2_conn._obj.send_data = mock.Mock(return_value=None) # type: ignore[method-assign]
250+
conn._h2_conn._obj.get_next_available_stream_id = mock.Mock(return_value=1) # type: ignore[method-assign]
251+
close_connection = conn._h2_conn._obj.close_connection = mock.Mock( # type: ignore[method-assign]
252252
return_value=None
253253
)
254254

@@ -277,11 +277,11 @@ def test_request_POST(self) -> None:
277277
sendall=mock.Mock(return_value=None),
278278
)
279279
sendall = conn.sock.sendall
280-
data_to_send = conn._h2_conn._obj.data_to_send = mock.Mock(return_value=b"foo")
281-
send_headers = conn._h2_conn._obj.send_headers = mock.Mock(return_value=None)
282-
send_data = conn._h2_conn._obj.send_data = mock.Mock(return_value=None)
283-
conn._h2_conn._obj.get_next_available_stream_id = mock.Mock(return_value=1)
284-
close_connection = conn._h2_conn._obj.close_connection = mock.Mock(
280+
data_to_send = conn._h2_conn._obj.data_to_send = mock.Mock(return_value=b"foo") # type: ignore[method-assign]
281+
send_headers = conn._h2_conn._obj.send_headers = mock.Mock(return_value=None) # type: ignore[method-assign]
282+
send_data = conn._h2_conn._obj.send_data = mock.Mock(return_value=None) # type: ignore[method-assign]
283+
conn._h2_conn._obj.get_next_available_stream_id = mock.Mock(return_value=1) # type: ignore[method-assign]
284+
close_connection = conn._h2_conn._obj.close_connection = mock.Mock( # type: ignore[method-assign]
285285
return_value=None
286286
)
287287

@@ -310,8 +310,8 @@ def test_close(self) -> None:
310310
sendall=mock.Mock(side_effect=Exception("foo")),
311311
)
312312
sendall = conn.sock.sendall
313-
data_to_send = conn._h2_conn._obj.data_to_send = mock.Mock(return_value=b"foo")
314-
close_connection = conn._h2_conn._obj.close_connection = mock.Mock(
313+
data_to_send = conn._h2_conn._obj.data_to_send = mock.Mock(return_value=b"foo") # type: ignore[method-assign]
314+
close_connection = conn._h2_conn._obj.close_connection = mock.Mock( # type: ignore[method-assign]
315315
return_value=None
316316
)
317317

@@ -332,11 +332,11 @@ def test_request_ignore_chunked(self) -> None:
332332
sendall=mock.Mock(return_value=None),
333333
)
334334
sendall = conn.sock.sendall
335-
data_to_send = conn._h2_conn._obj.data_to_send = mock.Mock(return_value=b"foo")
336-
send_headers = conn._h2_conn._obj.send_headers = mock.Mock(return_value=None)
337-
conn._h2_conn._obj.send_data = mock.Mock(return_value=None)
338-
conn._h2_conn._obj.get_next_available_stream_id = mock.Mock(return_value=1)
339-
close_connection = conn._h2_conn._obj.close_connection = mock.Mock(
335+
data_to_send = conn._h2_conn._obj.data_to_send = mock.Mock(return_value=b"foo") # type: ignore[method-assign]
336+
send_headers = conn._h2_conn._obj.send_headers = mock.Mock(return_value=None) # type: ignore[method-assign]
337+
conn._h2_conn._obj.send_data = mock.Mock(return_value=None) # type: ignore[method-assign]
338+
conn._h2_conn._obj.get_next_available_stream_id = mock.Mock(return_value=1) # type: ignore[method-assign]
339+
close_connection = conn._h2_conn._obj.close_connection = mock.Mock( # type: ignore[method-assign]
340340
return_value=None
341341
)
342342

0 commit comments

Comments
 (0)