From f94f5c0745e772c32c00568b6fee8a400835f291 Mon Sep 17 00:00:00 2001 From: jowi Date: Sat, 29 Apr 2017 18:53:02 +0200 Subject: [PATCH 1/5] Update Init7 rules --- src/chrome/content/rules/Fiber7.ch.xml | 4 ++-- src/chrome/content/rules/Init7.xml | 33 +++++++++++++++++--------- 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/src/chrome/content/rules/Fiber7.ch.xml b/src/chrome/content/rules/Fiber7.ch.xml index a53ea1697fd3..eec5ef94c0de 100644 --- a/src/chrome/content/rules/Fiber7.ch.xml +++ b/src/chrome/content/rules/Fiber7.ch.xml @@ -4,11 +4,11 @@ --> - + + diff --git a/src/chrome/content/rules/Init7.xml b/src/chrome/content/rules/Init7.xml index fe83fdeba04f..ed3023c1bead 100644 --- a/src/chrome/content/rules/Init7.xml +++ b/src/chrome/content/rules/Init7.xml @@ -3,22 +3,33 @@ - Fiber7.ch.xml ---> - + Mismatch: + - init7.ch + - www.init7.ch - - + - camelus.init7.net + - ipv6.init7.net + - vombatus.init7.net - - + Refused: + - lists.init7.ch + + - colo.init7.net + - lists.init7.net + Customers: + - *.fiber7.init7.net - +--> + + + + + + - + + From a80275eb75c34981f68d1ad078cc978b7ab910c3 Mon Sep 17 00:00:00 2001 From: J0WI Date: Mon, 30 Oct 2017 19:58:35 +0100 Subject: [PATCH 2/5] incomplete cert chain errors --- src/chrome/content/rules/Init7.xml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/chrome/content/rules/Init7.xml b/src/chrome/content/rules/Init7.xml index ed3023c1bead..055c93fc69eb 100644 --- a/src/chrome/content/rules/Init7.xml +++ b/src/chrome/content/rules/Init7.xml @@ -17,6 +17,10 @@ - colo.init7.net - lists.init7.net + Incomplete cert chain: + - enoc.init7.net + - wc.init7.net + Customers: - *.fiber7.init7.net @@ -25,8 +29,6 @@ - - From 87882e2728825b37b424415632a21dbe5c79c431 Mon Sep 17 00:00:00 2001 From: J0WI Date: Sat, 4 Nov 2017 16:33:47 +0100 Subject: [PATCH 3/5] Merge Fiber7.ch.xml into Init7.xml --- src/chrome/content/rules/Fiber7.ch.xml | 16 ---------------- src/chrome/content/rules/Init7.xml | 13 +++++++++---- 2 files changed, 9 insertions(+), 20 deletions(-) delete mode 100644 src/chrome/content/rules/Fiber7.ch.xml diff --git a/src/chrome/content/rules/Fiber7.ch.xml b/src/chrome/content/rules/Fiber7.ch.xml deleted file mode 100644 index eec5ef94c0de..000000000000 --- a/src/chrome/content/rules/Fiber7.ch.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - diff --git a/src/chrome/content/rules/Init7.xml b/src/chrome/content/rules/Init7.xml index 055c93fc69eb..f8469ab2b353 100644 --- a/src/chrome/content/rules/Init7.xml +++ b/src/chrome/content/rules/Init7.xml @@ -1,8 +1,4 @@ + + + + + + + From 20b9bca827d398071e7abf4d168d0bae75c729f2 Mon Sep 17 00:00:00 2001 From: J0WI Date: Sat, 4 Nov 2017 16:37:15 +0100 Subject: [PATCH 4/5] Update customer domain comment --- src/chrome/content/rules/Init7.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chrome/content/rules/Init7.xml b/src/chrome/content/rules/Init7.xml index f8469ab2b353..bde7f9de81b1 100644 --- a/src/chrome/content/rules/Init7.xml +++ b/src/chrome/content/rules/Init7.xml @@ -19,7 +19,7 @@ - enoc.init7.net - wc.init7.net - Customers: + Customers (PTR Resource Records): - *.fiber7.init7.net --> From f3159c8626a00c4a9335bb9d823e9a68d2680c97 Mon Sep 17 00:00:00 2001 From: J0WI Date: Mon, 6 Nov 2017 22:54:02 +0100 Subject: [PATCH 5/5] Change wording --- src/chrome/content/rules/Init7.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/chrome/content/rules/Init7.xml b/src/chrome/content/rules/Init7.xml index bde7f9de81b1..d595429efd1f 100644 --- a/src/chrome/content/rules/Init7.xml +++ b/src/chrome/content/rules/Init7.xml @@ -19,8 +19,7 @@ - enoc.init7.net - wc.init7.net - Customers (PTR Resource Records): - - *.fiber7.init7.net + User-controlled subdomains (*.fiber7.init7.net) not covered here. -->