c5679da3a1
to address CVE-2020-26160
full diff: a601269ab7...v3.2.2
3.2.1 release notes
---------------------------------------
- Import Path Change: See MIGRATION_GUIDE.md for tips on updating your code
Changed the import path from github.com/dgrijalva/jwt-go to github.com/golang-jwt/jwt
- Fixed type confusion issue between string and []string in VerifyAudience.
This fixes CVE-2020-26160
3.2.2 release notes
---------------------------------------
- Starting from this release, we are adopting the policy to support the most 2
recent versions of Go currently available. By the time of this release, this
is Go 1.15 and 1.16.
- Fixed a potential issue that could occur when the verification of exp, iat
or nbf was not required and contained invalid contents, i.e. non-numeric/date.
Thanks for @thaJeztah for making us aware of that and @giorgos-f3 for originally
reporting it to the formtech fork.
- Added support for EdDSA / ED25519.
- Optimized allocations.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
101 lines
2.4 KiB
Go
101 lines
2.4 KiB
Go
package jwt
|
|
|
|
import (
|
|
"crypto/rsa"
|
|
"crypto/x509"
|
|
"encoding/pem"
|
|
"errors"
|
|
)
|
|
|
|
var (
|
|
ErrKeyMustBePEMEncoded = errors.New("Invalid Key: Key must be a PEM encoded PKCS1 or PKCS8 key")
|
|
ErrNotRSAPrivateKey = errors.New("Key is not a valid RSA private key")
|
|
ErrNotRSAPublicKey = errors.New("Key is not a valid RSA public key")
|
|
)
|
|
|
|
// Parse PEM encoded PKCS1 or PKCS8 private key
|
|
func ParseRSAPrivateKeyFromPEM(key []byte) (*rsa.PrivateKey, error) {
|
|
var err error
|
|
|
|
// Parse PEM block
|
|
var block *pem.Block
|
|
if block, _ = pem.Decode(key); block == nil {
|
|
return nil, ErrKeyMustBePEMEncoded
|
|
}
|
|
|
|
var parsedKey interface{}
|
|
if parsedKey, err = x509.ParsePKCS1PrivateKey(block.Bytes); err != nil {
|
|
if parsedKey, err = x509.ParsePKCS8PrivateKey(block.Bytes); err != nil {
|
|
return nil, err
|
|
}
|
|
}
|
|
|
|
var pkey *rsa.PrivateKey
|
|
var ok bool
|
|
if pkey, ok = parsedKey.(*rsa.PrivateKey); !ok {
|
|
return nil, ErrNotRSAPrivateKey
|
|
}
|
|
|
|
return pkey, nil
|
|
}
|
|
|
|
// Parse PEM encoded PKCS1 or PKCS8 private key protected with password
|
|
func ParseRSAPrivateKeyFromPEMWithPassword(key []byte, password string) (*rsa.PrivateKey, error) {
|
|
var err error
|
|
|
|
// Parse PEM block
|
|
var block *pem.Block
|
|
if block, _ = pem.Decode(key); block == nil {
|
|
return nil, ErrKeyMustBePEMEncoded
|
|
}
|
|
|
|
var parsedKey interface{}
|
|
|
|
var blockDecrypted []byte
|
|
if blockDecrypted, err = x509.DecryptPEMBlock(block, []byte(password)); err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
if parsedKey, err = x509.ParsePKCS1PrivateKey(blockDecrypted); err != nil {
|
|
if parsedKey, err = x509.ParsePKCS8PrivateKey(blockDecrypted); err != nil {
|
|
return nil, err
|
|
}
|
|
}
|
|
|
|
var pkey *rsa.PrivateKey
|
|
var ok bool
|
|
if pkey, ok = parsedKey.(*rsa.PrivateKey); !ok {
|
|
return nil, ErrNotRSAPrivateKey
|
|
}
|
|
|
|
return pkey, nil
|
|
}
|
|
|
|
// Parse PEM encoded PKCS1 or PKCS8 public key
|
|
func ParseRSAPublicKeyFromPEM(key []byte) (*rsa.PublicKey, error) {
|
|
var err error
|
|
|
|
// Parse PEM block
|
|
var block *pem.Block
|
|
if block, _ = pem.Decode(key); block == nil {
|
|
return nil, ErrKeyMustBePEMEncoded
|
|
}
|
|
|
|
// Parse the key
|
|
var parsedKey interface{}
|
|
if parsedKey, err = x509.ParsePKIXPublicKey(block.Bytes); err != nil {
|
|
if cert, err := x509.ParseCertificate(block.Bytes); err == nil {
|
|
parsedKey = cert.PublicKey
|
|
} else {
|
|
return nil, err
|
|
}
|
|
}
|
|
|
|
var pkey *rsa.PublicKey
|
|
var ok bool
|
|
if pkey, ok = parsedKey.(*rsa.PublicKey); !ok {
|
|
return nil, ErrNotRSAPublicKey
|
|
}
|
|
|
|
return pkey, nil
|
|
}
|