From dc3d3bb4192d11c7541a0a8c173cc576fae88850 Mon Sep 17 00:00:00 2001 From: ErickSkrauch Date: Tue, 11 Jun 2024 04:43:43 +0200 Subject: [PATCH] Remove left parts of the signer implementation --- internal/security/signer.go | 59 ----------------------- internal/security/signer_test.go | 81 -------------------------------- 2 files changed, 140 deletions(-) delete mode 100644 internal/security/signer.go delete mode 100644 internal/security/signer_test.go diff --git a/internal/security/signer.go b/internal/security/signer.go deleted file mode 100644 index b42049e..0000000 --- a/internal/security/signer.go +++ /dev/null @@ -1,59 +0,0 @@ -package security - -import ( - "crypto" - "crypto/rand" - "crypto/rsa" - "crypto/sha1" - "crypto/x509" - "encoding/pem" - "errors" - "io" -) - -var randomReader = rand.Reader -var invalidKeyFormat = errors.New(`invalid key format: it should be"der" or "pem"`) - -func NewSigner(key *rsa.PrivateKey) *Signer { - return &Signer{Key: key} -} - -type Signer struct { - Key *rsa.PrivateKey -} - -func (s *Signer) Sign(data io.Reader) ([]byte, error) { - messageHash := sha1.New() - _, err := io.Copy(messageHash, data) - if err != nil { - return nil, err - } - - messageHashSum := messageHash.Sum(nil) - signature, err := rsa.SignPKCS1v15(randomReader, s.Key, crypto.SHA1, messageHashSum) - if err != nil { - return nil, err - } - - return signature, nil -} - -func (s *Signer) GetPublicKey(format string) ([]byte, error) { - if format != "der" && format != "pem" { - return nil, invalidKeyFormat - } - - asn1Bytes, err := x509.MarshalPKIXPublicKey(s.Key.Public()) - if err != nil { - return nil, err - } - - if format == "pem" { - return pem.EncodeToMemory(&pem.Block{ - Type: "PUBLIC KEY", - Bytes: asn1Bytes, - }), nil - } - - return asn1Bytes, nil -} diff --git a/internal/security/signer_test.go b/internal/security/signer_test.go deleted file mode 100644 index 39384b3..0000000 --- a/internal/security/signer_test.go +++ /dev/null @@ -1,81 +0,0 @@ -package security - -import ( - "crypto/x509" - "encoding/pem" - "strings" - "testing" - - "github.com/stretchr/testify/require" -) - -type ConstantReader struct { -} - -func (c *ConstantReader) Read(p []byte) (int, error) { - return 1, nil -} - -func TestSigner_Sign(t *testing.T) { - randomReader = &ConstantReader{} - - rawKey, _ := pem.Decode([]byte("-----BEGIN RSA PRIVATE KEY-----\nMIIBOwIBAAJBANbUpVCZkMKpfvYZ08W3lumdAaYxLBnmUDlzHBQH3DpYef5WCO32\nTDU6feIJ58A0lAywgtZ4wwi2dGHOz/1hAvcCAwEAAQJAItaxSHTe6PKbyEU/9pxj\nONdhYRYwVLLo56gnMYhkyoEqaaMsfov8hhoepkYZBMvZFB2bDOsQ2SaJ+E2eiBO4\nAQIhAPssS0+BR9w0bOdmjGqmdE9NrN5UJQcOW13s29+6QzUBAiEA2vWOepA5Apiu\npEA3pwoGdkVCrNSnnKjDQzDXBnpd3/cCIEFNd9sY4qUG4FWdXN6RnmXL7Sj0uZfH\nDMwzu8rEM5sBAiEAhvdoDNqLmbMdq3c+FsPSOeL1d21Zp/JK8kbPtFmHNf8CIQDV\n6FSZDwvWfuxaM7BsycQONkjDBTPNu+lqctJBGnBv3A==\n-----END RSA PRIVATE KEY-----\n")) - key, _ := x509.ParsePKCS1PrivateKey(rawKey.Bytes) - - signer := NewSigner(key) - - signature, err := signer.Sign(strings.NewReader("mock string to sign")) - require.NoError(t, err) - require.Equal(t, []byte{ - 0xd0, 0x88, 0xc6, 0x65, 0x27, 0x5d, 0xe4, 0x86, 0x6b, 0x7a, 0x5a, 0xd, 0x94, 0x6f, 0x80, 0x88, 0x12, 0x8e, 0x65, - 0x75, 0xfb, 0xba, 0xcb, 0x7f, 0x90, 0xf5, 0xae, 0x5d, 0x2c, 0x5d, 0x60, 0xf6, 0x83, 0x54, 0xd3, 0x40, 0xd, 0x1f, - 0xc0, 0xbc, 0x6d, 0xa8, 0x6f, 0x6, 0xd8, 0x38, 0x74, 0x5b, 0x4f, 0x15, 0x82, 0x6d, 0x67, 0x95, 0x7b, 0xf, 0xcc, - 0xf3, 0x51, 0xfe, 0xcd, 0xb9, 0x1e, 0xdf, - }, signature) -} - -func TestSigner_GetPublicKey(t *testing.T) { - randomReader = &ConstantReader{} - - rawKey, _ := pem.Decode([]byte("-----BEGIN RSA PRIVATE KEY-----\nMIIBOwIBAAJBANbUpVCZkMKpfvYZ08W3lumdAaYxLBnmUDlzHBQH3DpYef5WCO32\nTDU6feIJ58A0lAywgtZ4wwi2dGHOz/1hAvcCAwEAAQJAItaxSHTe6PKbyEU/9pxj\nONdhYRYwVLLo56gnMYhkyoEqaaMsfov8hhoepkYZBMvZFB2bDOsQ2SaJ+E2eiBO4\nAQIhAPssS0+BR9w0bOdmjGqmdE9NrN5UJQcOW13s29+6QzUBAiEA2vWOepA5Apiu\npEA3pwoGdkVCrNSnnKjDQzDXBnpd3/cCIEFNd9sY4qUG4FWdXN6RnmXL7Sj0uZfH\nDMwzu8rEM5sBAiEAhvdoDNqLmbMdq3c+FsPSOeL1d21Zp/JK8kbPtFmHNf8CIQDV\n6FSZDwvWfuxaM7BsycQONkjDBTPNu+lqctJBGnBv3A==\n-----END RSA PRIVATE KEY-----\n")) - key, _ := x509.ParsePKCS1PrivateKey(rawKey.Bytes) - - signer := NewSigner(key) - - t.Run("pem format", func(t *testing.T) { - publicKey, err := signer.GetPublicKey("pem") - require.NoError(t, err) - require.Equal(t, []byte{ - 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x42, 0x45, 0x47, 0x49, 0x4e, 0x20, 0x50, 0x55, 0x42, 0x4c, 0x49, 0x43, 0x20, - 0x4b, 0x45, 0x59, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0xa, 0x4d, 0x46, 0x77, 0x77, 0x44, 0x51, 0x59, 0x4a, 0x4b, - 0x6f, 0x5a, 0x49, 0x68, 0x76, 0x63, 0x4e, 0x41, 0x51, 0x45, 0x42, 0x42, 0x51, 0x41, 0x44, 0x53, 0x77, 0x41, - 0x77, 0x53, 0x41, 0x4a, 0x42, 0x41, 0x4e, 0x62, 0x55, 0x70, 0x56, 0x43, 0x5a, 0x6b, 0x4d, 0x4b, 0x70, 0x66, - 0x76, 0x59, 0x5a, 0x30, 0x38, 0x57, 0x33, 0x6c, 0x75, 0x6d, 0x64, 0x41, 0x61, 0x59, 0x78, 0x4c, 0x42, 0x6e, - 0x6d, 0xa, 0x55, 0x44, 0x6c, 0x7a, 0x48, 0x42, 0x51, 0x48, 0x33, 0x44, 0x70, 0x59, 0x65, 0x66, 0x35, 0x57, - 0x43, 0x4f, 0x33, 0x32, 0x54, 0x44, 0x55, 0x36, 0x66, 0x65, 0x49, 0x4a, 0x35, 0x38, 0x41, 0x30, 0x6c, 0x41, - 0x79, 0x77, 0x67, 0x74, 0x5a, 0x34, 0x77, 0x77, 0x69, 0x32, 0x64, 0x47, 0x48, 0x4f, 0x7a, 0x2f, 0x31, 0x68, - 0x41, 0x76, 0x63, 0x43, 0x41, 0x77, 0x45, 0x41, 0x41, 0x51, 0x3d, 0x3d, 0xa, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, - 0x45, 0x4e, 0x44, 0x20, 0x50, 0x55, 0x42, 0x4c, 0x49, 0x43, 0x20, 0x4b, 0x45, 0x59, 0x2d, 0x2d, 0x2d, 0x2d, - 0x2d, 0xa, - }, publicKey) - }) - - t.Run("der format", func(t *testing.T) { - publicKey, err := signer.GetPublicKey("der") - require.NoError(t, err) - require.Equal(t, []byte{ - 0x30, 0x5c, 0x30, 0xd, 0x6, 0x9, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0xd, 0x1, 0x1, 0x1, 0x5, 0x0, 0x3, 0x4b, 0x0, - 0x30, 0x48, 0x2, 0x41, 0x0, 0xd6, 0xd4, 0xa5, 0x50, 0x99, 0x90, 0xc2, 0xa9, 0x7e, 0xf6, 0x19, 0xd3, 0xc5, - 0xb7, 0x96, 0xe9, 0x9d, 0x1, 0xa6, 0x31, 0x2c, 0x19, 0xe6, 0x50, 0x39, 0x73, 0x1c, 0x14, 0x7, 0xdc, 0x3a, - 0x58, 0x79, 0xfe, 0x56, 0x8, 0xed, 0xf6, 0x4c, 0x35, 0x3a, 0x7d, 0xe2, 0x9, 0xe7, 0xc0, 0x34, 0x94, 0xc, - 0xb0, 0x82, 0xd6, 0x78, 0xc3, 0x8, 0xb6, 0x74, 0x61, 0xce, 0xcf, 0xfd, 0x61, 0x2, 0xf7, 0x2, 0x3, 0x1, 0x0, - 0x1, - }, publicKey) - }) - - t.Run("unknown format", func(t *testing.T) { - publicKey, err := signer.GetPublicKey("unknown") - require.Nil(t, publicKey) - require.ErrorContains(t, err, "invalid") - }) -}