scottk/vault
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/vault.git synced 2025-11-02 03:27:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Do not mask RSA verification misuse errors as verification failures (#16695)" (#16756)

Browse Source 
This reverts commit 34225943c5.
This commit is contained in:
Steven Clark
2022-08-22 10:15:15 -04:00
committed by GitHub
parent b571ea40f5
commit 4a44c4666a
2 changed files with 1 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sdk/helper/keysutil/policy.go
View File

@@ -1355,14 +1355,7 @@ func (p *Policy) VerifySignature(context, input []byte, hashAlgorithm HashType,
return false, errutil.InternalError{Err: fmt.Sprintf("unsupported rsa signature algorithm %s", sigAlgorithm)}
}
if err != nil {
// Don't send back verification errors to caller, only misuse errors.
if errors.Is(err, rsa.ErrVerification) {
return false, nil
}
return false, errutil.InternalError{Err: err.Error()}
}
return true, nil
return err == nil, nil
default:
return false, errutil.InternalError{Err: fmt.Sprintf("unsupported key type %v", p.Type)}

62
sdk/helper/keysutil/policy_test.go
View File

@@ -3,7 +3,6 @@ package keysutil
import (
"bytes"
"context"
"crypto"
"crypto/ecdsa"
"crypto/elliptic"
"crypto/rand"
@@ -622,67 +621,6 @@ func Test_BadArchive(t *testing.T) {
}
}
func Test_RSAVerificationErrors(t *testing.T) {
ctx := context.Background()
lm, _ := NewLockManager(true, 0)
storage := &logical.InmemStorage{}
p, _, err := lm.GetPolicy(ctx, PolicyRequest{
Upsert: true,
Storage: storage,
KeyType: KeyType_RSA2048,
Name: "test",
}, rand.Reader)
if err != nil {
t.Fatal(err)
}
if p == nil {
t.Fatal("nil policy")
}
signContext := []byte("context")
hf := crypto.SHA1.New()
hf.Write([]byte("input"))
input := hf.Sum(nil)
sig, err := p.Sign(0, signContext, input, HashTypeSHA1, "", MarshalingTypeASN1)
if err != nil {
t.Fatalf("failed signing: %#v", err)
}
// Normal signature success
matches, err := p.VerifySignature(signContext, input, HashTypeSHA1, "", MarshalingTypeASN1, sig.Signature)
if err != nil {
t.Fatalf("failed signature verification: %#v", err)
}
if !matches {
t.Fatalf("signature verification failed ")
}
hf.Reset()
hf.Write([]byte("bad-input"))
badInput := hf.Sum(nil)
// Normal signature failure
matches2, err := p.VerifySignature(signContext, badInput, HashTypeSHA1, "", MarshalingTypeASN1, sig.Signature)
if err != nil {
t.Fatalf("failed signature verification: %#v", err)
}
if matches2 {
t.Fatalf("signature verification passed when it should have failed")
}
// bad usage (not hashing input will trigger an error that is not rsa.ErrVerification so we
// should get an error back.
matches3, err := p.VerifySignature(signContext, []byte("bad-input"), HashTypeSHA1, "pkcs1v15", MarshalingTypeASN1, sig.Signature)
if err == nil {
t.Fatal("expected error signature without hashing input with pkcs1v15 but got none")
}
if matches3 {
t.Fatalf("signature verification passed when it should have failed with an error returned")
}
}
func Test_Import(t *testing.T) {
ctx := context.Background()
storage := &logical.InmemStorage{}