Skip to content
This repository was archived by the owner on Nov 6, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions src/chrome/content/rules/Flickr.net.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,7 @@
For other Yahoo coverage, see Yahoo.xml.


These altnames don't exist:

- www.blog.flickr.net
- www.code.flickr.net
Timeout on (www.)


Insecure cookies are set for these domains:
Expand All @@ -15,8 +12,6 @@
-->
<ruleset name="Flickr.net">

<!-- Direct rewrites:
-->
<target host="blog.flickr.net" />
<target host="code.flickr.net" />

Expand Down
39 changes: 22 additions & 17 deletions src/chrome/content/rules/Flickr.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,11 @@
For other Yahoo coverage, see Yahoo.xml.


Fully covered hosts in *flickr.com:
Mismatch:
- parkorbird.flickr.com

- (www.)?
- api
- secure
- static

- *.static:

- c\d+
- farm\d+
Timeout:
- blog.flickr.com (blog.flickr.net)


Insecure cookies are set for these domains and hosts:
Expand All @@ -28,27 +22,38 @@
-->
<ruleset name="Flickr.com">

<!-- Direct rewrites:
-->
<target host="flickr.com" />
<target host="www.flickr.com" />
<target host="api.flickr.com" />
<target host="blog.flickr.com" />
<target host="code.flickr.com" />
<target host="m.flickr.com" />
<target host="secure.flickr.com" />
<target host="static.flickr.com" />
<target host="*.static.flickr.com" />
<target host="www.flickr.com" />

<test url="http://farm2.static.flickr.com/1425/cameras/72157624846412485_model_large_194e38d197.jpg" />
<test url="http://farm8.static.flickr.com/7303/buddyicons/42041051@N04_r.jpg" />
<test url="http://farm8.static.flickr.com/7565/cameras/72157646085815427_model_large_7a8c07d8b0.jpg" />
<test url="http://farm1.static.flickr.com/" />
<test url="http://farm2.static.flickr.com/" />
<test url="http://farm3.static.flickr.com/" />
<test url="http://farm4.static.flickr.com/" />
<test url="http://farm5.static.flickr.com/" />
<test url="http://farm6.static.flickr.com/" />
<test url="http://farm7.static.flickr.com/" />
<test url="http://farm8.static.flickr.com/" />
<test url="http://farm9.static.flickr.com/" />


<!-- Not secured by server:
-->
<!--securecookie host="^\.flickr\.com$" name="^(BX|admsort|cookie_session|current_identity|density|ffs|fldetectedlang|flrb|flrbcr|flrbgdrp|flrbgmrp|flrbgrp|flrbp|flrbs|fltoto|just_registered|localization|memsort|modsort|photoPHS|photoPWS|vp|xb)$" /-->
<!--securecookie host="^www\.flickr\.com$" name="^(liqph|liqpw|ywandp)" /-->

<securecookie host=".*\.flickr\.com$" name="^(?!current_identity$).+" />
<!-- https://github.com/EFForg/https-everywhere/issues/728
<securecookie host=".*\.flickr\.com$" name="^(?!current_identity$).+" />-->


<rule from="^http://blog\.flickr\.com/"
to="https://blog.flickr.net/" />
<rule from="^http:"
to="https:" />

Expand Down
35 changes: 20 additions & 15 deletions src/chrome/content/rules/Static_Flickr.com.xml
Original file line number Diff line number Diff line change
@@ -1,26 +1,31 @@
<!--
NB: Tests may be broken by users deleting their data


For other Yahoo coverage, see Yahoo.xml.


Observed hosts in *staticflickr.com:

- c\d+
- farm\d+

(www.)staticflickr.com does not exist
-->
<ruleset name="static Flickr.com">
<ruleset name="staticflickr.com">

<!-- Direct rewrites:
-->
<target host="*.staticflickr.com" />

<test url="http://c4.staticflickr.com/4/3895/buddyicons/24710541@N08_l.jpg" />
<test url="http://farm2.staticflickr.com/1425/cameras/72157624846412485_model_large_194e38d197.jpg" />
<test url="http://farm8.staticflickr.com/7303/buddyicons/42041051@N04_r.jpg" />
<test url="http://farm8.staticflickr.com/7565/cameras/72157646085815427_model_large_7a8c07d8b0.jpg" />
<test url="http://c1.staticflickr.com/" />
<test url="http://c2.staticflickr.com/" />
<test url="http://c3.staticflickr.com/" />
<test url="http://c4.staticflickr.com/" />
<test url="http://c5.staticflickr.com/" />
<test url="http://c6.staticflickr.com/" />
<test url="http://c7.staticflickr.com/" />
<test url="http://c8.staticflickr.com/" />

<test url="http://farm1.staticflickr.com/" />
<test url="http://farm2.staticflickr.com/" />
<test url="http://farm3.staticflickr.com/" />
<test url="http://farm4.staticflickr.com/" />
<test url="http://farm5.staticflickr.com/" />
<test url="http://farm6.staticflickr.com/" />
<test url="http://farm7.staticflickr.com/" />
<test url="http://farm8.staticflickr.com/" />
<test url="http://farm9.staticflickr.com/" />

<rule from="^http:"
to="https:" />
Expand Down
2 changes: 0 additions & 2 deletions utils/ruleset-coverage-whitelist.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4530,7 +4530,6 @@ ef6c2187d795339cc2fab6360e0a5355989bc99492276d720e93efbe839e6116 Flattr.xml
a5c8c5ba70eda4fdc1061070ffd012a1aadb8396d80a344b11520bc621d263d1 Flavors.me.xml
16a442961bc605df07d71876f69be34cb50a938f5d2698cbdb4acc48a2ed15fa Fleet_Networks.xml
2d64a92351f88b1626a7af92eef7ff204f559c9ef1269c42624e09c8aaa32ef7 Flex_Investments.xml
677b58f1b9b71ca5ac7272a5f6efd10a84bea7fdbcd0dd8e19184cd43a4360ef Flickr.xml
24c376a5a6786a98a3db5e7ebaf5e9463ee06bedeca597813a3cff769bd69bbc Flightaware.xml
141e304897274ec623b1c8f6851f4bd98a130a544bb0b1069fc51c5a79f92287 Flightglobal-mismatches.xml
3937752f7e787aed21ab503da7978461734f5b5bc2886712dcca57bce9519d5b Flightglobal.xml
Expand Down Expand Up @@ -11859,7 +11858,6 @@ cbb59c8fb32a2a5ea0cf3b3fd7d70b6add8a46094a11757de3c678d5e61aeb3d State_of_Orego
f41ae69f3061e7a3dfcad76556a1086b3abe97b07d6fbb045e8f49784022420d Staticmy.com.xml
f2bf554fa7c1e2e42482d4f3e1f91ea03ca89ff20c3e480c40f24f90c4881c0c Staticskynet.be.xml
5c9829129baf195a9dbfac286a509c36e0e41bb8adafa18e9162034a65c19904 StaticWars.com.xml
1a4cddec6dc0af7b913a5ffa4db2cf946227fcc23a45a1cff1f852076cd2da66 Static_Flickr.com.xml
7500f592127c32a25e139992a6e1e067e488031164d9d8ba29173471e81d26e1 Static_Site_Generators.net.xml
a9403952ebc8d7fdaa783d9987719a614a9c97ced2dfbd137fa3eda9ad8c0f4c Station_L_Rowing_Club.xml
bf1bf4c8f4a9d2709a7f64e25ec4c5e28359bf3233b9fc06ba42a638f3eb0968 StatistikamtBayern.xml
Expand Down