mirror of https://github.com/go-gitea/gitea
* Upgrade to the latest version of golang-jwt. Backport #16590 * Forcibly update the vendored versions too * Update our minimal go lang version to 1.15 (differs from 1.16 in #16590) Signed-off-by: Andrew Thornton <art27@cantab.net> ### ⚠️ BREAKING ⚠️ This PR raises the minimal version of go supported to 1.15 which will mean the end of support of 32-bit Mac and Mac OS versions before Sierra. Signed-off-by: Andrew Thornton <art27@cantab.net> * update minimal go required Signed-off-by: Andrew Thornton <art27@cantab.net> * update config.yaml Signed-off-by: Andrew Thornton <art27@cantab.net>pull/16598/head^2
zeripath
4 years ago
committed by
GitHub
parent
5fe7c0ed7b
commit
ff8fadd2be
@ -1,11 +0,0 @@ |
||||
language: go |
||||
|
||||
script: |
||||
- go vet ./... |
||||
- go test -v ./... |
||||
|
||||
go: |
||||
- 1.7 |
||||
- 1.8 |
||||
- 1.9 |
||||
- 1.10 |
||||
@ -0,0 +1,81 @@ |
||||
package jwt |
||||
|
||||
import ( |
||||
"errors" |
||||
|
||||
"crypto/ed25519" |
||||
) |
||||
|
||||
var ( |
||||
ErrEd25519Verification = errors.New("ed25519: verification error") |
||||
) |
||||
|
||||
// Implements the EdDSA family
|
||||
// Expects ed25519.PrivateKey for signing and ed25519.PublicKey for verification
|
||||
type SigningMethodEd25519 struct{} |
||||
|
||||
// Specific instance for EdDSA
|
||||
var ( |
||||
SigningMethodEdDSA *SigningMethodEd25519 |
||||
) |
||||
|
||||
func init() { |
||||
SigningMethodEdDSA = &SigningMethodEd25519{} |
||||
RegisterSigningMethod(SigningMethodEdDSA.Alg(), func() SigningMethod { |
||||
return SigningMethodEdDSA |
||||
}) |
||||
} |
||||
|
||||
func (m *SigningMethodEd25519) Alg() string { |
||||
return "EdDSA" |
||||
} |
||||
|
||||
// Implements the Verify method from SigningMethod
|
||||
// For this verify method, key must be an ed25519.PublicKey
|
||||
func (m *SigningMethodEd25519) Verify(signingString, signature string, key interface{}) error { |
||||
var err error |
||||
var ed25519Key ed25519.PublicKey |
||||
var ok bool |
||||
|
||||
if ed25519Key, ok = key.(ed25519.PublicKey); !ok { |
||||
return ErrInvalidKeyType |
||||
} |
||||
|
||||
if len(ed25519Key) != ed25519.PublicKeySize { |
||||
return ErrInvalidKey |
||||
} |
||||
|
||||
// Decode the signature
|
||||
var sig []byte |
||||
if sig, err = DecodeSegment(signature); err != nil { |
||||
return err |
||||
} |
||||
|
||||
// Verify the signature
|
||||
if !ed25519.Verify(ed25519Key, []byte(signingString), sig) { |
||||
return ErrEd25519Verification |
||||
} |
||||
|
||||
return nil |
||||
} |
||||
|
||||
// Implements the Sign method from SigningMethod
|
||||
// For this signing method, key must be an ed25519.PrivateKey
|
||||
func (m *SigningMethodEd25519) Sign(signingString string, key interface{}) (string, error) { |
||||
var ed25519Key ed25519.PrivateKey |
||||
var ok bool |
||||
|
||||
if ed25519Key, ok = key.(ed25519.PrivateKey); !ok { |
||||
return "", ErrInvalidKeyType |
||||
} |
||||
|
||||
// ed25519.Sign panics if private key not equal to ed25519.PrivateKeySize
|
||||
// this allows to avoid recover usage
|
||||
if len(ed25519Key) != ed25519.PrivateKeySize { |
||||
return "", ErrInvalidKey |
||||
} |
||||
|
||||
// Sign the string and return the encoded result
|
||||
sig := ed25519.Sign(ed25519Key, []byte(signingString)) |
||||
return EncodeSegment(sig), nil |
||||
} |
||||
@ -0,0 +1,64 @@ |
||||
package jwt |
||||
|
||||
import ( |
||||
"crypto" |
||||
"crypto/ed25519" |
||||
"crypto/x509" |
||||
"encoding/pem" |
||||
"errors" |
||||
) |
||||
|
||||
var ( |
||||
ErrNotEdPrivateKey = errors.New("Key is not a valid Ed25519 private key") |
||||
ErrNotEdPublicKey = errors.New("Key is not a valid Ed25519 public key") |
||||
) |
||||
|
||||
// Parse PEM-encoded Edwards curve private key
|
||||
func ParseEdPrivateKeyFromPEM(key []byte) (crypto.PrivateKey, 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.ParsePKCS8PrivateKey(block.Bytes); err != nil { |
||||
return nil, err |
||||
} |
||||
|
||||
var pkey ed25519.PrivateKey |
||||
var ok bool |
||||
if pkey, ok = parsedKey.(ed25519.PrivateKey); !ok { |
||||
return nil, ErrNotEdPrivateKey |
||||
} |
||||
|
||||
return pkey, nil |
||||
} |
||||
|
||||
// Parse PEM-encoded Edwards curve public key
|
||||
func ParseEdPublicKeyFromPEM(key []byte) (crypto.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 { |
||||
return nil, err |
||||
} |
||||
|
||||
var pkey ed25519.PublicKey |
||||
var ok bool |
||||
if pkey, ok = parsedKey.(ed25519.PublicKey); !ok { |
||||
return nil, ErrNotEdPublicKey |
||||
} |
||||
|
||||
return pkey, nil |
||||
} |
||||
Loading…
Reference in new issue