check for both signatures and payload

lestrrat-go · Aug 16, 2021 · fb0a859 · fb0a859
1 parent c36131f
commit fb0a859
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/format.go b/format.go
@@ -17,6 +17,7 @@ const (
 )
 
 type formatHint struct {
+	Payload    json.RawMessage `json:"payload"`    // Only in JWS
 	Signatures json.RawMessage `json:"signatures"` // Only in JWS
 	Ciphertext json.RawMessage `json:"ciphertext"` // Only in JWE
 	KeyType    json.RawMessage `json:"kty"`        // Only in JWK
@@ -87,7 +88,7 @@ func GuessFormat(payload []byte) FormatKind {
 	if h.Ciphertext != nil {
 		return JWE
 	}
-	if h.Signatures != nil {
+	if h.Signatures != nil && h.Payload != nil {
 		return JWS
 	}
 	return UnknownFormat

diff --git a/jwx_test.go b/jwx_test.go
@@ -466,7 +466,7 @@ func TestGuessFormat(t *testing.T) {
 		{
 			Name:     "JWS (JSON)",
 			Expected: jwx.JWS,
-			Source:   []byte(`{"signatures": []}`),
+			Source:   []byte(`{"signatures": [], "payload": ""}`),
 		},
 		{
 			Name:     "JWT",