wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-10-05 14:57:30 +09:00
Code Issues Projects Releases Packages Wiki Activity

[Pale-Moon] Issue #1717 - Differentiate DV & EV Mixed Content

Browse source 
UXP drops STATE_IDENTITY_EV_TOPLEVEL for Mixed Content.
If we want to have different behaviors between DV and EV, we need to use nsISSLStatus.
This commit is contained in:
Andy 2020-08-14 15:59:29 -07:00 • committed by Roy Tam
commit 66a5df11c1
1 changed files with 31 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

69
application/palemoon/base/content/padlock.js
View file

@ -21,36 +21,15 @@ var padlock_PadLock =
const wpl = Ci.nsIWebProgressListener; const wpl = Ci.nsIWebProgressListener;
const wpl_security_bits = wpl.STATE_IS_SECURE | const wpl_security_bits = wpl.STATE_IS_SECURE |
wpl.STATE_IS_BROKEN | wpl.STATE_IS_BROKEN |
wpl.STATE_IS_INSECURE | wpl.STATE_IS_INSECURE;
wpl.STATE_LOADED_MIXED_ACTIVE_CONTENT |
wpl.STATE_LOADED_MIXED_DISPLAY_CONTENT |
wpl.STATE_IDENTITY_EV_TOPLEVEL;
var level; var level;
var highlight_urlbar = false; var highlight_urlbar = false;
switch (aState & wpl_security_bits) { switch (aState & wpl_security_bits) {
case wpl.STATE_IS_SECURE | wpl.STATE_IDENTITY_EV_TOPLEVEL:
level = "ev";
highlight_urlbar = true;
break;
case wpl.STATE_IS_SECURE: case wpl.STATE_IS_SECURE:
case wpl.STATE_IS_BROKEN |
wpl.STATE_LOADED_MIXED_DISPLAY_CONTENT:
level = "high"; level = "high";
highlight_urlbar = true; highlight_urlbar = true;
break; break;
case wpl.STATE_IS_BROKEN |
wpl.STATE_LOADED_MIXED_ACTIVE_CONTENT:
level = "low";
highlight_urlbar = true;
break;
case wpl.STATE_IS_BROKEN | wpl.STATE_IDENTITY_EV_TOPLEVEL |
wpl.STATE_LOADED_MIXED_ACTIVE_CONTENT |
wpl.STATE_LOADED_MIXED_DISPLAY_CONTENT:
case wpl.STATE_IS_BROKEN | wpl.STATE_IDENTITY_EV_TOPLEVEL |
wpl.STATE_LOADED_MIXED_ACTIVE_CONTENT:
case wpl.STATE_IS_BROKEN | wpl.STATE_IDENTITY_EV_TOPLEVEL |
wpl.STATE_LOADED_MIXED_DISPLAY_CONTENT:
case wpl.STATE_IS_BROKEN: case wpl.STATE_IS_BROKEN:
level = "broken"; level = "broken";
highlight_urlbar = true; highlight_urlbar = true;
@ -59,33 +38,47 @@ var padlock_PadLock =
level = null; level = null;
} }
if (level != null && level != "broken") { if (level != null) {
var secUI = gBrowser.securityUI; var secUI = gBrowser.securityUI;
//if we wanted, we could use secUI.state instead of aState above? //if we wanted, we could use secUI.state instead of aState above?
var secState = secUI.QueryInterface(Ci.nsISSLStatusProvider).SSLStatus; var secState = secUI.QueryInterface(Ci.nsISSLStatusProvider).SSLStatus;
if (secState) { if (secState) {
secState.QueryInterface(Ci.nsISSLStatus); secState.QueryInterface(Ci.nsISSLStatus);
var proto = secState.protocolVersion; if (secState.isExtendedValidation) {
if (proto == Ci.nsISSLStatus.SSL_VERSION_3) { if ((aState & wpl.STATE_LOADED_MIXED_ACTIVE_CONTENT) ||
level = "broken"; (aState & wpl.STATE_LOADED_MIXED_DISPLAY_CONTENT))
} else if (proto == Ci.nsISSLStatus.TLS_VERSION_1 || level = "broken";
proto == Ci.nsISSLStatus.TLS_VERSION_1_1) { else if (level == "high")
level = "low"; level = "ev";
} else {
if (aState & wpl.STATE_LOADED_MIXED_ACTIVE_CONTENT)
level = "low";
else if (aState & wpl.STATE_LOADED_MIXED_DISPLAY_CONTENT)
level = "high";
} }
if (level != "broken") { if (level != "broken") {
var aCipher = secState.cipherSuite; var proto = secState.protocolVersion;
if (aCipher.indexOf("_EXPORT") > -1) { if (proto == Ci.nsISSLStatus.SSL_VERSION_3) {
level = "broken"; level = "broken";
} else if (aCipher.indexOf("_RC2_") > -1) { } else if (proto == Ci.nsISSLStatus.TLS_VERSION_1 ||
level = "broken"; proto == Ci.nsISSLStatus.TLS_VERSION_1_1) {
} else if (aCipher.indexOf("_RC4_") > -1) { level = "low";
if (aCipher.indexOf("_MD5") > -1) { }
if (level != "broken") {
var aCipher = secState.cipherSuite;
if (aCipher.indexOf("_EXPORT") > -1) {
level = "broken"; level = "broken";
} else if (aCipher.indexOf("_SHA") > -1) { } else if (aCipher.indexOf("_RC2_") > -1) {
level = "broken";
} else if (aCipher.indexOf("_RC4_") > -1) {
if (aCipher.indexOf("_MD5") > -1) {
level = "broken";
} else if (aCipher.indexOf("_SHA") > -1) {
level = "low";
}
} else if (aCipher.indexOf("_3DES_") > -1) {
level = "low"; level = "low";
} }
} else if (aCipher.indexOf("_3DES_") > -1) {
level = "low";
} }
} }
} }