Skip to content

Commit

Permalink
helpers: replace uses of deprecated io/ioutil
Browse files Browse the repository at this point in the history 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
  • Loading branch information
@thaJeztah
thaJeztah committed Nov 20, 2022
1 parent fc8619e commit b27c723
Show file tree
Hide file tree
Showing 4 changed files with 37 additions and 42 deletions.
18 changes: 8 additions & 10 deletions helpers/helpers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,19 @@ import (
"encoding/pem"
"errors"
"fmt"
"io/ioutil"
"os"

ct "github.com/google/certificate-transparency-go"
cttls "github.com/google/certificate-transparency-go/tls"
ctx509 "github.com/google/certificate-transparency-go/x509"
"golang.org/x/crypto/ocsp"

"strings"
"time"

"github.com/cloudflare/cfssl/crypto/pkcs7"
cferr "github.com/cloudflare/cfssl/errors"
"github.com/cloudflare/cfssl/helpers/derhelpers"
"github.com/cloudflare/cfssl/log"

ct "github.com/google/certificate-transparency-go"
cttls "github.com/google/certificate-transparency-go/tls"
ctx509 "github.com/google/certificate-transparency-go/x509"
"golang.org/x/crypto/ocsp"
"golang.org/x/crypto/pkcs12"
)

Expand Down Expand Up @@ -345,7 +343,7 @@ func LoadPEMCertPool(certsFile string) (*x509.CertPool, error) {
if certsFile == "" {
return nil, nil
}
pemCerts, err := ioutil.ReadFile(certsFile)
pemCerts, err := os.ReadFile(certsFile)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -591,13 +589,13 @@ func SCTListFromOCSPResponse(response *ocsp.Response) ([]ct.SignedCertificateTim
func ReadBytes(valFile string) ([]byte, error) {
switch splitVal := strings.SplitN(valFile, ":", 2); len(splitVal) {
case 1:
return ioutil.ReadFile(valFile)
return os.ReadFile(valFile)
case 2:
switch splitVal[0] {
case "env":
return []byte(os.Getenv(splitVal[1])), nil
case "file":
return ioutil.ReadFile(splitVal[1])
return os.ReadFile(splitVal[1])
default:
return nil, fmt.Errorf("unknown prefix: %s", splitVal[0])
}
Expand Down
53 changes: 26 additions & 27 deletions helpers/helpers_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,13 @@ import (
"crypto/x509/pkix"
"encoding/asn1"
"encoding/pem"
"io/ioutil"
"math"
"os"
"testing"
"time"

"golang.org/x/crypto/ocsp"

"github.com/google/certificate-transparency-go"
"golang.org/x/crypto/ocsp"
)

const (
Expand Down Expand Up @@ -52,7 +51,7 @@ const (
func TestParseCertificatesDER(t *testing.T) {
var password = []string{"password", "", ""}
for i, testFile := range []string{testPKCS12Passwordispassword, testPKCS12EmptyPswd, testCertDERFile} {
testDER, err := ioutil.ReadFile(testFile)
testDER, err := os.ReadFile(testFile)
if err != nil {
t.Fatal(err)
}
Expand All @@ -65,7 +64,7 @@ func TestParseCertificatesDER(t *testing.T) {
}
}

testDER, err := ioutil.ReadFile(testEmptyPKCS7DER)
testDER, err := os.ReadFile(testEmptyPKCS7DER)
if err != nil {
t.Fatal(err)
}
Expand All @@ -89,7 +88,7 @@ func TestKeyLength(t *testing.T) {
t.Fatal("KeyLength malfunctioning on nonsense input")
}

//test the ecdsa branch
// test the ecdsa branch
ecdsaPriv, _ := ecdsa.GenerateKey(elliptic.P224(), rand.Reader)
ecdsaIn, _ := ecdsaPriv.Public().(*ecdsa.PublicKey)
expEcdsa := ecdsaIn.Curve.Params().BitSize
Expand All @@ -98,7 +97,7 @@ func TestKeyLength(t *testing.T) {
t.Fatal("KeyLength malfunctioning on ecdsa input")
}

//test the rsa branch
// test the rsa branch
rsaPriv, _ := rsa.GenerateKey(rand.Reader, 256)
rsaIn, _ := rsaPriv.Public().(*rsa.PublicKey)
expRsa := rsaIn.N.BitLen()
Expand All @@ -118,8 +117,8 @@ func TestExpiryTime(t *testing.T) {
t.Fatal("Expiry time is malfunctioning on empty input")
}

//read a pem file and use that expiry date
bytes, _ := ioutil.ReadFile(testBundleFile)
// read a pem file and use that expiry date
bytes, _ := os.ReadFile(testBundleFile)
certs, err := ParseCertificatesPEM(bytes)
if err != nil {
t.Fatalf("%v", err)
Expand Down Expand Up @@ -269,7 +268,7 @@ func TestSignatureString(t *testing.T) {

func TestParseCertificatePEM(t *testing.T) {
for _, testFile := range []string{testCertFile, testExtraWSCertFile, testSinglePKCS7} {
certPEM, err := ioutil.ReadFile(testFile)
certPEM, err := os.ReadFile(testFile)
if err != nil {
t.Fatal(err)
}
Expand All @@ -280,7 +279,7 @@ func TestParseCertificatePEM(t *testing.T) {
}
}
for _, testFile := range []string{testBundleFile, testMessedUpCertFile, testEmptyPKCS7PEM, testEmptyCertFile, testMultiplePKCS7} {
certPEM, err := ioutil.ReadFile(testFile)
certPEM, err := os.ReadFile(testFile)
if err != nil {
t.Fatal(err)
}
Expand All @@ -294,7 +293,7 @@ func TestParseCertificatePEM(t *testing.T) {
func TestParseCertificatesPEM(t *testing.T) {
// expected cases
for _, testFile := range []string{testBundleFile, testExtraWSBundleFile, testSinglePKCS7, testMultiplePKCS7} {
bundlePEM, err := ioutil.ReadFile(testFile)
bundlePEM, err := os.ReadFile(testFile)
if err != nil {
t.Fatal(err)
}
Expand All @@ -308,7 +307,7 @@ func TestParseCertificatesPEM(t *testing.T) {
// test failure cases
// few lines deleted, then headers removed
for _, testFile := range []string{testMessedUpBundleFile, testEmptyPKCS7PEM, testNoHeaderCert} {
bundlePEM, err := ioutil.ReadFile(testFile)
bundlePEM, err := os.ReadFile(testFile)
if err != nil {
t.Fatal(err)
}
Expand All @@ -320,7 +319,7 @@ func TestParseCertificatesPEM(t *testing.T) {
}

func TestSelfSignedCertificatePEM(t *testing.T) {
testPEM, err := ioutil.ReadFile(testCertFile)
testPEM, err := os.ReadFile(testCertFile)
if err != nil {
t.Fatal(err)
}
Expand All @@ -330,7 +329,7 @@ func TestSelfSignedCertificatePEM(t *testing.T) {
}

// a few lines deleted from the pem file
wrongPEM, err := ioutil.ReadFile(testMessedUpCertFile)
wrongPEM, err := os.ReadFile(testMessedUpCertFile)
if err != nil {
t.Fatal(err)
}
Expand All @@ -353,7 +352,7 @@ func TestSelfSignedCertificatePEM(t *testing.T) {
func TestParsePrivateKeyPEM(t *testing.T) {

// expected cases
testRSAPEM, err := ioutil.ReadFile(testPrivateRSAKey)
testRSAPEM, err := os.ReadFile(testPrivateRSAKey)
if err != nil {
t.Fatal(err)
}
Expand All @@ -362,7 +361,7 @@ func TestParsePrivateKeyPEM(t *testing.T) {
t.Fatal(err)
}

testECDSAPEM, err := ioutil.ReadFile(testPrivateECDSAKey)
testECDSAPEM, err := os.ReadFile(testPrivateECDSAKey)
if err != nil {
t.Fatal(err)
}
Expand All @@ -371,7 +370,7 @@ func TestParsePrivateKeyPEM(t *testing.T) {
t.Fatal(err)
}

testEd25519PEM, err := ioutil.ReadFile(testPrivateEd25519Key)
testEd25519PEM, err := os.ReadFile(testPrivateEd25519Key)
if err != nil {
t.Fatal(err)
}
Expand All @@ -381,7 +380,7 @@ func TestParsePrivateKeyPEM(t *testing.T) {
t.Fatal(err)
}

testOpenSSLECKey, err := ioutil.ReadFile(testPrivateOpenSSLECKey)
testOpenSSLECKey, err := os.ReadFile(testPrivateOpenSSLECKey)
if err != nil {
t.Fatal(err)
}
Expand All @@ -400,7 +399,7 @@ func TestParsePrivateKeyPEM(t *testing.T) {
}

for _, fname := range errCases {
testPEM, _ := ioutil.ReadFile(fname)
testPEM, _ := os.ReadFile(fname)
_, err = ParsePrivateKeyPEM(testPEM)
if err == nil {
t.Fatal("Incorrect private key failed to produce an error")
Expand All @@ -413,7 +412,7 @@ func TestParsePrivateKeyPEM(t *testing.T) {
const ecdsaTestCSR = "testdata/ecdsa256.csr"

func TestParseCSRPEM(t *testing.T) {
in, err := ioutil.ReadFile(ecdsaTestCSR)
in, err := os.ReadFile(ecdsaTestCSR)
if err != nil {
t.Fatalf("%v", err)
}
Expand All @@ -432,7 +431,7 @@ func TestParseCSRPEM(t *testing.T) {
}

func TestParseCSRPEMMore(t *testing.T) {
csrPEM, err := ioutil.ReadFile(testCSRPEM)
csrPEM, err := os.ReadFile(testCSRPEM)
if err != nil {
t.Fatal(err)
}
Expand All @@ -441,7 +440,7 @@ func TestParseCSRPEMMore(t *testing.T) {
t.Fatal(err)
}

csrPEM, err = ioutil.ReadFile(testCSRPEMBad)
csrPEM, err = os.ReadFile(testCSRPEMBad)
if err != nil {
t.Fatal(err)
}
Expand All @@ -459,7 +458,7 @@ func TestParseCSRPEMMore(t *testing.T) {
const rsaOldTestCSR = "testdata/rsa-old.csr"

func TestParseOldCSR(t *testing.T) {
in, err := ioutil.ReadFile(rsaOldTestCSR)
in, err := os.ReadFile(rsaOldTestCSR)
if err != nil {
t.Fatalf("%v", err)
}
Expand Down Expand Up @@ -508,7 +507,7 @@ func TestLoadPEMCertPool(t *testing.T) {
t.Fatal("Empty file name should not generate error or a cert pool")
}

in, err := ioutil.ReadFile(testEmptyPem)
in, err := os.ReadFile(testEmptyPem)
if err != nil {
t.Fatalf("%v", err)
}
Expand All @@ -519,7 +518,7 @@ func TestLoadPEMCertPool(t *testing.T) {
t.Fatal("Expected error for empty file")
}

in, err = ioutil.ReadFile(testEmptyCertFile)
in, err = os.ReadFile(testEmptyCertFile)
if err != nil {
t.Fatalf("%v", err)
}
Expand All @@ -530,7 +529,7 @@ func TestLoadPEMCertPool(t *testing.T) {
t.Fatal("Expected error for empty cert")
}

in, err = ioutil.ReadFile(clientCertFile)
in, err = os.ReadFile(clientCertFile)
if err != nil {
t.Fatalf("%v", err)
}
Expand Down
3 changes: 1 addition & 2 deletions helpers/testsuite/testing_helpers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import (
"encoding/json"
"errors"
"fmt"
"io/ioutil"
"os"
"os/exec"
"strconv"
Expand Down Expand Up @@ -324,7 +323,7 @@ func createTempFile(data []byte) (fileName string, err error) {
}

readWritePermissions := os.FileMode(0664)
err = ioutil.WriteFile(tempFileName, data, readWritePermissions)
err = os.WriteFile(tempFileName, data, readWritePermissions)
if err != nil {
return "", err
}
Expand Down
5 changes: 2 additions & 3 deletions helpers/testsuite/testing_helpers_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package testsuite
import (
"crypto/x509"
"encoding/json"
"io/ioutil"
"math"
"math/rand"
"os"
Expand Down Expand Up @@ -154,7 +153,7 @@ func TestCreateCertificateChain(t *testing.T) {
// the same request data.

CLIOutputFile := preMadeOutput
CLIOutput, err := ioutil.ReadFile(CLIOutputFile)
CLIOutput, err := os.ReadFile(CLIOutputFile)
if err != nil {
t.Fatal(err.Error())
}
Expand Down Expand Up @@ -291,7 +290,7 @@ func TestCreateSelfSignedCert(t *testing.T) {
// and is called ca_csr.json.

CLIOutputFile := preMadeOutput
CLIOutput, err := ioutil.ReadFile(CLIOutputFile)
CLIOutput, err := os.ReadFile(CLIOutputFile)
if err != nil {
t.Fatal(err.Error())
}
Expand Down

0 comments on commit b27c723

Please sign in to comment.