Skip to content

Commit 33214a0

Browse files
jshajsha
committed
First steps towards fixing AmazonAWS rule.
1 parent 4f99cda commit 33214a0

File tree

2 files changed

+123
-8
lines changed

2 files changed

+123
-8
lines changed

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

Lines changed: 119 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<!--
22
Disabled by https-everywhere-checker because:
33
Fetch error: http://forums.aws.amazon.com/ => https://forums.aws.amazon.com/: Cycle detected - URL already encountered: https://forums.aws.amazon.com/index.jspa
4-
Fetch error: http://signin.aws.amazon.com/ => https://signin.aws.amazon.com/: (7, 'Failed to connect to signin.aws.amazon.com port 80: Connection refused')
54
For rules that break image zoom, see AmazonAWS-breakzoom.xml.
65
76
For other Amazon coverage, see Amazon.xml.
@@ -99,7 +98,6 @@ Fetch error: http://signin.aws.amazon.com/ => https://signin.aws.amazon.com/: (7
9998
<target host="fls-eu.amazon.co.uk" />
10099
<target host="aws.amazon.com" />
101100
<target host="forums.aws.amazon.com" />
102-
<target host="signin.aws.amazon.com" />
103101
<target host="docs.aws.amazon.com" />
104102
<target host="aws-portal.amazon.com" />
105103
<target host="fls-eu.amazon.com" />
@@ -152,32 +150,34 @@ Fetch error: http://signin.aws.amazon.com/ => https://signin.aws.amazon.com/: (7
152150
-->
153151
<rule from="^http://dis(\.resized)?\.images\.s3\.amazonaws\.com/"
154152
to="https://s3-eu-west-1.amazonaws.com/dis$1.images/" />
153+
<test url="http://dis.images.s3.amazonaws.com/" />
154+
<test url="http://dis.resized.images.s3.amazonaws.com/" />
155155

156156
<rule from="^http://cms\.kiva\.org\.s3\.amazonaws\.com/"
157157
to="https://s3-us-west-1.amazonaws.com/cms.kiva.org/" />
158158

159159
<rule from="^http://fls-eu\.amazon\.co\.uk/"
160160
to="https://fls-eu.amazon.co.uk/" />
161161

162-
<rule from="^http://((?:docs|forums|signin)\.aws|aws-portal|fls-eu|fls-na|payments|sis|webservices)\.amazon\.com/"
162+
<rule from="^http://((?:docs|forums)\.aws|aws|aws-portal|fls-eu|fls-na|payments|sis|webservices)\.amazon\.com/"
163163
to="https://$1.amazon.com/" />
164164

165165
<rule from="^http://s3(?:-website)?(-ap-(?:nor|sou)theast-1|-(?:eu|us)-west-\d|-external-\d|-sa-east-1)?\.amazonaws\.com/"
166166
to="https://s3$1.amazonaws.com/" />
167167

168-
<rule from="^http://([^@:\.]+)\.s3(?:-website)?(-ap-(?:nor|sou)theast-1|-(?:eu|us)-west-\d|-external-\d|-sa-east-1)?\.amazonaws\.com/"
168+
<rule from="^http://([\w-]+)\.s3(?:-website)?(-ap-(?:nor|sou)theast-1|-(?:eu|us)-west-\d|-external-\d|-sa-east-1)?\.amazonaws\.com/"
169169
to="https://$1.s3$2.amazonaws.com/" />
170170

171-
<rule from="^http://([^@:\.]+)\.([^@:/]+)\.s3(?:-website)?(-ap-(?:nor|sou)theast-1|-(?:eu|us)-west-\d|-external-\d|-sa-east-1)?\.amazonaws\.com/"
171+
<rule from="^http://([\w-]+)\.([^@:/]+)\.s3(?:-website)?(-ap-(?:nor|sou)theast-1|-(?:eu|us)-west-\d|-external-\d|-sa-east-1)?\.amazonaws\.com/"
172172
to="https://s3$3.amazonaws.com/$1.$2/" />
173173

174174
<rule from="^http://s3-website-us-east-1\.amazonaws\.com/"
175175
to="https://s3.amazonaws.com/" />
176176

177-
<rule from="^http://([^@:\.]+)\.s3-website-us-east-1\.amazonaws\.com/"
177+
<rule from="^http://([\w-]+)\.s3-website-us-east-1\.amazonaws\.com/"
178178
to="https://$1.s3.amazonaws.com/" />
179179

180-
<rule from="^http://([^@:\.]+)\.([^@:/]+)\.s3-website-us-east-1\.amazonaws\.com/"
180+
<rule from="^http://([\w-]+)\.([^@:/]+)\.s3-website-us-east-1\.amazonaws\.com/"
181181
to="https://s3.amazonaws.com/$1.$2/" />
182182

183183
<rule from="^http://(?:www\.)?amazonwebservices\.com/"
@@ -205,9 +205,120 @@ Fetch error: http://signin.aws.amazon.com/ => https://signin.aws.amazon.com/: (7
205205
copied the crazy pattern from the rule above.
206206
-->
207207
<exclusion pattern="^http://amazon-zg\.s3\.amazonaws.com/" />
208-
<exclusion pattern="^http://[^@:/]+images[^@:/]+/images/G/01/zeitgeist/mp3player" />
208+
<exclusion pattern="^http://[\w-]+images[\w-]+/images/G/01/zeitgeist/mp3player" />
209209

210210
<rule from="^http://images-(eu|fe|na)\.ssl-images-amazon\.com/"
211211
to="https://images-$1.ssl-images-amazon.com/" />
212212

213+
<test url="http://cms.kiva.org.s3.amazonaws.com/" />
214+
<test url="http://fls-eu.amazon.co.uk/" />
215+
<test url="http://docs.aws.amazon.com/" />
216+
<test url="http://forums.aws.amazon.com/" />
217+
<test url="http://aws-portal.amazon.com/" />
218+
<test url="http://fls-eu.amazon.com/" />
219+
<test url="http://fls-na.amazon.com/" />
220+
<test url="http://payments.amazon.com/" />
221+
<test url="http://sis.amazon.com/" />
222+
<test url="http://webservices.amazon.com/" />
223+
<test url="http://s3.amazonaws.com/" />
224+
<test url="http://s3-ap-northeast-1.amazonaws.com/" />
225+
<test url="http://s3-ap-southeast-1.amazonaws.com/" />
226+
<test url="http://s3-eu-west-0.amazonaws.com/" />
227+
<test url="http://s3-eu-west-1.amazonaws.com/" />
228+
<test url="http://s3-eu-west-2.amazonaws.com/" />
229+
<test url="http://s3-eu-west-3.amazonaws.com/" />
230+
<test url="http://s3-eu-west-4.amazonaws.com/" />
231+
<test url="http://s3-eu-west-5.amazonaws.com/" />
232+
<test url="http://s3-eu-west-6.amazonaws.com/" />
233+
<test url="http://s3-eu-west-7.amazonaws.com/" />
234+
<test url="http://s3-eu-west-8.amazonaws.com/" />
235+
<test url="http://s3-eu-west-9.amazonaws.com/" />
236+
<test url="http://s3-us-west-0.amazonaws.com/" />
237+
<test url="http://s3-us-west-1.amazonaws.com/" />
238+
<test url="http://s3-us-west-2.amazonaws.com/" />
239+
<test url="http://s3-us-west-3.amazonaws.com/" />
240+
<test url="http://s3-us-west-4.amazonaws.com/" />
241+
<test url="http://s3-us-west-5.amazonaws.com/" />
242+
<test url="http://s3-us-west-6.amazonaws.com/" />
243+
<test url="http://s3-us-west-7.amazonaws.com/" />
244+
<test url="http://s3-us-west-8.amazonaws.com/" />
245+
<test url="http://s3-us-west-9.amazonaws.com/" />
246+
<test url="http://s3-external-0.amazonaws.com/" />
247+
<test url="http://s3-external-1.amazonaws.com/" />
248+
<test url="http://s3-external-2.amazonaws.com/" />
249+
<test url="http://s3-external-3.amazonaws.com/" />
250+
<test url="http://s3-external-4.amazonaws.com/" />
251+
<test url="http://s3-external-5.amazonaws.com/" />
252+
<test url="http://s3-external-6.amazonaws.com/" />
253+
<test url="http://s3-external-7.amazonaws.com/" />
254+
<test url="http://s3-external-8.amazonaws.com/" />
255+
<test url="http://s3-external-9.amazonaws.com/" />
256+
<test url="http://s3-sa-east-1.amazonaws.com/" />
257+
<test url="http://s3-website.amazonaws.com/" />
258+
<test url="http://s3-website-ap-northeast-1.amazonaws.com/" />
259+
<test url="http://s3-website-ap-southeast-1.amazonaws.com/" />
260+
<test url="http://s3-website-eu-west-0.amazonaws.com/" />
261+
<test url="http://s3-website-eu-west-1.amazonaws.com/" />
262+
<test url="http://s3-website-eu-west-2.amazonaws.com/" />
263+
<test url="http://s3-website-eu-west-3.amazonaws.com/" />
264+
<test url="http://s3-website-eu-west-4.amazonaws.com/" />
265+
<test url="http://s3-website-eu-west-5.amazonaws.com/" />
266+
<test url="http://s3-website-eu-west-6.amazonaws.com/" />
267+
<test url="http://s3-website-eu-west-7.amazonaws.com/" />
268+
<test url="http://s3-website-eu-west-8.amazonaws.com/" />
269+
<test url="http://s3-website-eu-west-9.amazonaws.com/" />
270+
<test url="http://s3-website-us-west-0.amazonaws.com/" />
271+
<test url="http://s3-website-us-west-1.amazonaws.com/" />
272+
<test url="http://s3-website-us-west-2.amazonaws.com/" />
273+
<test url="http://s3-website-us-west-3.amazonaws.com/" />
274+
<test url="http://s3-website-us-west-4.amazonaws.com/" />
275+
<test url="http://s3-website-us-west-5.amazonaws.com/" />
276+
<test url="http://s3-website-us-west-6.amazonaws.com/" />
277+
<test url="http://s3-website-us-west-7.amazonaws.com/" />
278+
<test url="http://s3-website-us-west-8.amazonaws.com/" />
279+
<test url="http://s3-website-us-west-9.amazonaws.com/" />
280+
<test url="http://s3-website-external-0.amazonaws.com/" />
281+
<test url="http://s3-website-external-1.amazonaws.com/" />
282+
<test url="http://s3-website-external-2.amazonaws.com/" />
283+
<test url="http://s3-website-external-3.amazonaws.com/" />
284+
<test url="http://s3-website-external-4.amazonaws.com/" />
285+
<test url="http://s3-website-external-5.amazonaws.com/" />
286+
<test url="http://s3-website-external-6.amazonaws.com/" />
287+
<test url="http://s3-website-external-7.amazonaws.com/" />
288+
<test url="http://s3-website-external-8.amazonaws.com/" />
289+
<test url="http://s3-website-external-9.amazonaws.com/" />
290+
<test url="http://s3-website-sa-east-1.amazonaws.com/" />
291+
<test url="http://s3-website-us-east-1.amazonaws.com/" />
292+
<test url="http://amazonwebservices.com/" />
293+
<test url="http://www.amazonwebservices.com/" />
294+
<test url="http://developer.amazonwebservices.com/" />
295+
<test url="http://media.amazonwebservices.com/" />
296+
<test url="http://g-images.amazon.com/" />
297+
<test url="http://ec5.images-amazon.com/" />
298+
<test url="http://ecx.images-amazon.com/" />
299+
<test url="http://g-ecx.images-amazon.com/" />
300+
<test url="http://ec1.images-amazon.com/" />
301+
<test url="http://ec2.images-amazon.com/" />
302+
<test url="http://ec3.images-amazon.com/" />
303+
<test url="http://ec4.images-amazon.com/" />
304+
<test url="http://ec5.images-amazon.com/" />
305+
<test url="http://ec6.images-amazon.com/" />
306+
<test url="http://ec7.images-amazon.com/" />
307+
<test url="http://ec8.images-amazon.com/" />
308+
<test url="http://ecx.images-amazon.com/" />
309+
<test url="http://-ec1.images-amazon.com/" />
310+
<test url="http://-ec2.images-amazon.com/" />
311+
<test url="http://-ec3.images-amazon.com/" />
312+
<test url="http://-ec4.images-amazon.com/" />
313+
<test url="http://-ec5.images-amazon.com/" />
314+
<test url="http://-ec6.images-amazon.com/" />
315+
<test url="http://-ec7.images-amazon.com/" />
316+
<test url="http://-ec8.images-amazon.com/" />
317+
<test url="http://-ecx.images-amazon.com/" />
318+
<test url="http://z-ak.images-amazon.com/" />
319+
<test url="http://images.amazon.com/" />
320+
<test url="http://images-jp.amazon.com/" />
321+
<test url="http://images-eu.ssl-images-amazon.com/" />
322+
<test url="http://images-fe.ssl-images-amazon.com/" />
323+
<test url="http://images-na.ssl-images-amazon.com/" />
213324
</ruleset>

‎test-ruleset-coverage.sh‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ if ! [ -d https-everywhere-checker ] ; then
1111
echo "./install-dev-dependencies.sh"
1212
exit 1
1313
fi
14+
if [ $# -gt 0 ] ; then
15+
exec python2.7 https-everywhere-checker/src/https_everywhere_checker/check_rules.py \
16+
https-everywhere-checker/manual.checker.config "$@"
17+
fi
1418
# Git log gives us all changed files. Pipe that through ls to eliminate files
1519
# that have been deleted.
1620
if ! git log --name-only --date=local --since="2015-02-12 6:00" --pretty=format: \

0 commit comments

Comments
 (0)