Skip to content

Commit a82e7a5

Browse files
jshajsha
committed
Merge branch 'master' into disable-rulesets-june-2015-a
Conflicts: src/chrome/content/rules/GoogleMaps.xml src/chrome/content/rules/GoogleServices.xml
2 parents e7deb0d + 2cd2573 commit a82e7a5

17 files changed

+974
-638
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<!--
2-
2+
For other Google coverage, see GoogleServices.xml.
3+
34
Problematic domains:
45
56
- (www.)apture.com (works, mismatched, CN: *.google.com)

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

Lines changed: 136 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,136 @@
1+
<!--
2+
See Google.com_Subdomains_Complex.html for rules that don't match the simple rule here
3+
For other Google coverage, see GoogleServices.xml
4+
5+
Nonfunctional domains:
6+
7+
- partnerpage.google.com *
8+
- picasa.google.com *
9+
- www.picasa.google.com ²
10+
- safebrowsing.clients.google.com (404, mismatched)
11+
- (www.)googlesyndicatedsearch.com (404; mismatched, CN: google.com)
12+
- buttons.googlesyndication.com *
13+
14+
* 404, valid cert
15+
² 404; mismatched, CN: www.google.com
16+
17+
Problematic domains:
18+
19+
- www.goo.gl (404; mismatched, CN: *.google.com)
20+
21+
- www.news.google.ca ²
22+
23+
- google.com subdomains:
24+
25+
- cbks0 ****
26+
- earth *
27+
- gg ($ 404s)
28+
- knoll *
29+
- scholar **
30+
- trends *
31+
32+
Partially covered domains:
33+
34+
- google.cctld subdomains:
35+
36+
- scholar (→ www)
37+
38+
- google.com subdomains:
39+
40+
- (www.)
41+
- cbks0 ($ 404s)
42+
- gg ($ 404s)
43+
- news (→ www)
44+
- scholar (→ www)
45+
-->
46+
<ruleset name="Google.com Subdomains">
47+
<target host="admin.google.com" />
48+
<target host="apis.google.com" />
49+
<!-- See the complex ruleset for chart.apis -->
50+
<target host="appengine.google.com" />
51+
<target host="calendar.google.com" />
52+
<target host="cast.google.com" />
53+
<target host="cbks0.google.com" />
54+
<target host="cert-test.sandbox.google.com" />
55+
<target host="checkout.google.com" />
56+
<target host="chrome.google.com" />
57+
<!-- See the complex ruleset for clients\d -->
58+
<!-- See the complex ruleset for *.clients\d -->
59+
<target host="cloud.google.com" />
60+
<target host="code.google.com" />
61+
<!-- See the complex ruleset for codesearch -->
62+
<target host="*.corp.google.com" />
63+
<!-- See the wildcard section -->
64+
<target host="developers.google.com" />
65+
<target host="dl.google.com" />
66+
<target host="docs.google.com" />
67+
<!-- See the complex ruleset for docs\d -->
68+
<!-- See the complex ruleset for \d\.docs -->
69+
<target host="drive.google.com" />
70+
<target host="encrypted.google.com" />
71+
<!-- See the complex ruleset for encrypted-tbn\d -->
72+
<target host="feedburner.google.com" />
73+
<target host="feedproxy.google.com" />
74+
<target host="fiber.google.com" />
75+
<target host="gg.google.com" />
76+
<target host="glass.google.com" />
77+
<target host="goto.google.com" />
78+
<target host="health.google.com" />
79+
<target host="helpouts.google.com" />
80+
<target host="history.google.com" />
81+
<target host="talkgadget.google.com" />
82+
<target host="hostedtalkgadget.google.com" />
83+
<target host="investor.google.com" />
84+
<target host="ipv4.google.com" />
85+
<target host="ipv6.google.com" />
86+
<!-- See GoogleMaps.xml for khms\d? -->
87+
<target host="knol.google.com" />
88+
<target host="knoll.google.com" />
89+
<target host="mail.google.com" />
90+
<target host="chatenabled.mail.google.com" />
91+
<!-- See GoogleMaps.xml for maps -->
92+
<!-- See GoogleMaps.xml for maps-api-ssl -->
93+
<!-- See GoogleMaps.xml for mw2 -->
94+
<target host="pack.google.com" />
95+
<target host="pki.google.com" />
96+
<target host="play.google.com" />
97+
<target host="plus.google.com" />
98+
<target host="plus.sandbox.google.com" />
99+
<target host="plusone.google.com" />
100+
<target host="productforums.google.com" />
101+
<target host="profiles.google.com" />
102+
<target host="safebrowsing-cache.google.com" />
103+
<target host="sb-ssl.google.com" />
104+
<!-- see Google.tld_Subdomains.xml for scholar -->
105+
<target host="script.google.com" />
106+
<target host="security.google.com" />
107+
<target host="services.google.com" />
108+
<target host="sites.google.com" />
109+
<target host="slides.google.com" />
110+
<!-- see GoogleSorry.xml for sorry -->
111+
<target host="spreadsheets.google.com" />
112+
<target host="suggestqueries.google.com" />
113+
<target host="support.google.com" />
114+
<target host="talk.google.com" />
115+
<!-- See the complex ruleset for tbn\d -->
116+
<target host="tools.google.com" />
117+
<target host="wallet.google.com" />
118+
119+
<securecookie host="^(?:\.code|login\.corp|developers|docs|\d\.docs|fiber|mail|plus|\.?productforums|support)\.google\.[\w.]{2,6}$" name=".+" />
120+
121+
<!-- *.corp wildcard -->
122+
<rule from="^http://([\w-]+)\.corp\.google\.com/"
123+
to="https://$1.corp.google.com/" />
124+
<test url="http://login.corp.google.com/" />
125+
<test url="http://ideas.corp.google.com/" />
126+
<test url="http://discovery.corp.google.com/" />
127+
128+
<!-- subdomain to path redirects -->
129+
<rule from="^http://(earth|trends)\.google\.com/"
130+
to="https://www.google.com/$1" />
131+
<test url="http://earth.google.com/" />
132+
<test url="http://trends.google.com/" />
133+
134+
<rule from="^http:"
135+
to="https:" />
136+
</ruleset>

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

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
<!--
2+
Other Google rulesets:
3+
- See Google.com_Subdomains.html for rules that don't match the complex rule here
4+
- See GoogleServices.xml for the list
5+
-->
6+
<ruleset name="Google.com Subdomains (Complex)">
7+
<target host="*.google.com" />
8+
9+
<rule from="^http://(clients\d)\.google\.com/"
10+
to="https://clients1.google.com/" />
11+
<test url="http://clients1.google.com/" />
12+
<test url="http://clients2.google.com/" />
13+
<test url="http://clients3.google.com/" />
14+
<!--
15+
The need for clients\d -> clients1
16+
17+
"http://clients2.google.com/complete/search?hl=ja&client=hp&expIds=17259,24660,24729,24745&q=m&cp=1"
18+
HTTP/1.1 200 OK
19+
"https://clients2.google.com/complete/search?hl=ja&client=hp&expIds=17259,24660,24729,24745&q=m&cp=1"
20+
HTTP/1.1 404 Not Found
21+
"https://clients1.google.com/complete/search?hl=ja&client=hp&expIds=17259,24660,24729,24745&q=m&cp=1"s
22+
HTTP/1.1 200 OK
23+
-->
24+
<!-- This is needed for OCSP responder to work.
25+
If OCSP checking is set to hard-fail the user-agent might have troubles accessing some HTTPS sites
26+
-->
27+
<exclusion pattern="^http://clients[0-9]\.google\.com/ocsp"/>
28+
<test url="http://clients1.google.com/ocsp" />
29+
<test url="http://clients2.google.com/ocsp" />
30+
<test url="http://clients3.google.com/ocsp" />
31+
32+
<rule from="^http://(docs\d)\.google\.com/"
33+
to="https://$1.google.com/" />
34+
<test url="http://docs1.google.com/" />
35+
<test url="http://docs2.google.com/" />
36+
<test url="http://docs3.google.com/" />
37+
38+
<rule from="^http://(\d\.docs)\.google\.com/"
39+
to="https://$1.google.com/" />
40+
<test url="http://1.docs.google.com/" />
41+
<test url="http://2.docs.google.com/" />
42+
<test url="http://3.docs.google.com/" />
43+
44+
<rule from="^http://(spreadsheets\d)\.google\.com/"
45+
to="https://$1.google.com/" />
46+
<test url="http://spreadsheets1.google.com/" />
47+
<test url="http://spreadsheets2.google.com/" />
48+
<test url="http://spreadsheets3.google.com/" />
49+
50+
<rule from="^http://(?:encrypted-)?tbn(\d)\.google\.com/"
51+
to="https://encrypted-tbn$1.google.com/" />
52+
<test url="http://encrypted-tbn1.google.com/" />
53+
<test url="http://encrypted-tbn2.google.com/" />
54+
<test url="http://encrypted-tbn3.google.com/" />
55+
<test url="http://tbn1.google.com/" />
56+
<test url="http://tbn2.google.com/" />
57+
<test url="http://tbn3.google.com/" />
58+
59+
<rule from="^http://chart\.apis\.google\.com/chart"
60+
to="https://chart.googleapis.com/chart" />
61+
<test url="http://chart.apis.google.com/chart" />
62+
63+
<rule from="^http://([\w-]+)\.clients\.google\.com/"
64+
to="https://$1.clients.google.com/" />
65+
<test url="http://foo.clients.google.com/bar" />
66+
<test url="http://bar.clients.google.com/" />
67+
<test url="http://foobar.clients.google.com/foobar" />
68+
69+
<rule from="^http://codesearch\.google\.com/"
70+
to="https://www.google.com/codesearch/" />
71+
<test url="http://codesearch.google.com/" />
72+
</ruleset>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<!--
2-
For other Google coverage, see GoogleServices.xml.
3-
2+
For other Google coverage, see GoogleServices.xml
43
-->
54
<ruleset name="Google.org">
65

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

Lines changed: 99 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
2+
<!--
3+
For other Google coverage, see GoogleServices.xml
4+
5+
This ruleset is subdomains that exist on google.tld (not just google.com)
6+
7+
*** images.google.tld is covered in GoogleImages.xml ***
8+
-->
9+
<ruleset name="Google.tld Subdomains">
10+
<!--
11+
failure: *.google.* failed: The target host must be a hostname, not URL, and must use at most one wildcard.
12+
-->
13+
<target host="accounts.google.*" />
14+
<target host="adwords.google.*" />
15+
<target host="finance.google.*" />
16+
<target host="groups.google.*" />
17+
<target host="id.google.*" />
18+
<target host="lh2.google.*" />
19+
<target host="lh3.google.*" />
20+
<target host="lh4.google.*" />
21+
<target host="lh5.google.*" />
22+
<target host="lh6.google.*" />
23+
<target host="m.google.*" />
24+
<target host="news.google.*" />
25+
<target host="picasaweb.google.*" />
26+
<target host="scholar.google.*" />
27+
28+
<target host="accounts.google.co.*" />
29+
<target host="adwords.google.co.*" />
30+
<target host="finance.google.co.*" />
31+
<target host="groups.google.co.*" />
32+
<target host="id.google.co.*" />
33+
<target host="lh2.google.co.*" />
34+
<target host="lh3.google.co.*" />
35+
<target host="lh4.google.co.*" />
36+
<target host="lh5.google.co.*" />
37+
<target host="lh6.google.co.*" />
38+
<target host="m.google.co.*" />
39+
<target host="news.google.co.*" />
40+
<target host="picasaweb.google.co.*" />
41+
<target host="scholar.google.co.*" />
42+
43+
<target host="accounts.google.com.*" />
44+
<target host="adwords.google.com.*" />
45+
<target host="finance.google.com.*" />
46+
<target host="groups.google.com.*" />
47+
<target host="id.google.com.*" />
48+
<target host="lh2.google.com.*" />
49+
<target host="lh3.google.com.*" />
50+
<target host="lh4.google.com.*" />
51+
<target host="lh5.google.com.*" />
52+
<target host="lh6.google.com.*" />
53+
<target host="m.google.com.*" />
54+
<target host="news.google.com.*" />
55+
<target host="picasaweb.google.com.*" />
56+
<target host="scholar.google.com.*" />
57+
58+
<securecookie host="^(?:accounts|adwords|m|picasaweb)\.google\.[\w.]{2,6}$" name=".+" />
59+
60+
<!-- path that 404 on https but 301 on http -->
61+
<rule from="^http://news\.google\.((?:com?\.)?\w{2,3})/archivesearch"
62+
to="https://news.google.$1/news/advanced_news_search" />
63+
<test url="http://news.google.ca/archivesearch" />
64+
<test url="http://news.google.com/archivesearch" />
65+
<test url="http://news.google.com.au/archivesearch" />
66+
67+
<rule from="^http://(accounts|adwords|finance|groups|id|lh\d|m|news|picasaweb|scholar)\.google\.((?:com?\.)?\w{2,3})/"
68+
to="https://$1.google.$2/" />
69+
<test url="http://accounts.google.ca/" />
70+
<test url="http://accounts.google.com/" />
71+
<test url="http://accounts.google.com.au/" />
72+
<test url="http://adwords.google.ca/" />
73+
<test url="http://adwords.google.com/" />
74+
<test url="http://adwords.google.com.au/" />
75+
<test url="http://finance.google.ca/" />
76+
<test url="http://finance.google.com/" />
77+
<test url="http://finance.google.co.uk/" />
78+
<test url="http://groups.google.ca/" />
79+
<test url="http://groups.google.com/" />
80+
<test url="http://groups.google.com.au/" />
81+
<test url="http://id.google.ca/" />
82+
<test url="http://id.google.com/" />
83+
<test url="http://id.google.com.au/" />
84+
<test url="http://lh3.google.ca/" />
85+
<test url="http://lh4.google.com/" />
86+
<test url="http://lh5.google.com.au/" />
87+
<test url="http://m.google.ca/" />
88+
<test url="http://m.google.com/" />
89+
<test url="http://m.google.com.au/" />
90+
<test url="http://news.google.ca/" />
91+
<test url="http://news.google.com/" />
92+
<test url="http://news.google.com.au/" />
93+
<test url="http://picasaweb.google.ca/" />
94+
<test url="http://picasaweb.google.com/" />
95+
<test url="http://picasaweb.google.com.au/" />
96+
<test url="http://scholar.google.ca/" />
97+
<test url="http://scholar.google.com/" />
98+
<test url="http://scholar.google.com.au/" />
99+
</ruleset>

0 commit comments

Comments
 (0)