From 7dc7df9d89bee2284c2e62078c70985f3bfdefa5 Mon Sep 17 00:00:00 2001
From: Pasu Chan <ccspasu@gmail.com>
Date: Sat, 3 Jun 2017 10:54:59 +0800
Subject: [PATCH 1/3] Re-activate and Update
 Karlsruhe_Institute_of_Technology.xml

---
 ...he_Institute_of_Technology-problematic.xml |  21 ---
 .../Karlsruhe_Institute_of_Technology.xml     | 174 +++---------------
 2 files changed, 26 insertions(+), 169 deletions(-)
 delete mode 100644 src/chrome/content/rules/Karlsruhe_Institute_of_Technology-problematic.xml

diff --git a/src/chrome/content/rules/Karlsruhe_Institute_of_Technology-problematic.xml b/src/chrome/content/rules/Karlsruhe_Institute_of_Technology-problematic.xml
deleted file mode 100644
index 54c93169e6c0..000000000000
--- a/src/chrome/content/rules/Karlsruhe_Institute_of_Technology-problematic.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<!--
-	For rules that are on by default, see Karlsruhe_Institute_of_Technology.xml.
-
--->
-<ruleset name="Karlsruhe Institute of Technology (problematic)" default_off="self-signed">
-
-	<target host="blog.bibliothek.kit.edu" />
-	<target host="studiumundbehinderung.kit.edu" />
-	<target host="www.studiumundbehinderung.kit.edu" />
-
-
-	<!--	Cookies are handled in Karlsruhe_Institute_of_Technology.xml.	-->
-
-
-	<rule from="^http://blog\.bibliothek\.kit\.edu/"
-		to="https://blog.bibliothek.kit.edu/" />
-
-	<rule from="^http://(?:www\.)?studiumundbehinderung\.kit\.edu/"
-		to="https://studiumundbehinderung.kit.edu/" />
-
-</ruleset>
diff --git a/src/chrome/content/rules/Karlsruhe_Institute_of_Technology.xml b/src/chrome/content/rules/Karlsruhe_Institute_of_Technology.xml
index b4e053828224..f58b03e9f1e8 100644
--- a/src/chrome/content/rules/Karlsruhe_Institute_of_Technology.xml
+++ b/src/chrome/content/rules/Karlsruhe_Institute_of_Technology.xml
@@ -1,152 +1,30 @@
 <!--
-Disabled by https-everywhere-checker because:
-Fetch error: http://uni-karlsruhe.de/ => https://www.uni-karlsruhe.de/: (6, 'Could not resolve host: uni-karlsruhe.de')
-	For problematic rules, see Karlsruhe_Institute_of_Technology-problematic.xml.
-
-
-	Nonfunctional domains:
-
-		- rz.uni-karlsruhe.de *
-
-	* Refused
-
-
-	Problematic domains:
-
-		- kit.edu subdomains:
-
-			- ^ ¹
-			- bibliothek ¹
-			- blog.bibliothek ²
-			- (www.)cs ³
-			- informatik ¹
-			- innovation ¹
-			- lists ¹
-			- ptka ¹
-			- rsm ¹
-			- scc ¹
-
-		- www.rz.uni-karlsruhe.de ⁴
-
-	¹ Cert only matches www.foo
-	² Mixed css
-	³ Mismatched, CN: www.informatik.kit.edu
-	⁴ Mismatched, CN: www.scc.kit.edu
-
-
-	Partially covered domains:
-
-		- blog.bibliothek.kit.edu *
-
-	* Avoiding broken MCB
-
-
-	Fully covered domains:
-
-		- kit.edu subdomains:
-
-			- (www.)		(^ → www)
-			- (www.)bibliothek	(^ → www)
-			- (www.)cs		(→ www.informatik)
-			- (www.)informatik	(^ → www)
-			- (www.)innovation	(^ → www)
-			- intranet
-			- (www.)lists		(^ → www)
-			- (www.)ptka		(^ → www)
-			- (www.)rsm		(^ → www)
-			- (www.)scc		(^ → www)
-			- wsm10.scc
-			- idp.scc
-			- stadium
-			- ilias.stadium
-
-		- uni-karlsruhe.de subdomains:
-
-			- mensa.akk
-			- www.rz	(→ www.scc.kit.edu)
-			- www.ubka
-
-
-	Mixed content:
-
-		- css on blog.bibliothek from $self ¹
-
-		- Images, on:
-
-			- blog.bibliothek from $self ¹
-			- blog.bibliothek from www.ubka.uni-karlsruhe.de ¹
-			- www.informatik from www-gf.ira.uka.de ²
-			- www.ptka from wsm10.scc ¹
-			- www from $self ¹
-
-			- www.ubka.uni-karlsruhe.de from $self ¹
-
-		- Bug on www.bibliothek from dbspixel.hbz-nrw.de ¹
-
-	¹ Secured by us
-	² Unsecurable <= refused
-
+	Non-functional hosts in *.kit.edu
+		SSL peer certificate was not OK:
+			 - bibliothek.kit.edu
+			 - cs.kit.edu
+			 - www.cs.kit.edu
+			 - informatik.kit.edu
+			 - innovation.kit.edu
+			 - lists.kit.edu
+			 - ptka.kit.edu
+			 - rsm.kit.edu
+			 - scc.kit.edu
+			 - studiumundbehinderung.kit.edu
 -->
-<ruleset name="Karlsruhe Institute of Technology (partial)" default_off='failed ruleset test'>
-
+<ruleset name="Karlsruhe Institute of Technology (partial)">
 	<target host="kit.edu" />
-	<target host="*.kit.edu" />
-		<!--
-			Avoid false/broken MCB:
-						-->
-		<exclusion pattern="^http://blog\.bibliothek\.kit\.edu/+(?!\w+/wp-(?:content|includes)/)" />
-
-	<target host="uni-karlsruhe.de" />
-	<target host="*.uni-karlsruhe.de" />
-
-
-	<!--	Not secured by server:
-					-->
-	<!--securecookie host="^(www\.bibliothek|www\.informatik|www\.innovation|www\.intl|www\.ptka|www\.rsm|www\.scc|www)\.kit\.edu$" name="^PHPSESSID$" /-->
-	<!--securecookie host="^wsm10\.scc\.kit\.edu$" name="^ASPSESSIONID[A-Z]{8}$" /-->
-
-	<securecookie host="^.+\.kit\.edu$" name=".+" />
-
-
-	<!--	- Self-signed
-		- Redirects like so
-					-->
-	<rule from="^http://(?:www\.)?alumni\.kit\.edu/"
-		to="https://www.rsm.kit.edu/" />
-
-	<!--	^pst, ^radio: self-signed
-					-->
-	<rule from="^http://(?:www\.)?((?:bibliothek|informatik|innovation|lists|pst|ptka|radio|rsm|scc)\.)?kit\.edu/"
-		to="https://www.$1kit.edu/" />
-
-	<!--	^stiftung.kit.edu doesn't exist.
-							-->
-	<rule from="^http://(blog\.bibliothek|campus|(?:jplag|svn)\.ipd|intranet|owa|(?:idp|wsm10)\.scc|(?:ilias\.)?stadium|www\.stiftung)\.kit\.edu/"
-		to="https://$1.kit.edu/" />
-
-	<!--	Redirect keeps path and args:
-						-->
-	<rule from="^http://(?:www\.)?cs\.kit\.edu/+"
-		to="https://www.informatik.kit.edu/" />
-
-	<!--	- CN: www.kit.edu
-		- ^zib doesn't exist
-		- Redirects like so
-					-->
-	<rule from="^http://www\.zib\.kit\.edu/(?:.*)"
-		to="https://www.kit.edu/studieren/3052.php" />
-
-	<!--	^uni-karlsruhe & zvw: self-signed.
-					-->
-	<rule from="^http://(?:www\.)?(zvw\.)?uni-karlsruhe\.de/"
-		to="https://www.$1uni-karlsruhe.de/" />
-
-	<rule from="^http://(mensa\.akk|www\.ubka)\.uni-karlsruhe\.de/"
-		to="https://$1.uni-karlsruhe.de/" />
-
-	<!--	Redirect keeps path and args:
-						-->
-	<rule from="^http://www\.rz\.uni-karlsruhe\.de/+"
-		to="https://www.scc.kit.edu/" />
-
+	<target host="www.kit.edu" />
+	<target host="blog.bibliothek.kit.edu" />
+	<target host="www.informatik.kit.edu" />
+	<target host="www.innovation.kit.edu" />
+	<target host="www.lists.kit.edu" />
+	<target host="www.ptka.kit.edu" />
+	<target host="www.rsm.kit.edu" />
+	<target host="idp.scc.kit.edu" />
+	<target host="wsm10.scc.kit.edu" />
+	<target host="www.scc.kit.edu" />
+	<target host="www.studiumundbehinderung.kit.edu" />
+
+	<rule from="^http:" to="https:" />
 </ruleset>

From dc98bfd1e0a2bb0f44ef280519eff839a5281bd3 Mon Sep 17 00:00:00 2001
From: Pasu Chan <ccspasu@gmail.com>
Date: Sat, 3 Jun 2017 11:07:02 +0800
Subject: [PATCH 2/3] Update Karlsruhe_Institute_of_Technology.xml

Add 'campus.kit.edu', 'owa.kit.edu', 'intranet.kit.edu'
---
 src/chrome/content/rules/Karlsruhe_Institute_of_Technology.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/chrome/content/rules/Karlsruhe_Institute_of_Technology.xml b/src/chrome/content/rules/Karlsruhe_Institute_of_Technology.xml
index f58b03e9f1e8..91156882153a 100644
--- a/src/chrome/content/rules/Karlsruhe_Institute_of_Technology.xml
+++ b/src/chrome/content/rules/Karlsruhe_Institute_of_Technology.xml
@@ -16,9 +16,12 @@
 	<target host="kit.edu" />
 	<target host="www.kit.edu" />
 	<target host="blog.bibliothek.kit.edu" />
+	<target host="campus.kit.edu" />
 	<target host="www.informatik.kit.edu" />
 	<target host="www.innovation.kit.edu" />
+	<target host="intranet.kit.edu" />
 	<target host="www.lists.kit.edu" />
+	<target host="owa.kit.edu" />
 	<target host="www.ptka.kit.edu" />
 	<target host="www.rsm.kit.edu" />
 	<target host="idp.scc.kit.edu" />

From 948c920ecfb3471ee2fa9a333d0776b5e571f38d Mon Sep 17 00:00:00 2001
From: Pasu Chan <ccspasu@gmail.com>
Date: Mon, 12 Jun 2017 19:38:28 +0800
Subject: [PATCH 3/3] Update Karlsruhe_Institute_of_Technology.xml

---
 .../rules/Karlsruhe_Institute_of_Technology.xml   | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/chrome/content/rules/Karlsruhe_Institute_of_Technology.xml b/src/chrome/content/rules/Karlsruhe_Institute_of_Technology.xml
index 91156882153a..692a52576c8f 100644
--- a/src/chrome/content/rules/Karlsruhe_Institute_of_Technology.xml
+++ b/src/chrome/content/rules/Karlsruhe_Institute_of_Technology.xml
@@ -1,12 +1,14 @@
 <!--
 	Non-functional hosts in *.kit.edu
 		SSL peer certificate was not OK:
+			 - alumni.kit.edu
 			 - bibliothek.kit.edu
 			 - cs.kit.edu
 			 - www.cs.kit.edu
 			 - informatik.kit.edu
 			 - innovation.kit.edu
 			 - lists.kit.edu
+			 - pst.kit.edu
 			 - ptka.kit.edu
 			 - rsm.kit.edu
 			 - scc.kit.edu
@@ -15,6 +17,8 @@
 <ruleset name="Karlsruhe Institute of Technology (partial)">
 	<target host="kit.edu" />
 	<target host="www.kit.edu" />
+	<target host="alumni.kit.edu" />
+	<target host="www.alumni.kit.edu" />
 	<target host="blog.bibliothek.kit.edu" />
 	<target host="campus.kit.edu" />
 	<target host="www.informatik.kit.edu" />
@@ -22,6 +26,8 @@
 	<target host="intranet.kit.edu" />
 	<target host="www.lists.kit.edu" />
 	<target host="owa.kit.edu" />
+	<target host="pst.kit.edu" />
+	<target host="www.pst.kit.edu" />
 	<target host="www.ptka.kit.edu" />
 	<target host="www.rsm.kit.edu" />
 	<target host="idp.scc.kit.edu" />
@@ -29,5 +35,12 @@
 	<target host="www.scc.kit.edu" />
 	<target host="www.studiumundbehinderung.kit.edu" />
 
-	<rule from="^http:" to="https:" />
+	<rule from="^http://alumni\.kit\.edu/"
+			to="https://www.rsm.kit.edu/" />
+
+	<rule from="^http://pst\.kit\.edu/"
+			to="https://www.pst.kit.edu/" />
+
+	<rule from="^http:" 
+			to="https:" />
 </ruleset>