From e85ab0f13489b2d6ac0dab8694d19f79fcabbb59 Mon Sep 17 00:00:00 2001 From: Xuu Date: Mon, 3 Aug 2020 11:45:40 -0600 Subject: [PATCH] update primary-matches based on feedback --- data/schema/AS-BLOCK-SCHEMA | 2 +- data/schema/AS-SET-SCHEMA | 2 +- data/schema/AUT-NUM-SCHEMA | 2 +- data/schema/DNS-SCHEMA | 13 ++++++++++++- data/schema/KEY-CERT-SCHEMA | 3 ++- data/schema/PERSON-SCHEMA | 2 +- data/schema/REGISTRY-SCHEMA | 1 + data/schema/ROLE-SCHEMA | 2 +- data/schema/TINC-KEYSET-SCHEMA | 1 + 9 files changed, 21 insertions(+), 7 deletions(-) diff --git a/data/schema/AS-BLOCK-SCHEMA b/data/schema/AS-BLOCK-SCHEMA index 586771fcd..4ceb72975 100644 --- a/data/schema/AS-BLOCK-SCHEMA +++ b/data/schema/AS-BLOCK-SCHEMA @@ -8,6 +8,6 @@ key: admin-c optional multiple lookup=dn42.person,dn42.role key: tech-c optional multiple lookup=dn42.person,dn42.role key: remarks optional multiple key: source required single lookup=dn42.registry -primary-match: AS[0-9]+-AS[0-9]+ +primary-match: AS[0-9]{1,8}-AS[0-9]{1,8} mnt-by: DN42-MNT source: DN42 diff --git a/data/schema/AS-SET-SCHEMA b/data/schema/AS-SET-SCHEMA index 42f03d77b..fd41e69d2 100644 --- a/data/schema/AS-SET-SCHEMA +++ b/data/schema/AS-SET-SCHEMA @@ -9,6 +9,6 @@ key: admin-c optional multiple lookup=dn42.person,dn42.role key: tech-c optional multiple lookup=dn42.person,dn42.role key: remarks optional multiple key: source required single lookup=dn42.registry -primary-match: AS[0-9A-Z:-]+ +primary-match: [A-Z][0-9A-Z:-]{0,24} mnt-by: DN42-MNT source: DN42 diff --git a/data/schema/AUT-NUM-SCHEMA b/data/schema/AUT-NUM-SCHEMA index 5cb12466c..0437d1af4 100644 --- a/data/schema/AUT-NUM-SCHEMA +++ b/data/schema/AUT-NUM-SCHEMA @@ -19,6 +19,6 @@ key: mp-default optional multiple key: geo-loc optional multiple > [lat-c] [long-c] [name] key: remarks optional multiple key: source required single lookup=dn42.registry -primary-match: AS[0-9]+ +primary-match: AS[0-9]{1,8} mnt-by: DN42-MNT source: DN42 diff --git a/data/schema/DNS-SCHEMA b/data/schema/DNS-SCHEMA index 48a2db52b..03c7fff0d 100644 --- a/data/schema/DNS-SCHEMA +++ b/data/schema/DNS-SCHEMA @@ -12,6 +12,17 @@ key: country optional single key: ds-rdata optional multiple key: remarks optional multiple key: source required single lookup=dn42.registry -primary-match: [0-9a-z-]+.dn42 dn42 ff[0-9a-z]+ adm fmie hack helgo icvpn mueritz neo rzl 020 +primary-match: [0-9a-z-]{1,58}.dn42 + dn42 + ff[0-9a-z]{0,8} + adm + fmie + hack + helgo + icvpn + mueritz + neo + rzl + 020 mnt-by: DN42-MNT source: DN42 diff --git a/data/schema/KEY-CERT-SCHEMA b/data/schema/KEY-CERT-SCHEMA index 40ab2d9d5..5c9966311 100644 --- a/data/schema/KEY-CERT-SCHEMA +++ b/data/schema/KEY-CERT-SCHEMA @@ -11,6 +11,7 @@ key: admin-c optional multiple lookup=dn42.person,dn42.rol key: tech-c optional multiple lookup=dn42.person,dn42.role key: mnt-by required multiple lookup=dn42.mntner key: source required single -primary-match: PGPKEY-[0-9A-F]+ MTN-[0-9A-Z-]+ +primary-match: PGPKEY-[0-9A-F]{8} +primary-match: MTN-[0-9A-Z-]+ mnt-by: DN42-MNT source: DN42 diff --git a/data/schema/PERSON-SCHEMA b/data/schema/PERSON-SCHEMA index 824a8c907..c1d90cf8b 100644 --- a/data/schema/PERSON-SCHEMA +++ b/data/schema/PERSON-SCHEMA @@ -15,6 +15,6 @@ key: fax-no optional multiple key: address optional multiple key: remarks optional multiple key: source required single lookup=dn42.registry -primary-match: [0-9A-Z-]+-DN42 [0-9A-Z-]+-NEONETWORK +primary-match: [0-9A-Z-]+-[0-9A-Z]+ mnt-by: DN42-MNT source: DN42 diff --git a/data/schema/REGISTRY-SCHEMA b/data/schema/REGISTRY-SCHEMA index 9f380726d..0dcdd4ed2 100644 --- a/data/schema/REGISTRY-SCHEMA +++ b/data/schema/REGISTRY-SCHEMA @@ -7,5 +7,6 @@ key: mnt-by required multiple lookup=dn42.mntner key: admin-c optional multiple lookup=dn42.person,dn42.role key: tech-c optional multiple lookup=dn42.person,dn42.role key: source required single lookup=dn42.registry +primary-match: [A-Z0-9]+ mnt-by: DN42-MNT source: DN42 diff --git a/data/schema/ROLE-SCHEMA b/data/schema/ROLE-SCHEMA index ad30eddc6..a93bc45e3 100644 --- a/data/schema/ROLE-SCHEMA +++ b/data/schema/ROLE-SCHEMA @@ -11,6 +11,6 @@ key: abuse-mailbox optional multiple key: descr optional single key: remarks optional multiple key: source required single lookup=dn42.registry -primary-match: [0-9A-Z-]+-DN42 +primary-match: [0-9A-Z-]+-[0-9A-Z]+ mnt-by: DN42-MNT source: DN42 diff --git a/data/schema/TINC-KEYSET-SCHEMA b/data/schema/TINC-KEYSET-SCHEMA index 227069caf..474d2afdf 100644 --- a/data/schema/TINC-KEYSET-SCHEMA +++ b/data/schema/TINC-KEYSET-SCHEMA @@ -8,5 +8,6 @@ key: admin-c optional multiple lookup=dn42.person,dn42.rol key: tech-c optional multiple lookup=dn42.person,dn42.role key: mnt-by required multiple lookup=dn42.mntner key: source required single lookup=dn42.registry +primary-match: [0-9A-Z-]+-TINC-KEYSET mnt-by: DN42-MNT source: DN42