Skip to content

Commit

Permalink
Update CNBC.com related ruleset (EFForg#9772)
Browse files Browse the repository at this point in the history
  • Loading branch information
cschanaj authored and J0WI committed May 4, 2017
1 parent 58c865d commit 8bdc02f
Show file tree
Hide file tree
Showing 4 changed files with 77 additions and 62 deletions.
18 changes: 0 additions & 18 deletions src/chrome/content/rules/CNBC-mixed.xml

This file was deleted.

9 changes: 9 additions & 0 deletions src/chrome/content/rules/CNBC.com-mixed.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<!--
For more CNBC.com related, see CNBC.com.xml
-->
<ruleset name="CNBC.com (mixed)" platform="mixedcontent">
<target host="webcast.cnbc.com" />
<test url="http://webcast.cnbc.com/show/futuresnow" />

<rule from="^http:" to="https:" />
</ruleset>
68 changes: 68 additions & 0 deletions src/chrome/content/rules/CNBC.com.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
<!--
Other CNBC.com related ruleset:
- CNBC.com-mixed.xml
Non-functional hosts
Couldn't connect to server:
- apps.cnbc.com
- http://apps.cnbc.com/company/quote/newindex.asp?symbol=616660
SSL peer certificate was not OK:
- data.cnbc.com
- product.cnbc.com
- sc.cnbc.com
- video.cnbc.com
4xx client error:
- bigdata.cnbc.com
Secure connection redirects to plaintext:
- www.cnbc.com
- deliveringalpha.cnbc.com
- futuresnow.cnbc.com
- watchlist.cnbc.com
Mixed Content Blocking (MCB) tiggered:
- webcast.cnbc.com
- https://webcast.cnbc.com/show/futuresnow
-->
<ruleset name="CNBC.com (partial)">
<target host="cnbc.com" />
<target host="www.cnbc.com" />
<exclusion pattern="^http://www\.cnbc\.com/$" />
<test url="http://www.cnbc.com/fonts/fontawesome-webfont.woff2?v=4.3.0" />
<test url="http://www.cnbc.com/fonts/cnbc_font_icons.woff?-k1ej6q" />
<test url="http://www.cnbc.com/staticContent/showads.js" />
<test url="http://www.cnbc.com/staticcontent/global.2.css?vn=399" />
<test url="http://www.cnbc.com/staticcontent/home_page_ng.css?vn=399" />
<target host="commentsapi.cnbc.com" />
<target host="fm.cnbc.com" />
<test url="http://fm.cnbc.com/applications/cnbc.com/resources/img/editorial/2016/09/14/103940717-DSC_3362-2.350x197.jpg" />
<test url="http://fm.cnbc.com/applications/cnbc.com/resources/img/editorial/2017/02/21/104294496-Le_Pen_Germany_.240x160.jpg" />
<test url="http://fm.cnbc.com/dynamicyield/8765304/api_static.js" />
<target host="gdsapi.cnbc.com" />
<target host="login.cnbc.com" />
<test url="http://login.cnbc.com/authproxy/portfolio/auth.do?Action=portfolio" />
<target host="media.cnbc.com" />
<test url="http://media.cnbc.com/i/CNBC/Components/Email/NewsBrief/dotComLogo.jpg" />
<test url="http://media.cnbc.com/i/CNBC/Sections/CNBC_TV/CNBC_US/Shows/DonnyDeutsch/Slideshows/071121/DD-05.jpg" />
<test url="http://media.cnbc.com/i/CNBC/Sections/CNBC_TV/CNBC_Asia/Schedules/Nikkei_April08.pdf" />
<target host="mps.cnbc.com" />
<test url="http://mps.cnbc.com/fetch/ext/load-cnbc.com-relaunch.js" />
<target host="portfolio.cnbc.com" />
<target host="pro.cnbc.com" />
<target host="quote.cnbc.com" />
<test url="http://quote.cnbc.com/quote-html-webservice/quoteform.htm" />
<target host="register.cnbc.com" />
<target host="pages.response.cnbc.com" />

<rule from="^http://cnbc\.com/"
to="https://cnbc.com/" />

<rule from="^http://(commentsapi|fm|gdsapi|login|media|mps|portfolio|pro|quote|register|pages\.response)\.cnbc\.com/"
to="https://$1.cnbc.com/" />

<rule from="^http://www\.cnbc\.com/(fonts|staticcontent|staticContent)/"
to="https://www.cnbc.com/$1/" />

</ruleset>
44 changes: 0 additions & 44 deletions src/chrome/content/rules/CNBC.xml

This file was deleted.

0 comments on commit 8bdc02f

Please sign in to comment.