From 7be934288f41f1aa63c181ca8d1be02603b57e9e Mon Sep 17 00:00:00 2001
From: Hugo Gruson <Bisaloo@users.noreply.github.com>
Date: Thu, 4 Apr 2019 14:23:09 +0200
Subject: [PATCH 1/2] [Tinypass.com] Simplify ruleset

---
 src/chrome/content/rules/Tinypass.com.xml | 55 ++++++-----------------
 1 file changed, 13 insertions(+), 42 deletions(-)

diff --git a/src/chrome/content/rules/Tinypass.com.xml b/src/chrome/content/rules/Tinypass.com.xml
index 6e7be9e62890..aaf876080b2b 100644
--- a/src/chrome/content/rules/Tinypass.com.xml
+++ b/src/chrome/content/rules/Tinypass.com.xml
@@ -1,54 +1,25 @@
 <!--
-	For rules causing false/broken MCB, see Tinypass.com-falsemixed.xml.
-
-
-	Nonfunctional subdomains:
-
-		- developer *
-		- market **
-
-	* Refused
-	** Shows dashboard
-
-
-	Fully covered subdomains:
-
-		- cdn
-
-
-	Mixed content:
-
-		- iframe on publisher from tinypass.zendesk.com *
-
-		- css on publisher from $self *
-		- css on www from $self *
-
-		- Images, on:
-
-			- publisher from $self *
-			- publisher from www *
-			- www from $self *
-
-		- Bug on publisher from cloud.webtype.com *
-
-	* Secured by us
+	Invalid certificate:
+		assets.tinypass.com
+		jobs.tinypass.com
 
 -->
-<ruleset name="Tinypass.com (partial)">
+<ruleset name="Tinypass.com">
 
 	<target host="tinypass.com" />
+	<target host="www.tinypass.com" />
+	<target host="api.tinypass.com" />
+	<target host="buy.tinypass.com" />
 	<target host="cdn.tinypass.com" />
 	<target host="code.tinypass.com" />
 	<target host="dashboard.tinypass.com" />
+	<target host="experience.tinypass.com" />
+	<target host="fonts.tinypass.com" />
+	<target host="id.tinypass.com" />
+	<target host="market.tinypass.com" />
+	<target host="media.tinypass.com" />
+	<target host="play.tinypass.com" />
 	<target host="publisher.tinypass.com" />
-	<target host="www.tinypass.com" />
-		<!--exclusion pattern="^http://(developer|market)\.tinypass\.com/" /-->
-		<!--
-			Avoid false/broken MCB:
-						-->
-		<exclusion pattern="^http://publisher\.tinypass\.com/+(?!guide/(?:assets|media|plugins)/)" />
-		<exclusion pattern="^http://www\.tinypass\.com/+(?!favicon\.ico|wp-content/|wp-includes/)" />
-
 
 	<rule from="^http:" to="https:" />
 

From 0d8c0a092c8830ce19e77e72c344745adbb248fe Mon Sep 17 00:00:00 2001
From: Hugo Gruson <Bisaloo@users.noreply.github.com>
Date: Thu, 4 Apr 2019 14:23:41 +0200
Subject: [PATCH 2/2] Delete Tinypass.com-falsemixed.xml

---
 .../content/rules/Tinypass.com-falsemixed.xml      | 14 --------------
 1 file changed, 14 deletions(-)
 delete mode 100644 src/chrome/content/rules/Tinypass.com-falsemixed.xml

diff --git a/src/chrome/content/rules/Tinypass.com-falsemixed.xml b/src/chrome/content/rules/Tinypass.com-falsemixed.xml
deleted file mode 100644
index 9107c29b8a58..000000000000
--- a/src/chrome/content/rules/Tinypass.com-falsemixed.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<!--
-	For rules not causing false/broken MCB, see Tinypass.com.xml.
-
--->
-<ruleset name="Tinypass.com (false MCB)" platform="mixedcontent">
-
-	<target host="publisher.tinypass.com" />
-	<target host="www.tinypass.com" />
-
-
-
-	<rule from="^http:" to="https:" />
-
-</ruleset>