From 0ccea3d7f0ea622a9e7a9d9e6342ef3ff2496484 Mon Sep 17 00:00:00 2001 From: Sami Mokaddem Date: Tue, 23 Nov 2021 15:32:27 +0100 Subject: [PATCH] chg: [meta_templates:enisa-csirt-inventory] Simplified regexes --- libraries/default/meta_fields/enisa-csirt-inventory.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/default/meta_fields/enisa-csirt-inventory.json b/libraries/default/meta_fields/enisa-csirt-inventory.json index 9171a5c..e5999e1 100644 --- a/libraries/default/meta_fields/enisa-csirt-inventory.json +++ b/libraries/default/meta_fields/enisa-csirt-inventory.json @@ -9,7 +9,7 @@ { "field": "website", "type": "text", - "regex": "(http(s)?:\\\/\\\/.)?(www\\.)?[-a-zA-Z0-9@:%._\\+~#=]{2,256}\\.[a-z]{2,6}\\b([-a-zA-Z0-9@:%_\\+.~#?&\/\/=]*)" + "regex": "/https?:\/\/." }, { "field": "enisa-geo-group", @@ -50,7 +50,7 @@ { "field": "email", "type": "text", - "regex": "(?:[a-z0-9!#$%&'*+\/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+\/=?^_`{|}~-]+)*|\"(?:[\\x01-\\x08\\x0b\\x0c\\x0e-\\x1f\\x21\\x23-\\x5b\\x5d-\\x7f]|\\\\[\\x01-\\x09\\x0b\\x0c\\x0e-\\x7f])*\")@(?:(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?|\\[(?:(?:(2(5[0-5]|[0-4][0-9])|1[0-9][0-9]|[1-9]?[0-9]))\\.){3}(?:(2(5[0-5]|[0-4][0-9])|1[0-9][0-9]|[1-9]?[0-9])|[a-z0-9-]*[a-z0-9]:(?:[\\x01-\\x08\\x0b\\x0c\\x0e-\\x1f\\x21-\\x5a\\x53-\\x7f]|\\\\[\\x01-\\x09\\x0b\\x0c\\x0e-\\x7f])+)\\])" + "regex": "[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+\\.[a-zA-Z0-9-.]+" }, { "field": "country-name", @@ -70,5 +70,5 @@ "scope": "organisation", "source": "enisa.europa.eu/topics/csirts-in-europe/csirt-inventory/certs-by-country-interactive-map", "uuid": "089c68c7-d97e-4f21-a798-159cd10f7864", - "version": 1 + "version": 2 } \ No newline at end of file