Permalink
Browse files

Merge branch 'master' of git://git.torproject.org/https-everywhere

  • Loading branch information...
2 parents 9ae84a4 + 360c31c commit c196e65ef01ae4630575ca7f5e1cc4bd01095719 @Rafiot committed Jul 11, 2011
Showing with 2,266 additions and 1,223 deletions.
  1. +7 −0 src/chrome.manifest
  2. +16 −16 src/chrome/content/about.xul
  3. +17 −37 src/chrome/content/code/ApplicableList.js
  4. +1 −1 src/chrome/content/code/HTTPS.js
  5. +348 −0 src/chrome/content/code/Root-CAs.js
  6. +29 −0 src/chrome/content/meta-preferences.xul
  7. +62 −0 src/chrome/content/observatory-popup.xul
  8. +153 −0 src/chrome/content/observatory-preferences.js
  9. +96 −0 src/chrome/content/observatory-preferences.xul
  10. +18 −0 src/chrome/content/preferences.js
  11. +12 −9 src/chrome/content/preferences.xul
  12. +7 −0 src/chrome/content/rules/1time.co.za.xml
  13. +2 −4 src/chrome/content/rules/AdblockPlus.xml
  14. +6 −2 src/chrome/content/rules/Adobe.xml
  15. +9 −0 src/chrome/content/rules/AerLingus.xml
  16. +13 −0 src/chrome/content/rules/AirAsia.xml
  17. +9 −0 src/chrome/content/rules/AlaskaAirlines.xml
  18. +2 −0 src/chrome/content/rules/Apple.xml
  19. +7 −0 src/chrome/content/rules/AustrianAirlines.xml
  20. +44 −0 src/chrome/content/rules/BYU.xml
  21. +9 −0 src/chrome/content/rules/BendigoBank.xml
  22. +6 −1 src/chrome/content/rules/Bitly.xml
  23. +1 −1 src/chrome/content/rules/BlockBuster.xml
  24. +6 −0 src/chrome/content/rules/Bmibaby.com.xml
  25. +12 −0 src/chrome/content/rules/Booking.com.xml
  26. +47 −0 src/chrome/content/rules/Caltech.xml
  27. +24 −0 src/chrome/content/rules/CanalDigital.xml
  28. +9 −0 src/chrome/content/rules/Chase.xml
  29. +9 −0 src/chrome/content/rules/Citibank.xml
  30. +8 −0 src/chrome/content/rules/CompareTheMarket.xml
  31. +6 −2 src/chrome/content/rules/DuckDuckGo.xml
  32. +0 −2 src/chrome/content/rules/EdUbuntu.xml
  33. +4 −2 src/chrome/content/rules/FSF.xml
  34. +9 −0 src/chrome/content/rules/FifthThirdBank.xml
  35. +8 −0 src/chrome/content/rules/FitBit.xml
  36. +4 −0 src/chrome/content/rules/Flickr.xml
  37. +6 −0 src/chrome/content/rules/Forbrukerraadet.xml
  38. +9 −0 src/chrome/content/rules/FusionNet.xml
  39. +3 −2 src/chrome/content/rules/GNOME.xml
  40. +3 −0 src/chrome/content/rules/Google.xml
  41. +2 −2 src/chrome/content/rules/GoogleAPIs.xml
  42. +2 −23 src/chrome/content/rules/GoogleServices.xml
  43. +1 −1 src/chrome/content/rules/Groupon.xml
  44. +7 −0 src/chrome/content/rules/Halifax.xml
  45. +9 −0 src/chrome/content/rules/HawaiianAirlines.xml
  46. +9 −0 src/chrome/content/rules/Hotwire.xml
  47. +9 −0 src/chrome/content/rules/IANA.xml
  48. +7 −0 src/chrome/content/rules/JapanAirlines.xml
  49. +9 −0 src/chrome/content/rules/Jet2.com.xml
  50. +5 −4 src/chrome/content/rules/KLM.xml
  51. +7 −0 src/chrome/content/rules/Khronos.xml
  52. +6 −0 src/chrome/content/rules/MCLU.xml
  53. +9 −0 src/chrome/content/rules/MakeMyTrip.xml
  54. +1 −1 src/chrome/content/rules/McAfee.xml
  55. +9 −0 src/chrome/content/rules/MomentusMedia.xml
  56. +7 −0 src/chrome/content/rules/Monarch.co.uk.xml
  57. +3 −1 src/chrome/content/rules/Mozdev.xml
  58. +5 −1 src/chrome/content/rules/Mozilla.xml
  59. +9 −0 src/chrome/content/rules/NAB.xml
  60. +6 −0 src/chrome/content/rules/NanoHUB.xml
  61. +1 −0 src/chrome/content/rules/Netflix.xml
  62. +9 −0 src/chrome/content/rules/PNC.xml
  63. +1 −0 src/chrome/content/rules/Pastebin.ca.xml
  64. +1 −1 src/chrome/content/rules/Pastebin.com.xml
  65. +1 −1 src/chrome/content/rules/Pizzahut.xml
  66. +6 −0 src/chrome/content/rules/Prolific.com.tw.xml
  67. +1 −0 src/chrome/content/rules/RadioShack.xml
  68. +6 −7 src/chrome/content/rules/Reddit.xml
  69. +2 −0 src/chrome/content/rules/SANS.xml
  70. +2 −1 src/chrome/content/rules/SICS.se.xml
  71. +6 −0 src/chrome/content/rules/SVGOpen.xml
  72. +0 −6 src/chrome/content/rules/Savannah.xml
  73. +6 −0 src/chrome/content/rules/SchooltoPrison.org.xml
  74. +3 −3 src/chrome/content/rules/Scroogle.xml
  75. +9 −0 src/chrome/content/rules/SpiritAirlines.xml
  76. +9 −0 src/chrome/content/rules/SunTrust.xml
  77. +2 −2 src/chrome/content/rules/Swiss.xml
  78. +6 −0 src/chrome/content/rules/TDBank.xml
  79. +9 −0 src/chrome/content/rules/ThomasCook.xml
  80. +11 −0 src/chrome/content/rules/TicketingNetworkEastMidlands.xml
  81. +1 −1 src/chrome/content/rules/Twitpic.xml
  82. +99 −5 src/chrome/content/rules/UCSD.edu.xml
  83. +8 −0 src/chrome/content/rules/UIE.xml
  84. +6 −1 src/chrome/content/rules/USPS.xml
  85. +1 −1 src/chrome/content/rules/VideoLAN.xml
  86. +9 −0 src/chrome/content/rules/VirginAustralia.xml
  87. +7 −0 src/chrome/content/rules/VisionAirlines.xml
  88. +9 −0 src/chrome/content/rules/Wachovia.xml
  89. +9 −0 src/chrome/content/rules/WestJet.xml
  90. +9 −0 src/chrome/content/rules/Westpac.xml
  91. +31 −7 src/chrome/content/rules/Wikipedia.xml
  92. +1 −1 src/chrome/content/rules/YouTube_testing.xml
  93. +7 −0 src/chrome/content/rules/goMokulele.xml
  94. +0 −1,052 src/chrome/content/rules/validity-analysis
  95. +24 −11 src/chrome/content/toolbar_button.js
  96. +24 −7 src/chrome/content/toolbar_button.xul
  97. +23 −0 src/chrome/locale/en/https-everywhere.dtd
  98. +94 −0 src/chrome/locale/en/ssl-observatory.dtd
  99. +5 −0 src/chrome/locale/lv-LV/https-everywhere.dtd
  100. +92 −0 src/chrome/locale/lv-LV/ssl-observatory.dtd
  101. +5 −0 src/chrome/locale/pt-BR/https-everywhere.dtd
  102. +4 −0 src/chrome/locale/sv-SE/https-everywhere.dtd
  103. BIN src/chrome/skin/ssl-observatory-messy.jpg
  104. BIN src/chrome/skin/ssl-observatory.jpg
  105. +1 −1 src/components/https-everywhere.js
  106. +515 −0 src/components/ssl-observatory.js
  107. +22 −0 src/defaults/preferences/preferences.js
  108. +3 −3 src/install.rdf
  109. +3 −0 test.sh
View
@@ -1,6 +1,9 @@
content https-everywhere chrome/content/
locale https-everywhere en chrome/locale/en/
+locale https-everywhere lv-LV chrome/locale/lv-LV/
+locale https-everywhere pt-BR chrome/locale/pt-BR/
+locale https-everywhere sv-SE chrome/locale/sv-SE/
skin https-everywhere classic/1.0 chrome/skin/
@@ -14,3 +17,7 @@ overlay chrome://browser/content/browser.xul chrome://https-everywhere/content/t
overlay chrome://navigator/content/navigator.xul chrome://https-everywhere/content/toolbar_button.xul
style chrome://global/content/customizeToolbar.xul chrome://https-everywhere/skin/https-everywhere.css
+component {0f9ab521-986d-4ad8-9c1f-6934e195c15c} components/ssl-observatory.js
+contract @eff.org/ssl-observatory;1 {0f9ab521-986d-4ad8-9c1f-6934e195c15c}
+
+category profile-after-change SSLObservatory @eff.org/ssl-observatory;1
@@ -8,52 +8,52 @@
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
xmlns:html="http://www.w3.org/1999/xhtml"
buttons="accept"
- title="About HTTPS Everywhere"
+ title="&https-everywhere.about.title;"
width="500"
height="550"
align="center">
<script type="application/x-javascript"
src="chrome://https-everywhere/content/preferences.js"/>
<vbox>
- <label style="text-align:center; font-weight:bold; font-size:22px;">HTTPS Everywhere</label>
- <label style="text-align:center; font-size:18px; margin-bottom:10px;">Encrypt the Web! Automatically use HTTPS security on many sites.</label>
+ <label style="text-align:center; font-weight:bold; font-size:22px;">&https-everywhere.about.ext_name;</label>
+ <label style="text-align:center; font-size:18px; margin-bottom:10px;">&https-everywhere.about.ext_description;</label>
<groupbox>
- <caption label="Version" />
- <label>1.0.0development.2</label>
+ <caption label="&https-everywhere.about.version;" />
+ <label>2.0development.1</label>
</groupbox>
<groupbox>
- <caption label="Created by" />
+ <caption label="&https-everywhere.about.created_by;" />
<label>Mike Perry and Peter Eckersley</label>
</groupbox>
<groupbox>
- <caption label="Ruleset Librarians" />
+ <caption label="&https-everywhere.about.librarians;" />
<label>Seth Schoen, Mike Cardwell and Andreas Jonsson</label>
</groupbox>
<groupbox>
- <caption label="Thanks to" />
- <label>Many many contributors, including Alec Moskvin, Alex Xu,
- Chris Palmer, Claudio Moretti, Daniel Kahn Gillmor, Felix Geyer,
- Heiko Adams, Jeroen van der Gun, katmagic, Micah Lee, Ori Avtalion,
- Osama Khalid, nitrox, Pablo Castellano, Rules Moore, Stefan Tomanek
- and Whizz Mo</label>
+ <caption label="&https-everywhere.about.thanks;" />
+ <label>Many many contributors, including Alec Moskvin, Alex Xu, Chris
+ Palmer, Christopher Liu, Claudio Moretti, Daniel Kahn Gillmor, dm0,
+ Felix Geyer, Heiko Adams, Jeroen van der Gun, Jorge Bernal, katmagic,
+ Micah Lee, Ori Avtalion, Osama Khalid, nitrox, Pablo Castellano, Rules
+ Moore, Stefan Tomanek, Victor Garin and Whizz Mo</label>
</groupbox>
<label style="font-weight:bold; margin-top:10px;">
- If you like HTTPS Everywhere, you might consider
+ &https-everywhere.about.countribute;
<label id="donate link"
- value="Donating to Tor"
+ value="&https-everywhere.about.donate_tor;"
style="color: blue; cursor:hand; text-decoration:underline; font-style:bold"
onmouseover="event.target.style.cursor='pointer'"
onmouseout="event.target.style.cursor='default'"
onclick="window_opener('https://www.torproject.org/donate/donate.html.en')"/>
or
<label id="donate link2"
- value="Donating to EFF"
+ value="&https-everywhere.about.donate_eff;"
style="color: blue; cursor:hand; text-decoration:underline; font-style:bold"
onmouseover="event.target.style.cursor='pointer'"
onmouseout="event.target.style.cursor='default'"
@@ -55,7 +55,7 @@ ApplicableList.prototype = {
dst.setUserData(key, data, this.dom_handler);
},
- populate_menu: function(document) {
+ populate_menu: function(document, menupopup) {
// The base URI of the dom tends to be loaded from some /other/
// ApplicableList, so pretend we're loading it from here.
@@ -64,10 +64,10 @@ ApplicableList.prototype = {
this.document = document;
// get the menu popup
- this.menupopup = document.getElementById('https-everywhere-context');
+ this.menupopup = menupopup;
// empty it all of its menuitems
- while(this.menupopup.firstChild) {
+ while(this.menupopup.firstChild.tagName != "menuseparator") {
this.menupopup.removeChild(this.menupopup.firstChild);
}
@@ -84,7 +84,6 @@ ApplicableList.prototype = {
label.setAttribute('label', '(No Rules for This Page)');
}
label.setAttribute('command', 'https-everywhere-menuitem-preferences');
- this.menupopup.appendChild(label);
// create a commandset if it doesn't already exist
this.commandset = document.getElementById('https-everywhere-commandset');
@@ -110,43 +109,24 @@ ApplicableList.prototype = {
this.add_command(this.inactive[x]);
// add all the menu items
- for (var x in this.breaking)
- this.add_menuitem(this.breaking[x], 'breaking');
- // break once break everywhere
- for (var x in this.active)
- if (!(x in this.breaking))
- this.add_menuitem(this.active[x], 'active');
+ for (var x in this.inactive)
+ this.add_menuitem(this.inactive[x], 'inactive');
// rules that are active for some uris are not really moot
for (var x in this.moot)
if (!(x in this.active))
this.add_menuitem(this.moot[x], 'moot');
- for (var x in this.inactive)
- this.add_menuitem(this.inactive[x], 'inactive');
-
- // add other menu items
- this.menupopup.appendChild(document.createElement('menuseparator'));
-
- // preferences, about
- var about = document.createElement('menuitem');
- about.setAttribute('label', 'About HTTPS Everywhere');
- about.setAttribute('command', 'https-everywhere-menuitem-about');
- this.menupopup.appendChild(about);
-
- // separator
- this.menupopup.appendChild(document.createElement('menuseparator'));
-
- // donate
- /* var donate_eff = document.createElement('menuitem');
- donate_eff.setAttribute('label', 'Donate to EFF');
- donate_eff.setAttribute('command', 'https-everywhere-menuitem-donate-eff');
- this.menupopup.appendChild(donate_eff);
- var donate_tor = document.createElement('menuitem');
- donate_tor.setAttribute('label', 'Donate to Tor');
- donate_tor.setAttribute('command', 'https-everywhere-menuitem-donate-tor');
- this.menupopup.appendChild(donate_tor); */
-
- this.log(DBUG, "finished menu");
+ // break once break everywhere
+ for (var x in this.active)
+ if (!(x in this.breaking))
+ this.add_menuitem(this.active[x], 'active');
+ for (var x in this.breaking)
+ this.add_menuitem(this.breaking[x], 'breaking');
+ this.prepend_child(label);
+ },
+
+ prepend_child: function(node) {
+ this.menupopup.insertBefore(node, this.menupopup.firstChild);
},
add_command: function(rule) {
@@ -186,7 +166,7 @@ ApplicableList.prototype = {
item.appendChild(hbox);
// all done
- this.menupopup.appendChild(item);
+ this.prepend_child(item);
},
show_applicable: function() {
@@ -192,7 +192,7 @@ const HTTPS = {
this.log(WARN,"No URI inside request " +req);
return;
}
- this.log(DBUG, "Cookie hunting in " + uri.spec);
+ //this.log(DBUG, "Cookie hunting in " + uri.spec);
var alist = HTTPSEverywhere.instance.getApplicableListForChannel(req);
if (!alist)
this.log(INFO, "No alist for cookies for "+(req.URI) ? req.URI.spec : "???");
Oops, something went wrong.

0 comments on commit c196e65

Please sign in to comment.