[Google Services] Major Cleanup

src/chrome/content/rules/Google-mismatches.xml

@@ -1,5 +1,6 @@
 <!--
-
+	For other Google coverage, see GoogleServices.xml.
+
 	Problematic domains:
 
 		- (www.)apture.com	(works, mismatched, CN: *.google.com)

src/chrome/content/rules/Google.com_Subdomains.xml

@@ -0,0 +1,141 @@
+<!--
+	See Google.com_Subdomains_Complex.html for rules that don't match the simple rule here
+	For other Google coverage, see GoogleServices.xml
+
+	Nonfunctional domains:
+
+		- partnerpage.google.com *
+		- picasa.google.com *
+		- www.picasa.google.com ²
+		- safebrowsing.clients.google.com	(404, mismatched)
+		- (www.)googlesyndicatedsearch.com	(404; mismatched, CN: google.com)
+		- buttons.googlesyndication.com *
+
+	* 404, valid cert
+	² 404; mismatched, CN: www.google.com
+
+	Problematic domains:
+
+		- www.goo.gl		(404; mismatched, CN: *.google.com)
+
+		- www.news.google.ca ²
+
+		- google.com subdomains:
+
+			- cbks0 ****
+			- earth *
+			- gg		($ 404s)
+			- knoll *
+			- scholar **
+			- trends *
+
+	Partially covered domains:
+
+		- google.cctld subdomains:
+
+			- scholar	(→ www)
+
+		- google.com subdomains:
+
+			- (www.)
+			- cbks0		($ 404s)
+			- gg		($ 404s)
+			- news		(→ www)
+			- scholar	(→ www)
+-->
+<ruleset name="Google.com Subdomains">
+	<target host="admin.google.com" />
+	<target host="apis.google.com" />
+		<!-- See the complex ruleset for chart.apis -->
+	<target host="appengine.google.com" />
+	<target host="calendar.google.com" />
+	<target host="cast.google.com" />
+	<target host="cbks0.google.com" />
+	<target host="cert-test.sandbox.google.com" />
+	<target host="chat.google.com" />
+	<target host="checkout.google.com" />
+	<target host="chrome.google.com" />
+	<target host="clients.google.com" />
+		<!-- See the complex ruleset for clients\d -->
+		<!-- See the complex ruleset for *.clients\d -->
+	<target host="cloud.google.com" />
+	<target host="code.google.com" />
+		<!-- See the complex ruleset for codesearch -->
+	<target host="corp.google.com" />
+		<target host="*.corp.google.com" />
+		<!-- See the wildcard section -->
+	<target host="developers.google.com" />
+	<target host="dl.google.com" />
+	<target host="docs.google.com" />
+		<!-- See the complex ruleset for docs\d -->
+		<!-- See the complex ruleset for \d\.docs -->
+	<target host="drive.google.com" />
+	<target host="encrypted.google.com" />
+		<!-- See the complex ruleset for encrypted-tbn\d -->
+	<target host="feedburner.google.com" />
+	<target host="feedproxy.google.com" />
+	<target host="fiber.google.com" />
+	<target host="fonts.google.com" />
+	<target host="gg.google.com" />
+	<target host="glass.google.com" />
+	<target host="goto.google.com" />
+	<target host="health.google.com" />
+	<target host="helpouts.google.com" />
+	<target host="history.google.com" />
+	<target host="talkgadget.google.com" />
+	<target host="hostedtalkgadget.google.com" />
+	<target host="investor.google.com" />
+	<target host="ipv4.google.com" />
+	<target host="ipv6.google.com" />
+	<!-- See GoogleMaps.xml for khms\d? -->
+	<target host="knol.google.com" />
+	<target host="knoll.google.com" />
+	<target host="mail.google.com" />
+		<target host="chatenabled.mail.google.com" />
+	<!-- See GoogleMaps.xml for maps -->
+	<!-- See GoogleMaps.xml for maps-api-ssl -->
+	<!-- See GoogleMaps.xml for mw2 -->
+	<target host="pack.google.com" />
+	<target host="pki.google.com" />
+	<target host="play.google.com" />
+	<target host="plus.google.com" />
+		<target host="plus.sandbox.google.com" />
+	<target host="plusone.google.com" />
+	<target host="productforums.google.com" />
+	<target host="profiles.google.com" />
+	<target host="safebrowsing-cache.google.com" />
+	<target host="sb-ssl.google.com" />
+	<!-- see Google.tld_Subdomains.xml for scholar -->
+	<target host="script.google.com" />
+	<target host="security.google.com" />
+	<target host="services.google.com" />
+	<target host="servicessites.google.com" />
+	<target host="sites.google.com" />
+	<target host="slides.google.com" />
+	<!-- see GoogleSorry.xml for sorry -->
+	<target host="spreadsheets.google.com" />
+	<target host="suggestqueries.google.com" />
+	<target host="support.google.com" />
+	<target host="talk.google.com" />
+	<!-- See the complex ruleset for tbn\d -->
+	<target host="tools.google.com" />
+	<target host="wallet.google.com" />
+
+	<securecookie host="^(?:\.code|login\.corp|developers|docs|\d\.docs|fiber|mail|plus|\.?productforums|support)\.google\.[\w.]{2,6}$" name=".+" />
+
+	<!-- *.corp wildcard -->
+	<rule from="^http://([\w-]+)\.corp\.google\.com/"
+			to="https://$1.corp.google.com/" />
+		<test url="http://login.corp.google.com/" />
+		<test url="http://ideas.corp.google.com/" />
+		<test url="http://discovery.corp.google.com/" />
+
+	<!-- subdomain to path redirects -->
+	<rule from="^http://(earth|trends)\.google\.com/"
+		 to="https://www.google.com/$1" />
+		<test url="http://earth.google.com/" />
+		<test url="http://trends.google.com/" />
+
+	<rule from="^http:"
+			to="https:" />
+</ruleset>

src/chrome/content/rules/Google.com_Subdomains_Complex.xml

@@ -0,0 +1,72 @@
+<!--
+	Other Google rulesets:
+		- See Google.com_Subdomains.html for rules that don't match the complex rule here
+		- See GoogleServices.xml for the list
+-->
+<ruleset name="Google.com Subdomains (Complex)">
+	<target host="*.google.com" />
+
+	<rule from="^http://(clients\d)\.google\.com/"
+		 	to="https://clients1.google.com/" />
+		<test url="http://clients1.google.com/" />
+		<test url="http://clients2.google.com/" />
+		<test url="http://clients3.google.com/" />
+		<!--
+			The need for clients\d -> clients1
+
+			"http://clients2.google.com/complete/search?hl=ja&client=hp&expIds=17259,24660,24729,24745&q=m&cp=1"
+			HTTP/1.1 200 OK
+			"https://clients2.google.com/complete/search?hl=ja&client=hp&expIds=17259,24660,24729,24745&q=m&cp=1"
+			HTTP/1.1 404 Not Found
+			"https://clients1.google.com/complete/search?hl=ja&client=hp&expIds=17259,24660,24729,24745&q=m&cp=1"s
+			HTTP/1.1 200 OK
+		-->
+		<!-- This is needed for OCSP responder to work.
+			If OCSP checking is set to hard-fail the user-agent might have troubles accessing some HTTPS sites
+		-->
+		<exclusion pattern="^http://clients[0-9]\.google\.com/ocsp"/>
+			<test url="http://clients1.google.com/ocsp" />
+			<test url="http://clients2.google.com/ocsp" />
+			<test url="http://clients3.google.com/ocsp" />
+
+	<rule from="^http://(docs\d)\.google\.com/"
+		 	to="https://$1.google.com/" />
+			<test url="http://docs1.google.com/" />
+			<test url="http://docs2.google.com/" />
+			<test url="http://docs3.google.com/" />
+
+	<rule from="^http://(\d\.docs)\.google\.com/"
+		 	to="https://$1.google.com/" />
+			<test url="http://1.docs.google.com/" />
+			<test url="http://2.docs.google.com/" />
+			<test url="http://3.docs.google.com/" />
+
+	<rule from="^http://(spreadsheets\d)\.google\.com/"
+		 	to="https://$1.google.com/" />
+		<test url="http://spreadsheets1.google.com/" />
+		<test url="http://spreadsheets2.google.com/" />
+		<test url="http://spreadsheets3.google.com/" />
+
+	<rule from="^http://(?:encrypted-)?tbn(\d)\.google\.com/"
+		to="https://encrypted-tbn$1.google.com/" />
+		<test url="http://encrypted-tbn1.google.com/" />
+		<test url="http://encrypted-tbn2.google.com/" />
+		<test url="http://encrypted-tbn3.google.com/" />
+		<test url="http://tbn1.google.com/" />
+		<test url="http://tbn2.google.com/" />
+		<test url="http://tbn3.google.com/" />
+
+	<rule from="^http://chart\.apis\.google\.com/chart"
+	to="https://chart.googleapis.com/chart" />
+		<test url="http://chart.apis.google.com/chart" />
+
+	<rule from="^http://([\w-]+)\.clients\.google\.com/"
+		to="https://$1.clients.google.com/" />
+		<test url="http://foo.clients.google.com/bar" />
+		<test url="http://bar.clients.google.com/" />
+		<test url="http://foobar.clients.google.com/foobar" />
+
+	<rule from="^http://codesearch\.google\.com/"
+		to="https://www.google.com/codesearch/" />
+		<test url="http://codesearch.google.com/" />
+</ruleset>

src/chrome/content/rules/Google.org.xml

@@ -1,14 +1,10 @@
 <!--
-	For other Google coverage, see GoogleServices.xml.
-
+	For other Google coverage, see GoogleServices.xml
 -->
 <ruleset name="Google.org">
-
 	<target host="google.org" />
 	<target host="www.google.org" />
 
-
-	<rule from="^http://(www\.)?google\.org/"
-		to="https://$1google.org/" />
-
+	<rule from="^http:"
+			to="https:" />
 </ruleset>

src/chrome/content/rules/Google.tld_Subdomains.xml

@@ -0,0 +1,68 @@
+<!--
+	For other Google coverage, see GoogleServices.xml
+
+	This ruleset is subdomains that exist on google.tld (not just google.com)
+
+	*** images.google.tld is covered in GoogleImages.xml ***
+-->
+<ruleset name="Google.tld Subdomains">
+	<!--
+		failure: *.google.* failed: The target host must be a hostname, not URL, and must use at most one wildcard.
+	-->
+	<target host="accounts.google.*" />
+	<target host="adwords.google.*" />
+	<target host="finance.google.*" />
+	<target host="groups.google.*" />
+	<target host="id.google.*" />
+	<target host="lh2.google.*" />
+	<target host="lh3.google.*" />
+	<target host="lh4.google.*" />
+	<target host="lh5.google.*" />
+	<target host="lh6.google.*" />
+	<target host="m.google.*" />
+	<target host="news.google.*" />
+	<target host="picasaweb.google.*" />
+	<target host="scholar.google.*" />
+
+	<securecookie host="^(?:accounts|adwords|m|picasaweb)\.google\.[\w.]{2,6}$" name=".+" />
+
+	<!-- path that 404 on https but 301 on http -->
+	<rule from="^http://news\.google\.((?:com?\.)?\w{2,3})/archivesearch"
+			to="https://news.google.$1/news/advanced_news_search" />
+		<test url="http://news.google.ca/archivesearch" />
+		<test url="http://news.google.com/archivesearch" />
+		<test url="http://news.google.com.au/archivesearch" />
+
+	<rule from="^http://(accounts|adwords|finance|groups|id|lh\d|m|news|picasaweb|scholar)\.google\.((?:com?\.)?\w{2,3})/"
+			to="https://$1.google.$2/" />
+		<test url="http://accounts.google.ca/" />
+		<test url="http://accounts.google.com/" />
+		<test url="http://accounts.google.com.au/" />
+		<test url="http://adwords.google.ca/" />
+		<test url="http://adwords.google.com/" />
+		<test url="http://adwords.google.com.au/" />
+		<test url="http://finance.google.ca/" />
+		<test url="http://finance.google.com/" />
+		<test url="http://finance.google.com.au/" />
+		<test url="http://groups.google.ca/" />
+		<test url="http://groups.google.com/" />
+		<test url="http://groups.google.com.au/" />
+		<test url="http://id.google.ca/" />
+		<test url="http://id.google.com/" />
+		<test url="http://id.google.com.au/" />
+		<test url="http://lh3.google.ca/" />
+		<test url="http://lh4.google.com/" />
+		<test url="http://lh5.google.com.au/" />
+		<test url="http://m.google.ca/" />
+		<test url="http://m.google.com/" />
+		<test url="http://m.google.com.au/" />
+		<test url="http://news.google.ca/" />
+		<test url="http://news.google.com/" />
+		<test url="http://news.google.com.au/" />
+		<test url="http://picasaweb.google.ca/" />
+		<test url="http://picasaweb.google.com/" />
+		<test url="http://picasaweb.google.com.au/" />
+		<test url="http://scholar.google.ca/" />
+		<test url="http://scholar.google.com/" />
+		<test url="http://scholar.google.com.au/" />
+</ruleset>