Skip to content

Commit f2b933b

Browse files
pdepde
committed
Merge branch '3.5' of ssh://github.com/EFForg/https-everywhere into 3.5
2 parents 396df3c + 91fef12 commit f2b933b

File tree

2 files changed

+24
-184
lines changed

2 files changed

+24
-184
lines changed

‎src/Changelog‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
4.0development.17 (2014-05-23)
2+
* Re-enable ability to see all rulesets in enable/disable dialog.
3+
* Fix allowing global installation:
4+
https://github.com/EFForg/https-everywhere/pull/255
5+
* Better observatory whitelisting:
6+
https://github.com/EFForg/https-everywhere/pull/276
7+
* Add option for SSL obs. revoked cert warnings:
8+
https://github.com/EFForg/https-everywhere/pull/278
9+
* Numerous ruleset updates
10+
111
3.5.1 (2014-04-25)
212
* Revert https://github.com/EFForg/https-everywhere/pull/134 due to YouTube
313
breakage.

‎src/chrome/content/rules/BBC.xml‎

Lines changed: 14 additions & 184 deletions
Original file line numberDiff line numberDiff line change
@@ -2,141 +2,32 @@
22
For problematic rules, see BBC-mismatches.xml.
33
44
5-
Other BBC rulesets:
6-
7-
- BBC.com.xml
8-
9-
10-
CDN buckets:
11-
12-
- cdnedge.bbc.co.uk.edgesuite.net
13-
- electradl.iplayer.bbc.co.uk.edgesuite.net
14-
- news.bbc.co.uk.edgesuite.net
15-
- newsimg.bbc.co.uk
16-
- feeds.bbci.co.uk
17-
- news.bbcimg.co.uk
18-
- tile[1-4].bbcimg.co.uk
19-
- emp.bbci.co.uk.edgesuite.net
20-
- ichef.bbci.co.uk.edgesuite.net
21-
- node1.bbcimg.co.uk.edgesuite.net
22-
- bbcmedia.fcod.llnwd.net
23-
24-
25-
Problematic domains:
26-
27-
- polling.bbc.co.uk (akamai)
28-
- wwwimg.bbc.co.uk (redirects to http)
29-
- ichef.bbci.co.uk *
30-
- news.bbcimg.co.uk *
31-
- tile[1-4].bbcimg.co.uk (works, akamai)
32-
33-
* 503, akamai
34-
35-
365
Nonfunctional domains:
376
387
- bbc.co.uk subdomains:
398
40-
- cdnedge *
41-
- confluence.dev (handshake error)
42-
- ftp.kw (401, self-signed)
43-
- open.live
44-
- m **
45-
46-
47-
- newsbeta (no https)
48-
49-
- newsforums
50-
9+
- news
10+
When rewritten to www, redirects back to news
5111
- newsimg
5212
- When rewritten news, doesn't redirect back to newsimg..
5313
- When rewritten to www, redirects to http =(
5414
- Not on static.
55-
56-
- newsvote
57-
- playlists **
58-
- r **
59-
60-
- stats **
15+
- stats
16+
- wwwimg
17+
redirects to http
6118
6219
- (www.)bbcamerica.com (reset)
63-
- feeds.bbci.co.uk *
64-
- open.bbci.co.uk *
65-
66-
* 503, akamai
67-
** Refused
68-
69-
70-
Problematic domains:
71-
72-
- news.bbc.co.uk (refused)
73-
When rewritten to www, redirects back to news
74-
- emp.bbci.co.uk *
75-
- feeds.bbci.co.uk *
76-
- node1.bbcimg.co.uk (works, akamai)
77-
78-
* 503, akamai
79-
80-
81-
Partially covered domains:
82-
83-
- open.live.bbc.co.uk
84-
85-
- crossdomain.xml causes videos to fail; "media selection request failed"
86-
87-
- news.bbc.co.uk (→ beta.bbc.co.uk)
88-
89-
- emp.bbci.co.uk (→ www.bbc.co.uk)
90-
- feeds.bbci.co.uk (→ www.bbc.co.uk)
91-
92-
93-
Fully covered domains:
94-
95-
- www.live.bbc.co.uk
96-
97-
98-
Mixed content:
99-
100-
- Flash on www from airdownload.adobe.com
101-
102-
- Scripts:
103-
104-
- On www from www *
105-
- On www from static.bbci.co.uk *
106-
- On www from node1.bbcimg.co.uk *
107-
108-
- css:
109-
110-
- On www from static.bbci.co.uk *
111-
- On www from node1.bbcimg.co.uk *
112-
113-
- Images:
114-
115-
- On www from ichef.bbci.co.uk *
116-
- On www from static.bbci.co.uk *
117-
118-
- Web bug on www from stats.bbc.co.uk **
119-
120-
* Secured by us
121-
** Unsecurable, good riddance for MCB
122-
123-
124-
NB: iplayer has been excluded so as to work around broken MCB.
20+
- emp.bbci.co.uk (Akamai; "Service Unavailable")
12521
12622
-->
127-
<ruleset name="BBC (partial)">
23+
<ruleset name="BBC (mixed content)" platform="mixedcontent">
12824

129-
<target host="sa.bbc.com" />
13025
<target host="bbc.co.uk" />
13126
<target host="*.bbc.co.uk" />
13227
<!--
13328
Causes censorship bypass to fail.
13429
-->
13530
<exclusion pattern="^http://www\.bbc\.co\.uk/iplayer/episode/\w+/(?:hd/)?\w+/?(?:$|\?)" />
136-
<!--
137-
Avoid false mixed content until MCB works properly:
138-
-->
139-
<exclusion pattern="^http://(?:www\.)?bbc\.co\.uk/iplayer(?:/?\?|/?$|/radio(?:$|[?/]))" />
14031
<!--
14132
https://trac.torproject.org/projects/tor/ticket/9136
14233
@@ -145,86 +36,25 @@
14536
"This content doesn't seem to be working"
14637
-->
14738
<exclusion pattern="^http://www\.bbc\.co\.uk/iplayer/playlist/\w+$" />
148-
<exclusion pattern="^http://open\.live\.bbc\.co\.uk/(?!mediaselector/|wurfldemi/(?:network|useragent)\.jsonp|weather/feeds/\w\w/maps/forecast\.json)" />
149-
<target host="iplayerhelp.external.bbc.co.uk" />
150-
<target host="*.bbci.co.uk" />
39+
<target host="static.bbci.co.uk" />
15140
<!-- Akamai -->
15241
<target host="*.bbcimg.co.uk" />
15342

15443

15544
<!-- Tracking cookie set by sa -->
15645
<securecookie host="^\.bbc\.co\.uk$" name="^s1$" />
157-
<!--
158-
Can any of these be secured safely?
159-
-->
160-
<!--securecookie host="^\.bbc\.co\.uk$" name="^(BBC-UID|ckns_policy|BGUID|sa_labels|X-AB-iplayer-emp31|X-AB-iplayer-qunit1)" /-->
161-
<securecookie host="^(?:iplayerhelp\.external|ssl)\.bbc\.co\.uk$" name=".+" />
162-
163-
164-
<rule from="^http://sa\.bbc\.com/"
165-
to="https://bbc.112.2o7.net/" />
166-
167-
<rule from="^http://(?:www(?:img)?\.)?bbc\.co\.uk/(aboutthebbc/override\.css|a-z/style|cbbc/(?:all/homepage-background|img|structure)|help/404_img|help/style|inc|nfp/holepunched/api|news/special/shared|player/emp|survey/pulse|tv/js|view/1_0_\d\d/wide|weather/locales)/"
168-
to="https://beta.bbc.co.uk/$1/" />
16946

170-
<rule from="^http://feeds\.bbc\.co\.uk/modules/comments/"
171-
to="https://www.bbc.co.uk/modules/comments/" />
17247

173-
<!-- ichef: Images.
174-
-->
175-
<rule from="^http://(ichef|www\.live|sa|static)\.bbci?\.co\.uk/"
48+
<rule from="^https?://(sa|static)\.bbci?\.co\.uk/"
17649
to="https://$1.bbc.co.uk/" />
17750

178-
<rule from="^http://(?:www\.)?bbc\.co\.uk/(emp/|favicon\.ico$|glow/|guidance/|iplayer/|podcasts/assets/)"
51+
<rule from="^https?://(?:www\.)?bbc\.co\.uk/(favicon\.ico$|glow/|guidance/|iplayer/)"
17952
to="https://www.bbc.co.uk/$1" />
18053

181-
<rule from="^http://(?:www\.)?bbc\.co\.uk/programmes/branding/"
182-
to="https://ssl.bbc.co.uk/programmes/branding/" />
183-
184-
<rule from="^http://www\.bbc\.co\.uk/webwise/static/"
185-
to="https://static.bbc.co.uk/webwise/" />
186-
187-
<rule from="^http://(beta|careers|downloads|iplayerhelp\.external|id|ssl)\.bbc\.co\.uk/"
188-
to="https://$1.bbc.co.uk/" />
189-
190-
<rule from="^http://open\.live\.bbc\.co\.uk/"
191-
to="https://open.live.bbc.co.uk/" />
192-
193-
<rule from="^http://news\.bbc\.co\.uk/(css|furniture|stylesheets|js/app/av/emp)/"
194-
to="https://beta.bbc.co.uk/$1/" />
195-
196-
<rule from="^http://newsimg\.bbc\.co\.uk/(media/images|shared/img)/"
197-
to="https://beta.bbc.co.uk/$1/" />
198-
199-
<rule from="^http://news\.bbcimg\.co\.uk/media/images/"
200-
to="https://ssl.bbc.co.uk/media/images/" />
201-
202-
<rule from="^http://node[12]\.bbcimg\.co\.uk/(crossdomain\.xml$|glow/|iplayer/)"
203-
to="https://www.bbc.co.uk/$1" />
204-
205-
<rule from="^http://node\d\.bbcimg\.co\.uk/(podcasts|tv/p2)/"
206-
to="https://beta.bbc.co.uk/$1/" />
207-
208-
<rule from="^http://polling\.bbc\.co\.uk/modules/onairpanel/include/"
209-
to="https://ssl.bbc.co.uk/modules/onairpanel/include/" />
210-
211-
<!-- This may be needed again in the future:
212-
-->
213-
<!--rule from="^https://www\.bbc\.co\.uk/iplayer/episode/(\w+/(?:hd/)?[\w\.]+/?(?:$|\?))"
214-
to="http://www.bbc.co.uk/iplayer/episode/$1" downgrade="1" /-->
215-
216-
<rule from="^http://emp\.bbci\.co\.uk/emp/(bump|releases)/"
217-
to="https://www.bbc.co.uk/emp/$1/" />
218-
219-
<!-- iPlayer points here, but only when fetched via https.
220-
221-
<rule from="^https://open\.bbci\.co\.uk/buzz/shares($|\?)"
222-
to="http://open.bbci.co.uk/buzz/shares$1" downgrade="1" /-->
223-
224-
<rule from="^http://news\.bbcimg\.co\.uk/"
225-
to="https://beta.bbc.co.uk/" />
54+
<rule from="^https?://node[12]\.bbcimg\.co\.uk/iplayer/"
55+
to="https://www.bbc.co.uk/iplayer/" />
22656

227-
<rule from="^http://tile\d\.bbcimg\.co\.uk/"
228-
to="https://static.bbc.co.uk/" />
57+
<rule from="^https://www\.bbc\.co\.uk/iplayer/episode/(\w+/(?:hd/)?\w+/?(?:$|\?))"
58+
to="http://www.bbc.co.uk/iplayer/episode/$1" downgrade="1" />
22959

23060
</ruleset>

0 commit comments

Comments
 (0)