@@ -2,7 +2,6 @@ package httpsig
22
33import (
44 "bufio"
5- "context"
65 "net/http"
76 "net/http/httptest"
87 "strings"
@@ -24,7 +23,12 @@ func TestContentDigesterVerify(t *testing.T) {
2423 {
2524 uc : "malformed content-digest header" ,
2625 msg : func () * Message {
27- req := httptest .NewRequest (http .MethodGet , "http://example.com/foo" , strings .NewReader (`{"hello": "world"}` ))
26+ req := httptest .NewRequestWithContext (
27+ t .Context (),
28+ http .MethodGet ,
29+ "http://example.com/foo" ,
30+ strings .NewReader (`{"hello": "world"}` ),
31+ )
2832 req .Header .Set ("content-digest" , "," )
2933
3034 return MessageFromRequest (req )
@@ -40,7 +44,12 @@ func TestContentDigesterVerify(t *testing.T) {
4044 {
4145 uc : "invalid digest value format" ,
4246 msg : func () * Message {
43- req := httptest .NewRequest (http .MethodGet , "http://example.com/foo" , strings .NewReader (`{"hello": "world"}` ))
47+ req := httptest .NewRequestWithContext (
48+ t .Context (),
49+ http .MethodGet ,
50+ "http://example.com/foo" ,
51+ strings .NewReader (`{"hello": "world"}` ),
52+ )
4453 req .Header .Set ("content-digest" , "sha-256" )
4554
4655 return MessageFromRequest (req )
@@ -56,7 +65,12 @@ func TestContentDigesterVerify(t *testing.T) {
5665 {
5766 uc : "unknown algorithm" ,
5867 msg : func () * Message {
59- req := httptest .NewRequest (http .MethodGet , "http://example.com/foo" , strings .NewReader (`{"hello": "world"}` ))
68+ req := httptest .NewRequestWithContext (
69+ t .Context (),
70+ http .MethodGet ,
71+ "http://example.com/foo" ,
72+ strings .NewReader (`{"hello": "world"}` ),
73+ )
6074 req .Header .Set ("content-digest" , "md5=:eyJoZWxsbyI6ICJ3b3JsZCJ9:" )
6175
6276 return MessageFromRequest (req )
@@ -71,7 +85,12 @@ func TestContentDigesterVerify(t *testing.T) {
7185 {
7286 uc : "digest mismatch" ,
7387 msg : func () * Message {
74- req := httptest .NewRequest (http .MethodGet , "http://example.com/foo" , strings .NewReader (`{"hello": "world"}` ))
88+ req := httptest .NewRequestWithContext (
89+ t .Context (),
90+ http .MethodGet ,
91+ "http://example.com/foo" ,
92+ strings .NewReader (`{"hello": "world"}` ),
93+ )
7594 req .Header .Set ("content-digest" , "sha-256=:eyJoZWxsbyI6ICJ3b3JsZCJ9:" )
7695
7796 return MessageFromRequest (req )
@@ -86,7 +105,12 @@ func TestContentDigesterVerify(t *testing.T) {
86105 {
87106 uc : "successful request digest verification" ,
88107 msg : func () * Message {
89- req := httptest .NewRequest (http .MethodGet , "http://example.com/foo" , strings .NewReader (`{"hello": "world"}` ))
108+ req := httptest .NewRequestWithContext (
109+ t .Context (),
110+ http .MethodGet ,
111+ "http://example.com/foo" ,
112+ strings .NewReader (`{"hello": "world"}` ),
113+ )
90114 req .Header .Set ("content-digest" , "sha-256=:X48E9qOokqqrvdts8nOJRJN3OWDUoyWxBf7kbu9DBPE=:" )
91115
92116 return MessageFromRequest (req )
@@ -108,8 +132,12 @@ Content-Length: 23
108132
109133{"message": "good dog"}
110134`
111- req , err := http .NewRequestWithContext (context .TODO (), http .MethodGet , "http://example.com/foo" ,
112- strings .NewReader (`{"hello": "world"}` ))
135+ req , err := http .NewRequestWithContext (
136+ t .Context (),
137+ http .MethodGet ,
138+ "http://example.com/foo" ,
139+ strings .NewReader (`{"hello": "world"}` ),
140+ )
113141 require .NoError (t , err )
114142
115143 resp , err := http .ReadResponse (bufio .NewReader (strings .NewReader (responseWithBody )), req ) //nolint:bodyclose
@@ -134,8 +162,12 @@ Content-Length: 23
134162
135163{"message": "good dog"}
136164`
137- req , err := http .NewRequestWithContext (context .TODO (), http .MethodGet , "http://example.com/foo" ,
138- strings .NewReader (`{"hello": "world"}` ))
165+ req , err := http .NewRequestWithContext (
166+ t .Context (),
167+ http .MethodGet ,
168+ "http://example.com/foo" ,
169+ strings .NewReader (`{"hello": "world"}` ),
170+ )
139171 require .NoError (t , err )
140172 req .Header .Set ("content-digest" , "sha-256=:X48E9qOokqqrvdts8nOJRJN3OWDUoyWxBf7kbu9DBPE=:" )
141173
@@ -175,7 +207,7 @@ func TestContentDigesterUpdate(t *testing.T) {
175207 alg : Sha256 ,
176208 msg : func () * Message {
177209 req , err := http .NewRequestWithContext (
178- context . TODO (),
210+ t . Context (),
179211 http .MethodGet ,
180212 "http://example.com/foo" ,
181213 strings .NewReader (`{"hello": "world"}` ),
@@ -197,7 +229,7 @@ func TestContentDigesterUpdate(t *testing.T) {
197229 uc : "digest for client-side request without specified algorithm" ,
198230 msg : func () * Message {
199231 req , err := http .NewRequestWithContext (
200- context . TODO (),
232+ t . Context (),
201233 http .MethodGet ,
202234 "http://example.com/foo" ,
203235 strings .NewReader (`{"hello": "world"}` ),
@@ -222,8 +254,12 @@ func TestContentDigesterUpdate(t *testing.T) {
222254 uc : "digest for server-side response with specifying algorithm" ,
223255 alg : Sha512 ,
224256 msg : func () * Message {
225- req , err := http .NewRequestWithContext (context .TODO (), http .MethodGet , "http://example.com/foo" ,
226- strings .NewReader (`{"hello": "world"}` ))
257+ req , err := http .NewRequestWithContext (
258+ t .Context (),
259+ http .MethodGet ,
260+ "http://example.com/foo" ,
261+ strings .NewReader (`{"hello": "world"}` ),
262+ )
227263 require .NoError (t , err )
228264
229265 return MessageForResponse (req , make (http.Header ), []byte (`{"message": "good dog"}` ), http .StatusOK )
@@ -240,8 +276,12 @@ func TestContentDigesterUpdate(t *testing.T) {
240276 {
241277 uc : "digest for server-side response without specifying algorithm" ,
242278 msg : func () * Message {
243- req , err := http .NewRequestWithContext (context .TODO (), http .MethodGet , "http://example.com/foo" ,
244- strings .NewReader (`{"hello": "world"}` ))
279+ req , err := http .NewRequestWithContext (
280+ t .Context (),
281+ http .MethodGet ,
282+ "http://example.com/foo" ,
283+ strings .NewReader (`{"hello": "world"}` ),
284+ )
245285 require .NoError (t , err )
246286
247287 return MessageForResponse (req , make (http.Header ), []byte (`{"message": "good dog"}` ), http .StatusOK )
@@ -263,7 +303,7 @@ func TestContentDigesterUpdate(t *testing.T) {
263303 alg : Sha256 ,
264304 msg : func () * Message {
265305 req , err := http .NewRequestWithContext (
266- context . TODO (),
306+ t . Context (),
267307 http .MethodPost ,
268308 "http://example.com/foo" ,
269309 strings .NewReader (`{"hello": "world"}` ),
@@ -289,7 +329,7 @@ func TestContentDigesterUpdate(t *testing.T) {
289329 uc : "replaces existing content-digest values without specified algorithm" ,
290330 msg : func () * Message {
291331 req , err := http .NewRequestWithContext (
292- context . TODO (),
332+ t . Context (),
293333 http .MethodPost ,
294334 "http://example.com/foo" ,
295335 strings .NewReader (`{"hello": "world"}` ),
0 commit comments