Fix #232 -- Always silently ignore object classes starting with *xx

irrdnet · Jun 24, 2019 · 224593e · 224593e
1 parent e9e6e64
commit 224593e
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 1 deletion.
diff --git a/docs/admins/object-validation.rst b/docs/admins/object-validation.rst
@@ -35,6 +35,8 @@ The parser/validator has two modes:
 * Strict: validates presence, count, and correct syntax of all fields.
   Validation fails on attributes that are not known, or object classes
   that are not known. Values of all fields are validated.
+  Unknown object classes that start with ``*xx`` are silently ignored,
+  as these are harmless artifacts from certain legacy IRRd versions.
 
 In addition, the following validation changes to primary/lookup keys apply
 in non-strict mode:

diff --git a/docs/users/mirroring.rst b/docs/users/mirroring.rst
@@ -182,6 +182,8 @@ Manual loading uses the ``irrd_load_database`` command:
   :doc:`non-strict object validation </admins/object-validation>`,
   an object with an unknown object class, or an object for which
   the `source` attribute is inconsistent with the `--source` argument.
+  Unknown object classes that start with ``*xx`` are silently ignored,
+  as these are harmless artifacts from certain legacy IRRd versions.
 * The object class filter configured, if any, is followed.
 
 On serials:

diff --git a/irrd/mirroring/parsers.py b/irrd/mirroring/parsers.py
@@ -110,6 +110,11 @@ def _parse_object(self, rpsl_text: str) -> Optional[str]:
             self.database_handler.upsert_rpsl_object(obj, forced_serial=self.serial)
 
         except UnknownRPSLObjectClassException as e:
+            # Ignore legacy IRRd artifacts
+            # https://github.com/irrdnet/irrd4/issues/232
+            if e.rpsl_object_class.startswith('*xx'):
+                self.obj_parsed -= 1  # This object does not exist to us
+                return None
             if self.direct_error_return:
                 return f'Unknown object class: {e.rpsl_object_class}'
             self.obj_unknown += 1

diff --git a/irrd/mirroring/tests/test_parsers.py b/irrd/mirroring/tests/test_parsers.py
@@ -5,7 +5,7 @@
 
 from irrd.rpsl.rpsl_objects import rpsl_object_from_text
 from irrd.utils.rpsl_samples import SAMPLE_ROUTE, SAMPLE_UNKNOWN_CLASS, SAMPLE_UNKNOWN_ATTRIBUTE, SAMPLE_MALFORMED_PK, \
-    SAMPLE_ROUTE6, SAMPLE_KEY_CERT, KEY_CERT_SIGNED_MESSAGE_VALID
+    SAMPLE_ROUTE6, SAMPLE_KEY_CERT, KEY_CERT_SIGNED_MESSAGE_VALID, SAMPLE_LEGACY_IRRD_ARTIFACT
 from irrd.utils.test_utils import flatten_mock_calls
 from .nrtm_samples import (SAMPLE_NRTM_V3, SAMPLE_NRTM_V1, SAMPLE_NRTM_V1_TOO_MANY_ITEMS, SAMPLE_NRTM_INVALID_VERSION,
                            SAMPLE_NRTM_V3_SERIAL_GAP, SAMPLE_NRTM_V3_INVALID_MULTIPLE_START_LINES,
@@ -33,6 +33,7 @@ def test_parse(self, monkeypatch, caplog, tmp_gpg_dir, config_override):
             SAMPLE_ROUTE.replace('TEST', 'BADSOURCE'),
             SAMPLE_UNKNOWN_CLASS,
             SAMPLE_MALFORMED_PK,
+            SAMPLE_LEGACY_IRRD_ARTIFACT,
         ]
         test_input = '\n\n'.join(test_data)
 

diff --git a/irrd/utils/rpsl_samples.py b/irrd/utils/rpsl_samples.py
@@ -613,6 +613,14 @@
 source:         TEST
 """
 
+# https://github.com/irrdnet/irrd4/issues/232
+SAMPLE_LEGACY_IRRD_ARTIFACT = """*xxte:          192.0.2.0/24
+origin:         AS65537
+mnt-by:         TEST-MNT
+changed:        2009-10-15T09:32:17Z
+source:         TEST
+"""
+
 SAMPLE_MALFORMED_ATTRIBUTE_NAME = """route:          192.0.2.0/24
 origin:         AS65537
 $$$-by:         TEST-MNT