[Microsoft] Amend comment, split Office.com, add *office.com (comments|coverage)

MB · MB · commit 59fbf79ebe5f · 2015-04-21T12:00:00.000Z
diff --git a/src/chrome/content/rules/Microsoft.xml b/src/chrome/content/rules/Microsoft.xml
@@ -32,6 +32,7 @@
 		- Msecnd.net.xml
 		- MSN.xml
 		- Newsvine.com.xml
+		- Office.com.xml
 		- OneDrive.com.xml
 		- Outlook_Live.xml
 		- Photosynth.xml
@@ -100,7 +101,6 @@
 			- (www.)windows **
 
 		- msimg.com
-		- blogs.office.com ***
 		- blog.surface.com		(handshake fails)
 		- (www.)windowsteamblog.com
 
@@ -130,8 +130,6 @@
 			- update *
 			- res[12].windows **
 
-		- office.com
-
 		- widgets.membership.s-msft.com		(akamai)
 		- compass.surface.com **
 
@@ -197,7 +195,6 @@
 			- corp.sts
 			- res[12].windows	(&rarr; akamai)
 
-		- (www.)office.com			(^ &rarr; www)
 		- i.s-microsoft.com
 		- widgets.membership.s-msft.com		(&rarr; widgets.membership.microsoft.com)
 
@@ -306,15 +303,13 @@
 						-->
 		<exclusion pattern="^http://go\.microsoft\.com/fwlink/\?LinkID=219472&amp;clcid=0x409$" />
 
-	<target host="office.com" />
-	<target host="www.office.com" />
 	<target host="i.s-microsoft.com" />
 	<target host="*.s-msft.com" />
 
 
 	<!--	Not secured by server:
 					-->
-	<!--securecookie host="^\.microsoft\.com$" name="^msdn$" /-->
+	<!--securecookie host="^\.microsoft\.com$" name="^(A|MC1|MS0|msdn)$" /-->
 	<!--securecookie host="^support\.microsoft\.com$" name="^(\.ASPXANONYMOUS|SMC_SAGE|smcexpsessionticket|smcexpticket)$" /-->
 	<!--securecookie host="^smallbusiness\.support\.microsoft.com$" name="^(breadcrumb|culture|exitinfo)$" /-->
 	<!--securecookie host="^\.technet\.microsoft\.com$" name="^AuthorizationCookie$" /-->
@@ -371,9 +366,6 @@
 	<rule from="^http://res(1|2)\.windows\.microsoft\.com/"
 		to="https://a248.e.akamai.net/f/1737/7533/6/res$1.windows.microsoft.com/" />
 
-	<rule from="^http://(?:www\.)?office\.com/"
-		to="https://www.office.com/" />
-
 	<rule from="^http://([\w-]+)\.sec\.s-msft\.com/"
 		to="https://$1.sec.s-msft.com/" />
 
diff --git a/src/chrome/content/rules/Office.com.xml b/src/chrome/content/rules/Office.com.xml
@@ -0,0 +1,49 @@
+<!--
+	For other Microsoft coverage, see Microsoft.xml.
+
+
+	Nonfunctional hosts in *office.com:
+
+		- blogs *
+
+	* Dropped
+
+
+	Fully covered hosts in *office.com:
+
+		- (www.)?		(^ &rarr; www)
+		- store
+		- support
+		- templates
+
+
+	Insecure cookies are set for these domains and hosts:
+
+		- office.com
+		- .office.com
+		- www.office.com
+
+-->
+<ruleset name="Office.com (partial)">
+
+	<!--	Direct rewrites:
+				-->
+	<target host="office.com" />
+	<target host="store.office.com" />
+	<target host="support.office.com" />
+	<target host="templates.office.com" />
+	<target host="www.office.com" />
+
+
+	<!--	Not secured by server:
+					-->
+	<!--securecookie host="^(www\.)?office\.com$" name="^BIGipCookie$" /-->
+	<!--securecookie host="^\.office\.com$" name="^AM3-ARRAffinity$" /-->
+
+	<securecookie host="^(?:www\.)?office\.com$" name=".+" />
+
+
+	<rule from="^http:"
+		to="https:" />
+
+</ruleset>
diff --git a/utils/ruleset-coverage-whitelist.txt b/utils/ruleset-coverage-whitelist.txt
@@ -7892,7 +7892,7 @@ a9e3c6f9538af4ee45696824136b5314c58a827e662c5dfba7b8032f6920356f  Micro_Polia.xm
 cefc11c6aac01aa1ad487dec28dec26bb41141673dae37fb2b04b1595d24c1ac  Microsoft-mixedcontent.xml
 7b29d096e9956a0a3f126f7bd002123aac08debc69a9cc8001cfa9a50ecb58ca  Microsoft_Online_Services.xml
 d502d69ccfa450c767b4181e14fb5e9061f2ee2f9ea64c88afba100acdda3dc6  Microsoft_Store.xml
-d15740ca2c1bdeb49fc5b0c5ed21b3089579a2783f948bd61def1349146dfcc1  Microsoft.xml
+83791e3eb880e48f205ed270e50838881fc9eea2728877602c32c69b0f61a1ff  Microsoft.xml
 7b100b62a23d14a4e21a5f4775ce4f523326901c2464aeb6299fde517c42e32e  MicroSTER.pl.xml
 0aadb7ad42232edef2619a06c400203716310aed77e66417c3a11e1d49d4d744  Microtech.xml
 fb9361e5f9e26090b2ca7030c712c7ea214e7a531c650819ad8d7769a2538e0e  Microtronix.xml
