From 0197698b6ad0cd88150769ec630970cec59d4a9e Mon Sep 17 00:00:00 2001 From: J0WI Date: Tue, 6 Sep 2016 16:16:30 +0200 Subject: [PATCH 01/17] add more hosts to swissgov.xml --- ...Financial_Market_Supervisory_Authority.xml | 15 +- src/chrome/content/rules/dot.swiss.xml | 5 +- src/chrome/content/rules/swissgov.xml | 299 ++++++++++++++---- 3 files changed, 235 insertions(+), 84 deletions(-) diff --git a/src/chrome/content/rules/Swiss_Financial_Market_Supervisory_Authority.xml b/src/chrome/content/rules/Swiss_Financial_Market_Supervisory_Authority.xml index 809a5c2391e9..e786ed9c1fa6 100644 --- a/src/chrome/content/rules/Swiss_Financial_Market_Supervisory_Authority.xml +++ b/src/chrome/content/rules/Swiss_Financial_Market_Supervisory_Authority.xml @@ -1,24 +1,15 @@ - - + + diff --git a/src/chrome/content/rules/dot.swiss.xml b/src/chrome/content/rules/dot.swiss.xml index be94320e663a..f662b795cd0f 100644 --- a/src/chrome/content/rules/dot.swiss.xml +++ b/src/chrome/content/rules/dot.swiss.xml @@ -1,10 +1,9 @@ @@ -14,8 +13,6 @@ - diff --git a/src/chrome/content/rules/swissgov.xml b/src/chrome/content/rules/swissgov.xml index 4854b8068ef7..3d16e0f9bd09 100644 --- a/src/chrome/content/rules/swissgov.xml +++ b/src/chrome/content/rules/swissgov.xml @@ -1,4 +1,10 @@ - - - - - + + + + + + + + - - - - - - + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + - + + - + + - + + - - + + + - - + + + - - - - + + + + + + + + + - + + - + + - - - - + + + + + + + + - - + - - - - - - - - - - - - + + + + + + + + + + + From b085d930cc3bc0066529e00bb8a8701857c768b9 Mon Sep 17 00:00:00 2001 From: J0WI Date: Tue, 6 Sep 2016 18:22:18 +0200 Subject: [PATCH 02/17] fixed duped targets --- ...iss_Federal_Institute_of_Intellectual_Property.xml | 11 ++--------- src/chrome/content/rules/swissgov.xml | 9 ++------- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/src/chrome/content/rules/Swiss_Federal_Institute_of_Intellectual_Property.xml b/src/chrome/content/rules/Swiss_Federal_Institute_of_Intellectual_Property.xml index 5fca0bcfe534..5f2dbe08e782 100644 --- a/src/chrome/content/rules/Swiss_Federal_Institute_of_Intellectual_Property.xml +++ b/src/chrome/content/rules/Swiss_Federal_Institute_of_Intellectual_Property.xml @@ -1,25 +1,18 @@ - - - diff --git a/src/chrome/content/rules/swissgov.xml b/src/chrome/content/rules/swissgov.xml index 3d16e0f9bd09..7cb0f22a6979 100644 --- a/src/chrome/content/rules/swissgov.xml +++ b/src/chrome/content/rules/swissgov.xml @@ -2,6 +2,7 @@ Other swissgov rulesets: - dot.swiss.xml + - Swiss_Federal_Institute_of_Intellectual_Property.xml - Swiss_Financial_Market_Supervisory_Authority.xml @@ -198,12 +199,6 @@ - - - - - - @@ -220,7 +215,6 @@ - @@ -271,6 +265,7 @@ + From 7995f68486676464439ef2195bab843a6abc8f2e Mon Sep 17 00:00:00 2001 From: J0WI Date: Sun, 11 Sep 2016 17:45:36 +0200 Subject: [PATCH 03/17] exclude (www.)parlament.ch because of test errors --- src/chrome/content/rules/swissgov.xml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/chrome/content/rules/swissgov.xml b/src/chrome/content/rules/swissgov.xml index 7cb0f22a6979..b727972f3286 100644 --- a/src/chrome/content/rules/swissgov.xml +++ b/src/chrome/content/rules/swissgov.xml @@ -262,10 +262,9 @@ - + From aaa64a26d94abccb7a6a4069c83e3cdcd2943b86 Mon Sep 17 00:00:00 2001 From: J0WI Date: Sun, 11 Sep 2016 18:12:03 +0200 Subject: [PATCH 04/17] fix check error --- .../Swiss_Financial_Market_Supervisory_Authority.xml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/chrome/content/rules/Swiss_Financial_Market_Supervisory_Authority.xml b/src/chrome/content/rules/Swiss_Financial_Market_Supervisory_Authority.xml index e786ed9c1fa6..ced3903e73e8 100644 --- a/src/chrome/content/rules/Swiss_Financial_Market_Supervisory_Authority.xml +++ b/src/chrome/content/rules/Swiss_Financial_Market_Supervisory_Authority.xml @@ -1,15 +1,19 @@ - - From f5ce3ac9711a0b9788341f7cbd74ce7a055d681b Mon Sep 17 00:00:00 2001 From: J0WI Date: Tue, 13 Sep 2016 14:10:09 +0200 Subject: [PATCH 05/17] add sas.admin.ch --- src/chrome/content/rules/swissgov.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/chrome/content/rules/swissgov.xml b/src/chrome/content/rules/swissgov.xml index b727972f3286..19d852203a66 100644 --- a/src/chrome/content/rules/swissgov.xml +++ b/src/chrome/content/rules/swissgov.xml @@ -227,6 +227,7 @@ + From 2383a7016b14f84b7fe8c4771ced4beab3fa3f45 Mon Sep 17 00:00:00 2001 From: J0WI Date: Tue, 13 Sep 2016 14:18:13 +0200 Subject: [PATCH 06/17] add webftp.admin.ch --- src/chrome/content/rules/swissgov.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/chrome/content/rules/swissgov.xml b/src/chrome/content/rules/swissgov.xml index 19d852203a66..1d01c79414f6 100644 --- a/src/chrome/content/rules/swissgov.xml +++ b/src/chrome/content/rules/swissgov.xml @@ -218,6 +218,7 @@ + From 798ff41e551a77ac6e71e076456e9ac3c1e87409 Mon Sep 17 00:00:00 2001 From: jowi Date: Mon, 3 Oct 2016 15:14:58 +0200 Subject: [PATCH 07/17] fix mismatch on ^nic.swiss --- src/chrome/content/rules/dot.swiss.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/chrome/content/rules/dot.swiss.xml b/src/chrome/content/rules/dot.swiss.xml index f662b795cd0f..35e366d6e005 100644 --- a/src/chrome/content/rules/dot.swiss.xml +++ b/src/chrome/content/rules/dot.swiss.xml @@ -4,6 +4,7 @@ Mismatch: - 8.swiss - 1.8.swiss + - ^nic.swiss --> @@ -13,6 +14,13 @@ + + + + + + From e472d01d961d63a7f21ce0598d1b37cf25017367 Mon Sep 17 00:00:00 2001 From: jowi Date: Sun, 12 Mar 2017 14:15:36 +0100 Subject: [PATCH 08/17] add some missing hosts and update comments --- ...iss_Federal_Institute_of_Intellectual_Property.xml | 11 +++++++++-- .../Swiss_Financial_Market_Supervisory_Authority.xml | 5 ++++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/chrome/content/rules/Swiss_Federal_Institute_of_Intellectual_Property.xml b/src/chrome/content/rules/Swiss_Federal_Institute_of_Intellectual_Property.xml index 5f2dbe08e782..0d483933e8b7 100644 --- a/src/chrome/content/rules/Swiss_Federal_Institute_of_Intellectual_Property.xml +++ b/src/chrome/content/rules/Swiss_Federal_Institute_of_Intellectual_Property.xml @@ -1,18 +1,25 @@ + + + + diff --git a/src/chrome/content/rules/Swiss_Financial_Market_Supervisory_Authority.xml b/src/chrome/content/rules/Swiss_Financial_Market_Supervisory_Authority.xml index ced3903e73e8..952a56b13ca1 100644 --- a/src/chrome/content/rules/Swiss_Financial_Market_Supervisory_Authority.xml +++ b/src/chrome/content/rules/Swiss_Financial_Market_Supervisory_Authority.xml @@ -1,5 +1,5 @@ + + + From 3aed323e2eb8d690ed4f7fcf0a440ab2a77dd9db Mon Sep 17 00:00:00 2001 From: jowi Date: Sun, 12 Mar 2017 14:57:01 +0100 Subject: [PATCH 09/17] removed obsolete target --- src/chrome/content/rules/swissgov.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/src/chrome/content/rules/swissgov.xml b/src/chrome/content/rules/swissgov.xml index 1d01c79414f6..55376cdd3ed4 100644 --- a/src/chrome/content/rules/swissgov.xml +++ b/src/chrome/content/rules/swissgov.xml @@ -253,7 +253,6 @@ - From 27d9a5037d9d8c38f123a0816a32fdee3ed11cf9 Mon Sep 17 00:00:00 2001 From: jowi Date: Mon, 13 Mar 2017 23:26:51 +0100 Subject: [PATCH 10/17] fix refused host --- .../rules/Swiss_Federal_Institute_of_Intellectual_Property.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chrome/content/rules/Swiss_Federal_Institute_of_Intellectual_Property.xml b/src/chrome/content/rules/Swiss_Federal_Institute_of_Intellectual_Property.xml index 0d483933e8b7..5fca0bcfe534 100644 --- a/src/chrome/content/rules/Swiss_Federal_Institute_of_Intellectual_Property.xml +++ b/src/chrome/content/rules/Swiss_Federal_Institute_of_Intellectual_Property.xml @@ -5,6 +5,7 @@ - abnahme.swissreg.ch Refused: + - ip-search.ch - client.ip-search.ch - swissreg.ch @@ -19,7 +20,6 @@ - From 1b86c2d922d53c07a19eb6fab018e5776e6b95a5 Mon Sep 17 00:00:00 2001 From: jowi Date: Mon, 13 Mar 2017 23:49:09 +0100 Subject: [PATCH 11/17] comment out test url --- .../rules/Swiss_Financial_Market_Supervisory_Authority.xml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/chrome/content/rules/Swiss_Financial_Market_Supervisory_Authority.xml b/src/chrome/content/rules/Swiss_Financial_Market_Supervisory_Authority.xml index 952a56b13ca1..0898acb1dce4 100644 --- a/src/chrome/content/rules/Swiss_Financial_Market_Supervisory_Authority.xml +++ b/src/chrome/content/rules/Swiss_Financial_Market_Supervisory_Authority.xml @@ -15,8 +15,10 @@ - - + From 344660ae2a32d241d8338576745f1ad8f2040353 Mon Sep 17 00:00:00 2001 From: jowi Date: Sat, 18 Mar 2017 21:10:14 +0100 Subject: [PATCH 12/17] cosmetics --- .../rules/Swiss_Financial_Market_Supervisory_Authority.xml | 2 +- src/chrome/content/rules/dot.swiss.xml | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/chrome/content/rules/Swiss_Financial_Market_Supervisory_Authority.xml b/src/chrome/content/rules/Swiss_Financial_Market_Supervisory_Authority.xml index 0898acb1dce4..809a5c2391e9 100644 --- a/src/chrome/content/rules/Swiss_Financial_Market_Supervisory_Authority.xml +++ b/src/chrome/content/rules/Swiss_Financial_Market_Supervisory_Authority.xml @@ -16,7 +16,7 @@ diff --git a/src/chrome/content/rules/dot.swiss.xml b/src/chrome/content/rules/dot.swiss.xml index 35e366d6e005..be94320e663a 100644 --- a/src/chrome/content/rules/dot.swiss.xml +++ b/src/chrome/content/rules/dot.swiss.xml @@ -1,5 +1,5 @@ + From 2935ca8e0584519285722c2ad75120d8b971b1f0 Mon Sep 17 00:00:00 2001 From: jowi Date: Tue, 21 Mar 2017 20:50:03 +0100 Subject: [PATCH 14/17] reorganize comments --- src/chrome/content/rules/swissgov.xml | 168 +++++++++++++------------- 1 file changed, 84 insertions(+), 84 deletions(-) diff --git a/src/chrome/content/rules/swissgov.xml b/src/chrome/content/rules/swissgov.xml index c2f0eead5cc6..17f1f3d21861 100644 --- a/src/chrome/content/rules/swissgov.xml +++ b/src/chrome/content/rules/swissgov.xml @@ -18,14 +18,11 @@ - ur.ch - vd.ch - redirect: - - lu.ch + lu.ch (r) - no response: - - ne.ch + ne.ch (t) - self-signed: - - miljobs.ch + miljobs.ch (s) ag.ch - hydroftp @@ -52,21 +49,19 @@ - geoportail - mapfish - w3 - 404: - - album - - eco - - rsju + - album (d) + - eco (d) + - rsju (d) sh.ch - - 404 on subdomains + - *.sh.ch (d) so.ch - ausbildungsprogramm - lehrmittelshop - rrb - www.* - Mismatch: - - bgs + - bgs (m) vs.ch - escadaweb @@ -83,94 +78,98 @@ admin.ch: - - rpvz.nb ¬ - - www.afd ² - - www.ar ¬ - - www.are ¹ - - www.astra ° - - www.babs ¬ - - www.bafu ¹ - - www.bag ¹ - - www.bak ¹ - - www.bar ¹ - - www.baspo ¬ - - www.baspo ¹ - - www.bfe ¹ - - www.bfs ¬ - - www.big ¬ - - www.bit ° - - www.bsv ¹ - - www.btm · - - www.bwl ¹ - - www.comcom ¹ - - www.deseco ¹ - - www.disclaimer ¹ - - www.ebg ¹ - - www.ejpd · - - www.esbk · - - www.eschk· - - www.esti ° - - www.ezv ¹ - - www.gs-vbs ¬ - - www.isc-ejpd · - - www.kmu ¹ - - www.lw ¹ - - www.meteoschweiz ¬ - - www.meteosuisse ¬ - - www.meteosvizzera ¬ - - www.meteoswiss ¬ - - www.ndb ¬ - - www.nkvf· - - www.oa ¬ - - www.postcom ¹ - - www.ske ° - - www.spitex.bfs ¹ - - www.sust ° - - www.ubi ° - - www.vbs ¬ - - www.vtg ¹ + - rpvz.nb (m) + - www.afd (d) + - www.ar (m) + - www.are (r) + - www.astra (h) + - www.babs (m) + - www.bafu (r) + - www.bag (r) + - www.bak (r) + - www.bar (r) + - www.baspo (m) + - www.baspo (r) + - www.bfe (r) + - www.bfs (m) + - www.big (m) + - www.bit (h) + - www.bsv (r) + - www.btm (t) + - www.bwl (r) + - www.comcom (r) + - www.deseco (r) + - www.disclaimer (r) + - www.ebg (r) + - www.ejpd (t) + - www.esbk (t) + - www.eschk(t) + - www.esti (h) + - www.ezv (r) + - www.gs-vbs (m) + - www.isc-ejpd (t) + - www.kmu (r) + - www.lw (r) + - www.meteoschweiz (m) + - www.meteosuisse (m) + - www.meteosvizzera (m) + - www.meteoswiss (m) + - www.ndb (m) + - www.nkvf(t) + - www.oa (m) + - www.postcom (r) + - www.ske (h) + - www.spitex.bfs (r) + - www.sust (h) + - www.ubi (h) + - www.vbs (m) + - www.vtg (r) ^admin.ch doesn't exist. ensi.ch: - - static ¬ + - static (m) - (www.)dasgebaeudeprogramm.ch ¬ + (www.)dasgebaeudeprogramm.ch (m) - (www.)isdc.ch ¬ + (www.)isdc.ch (m) - (www.)gottardo2016.ch ¬ + (www.)gottardo2016.ch (m) - (www.)naturgefahren.ch ¬ - (www.)dangers-naturels.ch ¬ - (www.)pericoli-naturali.ch ¬ - (www.)privels-natira.ch ¬ - (www.)natural-hazards.ch ¬ + (www.)naturgefahren.ch (m) + (www.)dangers-naturels.ch (m) + (www.)pericoli-naturali.ch (m) + (www.)privels-natira.ch (m) + (www.)natural-hazards.ch (m) rab-asr.ch: - - newsletter ¬ - - register ¹ + - newsletter (m) + - register (r) metas.ch: - - (www.) · - - legnet · + - (www.) (t) + - legnet (t) - ^publica.ch ² + ^publica.ch (d) - ¹ Refused - ² Data differs from http - ° Redirect - ¬ Mismatch - · Timeout + + d: data differs from http + h: http redirect + m: certificate mismatch + r: connection refused + s: self-signed certificate + t: timeout on https --> - + + + @@ -270,6 +269,9 @@ + + + @@ -303,8 +305,9 @@ + @@ -342,18 +345,15 @@ - - + From 4ddaa991c1895c2e10d4de3a322e9499a87a8013 Mon Sep 17 00:00:00 2001 From: J0WI Date: Thu, 23 Mar 2017 13:11:00 +0100 Subject: [PATCH 15/17] update non-working hosts in *.admin.ch --- src/chrome/content/rules/swissgov.xml | 53 ++++++++++++++------------- 1 file changed, 28 insertions(+), 25 deletions(-) diff --git a/src/chrome/content/rules/swissgov.xml b/src/chrome/content/rules/swissgov.xml index 17f1f3d21861..8b90e4c256ae 100644 --- a/src/chrome/content/rules/swissgov.xml +++ b/src/chrome/content/rules/swissgov.xml @@ -81,47 +81,27 @@ - rpvz.nb (m) - www.afd (d) - www.ar (m) - - www.are (r) - - www.astra (h) - www.babs (m) - - www.bafu (r) - - www.bag (r) - www.bak (r) - - www.bar (r) - www.baspo (m) - - www.baspo (r) - www.bfe (r) - - www.bfs (m) - www.big (m) - www.bit (h) - - www.bsv (r) - - www.btm (t) - - www.bwl (r) - www.comcom (r) - www.deseco (r) - www.disclaimer (r) - - www.ebg (r) - - www.ejpd (t) - - www.esbk (t) - - www.eschk(t) - www.esti (h) - - www.ezv (r) - www.gs-vbs (m) - - www.isc-ejpd (t) - - www.kmu (r) + - www.hydrodaten (t) - www.lw (r) - www.meteoschweiz (m) - www.meteosuisse (m) - www.meteosvizzera (m) - www.meteoswiss (m) - www.ndb (m) - - www.nkvf(t) - www.oa (m) - www.postcom (r) - - www.ske (h) - - www.spitex.bfs (r) - - www.sust (h) - - www.ubi (h) + - www.sib (s) - www.vbs (m) - www.vtg (r) @@ -166,24 +146,30 @@ + + + + + - + - + + @@ -191,12 +177,18 @@ - + + + + + + + @@ -216,8 +208,10 @@ + + @@ -225,7 +219,9 @@ + + @@ -236,6 +232,9 @@ + + + @@ -246,6 +245,10 @@ + + + + From b6f52f7731e32e82d6200f89b1580bd4c10e7aef Mon Sep 17 00:00:00 2001 From: jowi Date: Sun, 9 Apr 2017 19:56:55 +0200 Subject: [PATCH 16/17] update comments for admin.ch --- src/chrome/content/rules/swissgov.xml | 32 ++++++++++++++++----------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/src/chrome/content/rules/swissgov.xml b/src/chrome/content/rules/swissgov.xml index 8b90e4c256ae..6aee51206375 100644 --- a/src/chrome/content/rules/swissgov.xml +++ b/src/chrome/content/rules/swissgov.xml @@ -84,16 +84,16 @@ - www.babs (m) - www.bak (r) - www.baspo (m) - - www.bfe (r) + - www.bfe (h) - www.big (m) - www.bit (h) - www.comcom (r) - - www.deseco (r) - - www.disclaimer (r) + - www.deseco (m) + - www.disclaimer (m) - www.esti (h) - www.gs-vbs (m) - www.hydrodaten (t) - - www.lw (r) + - www.lw (m) - www.meteoschweiz (m) - www.meteosuisse (m) - www.meteosvizzera (m) @@ -103,7 +103,7 @@ - www.postcom (r) - www.sib (s) - www.vbs (m) - - www.vtg (r) + - www.vtg (m) ^admin.ch doesn't exist. @@ -113,28 +113,33 @@ (www.)dasgebaeudeprogramm.ch (m) - (www.)isdc.ch (m) + (www.)isdc.ch (f) (www.)gottardo2016.ch (m) - (www.)naturgefahren.ch (m) - (www.)dangers-naturels.ch (m) - (www.)pericoli-naturali.ch (m) - (www.)privels-natira.ch (m) - (www.)natural-hazards.ch (m) + naturgefahren.ch (t) + www.naturgefahren.ch (m) + dangers-naturels.ch (t) + www.dangers-naturels.ch (m) + pericoli-naturali.ch (t) + www.pericoli-naturali.ch (m) + privels-natira.ch (t) + www.privels-natira.ch (m) + natural-hazards.ch (t) + www.natural-hazards.ch (m) rab-asr.ch: - newsletter (m) - - register (r) + - register (m) metas.ch: - - (www.) (t) - legnet (t) ^publica.ch (d) d: data differs from http + f: secure connection failed h: http redirect m: certificate mismatch r: connection refused @@ -195,6 +200,7 @@ + From d82b29149c4f37b3e056077f9a7488a32bc383e8 Mon Sep 17 00:00:00 2001 From: jowi Date: Fri, 28 Apr 2017 03:39:41 +0200 Subject: [PATCH 17/17] Update swissgoc.xml --- src/chrome/content/rules/swissgov.xml | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/src/chrome/content/rules/swissgov.xml b/src/chrome/content/rules/swissgov.xml index 6aee51206375..c48dffffde31 100644 --- a/src/chrome/content/rules/swissgov.xml +++ b/src/chrome/content/rules/swissgov.xml @@ -28,6 +28,9 @@ - hydroftp - newsletter + be.ch + - ^ (m) + ge.ch - bdp - edu @@ -39,12 +42,16 @@ - wap - vnm + gl.ch + - (www.) (mixed content) + gr.ch - www.* mixed content: - geo jura.ch + - ^ (d) - extranet - geoportail - mapfish @@ -145,10 +152,13 @@ r: connection refused s: self-signed certificate t: timeout on https + + + No valid test url known: + - link.admin.ch --> - @@ -160,6 +170,7 @@ + @@ -294,10 +305,6 @@ - - - - @@ -313,10 +320,10 @@ - - + @@ -347,17 +354,17 @@ + + -