Merge pull request #2014 from anarkiwi/master

Handle invalid UTF-8 in ofdesc messages.

Author: anarkiwi

faucet/valve.py

@@ -367,13 +367,16 @@ def _add_ports_and_vlans(self, discovered_ports):
 
     def ofdescstats_handler(self, body):
         """Handle OF DP description."""
+        def _decode(msg_str):
+            return msg_str.decode('utf-8', errors='replace')
+
         self.metrics.of_dp_desc_stats.labels( # pylint: disable=no-member
             **dict(self.base_prom_labels,
-                   mfr_desc=body.mfr_desc.decode(),
-                   hw_desc=body.hw_desc.decode(),
-                   sw_desc=body.sw_desc.decode(),
-                   serial_num=body.serial_num.decode(),
-                   dp_desc=body.dp_desc.decode())).set(self.dp.dp_id)
+                   mfr_desc=_decode(body.mfr_desc),
+                   hw_desc=_decode(body.hw_desc),
+                   sw_desc=_decode(body.sw_desc),
+                   serial_num=_decode(body.serial_num),
+                   dp_desc=_decode(body.dp_desc))).set(self.dp.dp_id)
 
     def _set_port_status(self, port_no, port_status):
         """Set port operational status."""

tests/test_valve.py

@@ -1245,6 +1245,13 @@ def test_ofdescstats_handler(self):
                 serial_num=u'99'.encode(),
                 dp_desc=u'test_dp_desc'.encode())
             self.valve.ofdescstats_handler(body)
+            invalid_body = parser.OFPDescStats(
+                mfr_desc=b'\x80',
+                hw_desc=b'test_hw_desc',
+                sw_desc=b'test_sw_desc',
+                serial_num=b'99',
+                dp_desc=b'test_dp_desc')
+            self.valve.ofdescstats_handler(invalid_body)
 
 
 class ValveTestCase(ValveTestBases.ValveTestBig):