Skip to content

Commit e7d48f1

Browse files
thaJeztahthaJeztah
committed
signer: replace uses of deprecated io/ioutil
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
1 parent b27c723 commit e7d48f1

File tree

3 files changed

+29
-28
lines changed

3 files changed

+29
-28
lines changed

‎signer/local/local_test.go

+22-21
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ import (
1212
"encoding/hex"
1313
"encoding/pem"
1414
"errors"
15-
"io/ioutil"
1615
"math/big"
1716
"net"
1817
"net/http"
1918
"net/http/httptest"
2019
"net/url"
20+
"os"
2121
"reflect"
2222
"regexp"
2323
"sort"
@@ -31,6 +31,7 @@ import (
3131
"github.com/cloudflare/cfssl/helpers"
3232
"github.com/cloudflare/cfssl/log"
3333
"github.com/cloudflare/cfssl/signer"
34+
3435
"github.com/google/certificate-transparency-go"
3536
"github.com/zmap/zlint/v3/lint"
3637
)
@@ -215,13 +216,13 @@ func TestSign(t *testing.T) {
215216
}
216217

217218
// not a csr
218-
certPem, err := ioutil.ReadFile("../../helpers/testdata/cert.pem")
219+
certPem, err := os.ReadFile("../../helpers/testdata/cert.pem")
219220
if err != nil {
220221
t.Fatal(err)
221222
}
222223

223224
// csr with ip as hostname
224-
pem, err := ioutil.ReadFile("testdata/ip.csr")
225+
pem, err := os.ReadFile("testdata/ip.csr")
225226
if err != nil {
226227
t.Fatal(err)
227228
}
@@ -239,7 +240,7 @@ func TestSign(t *testing.T) {
239240
t.Fatal("A bad case failed to raise an error")
240241
}
241242

242-
pem, err = ioutil.ReadFile("testdata/ex.csr")
243+
pem, err = os.ReadFile("testdata/ex.csr")
243244
validReq = signer.SignRequest{
244245
Request: string(pem),
245246
Hosts: []string{"example.com"},
@@ -295,7 +296,7 @@ const (
295296
func testSignFile(t *testing.T, certFile string) ([]byte, error) {
296297
s := newTestSigner(t)
297298

298-
pem, err := ioutil.ReadFile(certFile)
299+
pem, err := os.ReadFile(certFile)
299300
if err != nil {
300301
t.Fatal(err)
301302
}
@@ -369,7 +370,7 @@ func TestSignCSRs(t *testing.T) {
369370
s := newTestSigner(t)
370371
hostname := "cloudflare.com"
371372
for _, test := range csrTests {
372-
csr, err := ioutil.ReadFile(test.file)
373+
csr, err := os.ReadFile(test.file)
373374
if err != nil {
374375
t.Fatal("CSR loading error:", err)
375376
}
@@ -397,7 +398,7 @@ func TestECDSASigner(t *testing.T) {
397398
s := newCustomSigner(t, testECDSACaFile, testECDSACaKeyFile)
398399
hostname := "cloudflare.com"
399400
for _, test := range csrTests {
400-
csr, err := ioutil.ReadFile(test.file)
401+
csr, err := os.ReadFile(test.file)
401402
if err != nil {
402403
t.Fatal("CSR loading error:", err)
403404
}
@@ -449,7 +450,7 @@ func TestCAIssuing(t *testing.T) {
449450
s := newCustomSigner(t, caFile, caKeyFile)
450451
s.policy = CAPolicy
451452
for j, csr := range interCSRs {
452-
csrBytes, _ := ioutil.ReadFile(csr)
453+
csrBytes, _ := os.ReadFile(csr)
453454
certBytes, err := s.Sign(signer.SignRequest{Hosts: signer.SplitHosts(hostname), Request: string(csrBytes)})
454455
if err != nil {
455456
t.Fatal(err)
@@ -458,7 +459,7 @@ func TestCAIssuing(t *testing.T) {
458459
if err != nil {
459460
t.Fatal(err)
460461
}
461-
keyBytes, _ := ioutil.ReadFile(interKeys[j])
462+
keyBytes, _ := os.ReadFile(interKeys[j])
462463
interKey, _ := helpers.ParsePrivateKeyPEM(keyBytes)
463464
interSigner := &Signer{
464465
ca: interCert,
@@ -467,7 +468,7 @@ func TestCAIssuing(t *testing.T) {
467468
sigAlgo: signer.DefaultSigAlgo(interKey),
468469
}
469470
for _, anotherCSR := range interCSRs {
470-
anotherCSRBytes, _ := ioutil.ReadFile(anotherCSR)
471+
anotherCSRBytes, _ := os.ReadFile(anotherCSR)
471472
bytes, err := interSigner.Sign(
472473
signer.SignRequest{
473474
Hosts: signer.SplitHosts(hostname),
@@ -564,7 +565,7 @@ func TestPopulateSubjectFromCSR(t *testing.T) {
564565

565566
}
566567
func TestOverrideSubject(t *testing.T) {
567-
csrPEM, err := ioutil.ReadFile(fullSubjectCSR)
568+
csrPEM, err := os.ReadFile(fullSubjectCSR)
568569
if err != nil {
569570
t.Fatalf("%v", err)
570571
}
@@ -624,7 +625,7 @@ func TestOverrideSubject(t *testing.T) {
624625

625626
func TestOverwriteHosts(t *testing.T) {
626627
for _, csrFile := range []string{testCSR, testSANCSR} {
627-
csrPEM, err := ioutil.ReadFile(csrFile)
628+
csrPEM, err := os.ReadFile(csrFile)
628629
if err != nil {
629630
t.Fatal(err)
630631
}
@@ -702,7 +703,7 @@ func TestOverwriteHosts(t *testing.T) {
702703
}
703704

704705
func TestOverrideValidity(t *testing.T) {
705-
csrPEM, err := ioutil.ReadFile(fullSubjectCSR)
706+
csrPEM, err := os.ReadFile(fullSubjectCSR)
706707
if err != nil {
707708
t.Fatalf("%v", err)
708709
}
@@ -904,7 +905,7 @@ func TestCASignPathlen(t *testing.T) {
904905
}
905906

906907
for _, testCase := range csrPathlenTests {
907-
csrPEM, err := ioutil.ReadFile(testCase.csrFile)
908+
csrPEM, err := os.ReadFile(testCase.csrFile)
908909
if err != nil {
909910
t.Fatalf("%v", err)
910911
}
@@ -964,7 +965,7 @@ func TestCASignPathlen(t *testing.T) {
964965
}
965966

966967
func TestNoWhitelistSign(t *testing.T) {
967-
csrPEM, err := ioutil.ReadFile(fullSubjectCSR)
968+
csrPEM, err := os.ReadFile(fullSubjectCSR)
968969
if err != nil {
969970
t.Fatalf("%v", err)
970971
}
@@ -1019,7 +1020,7 @@ func TestNoWhitelistSign(t *testing.T) {
10191020
}
10201021

10211022
func TestWhitelistSign(t *testing.T) {
1022-
csrPEM, err := ioutil.ReadFile(fullSubjectCSR)
1023+
csrPEM, err := os.ReadFile(fullSubjectCSR)
10231024
if err != nil {
10241025
t.Fatalf("%v", err)
10251026
}
@@ -1088,7 +1089,7 @@ func TestWhitelistSign(t *testing.T) {
10881089
}
10891090

10901091
func TestNameWhitelistSign(t *testing.T) {
1091-
csrPEM, err := ioutil.ReadFile(fullSubjectCSR)
1092+
csrPEM, err := os.ReadFile(fullSubjectCSR)
10921093
if err != nil {
10931094
t.Fatalf("%v", err)
10941095
}
@@ -1160,7 +1161,7 @@ func TestNameWhitelistSign(t *testing.T) {
11601161
}
11611162

11621163
func TestExtensionSign(t *testing.T) {
1163-
csrPEM, err := ioutil.ReadFile(testCSR)
1164+
csrPEM, err := os.ReadFile(testCSR)
11641165
if err != nil {
11651166
t.Fatalf("%v", err)
11661167
}
@@ -1270,7 +1271,7 @@ func TestCTFailure(t *testing.T) {
12701271
t.Fatalf("%v", err)
12711272
}
12721273
var pem []byte
1273-
pem, err = ioutil.ReadFile("testdata/ex.csr")
1274+
pem, err = os.ReadFile("testdata/ex.csr")
12741275
if err != nil {
12751276
t.Fatalf("%v", err)
12761277
}
@@ -1307,7 +1308,7 @@ func TestCTSuccess(t *testing.T) {
13071308
t.Fatalf("%v", err)
13081309
}
13091310
var pem []byte
1310-
pem, err = ioutil.ReadFile("testdata/ex.csr")
1311+
pem, err = os.ReadFile("testdata/ex.csr")
13111312
if err != nil {
13121313
t.Fatalf("%v", err)
13131314
}
@@ -1335,7 +1336,7 @@ func TestReturnPrecert(t *testing.T) {
13351336
if err != nil {
13361337
t.Fatalf("%v", err)
13371338
}
1338-
csr, err := ioutil.ReadFile("testdata/ex.csr")
1339+
csr, err := os.ReadFile("testdata/ex.csr")
13391340
if err != nil {
13401341
t.Fatalf("%v", err)
13411342
}

‎signer/remote/remote_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ import (
55
"crypto/tls"
66
"crypto/x509"
77
"fmt"
8-
"io/ioutil"
98
"math/big"
109
"net/http"
1110
"net/http/httptest"
11+
"os"
1212
"testing"
1313
"time"
1414

@@ -130,7 +130,7 @@ func verifyRemoteInfo(t *testing.T, remoteConfig *config.Config) {
130130
t.Fatal("remote info failed:", err)
131131
}
132132

133-
caBytes, err := ioutil.ReadFile(testCaFile)
133+
caBytes, err := os.ReadFile(testCaFile)
134134
caBytes = bytes.TrimSpace(caBytes)
135135
if err != nil {
136136
t.Fatal("fail to read test CA cert:", err)
@@ -187,7 +187,7 @@ func verifyRemoteSign(t *testing.T, remoteConfig *config.Config) {
187187

188188
hosts := []string{"cloudflare.com"}
189189
for _, test := range testsuite.CSRTests {
190-
csr, err := ioutil.ReadFile(test.File)
190+
csr, err := os.ReadFile(test.File)
191191
if err != nil {
192192
t.Fatal("CSR loading error:", err)
193193
}
@@ -224,7 +224,7 @@ func TestRemoteSignBadServerAndOverride(t *testing.T) {
224224
s := newRemoteSigner(t, remoteConfig.Signing)
225225

226226
hosts := []string{"cloudflare.com"}
227-
csr, err := ioutil.ReadFile("../local/testdata/rsa2048.csr")
227+
csr, err := os.ReadFile("../local/testdata/rsa2048.csr")
228228
if err != nil {
229229
t.Fatal("CSR loading error:", err)
230230
}

‎signer/universal/universal_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ package universal
22

33
import (
44
"bytes"
5-
"io/ioutil"
65
"math/big"
76
"net/http"
87
"net/http/httptest"
8+
"os"
99
"strings"
1010
"testing"
1111
"time"
@@ -300,7 +300,7 @@ func checkInfo(t *testing.T, s signer.Signer, name string, profile *config.Signi
300300
t.Fatalf("Expected usage for profile %s to be %+v, got %+v", name, profile.Usage, resp.Usage)
301301
}
302302

303-
caBytes, err := ioutil.ReadFile(testCaFile)
303+
caBytes, err := os.ReadFile(testCaFile)
304304
caBytes = bytes.TrimSpace(caBytes)
305305
if err != nil {
306306
t.Fatal("fail to read test CA cert:", err)
@@ -375,7 +375,7 @@ func TestUniversalRemoteAndLocalSign(t *testing.T) {
375375
checkSign := func(name string, profile *config.SigningProfile) {
376376
hosts := []string{"cloudflare.com"}
377377
for _, test := range testsuite.CSRTests {
378-
csr, err := ioutil.ReadFile(test.File)
378+
csr, err := os.ReadFile(test.File)
379379
if err != nil {
380380
t.Fatalf("CSR loading error (%s): %v", name, err)
381381
}

0 commit comments

Comments
 (0)