[Pkg-privacy-commits] [xul-ext-monkeysphere] 101/296: change MONKEYSPHERE_VALIDATION_AGENT_URL to MONKEYSPHERE_VALIDATION_AGENT_SOCKET, add a default, ignore trailing slashes

[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 aed0658d979de08ee8895fee2963455eba1ce2e1
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Tue Feb 23 16:40:35 2010 -0500

    change MONKEYSPHERE_VALIDATION_AGENT_URL to MONKEYSPHERE_VALIDATION_AGENT_SOCKET, add a default, ignore trailing slashes
---
 chrome/content/monkeysphere.js | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/chrome/content/monkeysphere.js b/chrome/content/monkeysphere.js
index 5b68121..0e7d289 100644
--- a/chrome/content/monkeysphere.js
+++ b/chrome/content/monkeysphere.js
@@ -28,7 +28,11 @@ var monkeysphere = {
 
   // agent URL from environment variable
   // "http://localhost:8901" <-- NO TRAILING SLASH
-  agent_url: [],
+  agent_socket: [],
+  
+  // default socket
+  // FIXME: should be configurable via prefs.js
+  default_socket: "http://localhost:8901",
 
   // override service class
   // http://www.oxymoronical.com/experiments/xpcomref/applications/Firefox/3.5/interfaces/nsICertOverrideService
@@ -83,16 +87,16 @@ var monkeysphere = {
 
     // get the agent URL from the environment
     // https://developer.mozilla.org/en/XPCOM_Interface_Reference/nsIEnvironment
-    monkeysphere.agent_url = Components.classes["@mozilla.org/process/environment;1"].getService(Components.interfaces.nsIEnvironment).get("MONKEYSPHERE_VALIDATION_AGENT_URL");
+    monkeysphere.agent_socket = Components.classes["@mozilla.org/process/environment;1"].getService(Components.interfaces.nsIEnvironment).get("MONKEYSPHERE_VALIDATION_AGENT_SOCKET");
     // return error if agent URL not set
-    if(!monkeysphere.agent_url) {
-      var message = "MONKEYSPHERE_VALIDATION_AGENT_URL environment variable not set.";
+    if(!monkeysphere.agent_socket) {
+      var message = "MONKEYSPHERE_VALIDATION_AGENT_SOCKET environment variable not set.  Using default of " + monkeysphere.default_socket;
       alert(message);
-      monkeysphere.setStatus(monkeysphere.states.ERROR, message);
-      return;
-    } else {
-      monkeysphere.log("agent url: " + monkeysphere.agent_url);
+      monkeysphere.agent_socket = monkeysphere.default_socket;
     }
+    // replace trailing slashes
+    monkeysphere.agent_socket = monkeysphere.agent_socket.replace(/\/*$/, '');
+    monkeysphere.log("agent socket: " + monkeysphere.agent_socket);
 
     // create event listeners
     monkeysphere.log("creating listeners...");
@@ -383,7 +387,7 @@ var monkeysphere = {
   queryAgent: function(browser, cert) {
     monkeysphere.log("#### querying validation agent ####");
 
-    monkeysphere.log("agent_url: " + monkeysphere.agent_url);
+    monkeysphere.log("agent_socket: " + monkeysphere.agent_socket);
 
     var uri = browser.currentURI;
     var host = uri.host;
@@ -412,7 +416,7 @@ var monkeysphere = {
     // make JSON query string
     var query = JSON.stringify(apd);
 
-    var request_url = monkeysphere.agent_url + "/reviewcert";
+    var request_url = monkeysphere.agent_socket + "/reviewcert";
     monkeysphere.log("creating http request to " + request_url);
     var client = new XMLHttpRequest();
     client.open("POST", request_url, true);

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