Merge pull request #1316 from simonpasquier/fix-decode-state

Fix potential panic in decodeState()

nflog/nflog.go

@@ -37,6 +37,9 @@ import (
 // ErrNotFound is returned for empty query results.
 var ErrNotFound = errors.New("not found")
 
+// ErrInvalidState is returned if the state isn't valid.
+var ErrInvalidState = fmt.Errorf("invalid state")
+
 // query currently allows filtering by and/or receiver group key.
 // It is configured via QueryParameter functions.
 //
@@ -239,6 +242,9 @@ func decodeState(r io.Reader) (state, error) {
 		var e pb.MeshEntry
 		_, err := pbutil.ReadDelimited(r, &e)
 		if err == nil {
+			if e.Entry == nil || e.Entry.Receiver == nil {
+				return nil, ErrInvalidState
+			}
 			st[stateKey(string(e.Entry.GroupKey), e.Entry.Receiver)] = &e
 			continue
 		}

nflog/nflog_test.go

@@ -296,3 +296,14 @@ func TestQuery(t *testing.T) {
 	require.EqualValues(t, firingAlerts, entry.FiringAlerts)
 	require.EqualValues(t, resolvedAlerts, entry.ResolvedAlerts)
 }
+
+func TestStateDecodingError(t *testing.T) {
+	// Check whether decoding copes with erroneous data.
+	s := state{"": &pb.MeshEntry{}}
+
+	msg, err := s.MarshalBinary()
+	require.NoError(t, err)
+
+	_, err = decodeState(bytes.NewReader(msg))
+	require.Equal(t, ErrInvalidState, err)
+}

silence/silence.go

@@ -40,6 +40,9 @@ import (
 // ErrNotFound is returned if a silence was not found.
 var ErrNotFound = fmt.Errorf("not found")
 
+// ErrInvalidState is returned if the state isn't valid.
+var ErrInvalidState = fmt.Errorf("invalid state")
+
 func utcNow() time.Time {
 	return time.Now().UTC()
 }
@@ -758,6 +761,9 @@ func decodeState(r io.Reader) (state, error) {
 		var s pb.MeshSilence
 		_, err := pbutil.ReadDelimited(r, &s)
 		if err == nil {
+			if s.Silence == nil {
+				return nil, ErrInvalidState
+			}
 			st[s.Silence.Id] = &s
 			continue
 		}

silence/silence_test.go

@@ -1080,3 +1080,14 @@ func TestStateCoding(t *testing.T) {
 		require.Equal(t, in, out, "decoded data doesn't match encoded data")
 	}
 }
+
+func TestStateDecodingError(t *testing.T) {
+	// Check whether decoding copes with erroneous data.
+	s := state{"": &pb.MeshSilence{}}
+
+	msg, err := s.MarshalBinary()
+	require.NoError(t, err)
+
+	_, err = decodeState(bytes.NewReader(msg))
+	require.Equal(t, ErrInvalidState, err)
+}