Skip to content

Commit 789913f

Browse files
committed
more linting
1 parent 7d8ef21 commit 789913f

File tree

4 files changed

+20
-9
lines changed

4 files changed

+20
-9
lines changed

example_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,16 @@ const secret = "support-your-local-cat-bonnet-store"
1414
func Example_round_trip() {
1515
h := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
1616
w.Header().Set("Content-Type", "text/plain")
17-
io.WriteString(w, "Your request has a valid signature!")
17+
_, _ = io.WriteString(w, "Your request has a valid signature!")
1818
})
19-
19+
2020
middleware := httpsig.NewVerifyMiddleware(httpsig.WithHmacSha256("key1", []byte(secret)))
2121
http.Handle("/", middleware(h))
22-
go func() { http.ListenAndServe("127.0.0.1:1234", http.DefaultServeMux) }()
22+
go func() { _ = http.ListenAndServe("127.0.0.1:1234", http.DefaultServeMux) }()
2323

2424
// Give the server time to sleep. Terrible, I know.
2525
time.Sleep(100 * time.Millisecond)
26-
26+
2727
client := http.Client{
2828
// Wrap the transport:
2929
Transport: httpsig.NewSignTransport(http.DefaultTransport,

httpsig.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ func NewVerifyMiddleware(opts ...verifyOption) func(http.Handler) http.Handler {
122122
rw.Header().Set("Content-Type", "text/plain")
123123
rw.WriteHeader(http.StatusBadRequest)
124124

125-
rw.Write([]byte("invalid required signature"))
125+
_, _ = rw.Write([]byte("invalid required signature"))
126126
}
127127

128128
return func(h http.Handler) http.Handler {

sign.go

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,14 @@ func (s *signer) Sign(msg *message) (http.Header, error) {
8484
sps[fmt.Sprintf("sig%d", i)] = sp.canonicalize()
8585

8686
signer := si.signer()
87-
signer.w.Write(b.Bytes())
88-
canonicalizeSignatureParams(signer.w, sp)
87+
if _, err := signer.w.Write(b.Bytes()); err != nil {
88+
return nil, err
89+
}
90+
91+
if err := canonicalizeSignatureParams(signer.w, sp); err != nil {
92+
return nil, err
93+
}
94+
8995
sigs[fmt.Sprintf("sig%d", i)] = base64.StdEncoding.EncodeToString(signer.sign())
9096

9197
i++

verify.go

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,13 @@ func (v *verifier) Verify(msg *message) error {
134134
}
135135
}
136136

137-
verifier.w.Write(b.Bytes())
138-
canonicalizeSignatureParams(verifier.w, params)
137+
if _, err := verifier.w.Write(b.Bytes()); err != nil {
138+
return err
139+
}
140+
141+
if err = canonicalizeSignatureParams(verifier.w, params); err != nil {
142+
return err
143+
}
139144

140145
err = verifier.verify(sig)
141146
if err != nil {

0 commit comments

Comments
 (0)