[Pkg-privacy-commits] [xul-ext-monkeysphere] 123/296: set status neutral for secure site

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch debian
in repository xul-ext-monkeysphere.

commit 65d9c2e8ae94aa3569ed1bd402761cb1cd640ac3
Author: Jameson Rollins <jrollins at finestructure.net>
Date:   Sat Mar 6 15:11:20 2010 -0500

    set status neutral for secure site
---
 chrome/content/monkeysphere.js | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/chrome/content/monkeysphere.js b/chrome/content/monkeysphere.js
index e857d78..3e22159 100644
--- a/chrome/content/monkeysphere.js
+++ b/chrome/content/monkeysphere.js
@@ -213,6 +213,8 @@ var monkeysphere = {
     monkeysphere.log("checking security state: " + state);
     // if site secure...
     if(state & Components.interfaces.nsIWebProgressListener.STATE_IS_SECURE) {
+      // FIXME: if a monkeysphere-generated cert override is being used by this connection, then we should be setting the status from the override
+      monkeysphere.setStatus(browser, monkeysphere.states.NEUTRAL);
       monkeysphere.log("  site state SECURE.");
       monkeysphere.log("done.");
       return;
@@ -269,7 +271,7 @@ var monkeysphere = {
     var state = monkeysphere.states.NEUTRAL;
     var message = "";
 
-    if ( typeof browser.monkeysphere !== "undefined" ) {
+    if( typeof browser.monkeysphere !== "undefined" ) {
       state = browser.monkeysphere.state;
       message = browser.monkeysphere.message;
     }
@@ -302,10 +304,8 @@ var monkeysphere = {
         break;
     }
 
-    if(message) {
-      monkeysphere.log("set message: " + message);
-      panel.setAttribute("tooltiptext", message);
-    }
+    monkeysphere.log("set message: " + message);
+    panel.setAttribute("tooltiptext", message);
   },
 
 ////////////////////////////////////////////////////////////
@@ -357,10 +357,6 @@ var monkeysphere = {
     client.setRequestHeader("Connection", "close");
     client.setRequestHeader("Accept", "application/json");
 
-    browser.monkeysphere = {
-      message: 'foo bar'
-    };
-
     // setup the state change function
     client.onreadystatechange = function() {
       monkeysphere.onAgentStateChange(client, browser, cert);
@@ -481,6 +477,7 @@ var monkeysphere = {
   // FWIW, aWebProgress listener has:
   // securityUI = [xpconnect wrapped (nsISupports, nsISecureBrowserUI, nsISSLStatusProvider)]
   // but i don't think it can be used because it doesn't hold invalid cert info
+  // FIXME: is there a better way to get the cert for the actual current connection?
   getCertificate: function(uri) {
     try {
       var cert = monkeysphere.getInvalidCertSSLStatus(uri).QueryInterface(Components.interfaces.nsISSLStatus).serverCert;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/xul-ext-monkeysphere.git