fix: raise when an invalid wire type is present

Fix Required.Proto*.ProtobufInput.UnknownWireType*_Field*_Verion* from conformance tests
ahamez · Jan 14, 2025 · 02a32bd · 02a32bd
1 parent 07173d3
commit 02a32bd
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 52 deletions.
diff --git a/conformance/failure_list.txt b/conformance/failure_list.txt
@@ -1,51 +1,2 @@
-# TMP
 Required.Proto2.ProtobufInput.UnknownOrdering.ProtobufOutput
-Required.Proto2.ProtobufInput.UnknownWireType6_Field1_Verion0
-Required.Proto2.ProtobufInput.UnknownWireType6_Field1_Verion1
-Required.Proto2.ProtobufInput.UnknownWireType6_Field1_Verion2
-Required.Proto2.ProtobufInput.UnknownWireType6_Field1_Verion3
-Required.Proto2.ProtobufInput.UnknownWireType6_Field2_Verion0
-Required.Proto2.ProtobufInput.UnknownWireType6_Field2_Verion1
-Required.Proto2.ProtobufInput.UnknownWireType6_Field2_Verion2
-Required.Proto2.ProtobufInput.UnknownWireType6_Field2_Verion3
-Required.Proto2.ProtobufInput.UnknownWireType6_Field3_Verion0
-Required.Proto2.ProtobufInput.UnknownWireType6_Field3_Verion1
-Required.Proto2.ProtobufInput.UnknownWireType6_Field3_Verion2
-Required.Proto2.ProtobufInput.UnknownWireType6_Field3_Verion3
-Required.Proto2.ProtobufInput.UnknownWireType7_Field1_Verion0
-Required.Proto2.ProtobufInput.UnknownWireType7_Field1_Verion1
-Required.Proto2.ProtobufInput.UnknownWireType7_Field1_Verion2
-Required.Proto2.ProtobufInput.UnknownWireType7_Field1_Verion3
-Required.Proto2.ProtobufInput.UnknownWireType7_Field2_Verion0
-Required.Proto2.ProtobufInput.UnknownWireType7_Field2_Verion1
-Required.Proto2.ProtobufInput.UnknownWireType7_Field2_Verion2
-Required.Proto2.ProtobufInput.UnknownWireType7_Field2_Verion3
-Required.Proto2.ProtobufInput.UnknownWireType7_Field3_Verion0
-Required.Proto2.ProtobufInput.UnknownWireType7_Field3_Verion1
-Required.Proto2.ProtobufInput.UnknownWireType7_Field3_Verion2
-Required.Proto2.ProtobufInput.UnknownWireType7_Field3_Verion3
-Required.Proto3.ProtobufInput.UnknownOrdering.ProtobufOutput # Unknown field mismatch
-Required.Proto3.ProtobufInput.UnknownWireType6_Field1_Verion0
-Required.Proto3.ProtobufInput.UnknownWireType6_Field1_Verion1
-Required.Proto3.ProtobufInput.UnknownWireType6_Field1_Verion2
-Required.Proto3.ProtobufInput.UnknownWireType6_Field1_Verion3
-Required.Proto3.ProtobufInput.UnknownWireType6_Field2_Verion0
-Required.Proto3.ProtobufInput.UnknownWireType6_Field2_Verion1
-Required.Proto3.ProtobufInput.UnknownWireType6_Field2_Verion2
-Required.Proto3.ProtobufInput.UnknownWireType6_Field2_Verion3
-Required.Proto3.ProtobufInput.UnknownWireType6_Field3_Verion0
-Required.Proto3.ProtobufInput.UnknownWireType6_Field3_Verion1
-Required.Proto3.ProtobufInput.UnknownWireType6_Field3_Verion2
-Required.Proto3.ProtobufInput.UnknownWireType6_Field3_Verion3
-Required.Proto3.ProtobufInput.UnknownWireType7_Field1_Verion0
-Required.Proto3.ProtobufInput.UnknownWireType7_Field1_Verion1
-Required.Proto3.ProtobufInput.UnknownWireType7_Field1_Verion2
-Required.Proto3.ProtobufInput.UnknownWireType7_Field1_Verion3
-Required.Proto3.ProtobufInput.UnknownWireType7_Field2_Verion0
-Required.Proto3.ProtobufInput.UnknownWireType7_Field2_Verion1
-Required.Proto3.ProtobufInput.UnknownWireType7_Field2_Verion2
-Required.Proto3.ProtobufInput.UnknownWireType7_Field2_Verion3
-Required.Proto3.ProtobufInput.UnknownWireType7_Field3_Verion0
-Required.Proto3.ProtobufInput.UnknownWireType7_Field3_Verion1
-Required.Proto3.ProtobufInput.UnknownWireType7_Field3_Verion2
-Required.Proto3.ProtobufInput.UnknownWireType7_Field3_Verion3
+Required.Proto3.ProtobufInput.UnknownOrdering.ProtobufOutput
diff --git a/lib/protox.ex b/lib/protox.ex
@@ -115,7 +115,10 @@ defmodule Protox do
       iex> binary = <<66, 7, 8, 1, 18, 3, 102, 111, 66, 7, 8, 2, 18, 3, 98, 97, 114>>
       iex> {:error, reason} = Protox.decode(binary, ProtoxExample)
       iex> reason
-      %Protox.IllegalTagError{message: "Field with illegal tag 0"}
+      %Protox.DecodingError{
+                    message: "Could not decode data (invalid wire type 7)",
+                    binary: <<7, 8, 2, 18, 3, 98, 97, 114>>
+                  }
   """
   @doc since: "1.6.0"
   @spec decode(binary(), atom()) :: {:ok, struct()} | {:error, any()}

diff --git a/lib/protox/decode.ex b/lib/protox/decode.ex
@@ -34,7 +34,13 @@ defmodule Protox.Decode do
   @spec parse_key(binary()) :: {non_neg_integer(), non_neg_integer(), binary()}
   def parse_key(bytes) do
     {key, rest} = Varint.decode(bytes)
-    {key >>> 3, key &&& 0b111, rest}
+    wire_type = key &&& 0b111
+
+    if wire_type in [@wire_32bits, @wire_64bits, @wire_delimited, @wire_varint] do
+      {key >>> 3, wire_type, rest}
+    else
+      raise Protox.DecodingError.new(bytes, "invalid wire type #{wire_type}")
+    end
   end
 
   def parse_unknown(tag, @wire_varint, bytes) do

diff --git a/test/protox/decode_test.exs b/test/protox/decode_test.exs
@@ -1,6 +1,8 @@
 defmodule Protox.DecodeTest do
   use ExUnit.Case
 
+  import Bitwise
+
   alias ProtobufTestMessages.Proto3.{
     NullHypothesisProto3,
     TestAllTypesProto3,
@@ -397,6 +399,17 @@ defmodule Protox.DecodeTest do
         <<0::integer-size(min_invalid_string_size)-unit(8)>>,
       TestAllTypesProto3,
       Protox.DecodingError
+    },
+    {
+      "invalid wire type",
+      <<
+        # Field  |  Invalid wire type
+        1 <<< 3 ||| 6,
+        # Dummy value
+        1
+      >>,
+      TestAllTypesProto3,
+      Protox.DecodingError
     }
   ]