Skip to content

Commit 99480fe

Browse files
committed
Adding an option to enable/disable SSL observatory warnings about revoked certs (enabled by default)
1 parent db8ce35 commit 99480fe

37 files changed

+224
-8
lines changed

src/chrome/content/observatory-preferences.xul

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
<command id="use-obs-nonanon" oncommand="set_obs_anon(false)" />
3535
<command id="toggle-alt-roots" oncommand="toggle_alt_roots()" />
3636
<command id="toggle-send-asn" oncommand="toggle_send_asn()" />
37+
<command id="toggle-show-cert-warning" oncommand="toggle_show_cert_warning()" />
3738
<command id="toggle-priv-dns" oncommand="toggle_priv_dns()" />
3839
<command id="toggle-self-signed" oncommand="toggle_self_signed()" />
3940
</commandset>
@@ -58,6 +59,13 @@
5859
<checkbox label="&ssl-observatory.prefs.asn;" id="send-asn"
5960
tooltip="asn-tip" class="ssl-obs-conf"
6061
command="toggle-send-asn"/>
62+
<separator class="thin"/>
63+
<tooltip id="cert-warning-tip" noautohude="true">
64+
<label>&ssl-observatory.prefs.show_cert_warning_tooltip;</label>
65+
</tooltip>
66+
<checkbox label="&ssl-observatory.prefs.show_cert_warning;" id="show-cert-warning"
67+
tooltip="cert-warning-tip" class="ssl-obs-conf"
68+
command="toggle-show-cert-warning"/>
6169
<spacer flex="2" />
6270
<hbox>
6371
<spacer flex="1" />

src/chrome/content/observatory-xul.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ function observatory_prefs_init(doc) {
2727
obsprefs.getBoolPref("extensions.https_everywhere._observatory.self_signed");
2828
document.getElementById("send-asn").checked =
2929
obsprefs.getBoolPref("extensions.https_everywhere._observatory.send_asn");
30+
document.getElementById("show-cert-warning").checked =
31+
obsprefs.getBoolPref("extensions.https_everywhere._observatory.show_cert_warning");
3032

3133
// More complicated: is it anonymised by Tor?
3234
var obs_how = doc.getElementById("ssl-obs-how");
@@ -137,6 +139,11 @@ function toggle_send_asn() {
137139
else ssl_observatory.stopASNWatcher();
138140
}
139141

142+
function toggle_show_cert_warning() {
143+
var show_cert_warning = document.getElementById("show-cert-warning").checked;
144+
obsprefs.setBoolPref("extensions.https_everywhere._observatory.show_cert_warning", show_cert_warning);
145+
}
146+
140147
function toggle_alt_roots() {
141148
var alt_roots = document.getElementById("alt-roots").checked;
142149
obsprefs.setBoolPref("extensions.https_everywhere._observatory.alt_roots", alt_roots);

src/chrome/locale/ar/ssl-observatory.dtd

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,12 @@ to turn it on?">-->
4343
<!ENTITY ssl-observatory.prefs.asn_tooltip
4444
"هذا سيجلب و يرسل &quot;رقم النظام المستقل&quot; الخاص بشبكتك. هذا سيساعدنا على تحديد موقع الهجمات ضد HTTPS، وتحديد ما إذا كان لدينا ملاحظات من شبكات في أماكن مثل سوريا وإيران حيث هذه الهجمات شائعة نسبياً.">
4545

46+
<!ENTITY ssl-observatory.prefs.show_cert_warning
47+
''>
48+
49+
<!ENTITY ssl-observatory.prefs.show_cert_warning_tooltip
50+
''>
51+
4652
<!ENTITY ssl-observatory.prefs.done "انتهى">
4753

4854
<!ENTITY ssl-observatory.prefs.explanation

src/chrome/locale/bg/ssl-observatory.dtd

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,12 @@ to turn it on?">-->
4343
<!ENTITY ssl-observatory.prefs.asn_tooltip
4444
"">
4545

46+
<!ENTITY ssl-observatory.prefs.show_cert_warning
47+
''>
48+
49+
<!ENTITY ssl-observatory.prefs.show_cert_warning_tooltip
50+
''>
51+
4652
<!ENTITY ssl-observatory.prefs.done "Готово">
4753

4854
<!ENTITY ssl-observatory.prefs.explanation

src/chrome/locale/cs/ssl-observatory.dtd

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,12 @@ dotěrné firemní síti:">
4444
<!ENTITY ssl-observatory.prefs.asn_tooltip
4545
"Toto načte a odešle &quot;číslo Autonomního Systému&quot; vaší sítě. Pomůže nám to lokalizovat útoky na HTTPS, a rozpoznat jestli máme hlášení ze sítí v zemích jako je Írán a Sýrie, kde jsou útoky relativně časté.">
4646

47+
<!ENTITY ssl-observatory.prefs.show_cert_warning
48+
''>
49+
50+
<!ENTITY ssl-observatory.prefs.show_cert_warning_tooltip
51+
''>
52+
4753
<!ENTITY ssl-observatory.prefs.done "Hotovo">
4854

4955
<!ENTITY ssl-observatory.prefs.explanation

src/chrome/locale/da/ssl-observatory.dtd

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,12 @@ som er udsat for meget indtrængen:">
4444
<!ENTITY ssl-observatory.prefs.asn_tooltip
4545
"Dette vil hente og sende det &quot;autonome systemnummer&quot; for dit netværk. Dette vil hjælpe os med at lokalisere angreb mod HTTPS, og afgøre hvorvidt vi har observationer fra netværk fra steder som Iran og Syrien, hvor angreb set under sammenligning forekommer hyppigt.">
4646

47+
<!ENTITY ssl-observatory.prefs.show_cert_warning
48+
''>
49+
50+
<!ENTITY ssl-observatory.prefs.show_cert_warning_tooltip
51+
''>
52+
4753
<!ENTITY ssl-observatory.prefs.done "Færdig">
4854

4955
<!ENTITY ssl-observatory.prefs.explanation

src/chrome/locale/de/ssl-observatory.dtd

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,12 @@ to turn it on?">-->
4141
<!ENTITY ssl-observatory.prefs.asn_tooltip
4242
"Diese Option verwendet die 'Autonome System Zahl' Ihres Netzwerks. Das hilft uns, Angriffe gegen HTTPS zu orten und festzustellen, ob es sich um Angriffe von Netzwerken in Ländern wie Iran und Syrien handelt, in denen solche Angriffe vergleichsweise häufig sind.">
4343

44+
<!ENTITY ssl-observatory.prefs.show_cert_warning
45+
''>
46+
47+
<!ENTITY ssl-observatory.prefs.show_cert_warning_tooltip
48+
''>
49+
4450
<!ENTITY ssl-observatory.prefs.done "Fertig">
4551

4652
<!ENTITY ssl-observatory.prefs.explanation

src/chrome/locale/el/ssl-observatory.dtd

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,12 @@ to turn it on?">-->
4141
<!ENTITY ssl-observatory.prefs.asn
4242
"Όταν βλέπεις ένα νέο πιστοποιητικό, πες στο Παρατηρητήριο με ποιον Πάροχο Υπηρεσιών Διαδικτύου έχεις συνδεθεί.">
4343

44+
<!ENTITY ssl-observatory.prefs.show_cert_warning
45+
''>
46+
47+
<!ENTITY ssl-observatory.prefs.show_cert_warning_tooltip
48+
''>
49+
4450
<!ENTITY ssl-observatory.prefs.asn_tooltip
4551
"Η συγκεκριμένη επιλογή θα ανακτήσει και θα αποστείλει τον &quot;Αυτόνομο Αριθμό Συστήματος&quot; (Autonomous System number) του δικτύου σου. Αυτό θα μας βοηθήσει να εντοπίσουμε επιθέσεις εναντίον του HTTPS και να καθορίσουμε αν έχουν παρατηρηθεί επιθέσεις από μέρη όπως η Συρία και το Ιράν όπου αυτές οι επιθέσεις είναι συγκριτικά πιο συνηθισμένες.">
4652

src/chrome/locale/en/ssl-observatory.dtd

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,12 @@ intrusive corporate network:">
4444
<!ENTITY ssl-observatory.prefs.asn_tooltip
4545
'This will fetch and send the "Autonomous System number" of your network. This will help us locate attacks against HTTPS, and to determine whether we have observations from networks in places like Iran and Syria where attacks are comparatively common.'>
4646

47+
<!ENTITY ssl-observatory.prefs.show_cert_warning
48+
"Show a warning when the Observatory detects a revoked certificate not caught by your browser">
49+
50+
<!ENTITY ssl-observatory.prefs.show_cert_warning_tooltip
51+
"This will check submitted certificates against known Certificate Revocation Lists. Unfortunately we cannot guarantee that we will flag every revoked certificate, but if you do see a warning there's a good chance something is wrong.">
52+
4753
<!ENTITY ssl-observatory.prefs.done "Done">
4854

4955
<!ENTITY ssl-observatory.prefs.explanation
@@ -87,7 +93,7 @@ looked at. Mouseover the options for further details:">
8793
<!ENTITY ssl-observatory.warning.showcert "Show the certificate chain">
8894
<!ENTITY ssl-observatory.warning.okay "I understand">
8995
<!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory has issued a warning about the HTTPS certificiate(s) for this site:">
90-
<!ENTITY ssl-observatory.warning.defense "If you are logged in to this site, it may be advisable to change your password once you have a safe connection.">
96+
<!ENTITY ssl-observatory.warning.defense 'If you are logged in to this site, it may be advisable to change your password once you have a safe connection. (These warnings can be disabled in the "SSL Observatory" tab of the HTTPS Everywhere preferences dialog.)'>
9197

9298
<!ENTITY ssl-observatory.prefs.self_signed
9399
"Submit and check self-signed certificates">

src/chrome/locale/es/ssl-observatory.dtd

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,12 @@ una red corporativa muy intrusiva:">
4444
<!ENTITY ssl-observatory.prefs.asn_tooltip
4545
"Esto obtendrá y enviará el &quot;número de Sistema Autónomo&quot; (AS) de su red. Esto nos ayudará a ubicar ataques contra HTTPS, y a determinar si tenemos observaciones desde redes en lugares como Irán o Siria donde los ataques son comparativamente más comunes.">
4646

47+
<!ENTITY ssl-observatory.prefs.show_cert_warning
48+
''>
49+
50+
<!ENTITY ssl-observatory.prefs.show_cert_warning_tooltip
51+
''>
52+
4753
<!ENTITY ssl-observatory.prefs.done "Listo">
4854

4955
<!ENTITY ssl-observatory.prefs.explanation

0 commit comments

Comments
 (0)