fixingUT

Signed-off-by: Pritesh Bandi <[email protected]>
notaryproject · Jan 19, 2024 · 735b149 · 735b149
1 parent 99707d2
commit 735b149
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 4 deletions.
diff --git a/cli/cli.go b/cli/cli.go
@@ -142,7 +142,7 @@ func (c *CLI) unmarshalRequest(request plugin.Request) error {
 
 	if err := request.Validate(); err != nil {
 		c.logger.Errorf("%s validation error :%v", reflect.TypeOf(request), err)
-		return plugin.NewValidationError(plugin.ErrorMsgMalformedInput)
+		return plugin.NewValidationError(plugin.ErrorMsgMalformedInput + ":" + err.Error())
 	}
 
 	return nil

diff --git a/cli/cli_test.go b/cli/cli_test.go
@@ -121,36 +121,43 @@ func TestExecuteSuccess(t *testing.T) {
 	sigGenCli, _ := New(mock.NewSigGeneratorPlugin(false))
 	tests := map[string]struct {
 		c  *CLI
+		in string
 		op string
 	}{
 		string(plugin.CommandGetMetadata): {
 			c:  cli,
+			in: "{}",
 			op: "{\"name\":\"Example Plugin\",\"description\":\"This is an description of example plugin. 🍺\",\"version\":\"1.0.0\",\"url\":\"https://example.com/notation/plugin\",\"capabilities\":[\"SIGNATURE_VERIFIER.TRUSTED_IDENTITY\",\"SIGNATURE_VERIFIER.REVOCATION_CHECK\",\"SIGNATURE_GENERATOR.ENVELOPE\"]}",
 		},
 		string(plugin.Version): {
 			c:  cli,
+			in: "",
 			op: "Example Plugin - This is an description of example plugin. 🍺\nVersion: 1.0.0 \n",
 		},
 		string(plugin.CommandGenerateEnvelope): {
 			c:  cli,
-			op: "{\"signatureEnvelope\":\"\",\"signatureEnvelopeType\":\"\",\"annotations\":{\"manifestAnntnKey1\":\"value1\"}}",
+			in: "{\"contractVersion\":\"1.0\",\"keyId\":\"someKeyId\",\"payloadType\":\"somePT\",\"signatureEnvelopeType\":\"someSET\",\"payload\":\"em9w\"}",
+			op: "{\"signatureEnvelope\":\"\",\"signatureEnvelopeType\":\"someSET\",\"annotations\":{\"manifestAnntnKey1\":\"value1\"}}",
 		},
 		string(plugin.CommandVerifySignature): {
 			c:  cli,
+			in: "{\"contractVersion\":\"1.0\",\"signature\":{\"criticalAttributes\":{\"contentType\":\"someCT\",\"signingScheme\":\"someSigningScheme\"},\"unprocessedAttributes\":null,\"certificateChain\":[\"emFw\",\"em9w\"]},\"trustPolicy\":{\"trustedIdentities\":null,\"signatureVerification\":[\"SIGNATURE_GENERATOR.RAW\"]}}",
 			op: "{\"verificationResults\":{\"SIGNATURE_VERIFIER.REVOCATION_CHECK\":{\"success\":true,\"reason\":\"Not revoked\"},\"SIGNATURE_VERIFIER.TRUSTED_IDENTITY\":{\"success\":true,\"reason\":\"Valid trusted Identity\"}},\"processedAttributes\":[]}",
 		},
 		string(plugin.CommandGenerateSignature): {
 			c:  sigGenCli,
+			in: "{\"contractVersion\":\"1.0\",\"keyId\":\"someKeyId\",\"keySpec\":\"EC-384\",\"hashAlgorithm\":\"SHA-384\",\"payload\":\"em9w\"}",
 			op: "{\"keyId\":\"someKeyId\",\"signature\":\"YWJjZA==\",\"signingAlgorithm\":\"RSASSA-PSS-SHA-256\",\"certificateChain\":[\"YWJjZA==\",\"d3h5eg==\"]}",
 		},
 		string(plugin.CommandDescribeKey): {
 			c:  sigGenCli,
+			in: "{\"contractVersion\":\"1.0\",\"keyId\":\"someKeyId\"}",
 			op: "{\"keyId\":\"someKeyId\",\"keySpec\":\"RSA-2048\"}",
 		},
 	}
 	for name, test := range tests {
 		t.Run(name, func(t *testing.T) {
-			closer := setupReader("{}")
+			closer := setupReader(test.in)
 			defer closer()
 			op := captureStdOut(func() {
 				test.c.Execute(context.Background(), []string{"notation", name})

diff --git a/plugin/describekey_test.go b/plugin/describekey_test.go
@@ -57,6 +57,13 @@ func TestDescribeKeyRequest_Validate_Error(t *testing.T) {
 	}
 }
 
+func TestDescribeKeyRequest_Command(t *testing.T) {
+	req := getDescribeKeyRequest(ContractVersion, "someKeyId")
+	if cmd := req.Command(); cmd != CommandDescribeKey {
+		t.Errorf("DescribeKeyRequest#Command, expected %s but returned %s", CommandDescribeKey, cmd)
+	}
+}
+
 func getDescribeKeyRequest(cv, kid string) DescribeKeyRequest {
 	return DescribeKeyRequest{
 		ContractVersion: cv,

diff --git a/plugin/metadata_test.go b/plugin/metadata_test.go
@@ -53,3 +53,10 @@ func TestGetMetadataRequest_Validate(t *testing.T) {
 		}
 	}
 }
+
+func TestGetMetadataRequest_Command(t *testing.T) {
+	req := GetMetadataRequest{}
+	if cmd := req.Command(); cmd != CommandGetMetadata {
+		t.Errorf("DescribeKeyRequest#Command, expected %s but returned %s", CommandGetMetadata, cmd)
+	}
+}
diff --git a/plugin/sign_test.go b/plugin/sign_test.go
@@ -66,6 +66,13 @@ func TestGenerateSignatureRequest_Validate_Error(t *testing.T) {
 	}
 }
 
+func TestGenerateSignatureRequest_Command(t *testing.T) {
+	req := getGenerateSignatureRequest(ContractVersion, "someKeyId", string(KeySpecEC384), string(HashAlgorithmSHA384), []byte("zop"))
+	if cmd := req.Command(); cmd != CommandGenerateSignature {
+		t.Errorf("DescribeKeyRequest#Command, expected %s but returned %s", CommandGenerateSignature, cmd)
+	}
+}
+
 func TestGenerateEnvelopeRequest_Validate(t *testing.T) {
 	reqs := []GenerateEnvelopeRequest{
 		getGenerateEnvelopeRequest(ContractVersion, "someKeyId", "someSET", "somePT", []byte("zop")),
@@ -108,13 +115,19 @@ func TestGenerateEnvelopeRequest_Validate_Error(t *testing.T) {
 					t.Errorf("expected error message '%s' but got '%s'", expMsg, err.Error())
 				}
 			} else {
-				fmt.Println(testcase.req)
 				t.Error("GenerateEnvelopeRequest#Validate didn't returned error")
 			}
 		})
 	}
 }
 
+func TestGenerateEnvelopeRequest_Command(t *testing.T) {
+	req := getGenerateEnvelopeRequest(ContractVersion, "someKeyId", string(KeySpecEC384), string(HashAlgorithmSHA384), []byte("zop"))
+	if cmd := req.Command(); cmd != CommandGenerateEnvelope {
+		t.Errorf("DescribeKeyRequest#Command, expected %s but returned %s", CommandGenerateEnvelope, cmd)
+	}
+}
+
 func getGenerateSignatureRequest(cv, kid, ks, ha string, pl []byte) GenerateSignatureRequest {
 	return GenerateSignatureRequest{
 		ContractVersion: cv,

diff --git a/plugin/verify_test.go b/plugin/verify_test.go
@@ -55,6 +55,9 @@ func TestVerifySignatureRequest_Validate_Error(t *testing.T) {
 	reqWithoutSignature := getVerifySignatureRequest("1.0", "someCT", "someSigningScheme", mockCertChain, []Capability{CapabilitySignatureGenerator})
 	reqWithoutSignature.Signature = Signature{}
 
+	reqWithoutCriticalAttr := getVerifySignatureRequest("1.0", "someCT", "someSigningScheme", mockCertChain, []Capability{CapabilitySignatureGenerator})
+	reqWithoutCriticalAttr.Signature.CriticalAttributes = CriticalAttributes{}
+
 	testCases := []struct {
 		name string
 		req  VerifySignatureRequest
@@ -67,6 +70,7 @@ func TestVerifySignatureRequest_Validate_Error(t *testing.T) {
 		{name: "signature's trustPolicy", req: getVerifySignatureRequest(ContractVersion, "someCT", "someSigningScheme", mockCertChain, nil)},
 		{name: "signature's trustPolicy's signatureVerification", req: getVerifySignatureRequest(ContractVersion, "someCT", "someSigningScheme", mockCertChain, []Capability{})},
 		{name: "signature", req: reqWithoutSignature},
+		{name: "signature's criticalAttributes", req: reqWithoutCriticalAttr},
 	}
 
 	for _, testcase := range testCases {
@@ -83,6 +87,13 @@ func TestVerifySignatureRequest_Validate_Error(t *testing.T) {
 	}
 }
 
+func TestVerifySignatureRequest_Command(t *testing.T) {
+	req := getVerifySignatureRequest(ContractVersion, "someCT", "someSigningScheme", mockCertChain, []Capability{CapabilitySignatureGenerator})
+	if cmd := req.Command(); cmd != CommandVerifySignature {
+		t.Errorf("DescribeKeyRequest#Command, expected %s but returned %s", CommandVerifySignature, cmd)
+	}
+}
+
 func getVerifySignatureRequest(cv, ct, ss string, cc [][]byte, sv []Capability) VerifySignatureRequest {
 	return VerifySignatureRequest{
 		ContractVersion: cv,