re
/
jwt
forked from mirror/jwt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: replace ioutil with io and os (#198)

This commit is contained in:
Håvard Anda Estensen 2022-05-28 01:11:16 +02:00 committed by GitHub
parent 89a6400b7f
commit f6c6299f67
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/jwt/main.go
View File

@ -11,7 +11,6 @@ import (
"flag" "flag"
"fmt" "fmt"
"io" "io"
"io/ioutil"
"os" "os"
"regexp" "regexp"
"sort" "sort"
@ -91,7 +90,7 @@ func loadData(p string) ([]byte, error) {
return nil, err return nil, err
} }
} }
return ioutil.ReadAll(rdr) return io.ReadAll(rdr)
} }
// Print a json object in accordance with the prophecy (or the command line options) // Print a json object in accordance with the prophecy (or the command line options)

10
ecdsa_test.go
View File

@ -2,7 +2,7 @@ package jwt_test
import ( import (
"crypto/ecdsa" "crypto/ecdsa"
"io/ioutil" "os"
"strings" "strings"
"testing" "testing"
@ -55,7 +55,7 @@ func TestECDSAVerify(t *testing.T) {
for _, data := range ecdsaTestData { for _, data := range ecdsaTestData {
var err error var err error
key, _ := ioutil.ReadFile(data.keys["public"]) key, _ := os.ReadFile(data.keys["public"])
var ecdsaKey *ecdsa.PublicKey var ecdsaKey *ecdsa.PublicKey
if ecdsaKey, err = jwt.ParseECPublicKeyFromPEM(key); err != nil { if ecdsaKey, err = jwt.ParseECPublicKeyFromPEM(key); err != nil {
@ -78,7 +78,7 @@ func TestECDSAVerify(t *testing.T) {
func TestECDSASign(t *testing.T) { func TestECDSASign(t *testing.T) {
for _, data := range ecdsaTestData { for _, data := range ecdsaTestData {
var err error var err error
key, _ := ioutil.ReadFile(data.keys["private"]) key, _ := os.ReadFile(data.keys["private"])
var ecdsaKey *ecdsa.PrivateKey var ecdsaKey *ecdsa.PrivateKey
if ecdsaKey, err = jwt.ParseECPrivateKeyFromPEM(key); err != nil { if ecdsaKey, err = jwt.ParseECPrivateKeyFromPEM(key); err != nil {
@ -108,7 +108,7 @@ func TestECDSASign(t *testing.T) {
func BenchmarkECDSAParsing(b *testing.B) { func BenchmarkECDSAParsing(b *testing.B) {
for _, data := range ecdsaTestData { for _, data := range ecdsaTestData {
key, _ := ioutil.ReadFile(data.keys["private"]) key, _ := os.ReadFile(data.keys["private"])
b.Run(data.name, func(b *testing.B) { b.Run(data.name, func(b *testing.B) {
b.ReportAllocs() b.ReportAllocs()
@ -126,7 +126,7 @@ func BenchmarkECDSAParsing(b *testing.B) {
func BenchmarkECDSASigning(b *testing.B) { func BenchmarkECDSASigning(b *testing.B) {
for _, data := range ecdsaTestData { for _, data := range ecdsaTestData {
key, _ := ioutil.ReadFile(data.keys["private"]) key, _ := os.ReadFile(data.keys["private"])
ecdsaKey, err := jwt.ParseECPrivateKeyFromPEM(key) ecdsaKey, err := jwt.ParseECPrivateKeyFromPEM(key)
if err != nil { if err != nil {

6
ed25519_test.go
View File

@ -1,7 +1,7 @@
package jwt_test package jwt_test
import ( import (
"io/ioutil" "os"
"strings" "strings"
"testing" "testing"
@ -38,7 +38,7 @@ func TestEd25519Verify(t *testing.T) {
for _, data := range ed25519TestData { for _, data := range ed25519TestData {
var err error var err error
key, _ := ioutil.ReadFile(data.keys["public"]) key, _ := os.ReadFile(data.keys["public"])
ed25519Key, err := jwt.ParseEdPublicKeyFromPEM(key) ed25519Key, err := jwt.ParseEdPublicKeyFromPEM(key)
if err != nil { if err != nil {
@ -62,7 +62,7 @@ func TestEd25519Verify(t *testing.T) {
func TestEd25519Sign(t *testing.T) { func TestEd25519Sign(t *testing.T) {
for _, data := range ed25519TestData { for _, data := range ed25519TestData {
var err error var err error
key, _ := ioutil.ReadFile(data.keys["private"]) key, _ := os.ReadFile(data.keys["private"])
ed25519Key, err := jwt.ParseEdPrivateKeyFromPEM(key) ed25519Key, err := jwt.ParseEdPrivateKeyFromPEM(key)
if err != nil { if err != nil {

4
hmac_example_test.go
View File

@ -2,7 +2,7 @@ package jwt_test
import ( import (
"fmt" "fmt"
"io/ioutil" "os"
"time" "time"
"github.com/golang-jwt/jwt/v4" "github.com/golang-jwt/jwt/v4"
@ -15,7 +15,7 @@ var hmacSampleSecret []byte
func init() { func init() {
// Load sample key data // Load sample key data
if keyData, e := ioutil.ReadFile("test/hmacTestKey"); e == nil { if keyData, e := os.ReadFile("test/hmacTestKey"); e == nil {
hmacSampleSecret = keyData hmacSampleSecret = keyData
} else { } else {
panic(e) panic(e)

4
hmac_test.go
View File

@ -1,7 +1,7 @@
package jwt_test package jwt_test
import ( import (
"io/ioutil" "os"
"strings" "strings"
"testing" "testing"
@ -46,7 +46,7 @@ var hmacTestData = []struct {
} }
// Sample data from http://tools.ietf.org/html/draft-jones-json-web-signature-04#appendix-A.1 // Sample data from http://tools.ietf.org/html/draft-jones-json-web-signature-04#appendix-A.1
var hmacTestKey, _ = ioutil.ReadFile("test/hmacTestKey") var hmacTestKey, _ = os.ReadFile("test/hmacTestKey")
func TestHMACVerify(t *testing.T) { func TestHMACVerify(t *testing.T) {
for _, data := range hmacTestData { for _, data := range hmacTestData {

6
http_example_test.go
View File

@ -8,11 +8,11 @@ import (
"crypto/rsa" "crypto/rsa"
"fmt" "fmt"
"io" "io"
"io/ioutil"
"log" "log"
"net" "net"
"net/http" "net/http"
"net/url" "net/url"
"os"
"strings" "strings"
"time" "time"
@ -34,13 +34,13 @@ var (
// read the key files before starting http handlers // read the key files before starting http handlers
func init() { func init() {
signBytes, err := ioutil.ReadFile(privKeyPath) signBytes, err := os.ReadFile(privKeyPath)
fatal(err) fatal(err)
signKey, err = jwt.ParseRSAPrivateKeyFromPEM(signBytes) signKey, err = jwt.ParseRSAPrivateKeyFromPEM(signBytes)
fatal(err) fatal(err)
verifyBytes, err := ioutil.ReadFile(pubKeyPath) verifyBytes, err := os.ReadFile(pubKeyPath)
fatal(err) fatal(err)
verifyKey, err = jwt.ParseRSAPublicKeyFromPEM(verifyBytes) verifyKey, err = jwt.ParseRSAPublicKeyFromPEM(verifyBytes)

7
rsa_pss_test.go
View File

@ -1,10 +1,11 @@
//go:build go1.4
// +build go1.4 // +build go1.4
package jwt_test package jwt_test
import ( import (
"crypto/rsa" "crypto/rsa"
"io/ioutil" "os"
"strings" "strings"
"testing" "testing"
"time" "time"
@ -53,7 +54,7 @@ var rsaPSSTestData = []struct {
func TestRSAPSSVerify(t *testing.T) { func TestRSAPSSVerify(t *testing.T) {
var err error var err error
key, _ := ioutil.ReadFile("test/sample_key.pub") key, _ := os.ReadFile("test/sample_key.pub")
var rsaPSSKey *rsa.PublicKey var rsaPSSKey *rsa.PublicKey
if rsaPSSKey, err = jwt.ParseRSAPublicKeyFromPEM(key); err != nil { if rsaPSSKey, err = jwt.ParseRSAPublicKeyFromPEM(key); err != nil {
t.Errorf("Unable to parse RSA public key: %v", err) t.Errorf("Unable to parse RSA public key: %v", err)
@ -76,7 +77,7 @@ func TestRSAPSSVerify(t *testing.T) {
func TestRSAPSSSign(t *testing.T) { func TestRSAPSSSign(t *testing.T) {
var err error var err error
key, _ := ioutil.ReadFile("test/sample_key") key, _ := os.ReadFile("test/sample_key")
var rsaPSSKey *rsa.PrivateKey var rsaPSSKey *rsa.PrivateKey
if rsaPSSKey, err = jwt.ParseRSAPrivateKeyFromPEM(key); err != nil { if rsaPSSKey, err = jwt.ParseRSAPrivateKeyFromPEM(key); err != nil {
t.Errorf("Unable to parse RSA private key: %v", err) t.Errorf("Unable to parse RSA private key: %v", err)

24
rsa_test.go
View File

@ -1,7 +1,7 @@
package jwt_test package jwt_test
import ( import (
"io/ioutil" "os"
"strings" "strings"
"testing" "testing"
@ -46,7 +46,7 @@ var rsaTestData = []struct {
} }
func TestRSAVerify(t *testing.T) { func TestRSAVerify(t *testing.T) {
keyData, _ := ioutil.ReadFile("test/sample_key.pub") keyData, _ := os.ReadFile("test/sample_key.pub")
key, _ := jwt.ParseRSAPublicKeyFromPEM(keyData) key, _ := jwt.ParseRSAPublicKeyFromPEM(keyData)
for _, data := range rsaTestData { for _, data := range rsaTestData {
@ -64,7 +64,7 @@ func TestRSAVerify(t *testing.T) {
} }
func TestRSASign(t *testing.T) { func TestRSASign(t *testing.T) {
keyData, _ := ioutil.ReadFile("test/sample_key") keyData, _ := os.ReadFile("test/sample_key")
key, _ := jwt.ParseRSAPrivateKeyFromPEM(keyData) key, _ := jwt.ParseRSAPrivateKeyFromPEM(keyData)
for _, data := range rsaTestData { for _, data := range rsaTestData {
@ -83,7 +83,7 @@ func TestRSASign(t *testing.T) {
} }
func TestRSAVerifyWithPreParsedPrivateKey(t *testing.T) { func TestRSAVerifyWithPreParsedPrivateKey(t *testing.T) {
key, _ := ioutil.ReadFile("test/sample_key.pub") key, _ := os.ReadFile("test/sample_key.pub")
parsedKey, err := jwt.ParseRSAPublicKeyFromPEM(key) parsedKey, err := jwt.ParseRSAPublicKeyFromPEM(key)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
@ -97,7 +97,7 @@ func TestRSAVerifyWithPreParsedPrivateKey(t *testing.T) {
} }
func TestRSAWithPreParsedPrivateKey(t *testing.T) { func TestRSAWithPreParsedPrivateKey(t *testing.T) {
key, _ := ioutil.ReadFile("test/sample_key") key, _ := os.ReadFile("test/sample_key")
parsedKey, err := jwt.ParseRSAPrivateKeyFromPEM(key) parsedKey, err := jwt.ParseRSAPrivateKeyFromPEM(key)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
@ -114,9 +114,9 @@ func TestRSAWithPreParsedPrivateKey(t *testing.T) {
} }
func TestRSAKeyParsing(t *testing.T) { func TestRSAKeyParsing(t *testing.T) {
key, _ := ioutil.ReadFile("test/sample_key") key, _ := os.ReadFile("test/sample_key")
secureKey, _ := ioutil.ReadFile("test/privateSecure.pem") secureKey, _ := os.ReadFile("test/privateSecure.pem")
pubKey, _ := ioutil.ReadFile("test/sample_key.pub") pubKey, _ := os.ReadFile("test/sample_key.pub")
badKey := []byte("All your base are belong to key") badKey := []byte("All your base are belong to key")
// Test parsePrivateKey // Test parsePrivateKey
@ -156,7 +156,7 @@ func TestRSAKeyParsing(t *testing.T) {
} }
func BenchmarkRSAParsing(b *testing.B) { func BenchmarkRSAParsing(b *testing.B) {
key, _ := ioutil.ReadFile("test/sample_key") key, _ := os.ReadFile("test/sample_key")
b.ReportAllocs() b.ReportAllocs()
b.ResetTimer() b.ResetTimer()
@ -170,7 +170,7 @@ func BenchmarkRSAParsing(b *testing.B) {
} }
func BenchmarkRS256Signing(b *testing.B) { func BenchmarkRS256Signing(b *testing.B) {
key, _ := ioutil.ReadFile("test/sample_key") key, _ := os.ReadFile("test/sample_key")
parsedKey, err := jwt.ParseRSAPrivateKeyFromPEM(key) parsedKey, err := jwt.ParseRSAPrivateKeyFromPEM(key)
if err != nil { if err != nil {
b.Fatal(err) b.Fatal(err)
@ -180,7 +180,7 @@ func BenchmarkRS256Signing(b *testing.B) {
} }
func BenchmarkRS384Signing(b *testing.B) { func BenchmarkRS384Signing(b *testing.B) {
key, _ := ioutil.ReadFile("test/sample_key") key, _ := os.ReadFile("test/sample_key")
parsedKey, err := jwt.ParseRSAPrivateKeyFromPEM(key) parsedKey, err := jwt.ParseRSAPrivateKeyFromPEM(key)
if err != nil { if err != nil {
b.Fatal(err) b.Fatal(err)
@ -190,7 +190,7 @@ func BenchmarkRS384Signing(b *testing.B) {
} }
func BenchmarkRS512Signing(b *testing.B) { func BenchmarkRS512Signing(b *testing.B) {
key, _ := ioutil.ReadFile("test/sample_key") key, _ := os.ReadFile("test/sample_key")
parsedKey, err := jwt.ParseRSAPrivateKeyFromPEM(key) parsedKey, err := jwt.ParseRSAPrivateKeyFromPEM(key)
if err != nil { if err != nil {
b.Fatal(err) b.Fatal(err)

10
test/helpers.go
View File

@ -3,13 +3,13 @@ package test
import ( import (
"crypto" "crypto"
"crypto/rsa" "crypto/rsa"
"io/ioutil" "os"
"github.com/golang-jwt/jwt/v4" "github.com/golang-jwt/jwt/v4"
) )
func LoadRSAPrivateKeyFromDisk(location string) *rsa.PrivateKey { func LoadRSAPrivateKeyFromDisk(location string) *rsa.PrivateKey {
keyData, e := ioutil.ReadFile(location) keyData, e := os.ReadFile(location)
if e != nil { if e != nil {
panic(e.Error()) panic(e.Error())
} }
@ -21,7 +21,7 @@ func LoadRSAPrivateKeyFromDisk(location string) *rsa.PrivateKey {
} }
func LoadRSAPublicKeyFromDisk(location string) *rsa.PublicKey { func LoadRSAPublicKeyFromDisk(location string) *rsa.PublicKey {
keyData, e := ioutil.ReadFile(location) keyData, e := os.ReadFile(location)
if e != nil { if e != nil {
panic(e.Error()) panic(e.Error())
} }
@ -45,7 +45,7 @@ func MakeSampleToken(c jwt.Claims, method jwt.SigningMethod, key interface{}) st
} }
func LoadECPrivateKeyFromDisk(location string) crypto.PrivateKey { func LoadECPrivateKeyFromDisk(location string) crypto.PrivateKey {
keyData, e := ioutil.ReadFile(location) keyData, e := os.ReadFile(location)
if e != nil { if e != nil {
panic(e.Error()) panic(e.Error())
} }
@ -57,7 +57,7 @@ func LoadECPrivateKeyFromDisk(location string) crypto.PrivateKey {
} }
func LoadECPublicKeyFromDisk(location string) crypto.PublicKey { func LoadECPublicKeyFromDisk(location string) crypto.PublicKey {
keyData, e := ioutil.ReadFile(location) keyData, e := os.ReadFile(location)
if e != nil { if e != nil {
panic(e.Error()) panic(e.Error())
} }