From 109f38629bf1c6d9afc4cffe2cb68e4a2e450790 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Thu, 27 Aug 2020 05:08:49 +0200 Subject: [PATCH] Add files via upload --- .../LittleSnitchNorwegianList.lsrules | 21 +++++++++---------- .../XYZPrepareFilters.py | 8 +++---- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/NorwegianExperimentalList alternate versions/LittleSnitchNorwegianList.lsrules b/NorwegianExperimentalList alternate versions/LittleSnitchNorwegianList.lsrules index 84e5d4f3c..f890b6a2a 100644 --- a/NorwegianExperimentalList alternate versions/LittleSnitchNorwegianList.lsrules +++ b/NorwegianExperimentalList alternate versions/LittleSnitchNorwegianList.lsrules @@ -354,17 +354,16 @@ { "action": "deny", "process": "any", "remote-addresses": "195.88.54.21" }, { "action": "deny", "process": "any", "remote-addresses": "195.88.55.21" }, { "action": "deny", "process": "any", "remote-addresses": "196.196.230.76" }, -{ "action": "deny", "process": "any", "remote-domains": "2001:67c:21e0::ad" } -]} +{ "action": "deny", "process": "any", "remote-addresses": "2001:67c:21e0::ad" }, -{ \"action\": \"allow\", \"process\": \"any\", \"remote-domains\": \"5d404.v.fwmrm.net" }, -{ \"action\": \"allow\", \"process\": \"any\", \"remote-domains\": \"elkjop.no.edgekey.net" }, -{ \"action\": \"allow\", \"process\": \"any\", \"remote-domains\": \"dnb.no.edgekey.net" }, -{ \"action\": \"allow\", \"process\": \"any\", \"remote-domains\": \"skatteetaten.no.cdn.cloudflare.net" }, -{ \"action\": \"allow\", \"process\": \"any\", \"remote-domains\": \"norwegian.com.cdn.cloudflare.net" }, -{ \"action\": \"allow\", \"process\": \"any\", \"remote-domains\": \"ad.dep.no" }, -{ \"action\": \"allow\", \"process\": \"any\", \"remote-domains\": \"ad.hem.no" }, -{ \"action\": \"allow\", \"process\": \"any\", \"remote-domains\": \"ads.mst.dk" }, -{ \"action\": \"allow\", \"process\": \"any\", \"remote-domains\": \"annonser.gess.no" }, +{ "action": "allow", "process": "any", "remote-domains": "5d404.v.fwmrm.net" }, +{ "action": "allow", "process": "any", "remote-domains": "elkjop.no.edgekey.net" }, +{ "action": "allow", "process": "any", "remote-domains": "dnb.no.edgekey.net" }, +{ "action": "allow", "process": "any", "remote-domains": "skatteetaten.no.cdn.cloudflare.net" }, +{ "action": "allow", "process": "any", "remote-domains": "norwegian.com.cdn.cloudflare.net" }, +{ "action": "allow", "process": "any", "remote-domains": "ad.dep.no" }, +{ "action": "allow", "process": "any", "remote-domains": "ad.hem.no" }, +{ "action": "allow", "process": "any", "remote-domains": "ads.mst.dk" }, +{ "action": "allow", "process": "any", "remote-domains": "annonser.gess.no" }, diff --git a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py index a7cfeea93..f67916369 100644 --- a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py +++ b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py @@ -2395,19 +2395,19 @@ def prepare_ls(lines) -> str: ) line = re.sub( - r"remote-domains(\": \"[0-9a-f:]{4,39}\")", - r"remote-addresses\1", + r"remote-domains(\": \"[0-9a-f:]{4,39})$", + r'remote-addresses\1" },', line ) line = re.sub( r"{ \"action\": \"deny\", \"process\": \"any\", \"remote-domains\": \"!", - r"{ \"action\": \"allow\", \"process\": \"any\", \"remote-domains\": \"", + r'{ "action": "allow", "process": "any", "remote-domains": "', line ) line = re.sub( - r"(\"2001:67c:21e0::ad$)", + r"(\"annonser\.gess\.no$)", r'\1" }\n]}', line )