Skip to content

Commit 3bb31ea

Browse files
author
MB
committed
[Flickr] Enumerate, squish, split, add/amend comments
1 parent 91a877c commit 3bb31ea

File tree

3 files changed

+51
-31
lines changed

3 files changed

+51
-31
lines changed
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<!--
2+
For other Yahoo coverage, see Yahoo.xml.
3+
4+
5+
Insecure cookies are set for these domains:
6+
7+
- .flic.kr
8+
9+
-->
10+
<ruleset name="Flic.kr">
11+
12+
<!-- Direct rewrites:
13+
-->
14+
<target host="flic.kr" />
15+
16+
17+
<!-- Not secured by server:
18+
-->
19+
<!--securecookie host="^\.flic\.kr$" name="^BX$" /-->
20+
21+
<securecookie host="^\.flic\.kr$" name=".+" />
22+
23+
24+
<rule from="^http:"
25+
to="https:" />
26+
27+
</ruleset>
Lines changed: 22 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,52 @@
11
<!--
2-
Disabled by https-everywhere-checker because:
3-
Fetch error: http://flic.kr/ => https://flic.kr/: Redirect for 'https://flic.kr/' missing Location
4-
Fetch error: http://flickr.com/ => https://flickr.com/: Redirect for 'https://flickr.com/' missing Location
52
For other Yahoo coverage, see Yahoo.xml.
63
74
8-
These altnames don't exist:
5+
Fully covered hosts in *flickr.com:
96
10-
- www.blog.flickr.net
11-
- www.code.flickr.net
7+
- (www.)?
8+
- api
9+
- secure
10+
- static
1211
12+
- *.static:
1313
14-
Insecure cookies are set for these domains:
14+
- c\d+
15+
- farm\d+
16+
17+
18+
Insecure cookies are set for these domains and hosts:
1519
16-
- .flic.kr
1720
- .flickr.com
1821
- www.flickr.com
19-
- blog.flickr.net
2022
2123
Note: current_identity (.flickr.com) is read
2224
via script and so cannot be secured.
2325
2426
https://github.com/EFForg/https-everywhere/issues/239
2527
2628
-->
27-
<ruleset name="Flickr" default_off='failed ruleset test'>
29+
<ruleset name="Flickr.com">
2830

29-
<target host="flic.kr" />
30-
<target host="*.flic.kr" />
31+
<!-- Direct rewrites:
32+
-->
3133
<target host="flickr.com" />
32-
<target host="*.flickr.com" />
33-
<target host="*.flickr.net" />
34-
<target host="*.staticflickr.com" />
34+
<target host="api.flickr.com" />
35+
<target host="secure.flickr.com" />
36+
<target host="static.flickr.com" />
37+
<target host="*.static.flickr.com" />
38+
<target host="www.flickr.com" />
3539

3640

3741
<!-- Not secured by server:
3842
-->
39-
<!--securecookie host="^\.flic\.kr$" name="^BX$" /-->
40-
<!--securecookie host="^\.flickr\.com$" name="^(BX|admsort|cookie_session|current_identity|density|ffs|fldetectedlang|flrb|flrbgdrp|flrbgrp|flrbp|flrbs|fltoto|just_registered|localization|memsort|modsort|photoPHS|photoPWS|vp|xb)$" /-->
43+
<!--securecookie host="^\.flickr\.com$" name="^(BX|admsort|cookie_session|current_identity|density|ffs|fldetectedlang|flrb|flrbcr|flrbgdrp|flbgmrp|flrbgrp|flrbp|flrbs|fltoto|just_registered|localization|memsort|modsort|photoPHS|photoPWS|vp|xb)$" /-->
4144
<!--securecookie host="^www\.flickr\.com$" name="^(liqph|liqpw|ywandp)" /-->
42-
<!--securecookie host="^blog\.flickr\.net$" name="^cookie_l10n$" /-->
4345

44-
<securecookie host="^\.flic\.kr$" name=".+" />
4546
<securecookie host=".*\.flickr\.com$" name="^(?!current_identity$).+" />
4647

4748

48-
<rule from="^http://flic\.kr/"
49-
to="https://flic.kr/" />
50-
51-
<rule from="^http://((?:api|secure|static|www)\.)?flickr\.com/"
52-
to="https://$1flickr.com/" />
53-
54-
<rule from="^http://(c\d+|farm\d+)\.static(\.)?flickr\.com/"
55-
to="https://$1.static$2flickr.com/" />
56-
57-
<rule from="^http://(blog|code)\.flickr\.net/"
58-
to="https://$1.flickr.net/" />
49+
<rule from="^http:"
50+
to="https:" />
5951

6052
</ruleset>

utils/ruleset-coverage-whitelist.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4499,7 +4499,7 @@ ef6c2187d795339cc2fab6360e0a5355989bc99492276d720e93efbe839e6116 Flattr.xml
44994499
a5c8c5ba70eda4fdc1061070ffd012a1aadb8396d80a344b11520bc621d263d1 Flavors.me.xml
45004500
16a442961bc605df07d71876f69be34cb50a938f5d2698cbdb4acc48a2ed15fa Fleet_Networks.xml
45014501
2d64a92351f88b1626a7af92eef7ff204f559c9ef1269c42624e09c8aaa32ef7 Flex_Investments.xml
4502-
47bd33d6ef8a2b366fe5f6314af8118e6ac8416ff0a5bd7a686cbb5a2a29f609 Flickr.xml
4502+
677b58f1b9b71ca5ac7272a5f6efd10a84bea7fdbcd0dd8e19184cd43a4360ef Flickr.xml
45034503
24c376a5a6786a98a3db5e7ebaf5e9463ee06bedeca597813a3cff769bd69bbc Flightaware.xml
45044504
141e304897274ec623b1c8f6851f4bd98a130a544bb0b1069fc51c5a79f92287 Flightglobal-mismatches.xml
45054505
3937752f7e787aed21ab503da7978461734f5b5bc2886712dcca57bce9519d5b Flightglobal.xml
@@ -11776,6 +11776,7 @@ d9f9c0c881c17ac1b17d724eb51a3bd525c3db26df6606c87f845141dff66486 Sta.sh.xml
1177611776
5ca8cff3fc01840aed67b274b4e8cb10944c6aea9c232085d91dce0dc147a1ad State_of_Delaware.xml
1177711777
cbb59c8fb32a2a5ea0cf3b3fd7d70b6add8a46094a11757de3c678d5e61aeb3d State_of_Oregon.xml
1177811778
9a9157a909e69f41c77f65eba6b134f4271601a1beb868fafa639064a0751fb1 Statesman_Journal.xml
11779+
1a4cddec6dc0af7b913a5ffa4db2cf946227fcc23a45a1cff1f852076cd2da66 Static_Flickr.com.xml
1177911780
45b687f4eace0e55085c93ad4ab11def284713bb8338cf1e5d4eee412ab2599d StaticGen.com.xml
1178011781
f41ae69f3061e7a3dfcad76556a1086b3abe97b07d6fbb045e8f49784022420d Staticmy.com.xml
1178111782
7500f592127c32a25e139992a6e1e067e488031164d9d8ba29173471e81d26e1 Static_Site_Generators.net.xml

0 commit comments

Comments
 (0)