[Pkg-mozext-commits] [requestpolicy] 50/100: [refactoring] rename requestpolicy.mod to rp.mod
David Prévot
taffit at moszumanska.debian.org
Fri Dec 12 22:56:57 UTC 2014
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository requestpolicy.
commit 5a3f4683cf7f18bc3ad0b1a9c7fd80ab82951a75
Author: myrdd <myrdd at users.noreply.github.com>
Date: Sat Oct 4 02:19:05 2014 +0200
[refactoring] rename requestpolicy.mod to rp.mod
---
src/components/requestpolicyService.js | 144 +++++++-------
src/content/classicmenu.js | 20 +-
src/content/menu.js | 141 +++++++-------
src/content/overlay.js | 128 ++++++-------
src/content/requestLog.js | 16 +-
src/modules/DomainUtil.jsm | 13 +-
src/modules/FileUtil.jsm | 11 +-
src/modules/Policy.jsm | 18 +-
src/modules/PolicyManager.jsm | 50 +++--
src/modules/PolicyStorage.jsm | 24 +--
src/modules/Request.jsm | 18 +-
src/modules/RequestProcessor.jsm | 333 +++++++++++++++------------------
12 files changed, 418 insertions(+), 498 deletions(-)
diff --git a/src/components/requestpolicyService.js b/src/components/requestpolicyService.js
index 0bc490f..19cb2ed 100644
--- a/src/components/requestpolicyService.js
+++ b/src/components/requestpolicyService.js
@@ -36,8 +36,8 @@ const HTTPS_EVERYWHERE_REWRITE_TOPIC = "https-everywhere-uri-rewrite";
Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
// Scope for imported modules.
-if (!requestpolicy) {
- var requestpolicy = {mod : {}};
+if (!rp) {
+ var rp = {mod : {}};
}
function RequestPolicyService() {
@@ -122,7 +122,7 @@ RequestPolicyService.prototype = {
// preferences may not be ready. If we tried right now, we may get the
// default preferences.
} catch (e) {
- requestpolicy.mod.Logger.severe(requestpolicy.mod.Logger.TYPE_POLICY,
+ rp.mod.Logger.severe(rp.mod.Logger.TYPE_POLICY,
"exception from _init(): " + e);
}
} catch(e) {
@@ -159,7 +159,7 @@ RequestPolicyService.prototype = {
getService(CI.nsIExtensionManager);
var ext;
for (var i = 0; i < idArray.length; i++) {
- requestpolicy.mod.Logger.info(requestpolicy.mod.Logger.TYPE_INTERNAL,
+ rp.mod.Logger.info(rp.mod.Logger.TYPE_INTERNAL,
"Extension old-style check: " + idArray[i]);
this._initializeExtCompatCallback(em.getItemForID(idArray[i]));
}
@@ -170,7 +170,7 @@ RequestPolicyService.prototype = {
rpService._initializeExtCompatCallback(ext)
};
for (var i = 0; i < idArray.length; i++) {
- requestpolicy.mod.Logger.info(requestpolicy.mod.Logger.TYPE_INTERNAL,
+ rp.mod.Logger.info(rp.mod.Logger.TYPE_INTERNAL,
"Extension new-style check: " + idArray[i]);
AddonManager.getAddonByID(idArray[i], callback);
}
@@ -185,14 +185,14 @@ RequestPolicyService.prototype = {
// As of Firefox 3.7, we can easily whether addons are disabled.
// The isActive property won't exist before 3.7, so it will be null.
if (ext.isActive == false) {
- requestpolicy.mod.Logger.info(requestpolicy.mod.Logger.TYPE_INTERNAL,
+ rp.mod.Logger.info(rp.mod.Logger.TYPE_INTERNAL,
"Extension is not active: " + ext.name);
return;
}
switch (ext.id) {
case "greasefire at skrul.com" : // Greasefire
- requestpolicy.mod.Logger.info(requestpolicy.mod.Logger.TYPE_INTERNAL,
+ rp.mod.Logger.info(rp.mod.Logger.TYPE_INTERNAL,
"Using extension compatibility rules for: " + ext.name);
this._compatibilityRules.push(
["file://", "http://userscripts.org/", ext.name]);
@@ -202,7 +202,7 @@ RequestPolicyService.prototype = {
case "{0f9daf7e-2ee2-4fcf-9d4f-d43d93963420}" : // Sage-Too
case "{899DF1F8-2F43-4394-8315-37F6744E6319}" : // NewsFox
case "brief at mozdev.org" : // Brief
- requestpolicy.mod.Logger.info(requestpolicy.mod.Logger.TYPE_INTERNAL,
+ rp.mod.Logger.info(rp.mod.Logger.TYPE_INTERNAL,
"Conflicting extension: " + ext.name);
this._compatibilityRules.push(
["resource://brief-content/", null, ext.name]);
@@ -213,7 +213,7 @@ RequestPolicyService.prototype = {
});
break;
case "foxmarks at kei.com" : // Xmarks Sync
- requestpolicy.mod.Logger.info(requestpolicy.mod.Logger.TYPE_INTERNAL,
+ rp.mod.Logger.info(rp.mod.Logger.TYPE_INTERNAL,
"Using extension compatibility rules for: " + ext.name);
this._compatibilityRules.push([
"https://login.xmarks.com/",
@@ -224,13 +224,13 @@ RequestPolicyService.prototype = {
case "{203FB6B2-2E1E-4474-863B-4C483ECCE78E}" : // Norton Safe Web Lite
case "{0C55C096-0F1D-4F28-AAA2-85EF591126E7}" : // Norton NIS Toolbar
case "{2D3F3651-74B9-4795-BDEC-6DA2F431CB62}" : // Norton Toolbar
- requestpolicy.mod.Logger.info(requestpolicy.mod.Logger.TYPE_INTERNAL,
+ rp.mod.Logger.info(rp.mod.Logger.TYPE_INTERNAL,
"Using extension compatibility rules for: " + ext.name);
this._compatibilityRules.push([null, "symnst:", ext.name]);
this._compatibilityRules.push([null, "symres:", ext.name]);
break;
case "{c45c406e-ab73-11d8-be73-000a95be3b12}" : // Web Developer
- requestpolicy.mod.Logger.info(requestpolicy.mod.Logger.TYPE_INTERNAL,
+ rp.mod.Logger.info(rp.mod.Logger.TYPE_INTERNAL,
"Using extension compatibility rules for: " + ext.name);
this._compatibilityRules.push([
"about:blank",
@@ -241,14 +241,14 @@ RequestPolicyService.prototype = {
["about:blank", "http://validator.w3.org/check", ext.name]);
break;
case "{c07d1a49-9894-49ff-a594-38960ede8fb9}" : // Update Scanner
- requestpolicy.mod.Logger.info(requestpolicy.mod.Logger.TYPE_INTERNAL,
+ rp.mod.Logger.info(rp.mod.Logger.TYPE_INTERNAL,
"Using extension compatibility rules for: " + ext.name);
var orig = "chrome://updatescan/content/diffPage.xul";
var translated = "data:text/html";
this._topLevelDocTranslationRules.push([orig, translated]);
break;
case "FirefoxAddon at similarWeb.com" : // SimilarWeb
- requestpolicy.mod.Logger.info(requestpolicy.mod.Logger.TYPE_INTERNAL,
+ rp.mod.Logger.info(rp.mod.Logger.TYPE_INTERNAL,
"Using extension compatibility rules for: " + ext.name);
this._compatibilityRules.push([
"http://api2.similarsites.com/",
@@ -262,12 +262,12 @@ RequestPolicyService.prototype = {
]);
break;
case "{6614d11d-d21d-b211-ae23-815234e1ebb5}" : // Dr. Web Link Checker
- requestpolicy.mod.Logger.info(requestpolicy.mod.Logger.TYPE_INTERNAL,
+ rp.mod.Logger.info(rp.mod.Logger.TYPE_INTERNAL,
"Using extension compatibility rules for: " + ext.name);
this._compatibilityRules.push([null, "http://st.drweb.com/", ext.name]);
break;
default :
- requestpolicy.mod.Logger.severe(requestpolicy.mod.Logger.TYPE_INTERNAL,
+ rp.mod.Logger.severe(rp.mod.Logger.TYPE_INTERNAL,
"Unhandled extension (id typo?): " + ext.name);
break;
}
@@ -351,7 +351,7 @@ RequestPolicyService.prototype = {
// Flock
if (appInfo.ID == "{a463f10c-3994-11da-9945-000d60ca027b}") {
- requestpolicy.mod.Logger.info(requestpolicy.mod.Logger.TYPE_INTERNAL,
+ rp.mod.Logger.info(rp.mod.Logger.TYPE_INTERNAL,
"Application detected: " + appInfo.vendor);
this._compatibilityRules.push(
["about:myworld", "http://www.flock.com/", appInfo.vendor]);
@@ -370,7 +370,7 @@ RequestPolicyService.prototype = {
// Seamonkey
if (appInfo.ID == "{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}") {
- requestpolicy.mod.Logger.info(requestpolicy.mod.Logger.TYPE_INTERNAL,
+ rp.mod.Logger.info(rp.mod.Logger.TYPE_INTERNAL,
"Application detected: Seamonkey");
this._compatibilityRules.push(["mailbox:", null, "Seamonkey"]);
this._compatibilityRules.push([null, "mailbox:", "Seamonkey"]);
@@ -390,7 +390,7 @@ RequestPolicyService.prototype = {
if (this.prefs.getBoolPref("prefetch.link.disableOnStartup")) {
if (this._rootPrefs.getBoolPref("network.prefetch-next")) {
this._rootPrefs.setBoolPref("network.prefetch-next", false);
- requestpolicy.mod.Logger.info(requestpolicy.mod.Logger.TYPE_INTERNAL,
+ rp.mod.Logger.info(rp.mod.Logger.TYPE_INTERNAL,
"Disabled link prefetch.");
}
}
@@ -402,7 +402,7 @@ RequestPolicyService.prototype = {
if (!this._rootPrefs.prefHasUserValue("network.dns.disablePrefetch") ||
!this._rootPrefs.getBoolPref("network.dns.disablePrefetch")) {
this._rootPrefs.setBoolPref("network.dns.disablePrefetch", true);
- requestpolicy.mod.Logger.info(requestpolicy.mod.Logger.TYPE_INTERNAL,
+ rp.mod.Logger.info(rp.mod.Logger.TYPE_INTERNAL,
"Disabled DNS prefetch.");
}
}
@@ -422,8 +422,8 @@ RequestPolicyService.prototype = {
},
_loadConfigAndPolicies : function() {
- this._subscriptions = new requestpolicy.mod.UserSubscriptions();
- this._policyMgr = new requestpolicy.mod.PolicyManager();
+ this._subscriptions = new rp.mod.UserSubscriptions();
+ this._policyMgr = new rp.mod.PolicyManager();
this._policyMgr.loadUserPolicies();
var defaultPolicy = this._defaultAllow ? 'allow' : 'deny';
@@ -452,16 +452,16 @@ RequestPolicyService.prototype = {
}
}
function updateCompleted(result) {
- requestpolicy.mod.Logger.info(requestpolicy.mod.Logger.TYPE_INTERNAL,
+ rp.mod.Logger.info(rp.mod.Logger.TYPE_INTERNAL,
'Subscription updates completed: ' + result);
}
this._subscriptions.update(updateCompleted, serials, defaultPolicy);
},
_updateLoggingSettings : function() {
- requestpolicy.mod.Logger.enabled = this.prefs.getBoolPref("log");
- requestpolicy.mod.Logger.level = this.prefs.getIntPref("log.level");
- requestpolicy.mod.Logger.types = this.prefs.getIntPref("log.types");
+ rp.mod.Logger.enabled = this.prefs.getBoolPref("log");
+ rp.mod.Logger.level = this.prefs.getIntPref("log.level");
+ rp.mod.Logger.types = this.prefs.getIntPref("log.types");
},
_registerAddonListener : function() {
@@ -471,7 +471,7 @@ RequestPolicyService.prototype = {
if (addon.id != EXTENSION_ID) {
return;
}
- requestpolicy.mod.Logger.debug(requestpolicy.mod.Logger.TYPE_INTERNAL,
+ rp.mod.Logger.debug(rp.mod.Logger.TYPE_INTERNAL,
"Addon set to be disabled.");
rpService._uninstall = true;
},
@@ -479,7 +479,7 @@ RequestPolicyService.prototype = {
if (addon.id != EXTENSION_ID) {
return;
}
- requestpolicy.mod.Logger.debug(requestpolicy.mod.Logger.TYPE_INTERNAL,
+ rp.mod.Logger.debug(rp.mod.Logger.TYPE_INTERNAL,
"Addon set to be uninstalled.");
rpService._uninstall = true;
},
@@ -487,7 +487,7 @@ RequestPolicyService.prototype = {
if (addon.id != EXTENSION_ID) {
return;
}
- requestpolicy.mod.Logger.debug(requestpolicy.mod.Logger.TYPE_INTERNAL,
+ rp.mod.Logger.debug(rp.mod.Logger.TYPE_INTERNAL,
"Addon operation cancelled.");
// Just because an operation was cancelled doesn't mean there isn't
// a pending operation we care about. For example, a user can choose
@@ -496,7 +496,7 @@ RequestPolicyService.prototype = {
var pending = addon.pendingOperations &
(AddonManager.PENDING_DISABLE | AddonManager.PENDING_UNINSTALL);
if (!pending) {
- requestpolicy.mod.Logger.debug(requestpolicy.mod.Logger.TYPE_INTERNAL,
+ rp.mod.Logger.debug(rp.mod.Logger.TYPE_INTERNAL,
"No pending uninstall or disable.");
rpService._uninstall = false;
}
@@ -516,9 +516,9 @@ RequestPolicyService.prototype = {
os.addObserver(this, "quit-application", false);
os.addObserver(this, "private-browsing", false);
os.addObserver(this, HTTPS_EVERYWHERE_REWRITE_TOPIC, false);
- os.addObserver(this, requestpolicy.mod.SUBSCRIPTION_UPDATED_TOPIC, false);
- os.addObserver(this, requestpolicy.mod.SUBSCRIPTION_ADDED_TOPIC, false);
- os.addObserver(this, requestpolicy.mod.SUBSCRIPTION_REMOVED_TOPIC, false);
+ os.addObserver(this, rp.mod.SUBSCRIPTION_UPDATED_TOPIC, false);
+ os.addObserver(this, rp.mod.SUBSCRIPTION_ADDED_TOPIC, false);
+ os.addObserver(this, rp.mod.SUBSCRIPTION_REMOVED_TOPIC, false);
// Listening for uninstall/disable events is done with the AddonManager
// since Firefox 4.
@@ -539,14 +539,14 @@ RequestPolicyService.prototype = {
os.removeObserver(this, "profile-after-change");
os.removeObserver(this, "sessionstore-windows-restored");
os.removeObserver(this, "quit-application");
- os.removeObserver(this, requestpolicy.mod.SUBSCRIPTION_UPDATED_TOPIC);
- os.removeObserver(this, requestpolicy.mod.SUBSCRIPTION_ADDED_TOPIC);
- os.removeObserver(this, requestpolicy.mod.SUBSCRIPTION_REMOVED_TOPIC);
+ os.removeObserver(this, rp.mod.SUBSCRIPTION_UPDATED_TOPIC);
+ os.removeObserver(this, rp.mod.SUBSCRIPTION_ADDED_TOPIC);
+ os.removeObserver(this, rp.mod.SUBSCRIPTION_REMOVED_TOPIC);
if (!AddonManager) {
os.removeObserver(this, "em-action-requested");
}
} catch (e) {
- requestpolicy.mod.Logger.dump(e + " while unregistering.");
+ rp.mod.Logger.dump(e + " while unregistering.");
}
},
@@ -571,7 +571,7 @@ RequestPolicyService.prototype = {
_initVersionInfo : function() {
try {
- const util = requestpolicy.mod.Util;
+ const util = rp.mod.Util;
// Set the last version values in the Util module based on the prefs.
util.lastVersion = this.prefs.getCharPref("lastVersion");
@@ -608,7 +608,7 @@ RequestPolicyService.prototype = {
this._prefService.savePrefFile(null);
}
} catch (e) {
- requestpolicy.mod.Logger.error(requestpolicy.mod.Logger.TYPE_INTERNAL,
+ rp.mod.Logger.error(rp.mod.Logger.TYPE_INTERNAL,
"_initVersionInfo failed: " + e);
}
},
@@ -657,7 +657,7 @@ RequestPolicyService.prototype = {
filename = modules[i];
try {
Components.utils.import("resource://requestpolicy/" + filename,
- requestpolicy.mod);
+ rp.mod);
} catch(e) {
// Indicate the filename because the exception doesn't have that
// in the string.
@@ -676,7 +676,7 @@ RequestPolicyService.prototype = {
}
// Give the RequestUtil singleton a reference to us.
- requestpolicy.mod.RequestUtil.setRPService(this);
+ rp.mod.RequestUtil.setRPService(this);
},
_initializePrivateBrowsing : function() {
@@ -717,7 +717,7 @@ RequestPolicyService.prototype = {
prefs : null,
getUriIdentifier : function(uri) {
- return requestpolicy.mod.DomainUtil.getIdentifier(uri,
+ return rp.mod.DomainUtil.getIdentifier(uri,
// this._uriIdentificationLevel);
null);
},
@@ -749,34 +749,34 @@ RequestPolicyService.prototype = {
},
addAllowRule : function(rawRule, noStore) {
- this._policyMgr.addRule(requestpolicy.mod.RULE_TYPE_ALLOW, rawRule,
+ this._policyMgr.addRule(rp.mod.RULE_TYPE_ALLOW, rawRule,
noStore);
},
addTemporaryAllowRule : function(rawRule) {
- this._policyMgr.addTemporaryRule(requestpolicy.mod.RULE_TYPE_ALLOW,
+ this._policyMgr.addTemporaryRule(rp.mod.RULE_TYPE_ALLOW,
rawRule);
},
removeAllowRule : function(rawRule) {
- this._policyMgr.removeRule(requestpolicy.mod.RULE_TYPE_ALLOW, rawRule);
+ this._policyMgr.removeRule(rp.mod.RULE_TYPE_ALLOW, rawRule);
},
addDenyRule : function(rawRule) {
- this._policyMgr.addRule(requestpolicy.mod.RULE_TYPE_DENY, rawRule);
+ this._policyMgr.addRule(rp.mod.RULE_TYPE_DENY, rawRule);
},
addTemporaryDenyRule : function(rawRule) {
- this._policyMgr.addTemporaryRule(requestpolicy.mod.RULE_TYPE_DENY, rawRule);
+ this._policyMgr.addTemporaryRule(rp.mod.RULE_TYPE_DENY, rawRule);
},
removeDenyRule : function(rawRule) {
- this._policyMgr.removeRule(requestpolicy.mod.RULE_TYPE_DENY, rawRule);
+ this._policyMgr.removeRule(rp.mod.RULE_TYPE_DENY, rawRule);
},
_allowOrigin : function(host, noStore) {
var ruleData = {"o":{"h":host}};
- this._policyMgr.addRule(requestpolicy.mod.RULE_TYPE_ALLOW, ruleData,
+ this._policyMgr.addRule(rp.mod.RULE_TYPE_ALLOW, ruleData,
noStore);
},
@@ -790,13 +790,13 @@ RequestPolicyService.prototype = {
temporarilyAllowOrigin : function(host) {
var ruleData = {"o": {"h" : host}};
- this._policyMgr.addTemporaryRule(requestpolicy.mod.RULE_TYPE_ALLOW,
+ this._policyMgr.addTemporaryRule(rp.mod.RULE_TYPE_ALLOW,
ruleData);
},
_allowDestination : function(host, noStore) {
var ruleData = {"d": {"h" : host}};
- this._policyMgr.addRule(requestpolicy.mod.RULE_TYPE_ALLOW, ruleData,
+ this._policyMgr.addRule(rp.mod.RULE_TYPE_ALLOW, ruleData,
noStore);
},
@@ -810,7 +810,7 @@ RequestPolicyService.prototype = {
temporarilyAllowDestination : function(host) {
var ruleData = {"d": {"h" : host}};
- this._policyMgr.addTemporaryRule(requestpolicy.mod.RULE_TYPE_ALLOW,
+ this._policyMgr.addTemporaryRule(rp.mod.RULE_TYPE_ALLOW,
ruleData);
},
@@ -820,7 +820,7 @@ RequestPolicyService.prototype = {
"o": {"h" : originIdentifier},
"d": {"h" : destIdentifier}
};
- this._policyMgr.addRule(requestpolicy.mod.RULE_TYPE_ALLOW, ruleData,
+ this._policyMgr.addRule(rp.mod.RULE_TYPE_ALLOW, ruleData,
noStore);
},
@@ -839,7 +839,7 @@ RequestPolicyService.prototype = {
"o": {"h" : originIdentifier},
"d": {"h" : destIdentifier}
};
- this._policyMgr.addTemporaryRule(requestpolicy.mod.RULE_TYPE_ALLOW,
+ this._policyMgr.addTemporaryRule(rp.mod.RULE_TYPE_ALLOW,
ruleData);
},
@@ -928,7 +928,7 @@ RequestPolicyService.prototype = {
},
_handleUninstallOrDisable : function() {
- requestpolicy.mod.Logger.debug(requestpolicy.mod.Logger.TYPE_INTERNAL,
+ rp.mod.Logger.debug(rp.mod.Logger.TYPE_INTERNAL,
"Performing 'disable' operations.");
var resetLinkPrefetch = this.prefs.getBoolPref(
"prefetch.link.restoreDefaultOnUninstall");
@@ -960,9 +960,9 @@ RequestPolicyService.prototype = {
case "http-on-modify-request" :
this._requestProcessor._examineHttpRequest(subject);
break;
- case requestpolicy.mod.SUBSCRIPTION_UPDATED_TOPIC:
- requestpolicy.mod.Logger.debug(
- requestpolicy.mod.Logger.TYPE_INTERNAL, 'XXX updated: ' + data);
+ case rp.mod.SUBSCRIPTION_UPDATED_TOPIC:
+ rp.mod.Logger.debug(
+ rp.mod.Logger.TYPE_INTERNAL, 'XXX updated: ' + data);
// TODO: check if the subscription is enabled. The user might have
// disabled it between the time the update started and when it
// completed.
@@ -970,9 +970,9 @@ RequestPolicyService.prototype = {
var failures = this._policyMgr.loadSubscriptionPolicies(subInfo);
break;
- case requestpolicy.mod.SUBSCRIPTION_ADDED_TOPIC:
- requestpolicy.mod.Logger.debug(
- requestpolicy.mod.Logger.TYPE_INTERNAL, 'XXX added: ' + data);
+ case rp.mod.SUBSCRIPTION_ADDED_TOPIC:
+ rp.mod.Logger.debug(
+ rp.mod.Logger.TYPE_INTERNAL, 'XXX added: ' + data);
var subInfo = JSON.parse(data);
var failures = this._policyMgr.loadSubscriptionPolicies(subInfo);
var failed = false;
@@ -990,17 +990,17 @@ RequestPolicyService.prototype = {
}
}
function updateCompleted(result) {
- requestpolicy.mod.Logger.info(
- requestpolicy.mod.Logger.TYPE_INTERNAL,
+ rp.mod.Logger.info(
+ rp.mod.Logger.TYPE_INTERNAL,
'Subscription update completed: ' + result);
}
this._subscriptions.update(updateCompleted, serials);
}
break;
- case requestpolicy.mod.SUBSCRIPTION_REMOVED_TOPIC:
- requestpolicy.mod.Logger.debug(
- requestpolicy.mod.Logger.TYPE_INTERNAL, 'YYY: ' + data);
+ case rp.mod.SUBSCRIPTION_REMOVED_TOPIC:
+ rp.mod.Logger.debug(
+ rp.mod.Logger.TYPE_INTERNAL, 'YYY: ' + data);
var subInfo = JSON.parse(data);
var failures = this._policyMgr.unloadSubscriptionPolicies(subInfo);
break;
@@ -1054,8 +1054,8 @@ RequestPolicyService.prototype = {
&& subject.id == EXTENSION_ID) {
if (data == "item-uninstalled" || data == "item-disabled") {
this._uninstall = true;
- requestpolicy.mod.Logger.debug(
- requestpolicy.mod.Logger.TYPE_INTERNAL, "Disabled");
+ rp.mod.Logger.debug(
+ rp.mod.Logger.TYPE_INTERNAL, "Disabled");
} else if (data == "item-cancel-action") {
// This turns out to be correct. Unlike with the AddonManager
// in Firefox 4, here if the user does a "disable" followed by
@@ -1064,8 +1064,8 @@ RequestPolicyService.prototype = {
// appears to send an "item-disabled" and only if the user click
// "undo" a second time does the "item-cancel-action" event occur.
this._uninstall = false;
- requestpolicy.mod.Logger.debug(
- requestpolicy.mod.Logger.TYPE_INTERNAL, "Enabled");
+ rp.mod.Logger.debug(
+ rp.mod.Logger.TYPE_INTERNAL, "Enabled");
}
}
break;
@@ -1075,7 +1075,7 @@ RequestPolicyService.prototype = {
}
break;
default :
- requestpolicy.mod.Logger.warning(requestpolicy.mod.Logger.TYPE_ERROR,
+ rp.mod.Logger.warning(rp.mod.Logger.TYPE_ERROR,
"uknown topic observed: " + topic);
}
},
@@ -1090,7 +1090,7 @@ RequestPolicyService.prototype = {
// enable our actual shouldLoad function
_initContentPolicy : function() {
- this._requestProcessor = new requestpolicy.mod.RequestProcessor(this);
+ this._requestProcessor = new rp.mod.RequestProcessor(this);
this.shouldLoad = this.mainContentPolicy.shouldLoad;
if (!this.mimeService) {
// this.rejectCode = typeof(/ /) == "object" ? -4 : -3;
@@ -1105,7 +1105,7 @@ RequestPolicyService.prototype = {
// https://developer.mozilla.org/en/nsIContentPolicy
shouldLoad : function(aContentType, aContentLocation, aRequestOrigin,
aContext, aMimeTypeGuess, aExtra, aRequestPrincipal) {
- var request = new requestpolicy.mod.NormalRequest(
+ var request = new rp.mod.NormalRequest(
aContentType, aContentLocation, aRequestOrigin, aContext,
aMimeTypeGuess, aExtra, aRequestPrincipal);
return this._requestProcessor.process(request);
diff --git a/src/content/classicmenu.js b/src/content/classicmenu.js
index db103e1..35837a8 100644
--- a/src/content/classicmenu.js
+++ b/src/content/classicmenu.js
@@ -20,22 +20,16 @@
* ***** END LICENSE BLOCK *****
*/
-// if (!requestpolicy) {
-// var requestpolicy = {
-// mod : {}
-// };
+// if (!rp) {
+// var rp = {mod : {}};
// }
//
-// Components.utils.import("resource://requestpolicy/DomainUtil.jsm",
-// requestpolicy.mod);
-// Components.utils.import("resource://requestpolicy/Logger.jsm",
-// requestpolicy.mod);
-// Components.utils.import("resource://requestpolicy/Policy.jsm",
-// requestpolicy.mod);
-// Components.utils.import("resource://requestpolicy/RequestUtil.jsm",
-// requestpolicy.mod);
+// Components.utils.import("resource://requestpolicy/DomainUtil.jsm", rp.mod);
+// Components.utils.import("resource://requestpolicy/Logger.jsm", rp.mod);
+// Components.utils.import("resource://requestpolicy/Policy.jsm", rp.mod);
+// Components.utils.import("resource://requestpolicy/RequestUtil.jsm", rp.mod);
// Components.utils.import("resource://requestpolicy/PolicyManager.jsm",
-// requestpolicy.mod);
+// rp.mod);
requestpolicy.classicmenu = {
diff --git a/src/content/menu.js b/src/content/menu.js
index ba23fd3..094f349 100644
--- a/src/content/menu.js
+++ b/src/content/menu.js
@@ -20,22 +20,15 @@
* ***** END LICENSE BLOCK *****
*/
-if (!requestpolicy) {
- var requestpolicy = {
- mod : {}
- };
+if (!rp) {
+ var rp = {mod : {}};
}
-Components.utils.import("resource://requestpolicy/DomainUtil.jsm",
- requestpolicy.mod);
-Components.utils.import("resource://requestpolicy/Logger.jsm",
- requestpolicy.mod);
-Components.utils.import("resource://requestpolicy/Policy.jsm",
- requestpolicy.mod);
-Components.utils.import("resource://requestpolicy/RequestUtil.jsm",
- requestpolicy.mod);
-Components.utils.import("resource://requestpolicy/PolicyManager.jsm",
- requestpolicy.mod);
+Components.utils.import("resource://requestpolicy/DomainUtil.jsm", rp.mod);
+Components.utils.import("resource://requestpolicy/Logger.jsm", rp.mod);
+Components.utils.import("resource://requestpolicy/Policy.jsm", rp.mod);
+Components.utils.import("resource://requestpolicy/RequestUtil.jsm", rp.mod);
+Components.utils.import("resource://requestpolicy/PolicyManager.jsm", rp.mod);
requestpolicy.menu = {
@@ -97,10 +90,10 @@ requestpolicy.menu = {
this._currentUri = requestpolicy.overlay.getTopLevelDocumentUri();
try {
- this._currentBaseDomain = requestpolicy.mod.DomainUtil.getDomain(
+ this._currentBaseDomain = rp.mod.DomainUtil.getDomain(
this._currentUri);
} catch (e) {
- requestpolicy.mod.Logger.info(requestpolicy.mod.Logger.TYPE_INTERNAL,
+ rp.mod.Logger.info(rp.mod.Logger.TYPE_INTERNAL,
"Unable to prepare menu because base domain can't be determined: " + this._currentUri);
this._populateMenuForUncontrollableOrigin();
return;
@@ -109,14 +102,14 @@ requestpolicy.menu = {
this._currentIdentifier = requestpolicy.overlay
.getTopLevelDocumentUriIdentifier();
- //requestpolicy.mod.Logger.info(requestpolicy.mod.Logger.TYPE_POLICY,
+ //rp.mod.Logger.info(rp.mod.Logger.TYPE_POLICY,
// "this._currentUri: " + this._currentUri);
- this._currentUriObj = requestpolicy.mod.DomainUtil.getUriObject(this._currentUri);
+ this._currentUriObj = rp.mod.DomainUtil.getUriObject(this._currentUri);
this._isChromeUri = this._currentUriObj.scheme == "chrome";
//this._currentUriIsHttps = this._currentUriObj.scheme == "https";
- requestpolicy.mod.Logger.info(requestpolicy.mod.Logger.TYPE_INTERNAL,
+ rp.mod.Logger.info(rp.mod.Logger.TYPE_INTERNAL,
"this._currentUri: " + this._currentUri);
if (this._isChromeUri) {
@@ -130,7 +123,7 @@ requestpolicy.menu = {
// top-level document translation rule (these are used sometimes
// for extension compatibility). For example, this is essential to the
// menu showing relevant info when using the Update Scanner extension.
- this._allRequestsOnDocument = requestpolicy.mod.RequestUtil
+ this._allRequestsOnDocument = rp.mod.RequestUtil
.getAllRequestsOnDocument(content.document);
this._allRequestsOnDocument.print("_allRequestsOnDocument");
@@ -155,10 +148,10 @@ requestpolicy.menu = {
this._activateOriginItem(this._originItem);
} catch (e) {
- requestpolicy.mod.Logger.severe(requestpolicy.mod.Logger.TYPE_ERROR,
- "Fatal Error, " + e + ", stack was: " + e.stack);
- requestpolicy.mod.Logger.severe(requestpolicy.mod.Logger.TYPE_ERROR,
- "Unable to prepare menu due to error.");
+ rp.mod.Logger.severe(rp.mod.Logger.TYPE_ERROR,
+ "Fatal Error, " + e + ", stack was: " + e.stack);
+ rp.mod.Logger.severe(rp.mod.Logger.TYPE_ERROR,
+ "Unable to prepare menu due to error.");
throw e;
}
},
@@ -181,15 +174,15 @@ requestpolicy.menu = {
_populateList : function(list, values) {
this._removeChildren(list);
- if (values[0] && values[0] instanceof requestpolicy.mod.Destination) {
+ if (values[0] && values[0] instanceof rp.mod.Destination) {
// get prefs
var sorting = this._rpService.prefs.getCharPref('menu.sorting');
var showNumRequests = this._rpService.prefs.getBoolPref('menu.info.showNumRequests')
if (sorting == "numRequests") {
- values.sort(requestpolicy.mod.Destination.sortByNumRequestsCompareFunction);
+ values.sort(rp.mod.Destination.sortByNumRequestsCompareFunction);
} else if (sorting == "destName") {
- values.sort(requestpolicy.mod.Destination.compareFunction);
+ values.sort(rp.mod.Destination.compareFunction);
}
for (var i in values) {
@@ -238,7 +231,7 @@ requestpolicy.menu = {
// Set operations would be nice. These are small arrays, so keep it simple.
for (var i = 0; i < rawBlocked.length; i++) {
let dest = rawBlocked[i];
- if (false === requestpolicy.mod.Destination.existsInArray(dest, rawAllowed)) {
+ if (false === rp.mod.Destination.existsInArray(dest, rawAllowed)) {
blocked.push(dest);
} else {
// we assume that `dest` is a Destination getUriObject.
@@ -247,20 +240,20 @@ requestpolicy.menu = {
}
for (var i = 0; i < rawAllowed.length; i++) {
let dest = rawAllowed[i];
- var indexRawBlocked = requestpolicy.mod.Destination.indexOfDestInArray(dest, rawBlocked);
- var indexMixed = requestpolicy.mod.Destination.indexOfDestInArray(dest, mixed);
+ var indexRawBlocked = rp.mod.Destination.indexOfDestInArray(dest, rawBlocked);
+ var indexMixed = rp.mod.Destination.indexOfDestInArray(dest, mixed);
if (indexRawBlocked == -1) {
allowed.push(dest);
} else {
if (indexMixed != -1) {
- requestpolicy.mod.Logger.info(requestpolicy.mod.Logger.TYPE_INTERNAL,
+ rp.mod.Logger.info(rp.mod.Logger.TYPE_INTERNAL,
"Merging dest: <" + dest.dest + ">");
- mixed[indexMixed] = requestpolicy.mod.Destination.merge(dest, mixed[indexMixed]);
+ mixed[indexMixed] = rp.mod.Destination.merge(dest, mixed[indexMixed]);
} else {
// if the dest is in rawBlocked and rawAllowed, but not in mixed.
// this should never happen, the mixed destination should be added in the rawBlocked-loop.
- requestpolicy.mod.Logger.warning(requestpolicy.mod.Logger.TYPE_INTERNAL,
+ rp.mod.Logger.warning(rp.mod.Logger.TYPE_INTERNAL,
"mixed dest was not added to `mixed` list: <" + dest.dest + ">");
mixed.push(dest);
}
@@ -279,8 +272,8 @@ requestpolicy.menu = {
_populateDetails : function() {
var policyMgr = this._rpService._policyMgr;
- const RULE_TYPE_ALLOW = requestpolicy.mod.RULE_TYPE_ALLOW;
- const RULE_TYPE_DENY = requestpolicy.mod.RULE_TYPE_DENY;
+ const RULE_TYPE_ALLOW = rp.mod.RULE_TYPE_ALLOW;
+ const RULE_TYPE_DENY = rp.mod.RULE_TYPE_DENY;
var origin = this._currentlySelectedOrigin;
var dest = this._currentlySelectedDest;
@@ -509,7 +502,7 @@ requestpolicy.menu = {
item.parentNode.id == 'rp-rules-add') {
this._processRuleSelection(item);
} else {
- requestpolicy.mod.Logger.severe(requestpolicy.mod.Logger.TYPE_ERROR,
+ rp.mod.Logger.severe(rp.mod.Logger.TYPE_ERROR,
'Unable to figure out which item type was selected.');
}
},
@@ -527,20 +520,20 @@ requestpolicy.menu = {
}
if (!ruleData) {
- requestpolicy.mod.Logger.severe(requestpolicy.mod.Logger.TYPE_ERROR,
- 'ruleData is empty in menu._processRuleSelection()');
+ rp.mod.Logger.severe(rp.mod.Logger.TYPE_ERROR,
+ 'ruleData is empty in menu._processRuleSelection()');
return;
}
if (!ruleAction) {
- requestpolicy.mod.Logger.severe(requestpolicy.mod.Logger.TYPE_ERROR,
- 'ruleAction is empty in menu._processRuleSelection()');
+ rp.mod.Logger.severe(rp.mod.Logger.TYPE_ERROR,
+ 'ruleAction is empty in menu._processRuleSelection()');
return;
}
- var canonicalRule = requestpolicy.mod.Policy.rawRuleToCanonicalString(ruleData);
- requestpolicy.mod.Logger.dump("ruleData: " + canonicalRule);
- requestpolicy.mod.Logger.dump("ruleAction: " + ruleAction);
- requestpolicy.mod.Logger.dump("undo: " + undo);
+ var canonicalRule = rp.mod.Policy.rawRuleToCanonicalString(ruleData);
+ rp.mod.Logger.dump("ruleData: " + canonicalRule);
+ rp.mod.Logger.dump("ruleAction: " + ruleAction);
+ rp.mod.Logger.dump("undo: " + undo);
// TODO: does all of this get replaced with a generic rule processor that
// only cares whether it's an allow/deny and temporary and drops the ruleData
@@ -631,7 +624,7 @@ requestpolicy.menu = {
for (var i in request[destIdent][destUri]) {
++properties.numRequests;
++ruleTypeCounter;
- //requestpolicy.mod.Logger.dump("reason: "+ request[destIdent][destUri].resultReason
+ //rp.mod.Logger.dump("reason: "+ request[destIdent][destUri].resultReason
// + " -- default: "+request[destIdent][destUri].isDefaultPolicyUsed());
if ( request[destIdent][destUri][i].isDefaultPolicyUsed() ) {
++properties.numDefaultPolicyRequests;
@@ -641,11 +634,11 @@ requestpolicy.menu = {
}
switch (ruleType) {
- case requestpolicy.mod.RULE_TYPE_ALLOW:
+ case rp.mod.RULE_TYPE_ALLOW:
properties.numAllowedRequests = ruleTypeCounter;
break;
- case requestpolicy.mod.RULE_TYPE_DENY:
+ case rp.mod.RULE_TYPE_DENY:
properties.numBlockedRequests = ruleTypeCounter;
break;
@@ -657,23 +650,23 @@ requestpolicy.menu = {
},
_getBlockedDestinations : function() {
- var reqSet = requestpolicy.mod.RequestUtil.getDeniedRequests(
+ var reqSet = rp.mod.RequestUtil.getDeniedRequests(
this._currentlySelectedOrigin, this._allRequestsOnDocument);
var requests = reqSet.getAllMergedOrigins();
var result = [];
for (var destBase in requests) {
var properties = this._extractRequestProperties(requests[destBase],
- requestpolicy.mod.RULE_TYPE_DENY);
- result.push(new requestpolicy.mod.Destination(destBase, properties));
- //requestpolicy.mod.Logger.dump("destBase : "+destBase);
- //requestpolicy.mod.Logger.vardump(properties, "properties");
+ rp.mod.RULE_TYPE_DENY);
+ result.push(new rp.mod.Destination(destBase, properties));
+ //rp.mod.Logger.dump("destBase : "+destBase);
+ //rp.mod.Logger.vardump(properties, "properties");
}
return result;
},
_getAllowedDestinations : function() {
- var reqSet = requestpolicy.mod.RequestUtil.getAllowedRequests(
+ var reqSet = rp.mod.RequestUtil.getAllowedRequests(
this._currentlySelectedOrigin, this._allRequestsOnDocument);
var requests = reqSet.getAllMergedOrigins();
@@ -690,8 +683,8 @@ requestpolicy.menu = {
}
var properties = this._extractRequestProperties(requests[destBase],
- requestpolicy.mod.RULE_TYPE_ALLOW);
- result.push(new requestpolicy.mod.Destination(destBase, properties));
+ rp.mod.RULE_TYPE_ALLOW);
+ result.push(new rp.mod.Destination(destBase, properties));
}
return result;
},
@@ -704,7 +697,7 @@ requestpolicy.menu = {
var result = [];
for (var originUri in requests) {
- var originBase = requestpolicy.mod.DomainUtil.getDomain(originUri);
+ var originBase = rp.mod.DomainUtil.getDomain(originUri);
if (originBase == this._currentBaseDomain) {
continue;
}
@@ -744,7 +737,7 @@ requestpolicy.menu = {
},
_isIPAddressOrSingleName : function(hostname) {
- return requestpolicy.mod.DomainUtil.isIPAddress(hostname) ||
+ return rp.mod.DomainUtil.isIPAddress(hostname) ||
hostname.indexOf(".") == -1;
},
@@ -879,7 +872,7 @@ requestpolicy.menu = {
item.requestpolicyRuleAction = ruleAction;
//var statustext = ''; // TODO
item.setAttribute('class', 'rp-od-item ' + cssClass);
- var canonicalRule = requestpolicy.mod.Policy.rawRuleToCanonicalString(ruleData);
+ var canonicalRule = rp.mod.Policy.rawRuleToCanonicalString(ruleData);
if (this._ruleChangeQueues[ruleAction]) {
if (this._ruleChangeQueues[ruleAction][canonicalRule]) {
item.setAttribute('selected-rule', 'true');
@@ -944,7 +937,7 @@ requestpolicy.menu = {
// TODO: can we avoid calling getAllowedRequests here and reuse a result
// from calling it earlier?
- var reqSet = requestpolicy.mod.RequestUtil.getAllowedRequests(
+ var reqSet = rp.mod.RequestUtil.getAllowedRequests(
this._currentlySelectedOrigin, this._allRequestsOnDocument);
var requests = reqSet.getAllMergedOrigins();
@@ -956,7 +949,7 @@ requestpolicy.menu = {
//reqSet.print('allowedRequests');
// TODO: there is no dest if no dest is selected (origin only).
- //var destBase = requestpolicy.mod.DomainUtil.getDomain(
+ //var destBase = rp.mod.DomainUtil.getDomain(
// this._currentlySelectedDest);
for (var destBase in requests) {
@@ -976,7 +969,7 @@ requestpolicy.menu = {
// TODO: we at least in default allow mode, we need to give an option
// to add a deny rule for these requests.
if (!destinations[destUri]) {
- requestpolicy.mod.Logger.dump("destinations[destUri] is null or undefined for destUri: " + destUri);
+ rp.mod.Logger.dump("destinations[destUri] is null or undefined for destUri: " + destUri);
continue;
}
@@ -989,7 +982,7 @@ requestpolicy.menu = {
var policy, match;
[policy, match] = results.matchedAllowRules[i];
- var rawRule = requestpolicy.mod.Policy.matchToRawRule(match);
+ var rawRule = rp.mod.Policy.matchToRawRule(match);
if (!this._currentlySelectedDest) {
if (rawRule['d'] && rawRule['d']['h']) {
@@ -997,8 +990,8 @@ requestpolicy.menu = {
}
}
- var rawRuleStr = requestpolicy.mod.Policy.rawRuleToCanonicalString(rawRule);
- //requestpolicy.mod.Logger.info(requestpolicy.mod.Logger.TYPE_POLICY,
+ var rawRuleStr = rp.mod.Policy.rawRuleToCanonicalString(rawRule);
+ //rp.mod.Logger.info(rp.mod.Logger.TYPE_POLICY,
// "matched allow rule: " + rawRuleStr);
// This is how we remove duplicates: if two rules have the same
// canonical string, they'll have in the same key.
@@ -1027,7 +1020,7 @@ requestpolicy.menu = {
// TODO: can we avoid calling getDeniedRequests here and reuse a result
// from calling it earlier?
- var reqSet = requestpolicy.mod.RequestUtil.getDeniedRequests(
+ var reqSet = rp.mod.RequestUtil.getDeniedRequests(
this._currentlySelectedOrigin, this._allRequestsOnDocument);
var requests = reqSet.getAllMergedOrigins();
@@ -1039,7 +1032,7 @@ requestpolicy.menu = {
reqSet.print('deniedRequests');
// TODO: there is no dest if no dest is selected (origin only).
- //var destBase = requestpolicy.mod.DomainUtil.getDomain(
+ //var destBase = rp.mod.DomainUtil.getDomain(
// this._currentlySelectedDest);
for (var destBase in requests) {
@@ -1059,7 +1052,7 @@ requestpolicy.menu = {
// TODO: we at least in default deny mode, we need to give an option
// to add a allow rule for these requests.
if (!destinations[destUri]) {
- requestpolicy.mod.Logger.dump("destinations[destUri] is null or undefined for destUri: " + destUri);
+ rp.mod.Logger.dump("destinations[destUri] is null or undefined for destUri: " + destUri);
continue;
}
@@ -1071,7 +1064,7 @@ requestpolicy.menu = {
var policy, match;
[policy, match] = results.matchedDenyRules[i];
- var rawRule = requestpolicy.mod.Policy.matchToRawRule(match);
+ var rawRule = rp.mod.Policy.matchToRawRule(match);
if (!this._currentlySelectedDest) {
if (rawRule['d'] && rawRule['d']['h']) {
@@ -1079,8 +1072,8 @@ requestpolicy.menu = {
}
}
- var rawRuleStr = requestpolicy.mod.Policy.rawRuleToCanonicalString(rawRule);
- //requestpolicy.mod.Logger.info(requestpolicy.mod.Logger.TYPE_POLICY,
+ var rawRuleStr = rp.mod.Policy.rawRuleToCanonicalString(rawRule);
+ //rp.mod.Logger.info(rp.mod.Logger.TYPE_POLICY,
// "matched allow rule: " + rawRuleStr);
// This is how we remove duplicates: if two rules have the same
// canonical string, they'll have in the same key.
@@ -1107,15 +1100,15 @@ requestpolicy.menu = {
_populateDetailsAddSubdomainAllowRules : function(list) {
var policyMgr = this._rpService._policyMgr;
- const RULE_TYPE_ALLOW = requestpolicy.mod.RULE_TYPE_ALLOW;
- const RULE_TYPE_DENY = requestpolicy.mod.RULE_TYPE_DENY;
+ const RULE_TYPE_ALLOW = rp.mod.RULE_TYPE_ALLOW;
+ const RULE_TYPE_DENY = rp.mod.RULE_TYPE_DENY;
var origin = this._currentlySelectedOrigin;
// TODO: can we avoid calling getDeniedRequests here and reuse a result
// from calling it earlier?
- var reqSet = requestpolicy.mod.RequestUtil.getDeniedRequests(
+ var reqSet = rp.mod.RequestUtil.getDeniedRequests(
this._currentlySelectedOrigin, this._allRequestsOnDocument);
var requests = reqSet.getAllMergedOrigins();
@@ -1129,7 +1122,7 @@ requestpolicy.menu = {
for (var destIdent in requests[destBase]) {
var destinations = requests[destBase][destIdent];
for (var destUri in destinations) {
- destHosts[requestpolicy.mod.DomainUtil.getHost(destUri)] = null;
+ destHosts[rp.mod.DomainUtil.getHost(destUri)] = null;
}
}
}
diff --git a/src/content/overlay.js b/src/content/overlay.js
index 67cf5b5..64379b7 100644
--- a/src/content/overlay.js
+++ b/src/content/overlay.js
@@ -20,22 +20,18 @@
* ***** END LICENSE BLOCK *****
*/
+if (!rp) {
+ var rp = {mod : {}};
+}
if (!requestpolicy) {
- var requestpolicy = {
- mod : {}
- };
+ var requestpolicy = {};
}
-Components.utils.import("resource://requestpolicy/DomainUtil.jsm",
- requestpolicy.mod);
-Components.utils.import("resource://requestpolicy/JSON.jsm",
- requestpolicy.mod);
-Components.utils.import("resource://requestpolicy/Logger.jsm",
- requestpolicy.mod);
-Components.utils.import("resource://requestpolicy/RequestUtil.jsm",
- requestpolicy.mod);
-Components.utils.import("resource://requestpolicy/Util.jsm",
- requestpolicy.mod);
+Components.utils.import("resource://requestpolicy/DomainUtil.jsm", rp.mod);
+Components.utils.import("resource://requestpolicy/JSON.jsm", rp.mod);
+Components.utils.import("resource://requestpolicy/Logger.jsm", rp.mod);
+Components.utils.import("resource://requestpolicy/RequestUtil.jsm", rp.mod);
+Components.utils.import("resource://requestpolicy/Util.jsm", rp.mod);
/**
* Provides functionality for the overlay. An instance of this class exists for
@@ -132,7 +128,7 @@ requestpolicy.overlay = {
this._isFennec = (appInfo.ID == "{a23983c0-fd0e-11dc-95ff-0800200c9a66}");
if (this._isFennec) {
- requestpolicy.mod.Logger.dump("Detected Fennec.");
+ rp.mod.Logger.dump("Detected Fennec.");
// Set an attribute for CSS usage.
this._menu.setAttribute("fennec", "true");
this._menu.setAttribute("position", "after_end");
@@ -148,29 +144,29 @@ requestpolicy.overlay = {
this._setPermissiveNotification(this._rpService.isBlockingDisabled());
}
} catch (e) {
- requestpolicy.mod.Logger.severe(requestpolicy.mod.Logger.TYPE_ERROR,
+ rp.mod.Logger.severe(rp.mod.Logger.TYPE_ERROR,
"Fatal Error, " + e + ", stack was: " + e.stack);
- requestpolicy.mod.Logger.severe(requestpolicy.mod.Logger.TYPE_ERROR,
+ rp.mod.Logger.severe(rp.mod.Logger.TYPE_ERROR,
"Unable to initialize requestpolicy.overlay.");
throw e;
}
},
_installToolbarButtonOnce : function() {
- var util = requestpolicy.mod.Util;
+ var util = rp.mod.Util;
// SeaMonkey users have to use a toolbar button now. At the moment I can't
// justify a bunch of special cases to support the statusbar when such a
// tiny number of users have seamonkey and I can't even be sure that many of
// those users want a statusbar icon.
//if (!util.isFirefox()) {
- // requestpolicy.mod.Logger.info(requestpolicy.mod.Logger.TYPE_INTERNAL,
+ // rp.mod.Logger.info(rp.mod.Logger.TYPE_INTERNAL,
// "Not performing toolbar button check: not Firefox.");
// return;
//}
if (util.compareVersions(util.lastAppVersion, "0.0") > 0) {
- requestpolicy.mod.Logger.info(requestpolicy.mod.Logger.TYPE_INTERNAL,
+ rp.mod.Logger.info(rp.mod.Logger.TYPE_INTERNAL,
"Not performing toolbar button check: we've checked before.");
return;
}
@@ -185,7 +181,7 @@ requestpolicy.overlay = {
for (var i in toolbars) {
var toolbarName = toolbars[i];
if (this._isButtonInToolbar(toolbarName)) {
- requestpolicy.mod.Logger.info(requestpolicy.mod.Logger.TYPE_INTERNAL,
+ rp.mod.Logger.info(rp.mod.Logger.TYPE_INTERNAL,
"Button already in toolbar: " + toolbarName);
return;
}
@@ -201,13 +197,13 @@ requestpolicy.overlay = {
toolbar.setAttribute("currentset", toolbar.currentSet);
document.persist(toolbar.id, "currentset");
- requestpolicy.mod.Logger.info(requestpolicy.mod.Logger.TYPE_INTERNAL,
+ rp.mod.Logger.info(rp.mod.Logger.TYPE_INTERNAL,
"Adding toolbar button.");
try {
BrowserToolboxCustomizeDone(true);
}
catch (e) {
- requestpolicy.mod.Logger.info(requestpolicy.mod.Logger.TYPE_INTERNAL,
+ rp.mod.Logger.info(rp.mod.Logger.TYPE_INTERNAL,
"Adding toolbar button failed: " + e);
}
},
@@ -332,9 +328,9 @@ requestpolicy.overlay = {
}
} catch (e) {
- requestpolicy.mod.Logger.severe(requestpolicy.mod.Logger.TYPE_ERROR,
+ rp.mod.Logger.severe(rp.mod.Logger.TYPE_ERROR,
"Fatal Error, " + e + ", stack was: " + e.stack);
- requestpolicy.mod.Logger.severe(requestpolicy.mod.Logger.TYPE_ERROR,
+ rp.mod.Logger.severe(rp.mod.Logger.TYPE_ERROR,
"Unable to complete requestpolicy.overlay.onLoad actions.");
throw e;
}
@@ -367,7 +363,7 @@ requestpolicy.overlay = {
// Line: 260
if (this._isFennec) {
- requestpolicy.mod.Logger.warning(requestpolicy.mod.Logger.TYPE_INTERNAL,
+ rp.mod.Logger.warning(rp.mod.Logger.TYPE_INTERNAL,
"Should have shown redirect notification to <" + redirectTargetUri
+ ">, but it's not implemented yet on Fennec.");
return;
@@ -389,7 +385,7 @@ requestpolicy.overlay = {
if (redirectTargetUri.length < maxLength) {
var shortUri = redirectTargetUri;
} else {
- var prePathLength = requestpolicy.mod.DomainUtil
+ var prePathLength = rp.mod.DomainUtil
.getPrePath(redirectTargetUri).length
+ 1;
shortUri = redirectTargetUri.substring(0, Math.max(prePathLength,
@@ -416,9 +412,9 @@ requestpolicy.overlay = {
}
var origin = requestpolicy.menu._addWildcard(
- requestpolicy.mod.DomainUtil.getDomain(this.getTopLevelDocumentUri()));
+ rp.mod.DomainUtil.getDomain(this.getTopLevelDocumentUri()));
var dest = requestpolicy.menu._addWildcard(
- requestpolicy.mod.DomainUtil.getDomain(redirectTargetUri));
+ rp.mod.DomainUtil.getDomain(redirectTargetUri));
requestpolicy.classicmenu.
addMenuItemTemporarilyAllowDest(optionsPopup, dest);
@@ -455,7 +451,7 @@ requestpolicy.overlay = {
// targetDocument.location is null. If that's the case, just use
// do the redirection in the current content pane.
if (targetDocument.location == null) {
- requestpolicy.mod.Logger
+ rp.mod.Logger
.dump("in callback: targetDocument.location == null, "
+ "using content.location instead");
location = content.location;
@@ -548,7 +544,7 @@ requestpolicy.overlay = {
// isn't set on new tab open when this is called.
return;
}
- requestpolicy.mod.Logger.warning(requestpolicy.mod.Logger.TYPE_INTERNAL,
+ rp.mod.Logger.warning(rp.mod.Logger.TYPE_INTERNAL,
"onAppContentLoaded called for " + document.documentURI);
this._onDOMContentLoaded(document);
@@ -571,10 +567,10 @@ requestpolicy.overlay = {
this._setBlockedContentCheckTimeout();
}
} catch (e) {
- requestpolicy.mod.Logger.severe(requestpolicy.mod.Logger.TYPE_ERROR,
+ rp.mod.Logger.severe(rp.mod.Logger.TYPE_ERROR,
"Fatal Error, " + e + ", stack was: " + e.stack);
- requestpolicy.mod.Logger
- .severe(requestpolicy.mod.Logger.TYPE_ERROR,
+ rp.mod.Logger
+ .severe(rp.mod.Logger.TYPE_ERROR,
"Unable to complete requestpolicy.overlay.onAppContentLoaded actions.");
throw e;
}
@@ -597,7 +593,7 @@ requestpolicy.overlay = {
if (iframe.contentDocument === undefined) {
return;
}
- requestpolicy.mod.Logger.debug(requestpolicy.mod.Logger.TYPE_INTERNAL,
+ rp.mod.Logger.debug(rp.mod.Logger.TYPE_INTERNAL,
"onAppFrameContentLoaded called for <"
+ iframe.contentDocument.documentURI + "> in <"
+ iframe.ownerDocument.documentURI + ">");
@@ -615,10 +611,10 @@ requestpolicy.overlay = {
this._checkForBlockedContent(iframe.ownerDocument);
}
} catch (e) {
- requestpolicy.mod.Logger.severe(requestpolicy.mod.Logger.TYPE_ERROR,
+ rp.mod.Logger.severe(rp.mod.Logger.TYPE_ERROR,
"Fatal Error, " + e + ", stack was: " + e.stack);
- requestpolicy.mod.Logger
- .severe(requestpolicy.mod.Logger.TYPE_ERROR,
+ rp.mod.Logger
+ .severe(rp.mod.Logger.TYPE_ERROR,
"Unable to complete requestpolicy.overlay.onAppFrameContentLoaded actions.");
throw e;
}
@@ -634,33 +630,33 @@ requestpolicy.overlay = {
// likely that there's wasted work happening during time-critical page
// loading going on in here.
try {
- var documentUri = requestpolicy.mod.DomainUtil
+ var documentUri = rp.mod.DomainUtil
.stripFragment(document.documentURI);
- requestpolicy.mod.Logger.debug(requestpolicy.mod.Logger.TYPE_INTERNAL,
+ rp.mod.Logger.debug(rp.mod.Logger.TYPE_INTERNAL,
"Checking for blocked requests from page <" + documentUri + ">");
this._setCustomizingPageNotification((documentUri == "about:customizing"));
this._blockedContentCheckLastTime = (new Date()).getTime();
this._stopBlockedContentCheckTimeout();
- var allRequestsOnDocument = requestpolicy.mod.RequestUtil
+ var allRequestsOnDocument = rp.mod.RequestUtil
.getAllRequestsOnDocument(document);
if (true === allRequestsOnDocument.containsBlockedRequests()) {
- requestpolicy.mod.Logger.debug(requestpolicy.mod.Logger.TYPE_INTERNAL,
+ rp.mod.Logger.debug(rp.mod.Logger.TYPE_INTERNAL,
"Requests have been blocked.");
this._setBlockedContentNotification(true);
this._indicateBlockedVisibleObjects(document);
return;
} else {
- requestpolicy.mod.Logger.debug(requestpolicy.mod.Logger.TYPE_INTERNAL,
+ rp.mod.Logger.debug(rp.mod.Logger.TYPE_INTERNAL,
"No requests have been blocked.");
this._setBlockedContentNotification(false);
}
} catch (e) {
- requestpolicy.mod.Logger.severe(requestpolicy.mod.Logger.TYPE_ERROR,
+ rp.mod.Logger.severe(rp.mod.Logger.TYPE_ERROR,
"Fatal Error, " + e + ", stack was: " + e.stack);
- requestpolicy.mod.Logger
- .severe(requestpolicy.mod.Logger.TYPE_ERROR,
+ rp.mod.Logger
+ .severe(rp.mod.Logger.TYPE_ERROR,
"Unable to complete requestpolicy.overlay._checkForBlockedContent actions.");
throw e;
}
@@ -805,8 +801,8 @@ requestpolicy.overlay = {
// least be showing up in the menu the first time it happens. After that,
// some caching issues seem to get in the way and the blocked request
// isn't tried again, so there's no awareness of it.
- requestpolicy.mod.Logger.warning(
- requestpolicy.mod.Logger.TYPE_HEADER_REDIRECT,
+ rp.mod.Logger.warning(
+ rp.mod.Logger.TYPE_HEADER_REDIRECT,
"Observed blocked link click redirect from page <" + sourcePageUri
+ "> with redirect origin <" + linkDestUri
+ "> and redirect dest <" + blockedRedirectUri
@@ -895,7 +891,7 @@ requestpolicy.overlay = {
* event
*/
_onDOMContentLoaded : function(document) {
- requestpolicy.mod.Logger.warning(requestpolicy.mod.Logger.TYPE_INTERNAL,
+ rp.mod.Logger.warning(rp.mod.Logger.TYPE_INTERNAL,
"_onDOMContentLoaded called.");
// Find all meta redirects.
@@ -906,31 +902,31 @@ requestpolicy.overlay = {
// TODO: Register meta redirects so we can tell which blocked requests
// were meta redirects in the statusbar menu.
// TODO: move this logic to the requestpolicy service.
- var parts = requestpolicy.mod.DomainUtil
+ var parts = rp.mod.DomainUtil
.parseRefresh(metaTags[i].content);
var delay = parts[0];
// The dest may be empty if the origin is what should be refreshed. This
// will be handled by DomainUtil.determineRedirectUri().
var dest = parts[1];
- requestpolicy.mod.Logger.info(
- requestpolicy.mod.Logger.TYPE_META_REFRESH, "meta refresh to <"
+ rp.mod.Logger.info(
+ rp.mod.Logger.TYPE_META_REFRESH, "meta refresh to <"
+ dest + "> (" + delay
+ " second delay) found in document at <" + document.location
+ ">");
// If dest isn't a valid uri, assume it's a relative uri.
- if (!requestpolicy.mod.DomainUtil.isValidUri(dest)) {
+ if (!rp.mod.DomainUtil.isValidUri(dest)) {
var origDest = dest;
dest = document.documentURIObject.resolve(dest);
- requestpolicy.mod.Logger.info(
- requestpolicy.mod.Logger.TYPE_META_REFRESH,
+ rp.mod.Logger.info(
+ rp.mod.Logger.TYPE_META_REFRESH,
"meta refresh destination <" + origDest
+ "> appeared to be relative to <" + document.documentURI
+ ">, so it has been resolved to <" + dest + ">");
}
if (!this._getDocShellAllowMetaRedirects(document)) {
- requestpolicy.mod.Logger.warning(
- requestpolicy.mod.Logger.TYPE_META_REFRESH,
+ rp.mod.Logger.warning(
+ rp.mod.Logger.TYPE_META_REFRESH,
"Another extension disabled docShell.allowMetaRedirects.");
}
@@ -940,10 +936,10 @@ requestpolicy.overlay = {
if (!this._rpService._blockingDisabled
&& !this._rpService.isAllowedRedirect(document.location.href, dest)) {
// Ignore redirects to javascript. The browser will ignore them, as well.
- if (requestpolicy.mod.DomainUtil.getUriObject(dest)
+ if (rp.mod.DomainUtil.getUriObject(dest)
.schemeIs("javascript")) {
- requestpolicy.mod.Logger.warning(
- requestpolicy.mod.Logger.TYPE_META_REFRESH,
+ rp.mod.Logger.warning(
+ rp.mod.Logger.TYPE_META_REFRESH,
"Ignoring redirect to javascript URI <" + dest + ">");
continue;
}
@@ -976,8 +972,8 @@ requestpolicy.overlay = {
_blockedRedirects[document.location]) {
var dest = this._rpService._requestProcessor.
_blockedRedirects[document.location];
- requestpolicy.mod.Logger.warning(
- requestpolicy.mod.Logger.TYPE_HEADER_REDIRECT,
+ rp.mod.Logger.warning(
+ rp.mod.Logger.TYPE_HEADER_REDIRECT,
"Showing notification for blocked redirect. To <" + dest + "> "
+ "from <" + document.location + ">");
this._showRedirectNotification(document, dest);
@@ -1313,7 +1309,7 @@ requestpolicy.overlay = {
}
}
}
- return requestpolicy.mod.DomainUtil
+ return rp.mod.DomainUtil
.stripFragment(content.document.documentURI);
},
@@ -1508,7 +1504,7 @@ requestpolicy.overlay = {
_performRedirect : function(document, redirectTargetUri) {
try {
if (redirectTargetUri[0] == '/') {
- requestpolicy.mod.Logger.info(requestpolicy.mod.Logger.TYPE_INTERNAL,
+ rp.mod.Logger.info(rp.mod.Logger.TYPE_INTERNAL,
"Redirecting to relative path <" + redirectTargetUri + "> from <"
+ document.documentURI + ">");
document.location.pathname = redirectTargetUri;
@@ -1519,7 +1515,7 @@ requestpolicy.overlay = {
var curDir = document.documentURI.split("/").slice(0, -1).join("/");
redirectTargetUri = curDir + "/" + redirectTargetUri;
}
- requestpolicy.mod.Logger.info(requestpolicy.mod.Logger.TYPE_INTERNAL,
+ rp.mod.Logger.info(rp.mod.Logger.TYPE_INTERNAL,
"Redirecting to <" + redirectTargetUri + "> from <"
+ document.documentURI + ">");
document.location.href = redirectTargetUri;
@@ -1546,7 +1542,7 @@ requestpolicy.overlay = {
// The first time the width will be 0. The default value is determined by
// logging it or you can probably figure it out from the CSS which doesn't
// directly specify the width of the entire popup.
- //requestpolicy.mod.Logger.dump('popup width: ' + popup.clientWidth);
+ //rp.mod.Logger.dump('popup width: ' + popup.clientWidth);
var popupWidth = popup.clientWidth ? 730 : popup.clientWidth;
var anchor = document.getElementById('content');
var contentWidth = anchor.clientWidth;
@@ -1557,7 +1553,7 @@ requestpolicy.overlay = {
// showExtensionConflictInfo : function() {
// var ext = this._rpService.getConflictingExtensions();
-// var extJson = requestpolicy.mod.JSON.stringify(ext);
+// var extJson = rp.mod.JSON.stringify(ext);
// this._openInNewTab(this._extensionConflictInfoUri
// + encodeURIComponent(extJson));
// },
diff --git a/src/content/requestLog.js b/src/content/requestLog.js
index 52a0bb9..587d825 100644
--- a/src/content/requestLog.js
+++ b/src/content/requestLog.js
@@ -20,16 +20,12 @@
* ***** END LICENSE BLOCK *****
*/
-if (!requestpolicy) {
- var requestpolicy = {
- mod : {}
- };
+if (!rp) {
+ var rp = {mod : {}};
}
-Components.utils.import("resource://requestpolicy/DomainUtil.jsm",
- requestpolicy.mod);
-Components.utils.import("resource://requestpolicy/Prompter.jsm",
- requestpolicy.mod);
+Components.utils.import("resource://requestpolicy/DomainUtil.jsm", rp.mod);
+Components.utils.import("resource://requestpolicy/Prompter.jsm", rp.mod);
requestpolicy.requestLog = {
@@ -77,7 +73,7 @@ requestpolicy.requestLog = {
var forbidden = true;
try {
- var uri = requestpolicy.mod.DomainUtil.getUriObject(content);
+ var uri = rp.mod.DomainUtil.getUriObject(content);
if (uri.scheme == 'http' || uri.scheme == 'https' || uri.scheme == 'ftp') {
forbidden = false;
}
@@ -88,7 +84,7 @@ requestpolicy.requestLog = {
var alertTitle = this._strbundle.getString("actionForbidden");
var alertText = this._strbundle
.getString("urlCanOnlyBeCopiedToClipboard");
- requestpolicy.mod.Prompter.alert(alertTitle, alertText);
+ rp.mod.Prompter.alert(alertTitle, alertText);
return;
}
diff --git a/src/modules/DomainUtil.jsm b/src/modules/DomainUtil.jsm
index d290a36..dbecd95 100644
--- a/src/modules/DomainUtil.jsm
+++ b/src/modules/DomainUtil.jsm
@@ -32,14 +32,11 @@ var EXPORTED_SYMBOLS = ["DomainUtil"]
const CI = Components.interfaces;
const CC = Components.classes;
-if (!requestpolicy) {
- var requestpolicy = {
- mod : {}
- };
+if (!rp) {
+ var rp = {mod : {}};
}
-Components.utils.import("resource://requestpolicy/Logger.jsm",
- requestpolicy.mod);
+Components.utils.import("resource://requestpolicy/Logger.jsm", rp.mod);
var DomainUtil = {};
@@ -104,7 +101,7 @@ DomainUtil.getIdentifier = function(uri, level) {
var identifier = uri.split(",")[0];
return identifier.split(";")[0];
}
- requestpolicy.mod.Logger.info(requestpolicy.mod.Logger.TYPE_INTERNAL,
+ rp.mod.Logger.info(rp.mod.Logger.TYPE_INTERNAL,
"Unable to getIdentifier from uri " + uri + " using identifier level "
+ level + ".");
return uri;
@@ -144,7 +141,7 @@ DomainUtil.getUriObject = function(uri) {
} catch (e) {
var msg = "DomainUtil.getUriObject exception on uri <" + uri + "> "
+ ". Exception was: " + e;
- requestpolicy.mod.Logger.info(requestpolicy.mod.Logger.TYPE_INTERNAL, msg);
+ rp.mod.Logger.info(rp.mod.Logger.TYPE_INTERNAL, msg);
throw e;
}
};
diff --git a/src/modules/FileUtil.jsm b/src/modules/FileUtil.jsm
index bd48e34..61b2bde 100644
--- a/src/modules/FileUtil.jsm
+++ b/src/modules/FileUtil.jsm
@@ -25,14 +25,11 @@ var EXPORTED_SYMBOLS = ["FileUtil"]
const CI = Components.interfaces;
const CC = Components.classes;
-if (!requestpolicy) {
- var requestpolicy = {
- mod : {}
- };
+if (!rp) {
+ var rp = {mod : {}};
}
-Components.utils.import("resource://requestpolicy/Services.jsm",
- requestpolicy.mod);
+Components.utils.import("resource://requestpolicy/Services.jsm", rp.mod);
const REQUESTPOLICY_DIR = "requestpolicy";
@@ -145,7 +142,7 @@ var FileUtil = {
* @return {nsILocalFile}
*/
getRPUserDir : function(subdir1, subdir2, subdir3) {
- var profileDir = requestpolicy.mod.Services.directoryService
+ var profileDir = rp.mod.Services.directoryService
.get("ProfD", CI.nsIFile);
var file = profileDir.clone().QueryInterface(CI.nsILocalFile);
file.appendRelativePath(REQUESTPOLICY_DIR);
diff --git a/src/modules/Policy.jsm b/src/modules/Policy.jsm
index 80a939f..b3a989a 100644
--- a/src/modules/Policy.jsm
+++ b/src/modules/Policy.jsm
@@ -27,16 +27,12 @@ var EXPORTED_SYMBOLS = [
"RULE_TYPE_DENY"
];
-if (!requestpolicy) {
- var requestpolicy = {
- mod : {}
- };
+if (!rp) {
+ var rp = {mod : {}};
}
-Components.utils.import("resource://requestpolicy/DomainUtil.jsm",
- requestpolicy.mod);
-Components.utils.import("resource://requestpolicy/Logger.jsm",
- requestpolicy.mod);
+Components.utils.import("resource://requestpolicy/DomainUtil.jsm", rp.mod);
+Components.utils.import("resource://requestpolicy/Logger.jsm", rp.mod);
const RULE_TYPE_ALLOW = 1;
const RULE_TYPE_DENY = 2;
@@ -46,12 +42,12 @@ function dprint(msg) {
if (typeof print == "function") {
print(msg);
} else {
- requestpolicy.mod.Logger.info(requestpolicy.mod.Logger.TYPE_POLICY, msg);
+ rp.mod.Logger.info(rp.mod.Logger.TYPE_POLICY, msg);
}
}
function dwarn(msg) {
- requestpolicy.mod.Logger.warning(requestpolicy.mod.Logger.TYPE_POLICY, msg);
+ rp.mod.Logger.warning(rp.mod.Logger.TYPE_POLICY, msg);
}
/*
@@ -614,7 +610,7 @@ Rule.prototype = {
return false;
}
} else {
- if (!requestpolicy.mod.DomainUtil.hasStandardPort(uriObj)) {
+ if (!rp.mod.DomainUtil.hasStandardPort(uriObj)) {
dprint("isMatch: wrong port (not the default port and the rule assumes default)");
return false;
}
diff --git a/src/modules/PolicyManager.jsm b/src/modules/PolicyManager.jsm
index 76399cd..533bbb4 100644
--- a/src/modules/PolicyManager.jsm
+++ b/src/modules/PolicyManager.jsm
@@ -31,32 +31,26 @@ const CC = Components.classes;
const RULES_CHANGED_TOPIC = "requestpolicy-rules-changed";
-if (!requestpolicy) {
- var requestpolicy = {
- mod : {}
- };
+if (!rp) {
+ var rp = {mod : {}};
}
-Components.utils.import("resource://requestpolicy/Logger.jsm",
- requestpolicy.mod);
-Components.utils.import("resource://requestpolicy/Policy.jsm",
- requestpolicy.mod);
-Components.utils.import("resource://requestpolicy/PolicyStorage.jsm",
- requestpolicy.mod);
-Components.utils.import("resource://requestpolicy/RequestResult.jsm",
- requestpolicy.mod);
+Components.utils.import("resource://requestpolicy/Logger.jsm", rp.mod);
+Components.utils.import("resource://requestpolicy/Policy.jsm", rp.mod);
+Components.utils.import("resource://requestpolicy/PolicyStorage.jsm", rp.mod);
+Components.utils.import("resource://requestpolicy/RequestResult.jsm", rp.mod);
function dprint(msg) {
if (typeof print == "function") {
print(msg);
} else {
- requestpolicy.mod.Logger.info(requestpolicy.mod.Logger.TYPE_POLICY, msg);
+ rp.mod.Logger.info(rp.mod.Logger.TYPE_POLICY, msg);
}
}
function warn(msg) {
- requestpolicy.mod.Logger.warning(requestpolicy.mod.Logger.TYPE_POLICY, msg);
+ rp.mod.Logger.warning(rp.mod.Logger.TYPE_POLICY, msg);
}
function notifyRulesChanged() {
@@ -222,14 +216,14 @@ PolicyManager.prototype = {
// Read the user policy from a file.
try {
dprint("PolicyManager::loadPolicies loading user policy");
- rawPolicy = requestpolicy.mod.PolicyStorage
+ rawPolicy = rp.mod.PolicyStorage
.loadRawPolicyFromFile("user.json");
} catch (e) {
// TODO: log a message about missing user.json policy file.
// There's no user policy. This is either because RP has just been
// installed, the file has been deleted, or something is wrong. For now,
// we'll assume this is a new install.
- rawPolicy = new requestpolicy.mod.RawPolicy();
+ rawPolicy = new rp.mod.RawPolicy();
}
this._userPolicies["user"] = {
"rawPolicy" : rawPolicy,
@@ -253,7 +247,7 @@ PolicyManager.prototype = {
try {
dprint("PolicyManager::loadSubscriptionPolicies: " +
listName + ' / ' + subName);
- rawPolicy = requestpolicy.mod.PolicyStorage
+ rawPolicy = rp.mod.PolicyStorage
.loadRawPolicyFromFile(subName + ".json", listName);
} catch (e) {
warn("Unable to load policy from file: " + e);
@@ -307,8 +301,8 @@ PolicyManager.prototype = {
},
_assertRuleType: function(ruleType) {
- if (ruleType != requestpolicy.mod.RULE_TYPE_ALLOW &&
- ruleType != requestpolicy.mod.RULE_TYPE_DENY) {
+ if (ruleType != rp.mod.RULE_TYPE_ALLOW &&
+ ruleType != rp.mod.RULE_TYPE_DENY) {
throw "Invalid rule type: " + ruleType;
}
},
@@ -333,7 +327,7 @@ PolicyManager.prototype = {
addRule : function(ruleType, ruleData, noStore) {
dprint("PolicyManager::addRule " + ruleType + " "
- + requestpolicy.mod.Policy.rawRuleToCanonicalString(ruleData));
+ + rp.mod.Policy.rawRuleToCanonicalString(ruleData));
//this._userPolicies["user"].policy.print();
this._assertRuleType(ruleType);
@@ -347,7 +341,7 @@ PolicyManager.prototype = {
// TODO: can we do this in the background and add some locking? It will
// become annoying when there is a large file to write.
if (!noStore) {
- requestpolicy.mod.PolicyStorage.saveRawPolicyToFile(
+ rp.mod.PolicyStorage.saveRawPolicyToFile(
this._userPolicies["user"].rawPolicy, "user.json");
}
@@ -357,13 +351,13 @@ PolicyManager.prototype = {
},
storeRules : function() {
- requestpolicy.mod.PolicyStorage.saveRawPolicyToFile(
+ rp.mod.PolicyStorage.saveRawPolicyToFile(
this._userPolicies["user"].rawPolicy, "user.json");
},
addTemporaryRule : function(ruleType, ruleData) {
dprint("PolicyManager::addTemporaryRule " + ruleType + " "
- + requestpolicy.mod.Policy.rawRuleToCanonicalString(ruleData));
+ + rp.mod.Policy.rawRuleToCanonicalString(ruleData));
//this._userPolicies["temp"].policy.print();
this._assertRuleType(ruleType);
@@ -378,7 +372,7 @@ PolicyManager.prototype = {
removeRule : function(ruleType, ruleData, noStore) {
dprint("PolicyManager::removeRule " + ruleType + " "
- + requestpolicy.mod.Policy.rawRuleToCanonicalString(ruleData));
+ + rp.mod.Policy.rawRuleToCanonicalString(ruleData));
//this._userPolicies["user"].policy.print();
//this._userPolicies["temp"].policy.print();
@@ -396,7 +390,7 @@ PolicyManager.prototype = {
// TODO: can we do this in the background and add some locking? It will
// become annoying when there is a large file to write.
if (!noStore) {
- requestpolicy.mod.PolicyStorage.saveRawPolicyToFile(
+ rp.mod.PolicyStorage.saveRawPolicyToFile(
this._userPolicies["user"].rawPolicy, "user.json");
}
@@ -412,7 +406,7 @@ PolicyManager.prototype = {
},
resetTemporaryPolicy : function() {
- var rawPolicy = new requestpolicy.mod.RawPolicy();
+ var rawPolicy = new rp.mod.RawPolicy();
this._userPolicies["temp"] = {
"rawPolicy" : rawPolicy,
"policy" : rawPolicy.toPolicy("temp")
@@ -427,7 +421,7 @@ PolicyManager.prototype = {
},
checkRequestAgainstSubscriptionPolicies : function(origin, dest) {
- var result = new requestpolicy.mod.RequestResult();
+ var result = new rp.mod.RequestResult();
for (var listName in this._subscriptionPolicies) {
var policies = this._subscriptionPolicies[listName];
this._checkRequest(origin, dest, policies, result);
@@ -443,7 +437,7 @@ PolicyManager.prototype = {
throw "Destination must be an nsIURI.";
}
if (!result) {
- result = new requestpolicy.mod.RequestResult();
+ result = new rp.mod.RequestResult();
}
for (var i in policies) {
var policy = policies[i].policy;
diff --git a/src/modules/PolicyStorage.jsm b/src/modules/PolicyStorage.jsm
index 14850e1..e5e0a0a 100644
--- a/src/modules/PolicyStorage.jsm
+++ b/src/modules/PolicyStorage.jsm
@@ -23,16 +23,12 @@
var EXPORTED_SYMBOLS = ["PolicyStorage"];
-if (!requestpolicy) {
- var requestpolicy = {
- mod : {}
- };
+if (!rp) {
+ var rp = {mod : {}};
}
-Components.utils.import("resource://requestpolicy/FileUtil.jsm",
- requestpolicy.mod);
-Components.utils.import("resource://requestpolicy/Policy.jsm",
- requestpolicy.mod);
+Components.utils.import("resource://requestpolicy/FileUtil.jsm", rp.mod);
+Components.utils.import("resource://requestpolicy/Policy.jsm", rp.mod);
var PolicyStorage = {
@@ -43,7 +39,7 @@ var PolicyStorage = {
/**string*/ subscriptionListName) {
// TODO: change filename argument to policyname and we'll append the '.json'
// TODO: get a stream and use the mozilla json interface to decode from stream.
- var policyFile = requestpolicy.mod.FileUtil.getRPUserDir("policies");
+ var policyFile = rp.mod.FileUtil.getRPUserDir("policies");
// TODO: maybe exercise additional paranoia and sanitize the filename
// even though we're already useing "appendRelativePath".
if (subscriptionListName) {
@@ -51,8 +47,8 @@ var PolicyStorage = {
policyFile.appendRelativePath(subscriptionListName);
}
policyFile.appendRelativePath(filename);
- var str = requestpolicy.mod.FileUtil.fileToString(policyFile);
- var rawPolicy = new requestpolicy.mod.RawPolicy(str);
+ var str = rp.mod.FileUtil.fileToString(policyFile);
+ var rawPolicy = new rp.mod.RawPolicy(str);
return rawPolicy;
},
@@ -61,13 +57,13 @@ var PolicyStorage = {
// TODO: change filename argument to policyname and we'll append the '.json'
// TODO: get a stream and use the mozilla json interface to encode to stream.
if (subscriptionListName) {
- var policyFile = requestpolicy.mod.FileUtil.getRPUserDir("policies",
+ var policyFile = rp.mod.FileUtil.getRPUserDir("policies",
'subscriptions', subscriptionListName);
} else {
- var policyFile = requestpolicy.mod.FileUtil.getRPUserDir("policies");
+ var policyFile = rp.mod.FileUtil.getRPUserDir("policies");
}
policyFile.appendRelativePath(filename);
- requestpolicy.mod.FileUtil.stringToFile(JSON.stringify(policy), policyFile);
+ rp.mod.FileUtil.stringToFile(JSON.stringify(policy), policyFile);
}
};
diff --git a/src/modules/Request.jsm b/src/modules/Request.jsm
index 7f3736c..d50f8b3 100644
--- a/src/modules/Request.jsm
+++ b/src/modules/Request.jsm
@@ -36,15 +36,11 @@ const REQUEST_TYPE_NORMAL = 1;
const REQUEST_TYPE_REDIRECT = 2;
-if (!requestpolicy) {
- var requestpolicy = {
- mod : {}
- };
+if (!rp) {
+ var rp = {mod : {}};
}
-Components.utils.import("resource://requestpolicy/DomainUtil.jsm",
- requestpolicy.mod);
-Components.utils.import("resource://requestpolicy/Logger.jsm",
- requestpolicy.mod);
+Components.utils.import("resource://requestpolicy/DomainUtil.jsm", rp.mod);
+Components.utils.import("resource://requestpolicy/Logger.jsm", rp.mod);
@@ -102,13 +98,13 @@ NormalRequest.prototype.constructor = Request;
NormalRequest.prototype.setOriginURI = function(originURI) {
this.originURI = originURI;
- this.aRequestOrigin = requestpolicy.mod.DomainUtil.
+ this.aRequestOrigin = rp.mod.DomainUtil.
getUriObject(originURI);
};
NormalRequest.prototype.setDestURI = function(destURI) {
this.destURI = destURI;
- this.aContentLocation = requestpolicy.mod.DomainUtil.
+ this.aContentLocation = rp.mod.DomainUtil.
getUriObject(destURI);
};
@@ -171,7 +167,7 @@ NormalRequest.prototype.isInternal = function() {
}
if (missingSpecOrHost) {
- requestpolicy.mod.Logger.info(requestpolicy.mod.Logger.TYPE_CONTENT,
+ rp.mod.Logger.info(rp.mod.Logger.TYPE_CONTENT,
"No asciiHost or empty spec on either aRequestOrigin <"
+ this.aRequestOrigin.spec + "> or aContentLocation <"
+ this.aContentLocation.spec + ">");
diff --git a/src/modules/RequestProcessor.jsm b/src/modules/RequestProcessor.jsm
index 0028efd..8fff234 100644
--- a/src/modules/RequestProcessor.jsm
+++ b/src/modules/RequestProcessor.jsm
@@ -33,21 +33,14 @@ const CP_REJECT = CI.nsIContentPolicy.REJECT_SERVER;
const CP_MAPPEDDESTINATION = 0x178c40bf;
-if (!requestpolicy) {
- var requestpolicy = {
- mod : {}
- };
+if (!rp) {
+ var rp = {mod : {}};
}
-Components.utils.import("resource://requestpolicy/DomainUtil.jsm",
- requestpolicy.mod);
-Components.utils.import("resource://requestpolicy/Logger.jsm",
- requestpolicy.mod);
-Components.utils.import("resource://requestpolicy/RequestResult.jsm",
- requestpolicy.mod);
-Components.utils.import("resource://requestpolicy/RequestUtil.jsm",
- requestpolicy.mod);
-Components.utils.import("resource://requestpolicy/Request.jsm",
- requestpolicy.mod);
+Components.utils.import("resource://requestpolicy/DomainUtil.jsm", rp.mod);
+Components.utils.import("resource://requestpolicy/Logger.jsm", rp.mod);
+Components.utils.import("resource://requestpolicy/RequestResult.jsm", rp.mod);
+Components.utils.import("resource://requestpolicy/RequestUtil.jsm", rp.mod);
+Components.utils.import("resource://requestpolicy/Request.jsm", rp.mod);
@@ -78,8 +71,8 @@ function RequestProcessor(rpService) {
"result" : null
};
- this._rejectedRequests = new requestpolicy.mod.RequestSet();
- this._allowedRequests = new requestpolicy.mod.RequestSet();
+ this._rejectedRequests = new rp.mod.RequestSet();
+ this._allowedRequests = new rp.mod.RequestSet();
/**
@@ -112,8 +105,8 @@ function RequestProcessor(rpService) {
* @param {NormalRequest} request
*/
RequestProcessor.prototype.process = function(request) {
- //requestpolicy.mod.Logger.vardump(request.aRequestOrigin);
- //requestpolicy.mod.Logger.vardump(request.aContentLocation);
+ //rp.mod.Logger.vardump(request.aRequestOrigin);
+ //rp.mod.Logger.vardump(request.aContentLocation);
try {
if (request.isInternal()) {
@@ -133,8 +126,8 @@ RequestProcessor.prototype.process = function(request) {
// document redirect notification.
if (request.aRequestOrigin.scheme == "moz-nullprincipal" &&
request.aRequestPrincipal) {
- requestpolicy.mod.Logger.warning(
- requestpolicy.mod.Logger.TYPE_CONTENT,
+ rp.mod.Logger.warning(
+ rp.mod.Logger.TYPE_CONTENT,
"Allowing request that appears to be a URL entered in the "
+ "location bar or some other good explanation: " + destURI);
return CP_OK;
@@ -145,10 +138,9 @@ RequestProcessor.prototype.process = function(request) {
// no longer supported.
if (request.aRequestOrigin.scheme == "moz-nullprincipal" &&
request.aContext) {
- var newOriginURI = requestpolicy.mod.DomainUtil
+ var newOriginURI = rp.mod.DomainUtil
.stripFragment(request.aContext.contentDocument.documentURI);
- requestpolicy.mod.Logger.info(
- requestpolicy.mod.Logger.TYPE_CONTENT,
+ rp.mod.Logger.info(rp.mod.Logger.TYPE_CONTENT,
"Considering moz-nullprincipal origin <"
+ originURI + "> to be origin <" + newOriginURI + ">");
originURI = newOriginURI;
@@ -157,8 +149,7 @@ RequestProcessor.prototype.process = function(request) {
if (request.aRequestOrigin.scheme == "view-source") {
var newOriginURI = originURI.split(":").slice(1).join(":");
- requestpolicy.mod.Logger.info(
- requestpolicy.mod.Logger.TYPE_CONTENT,
+ rp.mod.Logger.info(rp.mod.Logger.TYPE_CONTENT,
"Considering view-source origin <"
+ originURI + "> to be origin <" + newOriginURI + ">");
originURI = newOriginURI;
@@ -169,14 +160,12 @@ RequestProcessor.prototype.process = function(request) {
var newDestURI = destURI.split(":").slice(1).join(":");
if (newDestURI.indexOf("data:text/html") == 0) {
// "View Selection Source" has been clicked
- requestpolicy.mod.Logger.info(
- requestpolicy.mod.Logger.TYPE_CONTENT,
+ rp.mod.Logger.info(rp.mod.Logger.TYPE_CONTENT,
"Allowing \"data:text/html\" view-source destination"
+ " (Selection Source)");
return CP_OK;
} else {
- requestpolicy.mod.Logger.info(
- requestpolicy.mod.Logger.TYPE_CONTENT,
+ rp.mod.Logger.info(rp.mod.Logger.TYPE_CONTENT,
"Considering view-source destination <"
+ destURI + "> to be destination <" + newDestURI + ">");
destURI = newDestURI;
@@ -190,15 +179,14 @@ RequestProcessor.prototype.process = function(request) {
request.aContext.documentURI != "about:blank") {
newOriginURI = request.aContext.documentURI;
} else if (request.aContext.ownerDocument &&
- request.aContext.ownerDocument.documentURI &&
- request.aContext.ownerDocument.documentURI != "about:blank") {
+ request.aContext.ownerDocument.documentURI &&
+ request.aContext.ownerDocument.documentURI != "about:blank") {
newOriginURI = request.aContext.ownerDocument.documentURI;
}
if (newOriginURI) {
- newOriginURI = requestpolicy.mod.DomainUtil.stripFragment(newOriginURI);
- requestpolicy.mod.Logger.info(
- requestpolicy.mod.Logger.TYPE_CONTENT, "Considering origin <"
- + originURI + "> to be origin <" + newOriginURI + ">");
+ newOriginURI = rp.mod.DomainUtil.stripFragment(newOriginURI);
+ rp.mod.Logger.info(rp.mod.Logger.TYPE_CONTENT, "Considering origin <" +
+ originURI + "> to be origin <" + newOriginURI + ">");
originURI = newOriginURI;
request.setOriginURI(originURI);
}
@@ -217,8 +205,7 @@ RequestProcessor.prototype.process = function(request) {
// Example to test with: Click on "expand all" at
// http://code.google.com/p/SOME_PROJECT/source/detail?r=SOME_REVISION
if (originURI == destURI) {
- requestpolicy.mod.Logger.warning(
- requestpolicy.mod.Logger.TYPE_CONTENT,
+ rp.mod.Logger.warning(rp.mod.Logger.TYPE_CONTENT,
"Allowing (but not recording) request "
+ "where origin is the same as the destination: " + originURI);
return CP_OK;
@@ -255,8 +242,8 @@ RequestProcessor.prototype.process = function(request) {
// click again and so if we don't forget the previous blocked/allowed
// requests, the menu becomes inaccurate. Now the question is: what
// are we breaking by clearing the blocked/allowed requests here?
- request.requestResult = new requestpolicy.mod.RequestResult(true,
- requestpolicy.mod.REQUEST_REASON_LINK_CLICK);
+ request.requestResult = new rp.mod.RequestResult(true,
+ rp.mod.REQUEST_REASON_LINK_CLICK);
return this.accept("User-initiated request by link click", request);
} else if (this._submittedForms[originURI] &&
@@ -271,8 +258,8 @@ RequestProcessor.prototype.process = function(request) {
// See the note above for link clicks and forgetting blocked/allowed
// requests on refresh. I haven't tested if it's the same for forms
// but it should be so we're making the same change here.
- request.requestResult = new requestpolicy.mod.RequestResult(true,
- requestpolicy.mod.REQUEST_REASON_FORM_SUBMISSION);
+ request.requestResult = new rp.mod.RequestResult(true,
+ rp.mod.REQUEST_REASON_FORM_SUBMISSION);
return this.accept("User-initiated request by form submission", request);
} else if (this._historyRequests[destURI]) {
@@ -281,15 +268,15 @@ RequestProcessor.prototype.process = function(request) {
// the page's content. Therefore, we make sure that our cache of
// blocked requests isn't removed in this case.
delete this._historyRequests[destURI];
- request.requestResult = new requestpolicy.mod.RequestResult(true,
- requestpolicy.mod.REQUEST_REASON_HISTORY_REQUEST);
+ request.requestResult = new rp.mod.RequestResult(true,
+ rp.mod.REQUEST_REASON_HISTORY_REQUEST);
return this.accept("History request", request, true);
} else if (this._userAllowedRedirects[originURI]
&& this._userAllowedRedirects[originURI][destURI]) {
// shouldLoad is called by location.href in overlay.js as of Fx
// 3.7a5pre and SeaMonkey 2.1a.
- request.requestResult = new requestpolicy.mod.RequestResult(true,
- requestpolicy.mod.REQUEST_REASON_USER_ALLOWED_REDIRECT);
+ request.requestResult = new rp.mod.RequestResult(true,
+ rp.mod.REQUEST_REASON_USER_ALLOWED_REDIRECT);
return this.accept("User-allowed redirect", request, true);
}
@@ -297,8 +284,8 @@ RequestProcessor.prototype.process = function(request) {
if (request.aRequestOrigin.asciiHost == "browser") {
// "browser" origin shows up for favicon.ico and an address entered
// in address bar.
- request.requestResult = new requestpolicy.mod.RequestResult(true,
- requestpolicy.mod.REQUEST_REASON_USER_ACTION);
+ request.requestResult = new rp.mod.RequestResult(true,
+ rp.mod.REQUEST_REASON_USER_ACTION);
return this.accept(
"User action (e.g. address entered in address bar) or other good "
+ "explanation (e.g. new window/tab opened)", request);
@@ -310,8 +297,8 @@ RequestProcessor.prototype.process = function(request) {
// that originate from their xul files. If you're reading this and
// you know of a way to use this to evade RequestPolicy, please let
// me know, I will be very grateful.
- request.requestResult = new requestpolicy.mod.RequestResult(true,
- requestpolicy.mod.REQUEST_REASON_USER_ACTION);
+ request.requestResult = new rp.mod.RequestResult(true,
+ rp.mod.REQUEST_REASON_USER_ACTION);
return this.accept(
"User action (e.g. address entered in address bar) or other good "
+ "explanation (e.g. new window/tab opened)", request);
@@ -327,8 +314,8 @@ RequestProcessor.prototype.process = function(request) {
if (request.aContext && request.aContext.nodeName == "xul:browser" &&
request.aContext.currentURI &&
request.aContext.currentURI.spec == "about:blank") {
- request.requestResult = new requestpolicy.mod.RequestResult(true,
- requestpolicy.mod.REQUEST_REASON_NEW_WINDOW);
+ request.requestResult = new rp.mod.RequestResult(true,
+ rp.mod.REQUEST_REASON_NEW_WINDOW);
return this.accept("New window (should probably only be an allowed " +
"popup's initial request)", request, true);
}
@@ -344,11 +331,11 @@ RequestProcessor.prototype.process = function(request) {
// destination page. As a simple hack around this, for now we'll always
// allow request to the same origin. It would be nice to have a a better
// solution but I'm not sure what that solution is.
- var originIdent = requestpolicy.mod.DomainUtil.getIdentifier(originURI);
- var destIdent = requestpolicy.mod.DomainUtil.getIdentifier(destURI);
+ var originIdent = rp.mod.DomainUtil.getIdentifier(originURI);
+ var destIdent = rp.mod.DomainUtil.getIdentifier(destURI);
if (originIdent == destIdent) {
- request.requestResult = new requestpolicy.mod.RequestResult(true,
- requestpolicy.mod.REQUEST_REASON_IDENTICAL_IDENTIFIER);
+ request.requestResult = new rp.mod.RequestResult(true,
+ rp.mod.REQUEST_REASON_IDENTICAL_IDENTIFIER);
return this.accept(
"Allowing request where origin protocol, host, and port are the" +
" same as the destination: " + originIdent, request);
@@ -358,14 +345,12 @@ RequestProcessor.prototype.process = function(request) {
checkRequestAgainstUserPolicies(request.aRequestOrigin,
request.aContentLocation);
for (var i = 0; i < request.requestResult.matchedDenyRules.length; i++) {
- requestpolicy.mod.Logger.dump('Matched deny rules');
- requestpolicy.mod.Logger.vardump(
- request.requestResult.matchedDenyRules[i]);
+ rp.mod.Logger.dump('Matched deny rules');
+ rp.mod.Logger.vardump(request.requestResult.matchedDenyRules[i]);
}
for (var i = 0; i < request.requestResult.matchedAllowRules.length; i++) {
- requestpolicy.mod.Logger.dump('Matched allow rules');
- requestpolicy.mod.Logger.vardump(
- request.requestResult.matchedAllowRules[i]);
+ rp.mod.Logger.dump('Matched allow rules');
+ rp.mod.Logger.vardump(request.requestResult.matchedAllowRules[i]);
}
// If there are both allow and deny rules, then fall back on the default
// policy. I believe this is effectively the same as giving precedence
@@ -377,7 +362,7 @@ RequestProcessor.prototype.process = function(request) {
// question.
if (request.requestResult.allowRulesExist() &&
request.requestResult.denyRulesExist()) {
- request.requestResult.resultReason = requestpolicy.mod.
+ request.requestResult.resultReason = rp.mod.
REQUEST_REASON_DEFAULT_POLICY_INCONSISTENT_RULES;
if (this._rpService._defaultAllow) {
request.requestResult.isAllowed = true;
@@ -390,14 +375,12 @@ RequestProcessor.prototype.process = function(request) {
}
}
if (request.requestResult.allowRulesExist()) {
- request.requestResult.resultReason = requestpolicy.mod.
- REQUEST_REASON_USER_POLICY;
+ request.requestResult.resultReason = rp.mod.REQUEST_REASON_USER_POLICY;
request.requestResult.isAllowed = true;
return this.accept("Allowed by user policy", request);
}
if (request.requestResult.denyRulesExist()) {
- request.requestResult.resultReason = requestpolicy.mod.
- REQUEST_REASON_USER_POLICY;
+ request.requestResult.resultReason = rp.mod.REQUEST_REASON_USER_POLICY;
request.requestResult.isAllowed = false;
return this.reject("Blocked by user policy", request);
}
@@ -406,18 +389,18 @@ RequestProcessor.prototype.process = function(request) {
checkRequestAgainstSubscriptionPolicies(request.aRequestOrigin,
request.aContentLocation);
for (var i = 0; i < request.requestResult.matchedDenyRules.length; i++) {
- requestpolicy.mod.Logger.dump('Matched deny rules');
- requestpolicy.mod.Logger.vardump(
+ rp.mod.Logger.dump('Matched deny rules');
+ rp.mod.Logger.vardump(
request.requestResult.matchedDenyRules[i]);
}
for (var i = 0; i < request.requestResult.matchedAllowRules.length; i++) {
- requestpolicy.mod.Logger.dump('Matched allow rules');
- requestpolicy.mod.Logger.vardump(
+ rp.mod.Logger.dump('Matched allow rules');
+ rp.mod.Logger.vardump(
request.requestResult.matchedAllowRules[i]);
}
if (request.requestResult.allowRulesExist() &&
request.requestResult.denyRulesExist()) {
- request.requestResult.resultReason = requestpolicy.mod.
+ request.requestResult.resultReason = rp.mod.
REQUEST_REASON_DEFAULT_POLICY_INCONSISTENT_RULES;
if (this._rpService._defaultAllow) {
request.requestResult.isAllowed = true;
@@ -432,13 +415,13 @@ RequestProcessor.prototype.process = function(request) {
}
}
if (request.requestResult.denyRulesExist()) {
- request.requestResult.resultReason = requestpolicy.mod.
+ request.requestResult.resultReason = rp.mod.
REQUEST_REASON_SUBSCRIPTION_POLICY;
request.requestResult.isAllowed = false;
return this.reject("Blocked by subscription policy", request);
}
if (request.requestResult.allowRulesExist()) {
- request.requestResult.resultReason = requestpolicy.mod.
+ request.requestResult.resultReason = rp.mod.
REQUEST_REASON_SUBSCRIPTION_POLICY;
request.requestResult.isAllowed = true;
return this.accept("Allowed by subscription policy", request);
@@ -449,8 +432,8 @@ RequestProcessor.prototype.process = function(request) {
var allowOrigin = rule[0] ? originURI.indexOf(rule[0]) == 0 : true;
var allowDest = rule[1] ? destURI.indexOf(rule[1]) == 0 : true;
if (allowOrigin && allowDest) {
- request.requestResult = new requestpolicy.mod.RequestResult(true,
- requestpolicy.mod.REQUEST_REASON_COMPATIBILITY);
+ request.requestResult = new rp.mod.RequestResult(true,
+ rp.mod.REQUEST_REASON_COMPATIBILITY);
return this.accept(
"Extension/application compatibility rule matched [" + rule[2] +
"]", request, true);
@@ -465,8 +448,7 @@ RequestProcessor.prototype.process = function(request) {
this._mappedDestinations[destURI]) {
for (var mappedDest in this._mappedDestinations[destURI]) {
var mappedDestUriObj = this._mappedDestinations[destURI][mappedDest];
- requestpolicy.mod.Logger.warning(
- requestpolicy.mod.Logger.TYPE_CONTENT,
+ rp.mod.Logger.warning(rp.mod.Logger.TYPE_CONTENT,
"Checking mapped destination: " + mappedDest);
var mappedResult = this._rpService.shouldLoad(request.aContentType,
mappedDestUriObj, request.aRequestOrigin, request.aContext,
@@ -489,9 +471,9 @@ RequestProcessor.prototype.process = function(request) {
} catch (e) {
- requestpolicy.mod.Logger.severe(requestpolicy.mod.Logger.TYPE_ERROR,
+ rp.mod.Logger.severe(rp.mod.Logger.TYPE_ERROR,
"Fatal Error, " + e + ", stack was: " + e.stack);
- requestpolicy.mod.Logger.severe(requestpolicy.mod.Logger.TYPE_CONTENT,
+ rp.mod.Logger.severe(rp.mod.Logger.TYPE_CONTENT,
"Rejecting request due to internal error.");
return this._rpService._blockingDisabled ? CP_OK : CP_REJECT;
}
@@ -501,15 +483,15 @@ RequestProcessor.prototype.process = function(request) {
// };
RequestProcessor.prototype.mapDestinations = function(origDestUri, newDestUri) {
- origDestUri = requestpolicy.mod.DomainUtil.stripFragment(origDestUri);
- newDestUri = requestpolicy.mod.DomainUtil.stripFragment(newDestUri);
- requestpolicy.mod.Logger.info(requestpolicy.mod.Logger.TYPE_INTERNAL,
+ origDestUri = rp.mod.DomainUtil.stripFragment(origDestUri);
+ newDestUri = rp.mod.DomainUtil.stripFragment(newDestUri);
+ rp.mod.Logger.info(rp.mod.Logger.TYPE_INTERNAL,
"Mapping destination <" + origDestUri + "> to <" + newDestUri + ">.");
if (!this._mappedDestinations[newDestUri]) {
this._mappedDestinations[newDestUri] = {};
}
this._mappedDestinations[newDestUri][origDestUri] =
- requestpolicy.mod.DomainUtil.getUriObject(origDestUri);
+ rp.mod.DomainUtil.getUriObject(origDestUri);
};
@@ -585,10 +567,9 @@ RequestProcessor.prototype._examineHttpResponse = function(observedSubject) {
return;
}
try {
- var parts = requestpolicy.mod.DomainUtil.parseRefresh(refreshString);
+ var parts = rp.mod.DomainUtil.parseRefresh(refreshString);
} catch (e) {
- requestpolicy.mod.Logger.warning(
- requestpolicy.mod.Logger.TYPE_HEADER_REDIRECT,
+ rp.mod.Logger.warning(rp.mod.Logger.TYPE_HEADER_REDIRECT,
"Invalid refresh header: <" + refreshString + ">");
if (!this._rpService._blockingDisabled) {
httpChannel.setResponseHeader(headerType, "", false);
@@ -604,29 +585,28 @@ RequestProcessor.prototype._examineHttpResponse = function(observedSubject) {
// For origins that are IDNs, this will always be in ACE format. We want
// it in UTF8 format if it's a TLD that Mozilla allows to be in UTF8.
- var originURI = requestpolicy.mod.DomainUtil.formatIDNUri(httpChannel.name);
+ var originURI = rp.mod.DomainUtil.formatIDNUri(httpChannel.name);
// Allow redirects of requests from privileged code.
if (!this._isContentRequest(httpChannel)) {
// However, favicon requests that are redirected appear as non-content
// requests. So, check if the original request was for a favicon.
- var originPath = requestpolicy.mod.DomainUtil.getPath(httpChannel.name);
+ var originPath = rp.mod.DomainUtil.getPath(httpChannel.name);
// We always have to check "/favicon.ico" because Firefox will use this
// as a default path and that request won't pass through shouldLoad().
if (originPath == "/favicon.ico" || this._faviconRequests[originURI]) {
// If the redirected request is allowed, we need to know that was a
// favicon request in case it is further redirected.
this._faviconRequests[dest] = true;
- requestpolicy.mod.Logger.info(
- requestpolicy.mod.Logger.TYPE_HEADER_REDIRECT, "'" + headerType
+ rp.mod.Logger.info(rp.mod.Logger.TYPE_HEADER_REDIRECT, "'" + headerType
+ "' header to <" + dest + "> " + "from <" + originURI
+ "> appears to be a redirected favicon request. "
+ "This will be treated as a content request.");
} else {
- requestpolicy.mod.Logger.warning(
- requestpolicy.mod.Logger.TYPE_HEADER_REDIRECT, "** ALLOWED ** '"
- + headerType + "' header to <" + dest + "> " + "from <"
- + originURI + ">. Original request is from privileged code.");
+ rp.mod.Logger.warning(rp.mod.Logger.TYPE_HEADER_REDIRECT,
+ "** ALLOWED ** '" + headerType + "' header to <" + dest + "> " +
+ "from <" + originURI +
+ ">. Original request is from privileged code.");
return;
}
}
@@ -637,19 +617,17 @@ RequestProcessor.prototype._examineHttpResponse = function(observedSubject) {
// menu because DomainUtil.getIdentifier() doesn't raise exceptions.
// We add this to fix issue #39:
// https://github.com/RequestPolicyContinued/requestpolicy/issues/39
- if (!requestpolicy.mod.DomainUtil.isValidUri(dest)) {
- var destAsUri = requestpolicy.mod.DomainUtil.determineRedirectUri(originURI,
- dest);
- requestpolicy.mod.Logger.warning(
- requestpolicy.mod.Logger.TYPE_HEADER_REDIRECT,
+ if (!rp.mod.DomainUtil.isValidUri(dest)) {
+ var destAsUri = rp.mod.DomainUtil.determineRedirectUri(originURI, dest);
+ rp.mod.Logger.warning(
+ rp.mod.Logger.TYPE_HEADER_REDIRECT,
"Redirect destination is not a valid uri, assuming dest <" + dest
+ "> from origin <" + originURI + "> is actually dest <" + destAsUri
+ ">.");
dest = destAsUri;
}
- var request = new requestpolicy.mod.RedirectRequest(originURI, dest,
- headerType);
+ var request = new rp.mod.RedirectRequest(originURI, dest, headerType);
this.processRedirect(request, httpChannel);
};
@@ -659,20 +637,17 @@ RequestProcessor.prototype.processRedirect = function(request, httpChannel) {
var headerType = request.headerType;
// Ignore redirects to javascript. The browser will ignore them, as well.
- if (requestpolicy.mod.DomainUtil.getUriObject(destURI)
- .schemeIs("javascript")) {
- requestpolicy.mod.Logger.warning(
- requestpolicy.mod.Logger.TYPE_HEADER_REDIRECT,
+ if (rp.mod.DomainUtil.getUriObject(destURI).schemeIs("javascript")) {
+ rp.mod.Logger.warning(rp.mod.Logger.TYPE_HEADER_REDIRECT,
"Ignoring redirect to javascript URI <" + destURI + ">");
return;
}
request.requestResult = this.checkRedirect(request);
if (true === request.requestResult.isAllowed) {
- requestpolicy.mod.Logger.warning(
- requestpolicy.mod.Logger.TYPE_HEADER_REDIRECT, "** ALLOWED ** '"
- + headerType + "' header to <" + destURI + "> " + "from <" + originURI
- + ">. Same hosts or allowed origin/destination.");
+ rp.mod.Logger.warning(rp.mod.Logger.TYPE_HEADER_REDIRECT, "** ALLOWED ** '"
+ + headerType + "' header to <" + destURI + "> " + "from <" + originURI
+ + ">. Same hosts or allowed origin/destination.");
this._recordAllowedRequest(originURI, destURI, false,
request.requestResult);
this._allowedRedirectsReverse[destURI] = originURI;
@@ -687,20 +662,18 @@ RequestProcessor.prototype.processRedirect = function(request, httpChannel) {
if (this._clickedLinks[realOrigin]
&& this._clickedLinks[realOrigin][originURI]) {
- requestpolicy.mod.Logger.warning(
- requestpolicy.mod.Logger.TYPE_HEADER_REDIRECT,
- "This redirect was from a link click."
- + " Registering an additional click to <" + destURI + "> "
- + "from <" + realOrigin + ">");
+ rp.mod.Logger.warning(rp.mod.Logger.TYPE_HEADER_REDIRECT,
+ "This redirect was from a link click." +
+ " Registering an additional click to <" + destURI + "> " +
+ "from <" + realOrigin + ">");
this.registerLinkClicked(realOrigin, destURI);
} else if (this._submittedForms[realOrigin]
&& this._submittedForms[realOrigin][originURI.split("?")[0]]) {
- requestpolicy.mod.Logger.warning(
- requestpolicy.mod.Logger.TYPE_HEADER_REDIRECT,
- "This redirect was from a form submission."
- + " Registering an additional form submission to <" + destURI
- + "> " + "from <" + realOrigin + ">");
+ rp.mod.Logger.warning(rp.mod.Logger.TYPE_HEADER_REDIRECT,
+ "This redirect was from a form submission." +
+ " Registering an additional form submission to <" + destURI +
+ "> " + "from <" + realOrigin + ">");
this.registerFormSubmitted(realOrigin, destURI);
}
}
@@ -719,15 +692,13 @@ RequestProcessor.prototype.processRedirect = function(request, httpChannel) {
if (contentDisp.indexOf("attachment") != -1) {
try {
httpChannel.setResponseHeader("Content-Disposition", "", false);
- requestpolicy.mod.Logger.warning(
- requestpolicy.mod.Logger.TYPE_HEADER_REDIRECT,
- "Removed 'Content-Disposition: attachment' header to "
- + "prevent display of about:neterror.");
+ rp.mod.Logger.warning(rp.mod.Logger.TYPE_HEADER_REDIRECT,
+ "Removed 'Content-Disposition: attachment' header to " +
+ "prevent display of about:neterror.");
} catch (e) {
- requestpolicy.mod.Logger.warning(
- requestpolicy.mod.Logger.TYPE_HEADER_REDIRECT,
- "Unable to remove 'Content-Disposition: attachment' header "
- + "to prevent display of about:neterror. " + e);
+ rp.mod.Logger.warning(rp.mod.Logger.TYPE_HEADER_REDIRECT,
+ "Unable to remove 'Content-Disposition: attachment' header " +
+ "to prevent display of about:neterror. " + e);
}
}
} catch (e) {
@@ -778,15 +749,14 @@ RequestProcessor.prototype.processRedirect = function(request, httpChannel) {
this._recordRejectedRequest(originURI, destURI, result);
}
- requestpolicy.mod.Logger.warning(
- requestpolicy.mod.Logger.TYPE_HEADER_REDIRECT, "** BLOCKED ** '"
- + headerType + "' header to <" + destURI + ">"
- + " found in response from <" + originURI + ">");
+ rp.mod.Logger.warning(rp.mod.Logger.TYPE_HEADER_REDIRECT,
+ "** BLOCKED ** '" + headerType + "' header to <" + destURI + ">" +
+ " found in response from <" + originURI + ">");
} catch (e) {
- requestpolicy.mod.Logger.severe(
- requestpolicy.mod.Logger.TYPE_HEADER_REDIRECT, "Failed removing "
- + "'" + headerType + "' header to <" + destURI + ">"
- + " in response from <" + originURI + ">." + e);
+ rp.mod.Logger.severe(
+ rp.mod.Logger.TYPE_HEADER_REDIRECT, "Failed removing " +
+ "'" + headerType + "' header to <" + destURI + ">" +
+ " in response from <" + originURI + ">." + e);
}
};
@@ -804,7 +774,7 @@ RequestProcessor.prototype._examineHttpRequest = function(observedSubject) {
if (httpChannel.getRequestHeader("X-moz") == "prefetch") {
// Seems to be too late to block it at this point. Calling the
// cancel(status) method didn't stop it.
- requestpolicy.mod.Logger.warning(requestpolicy.mod.Logger.TYPE_CONTENT,
+ rp.mod.Logger.warning(rp.mod.Logger.TYPE_CONTENT,
"Discovered prefetch request being sent to: " + httpChannel.name);
}
} catch (e) {
@@ -870,23 +840,21 @@ RequestProcessor.prototype._notifyBlockedTopLevelDocRequest = function(
RequestProcessor.prototype.registerHistoryRequest = function(destinationUrl) {
- var destinationUrl = requestpolicy.mod.DomainUtil
- .ensureUriHasPath(requestpolicy.mod.DomainUtil
- .stripFragment(destinationUrl));
+ var destinationUrl = rp.mod.DomainUtil.ensureUriHasPath(
+ rp.mod.DomainUtil.stripFragment(destinationUrl));
this._historyRequests[destinationUrl] = true;
- requestpolicy.mod.Logger.info(requestpolicy.mod.Logger.TYPE_INTERNAL,
+ rp.mod.Logger.info(rp.mod.Logger.TYPE_INTERNAL,
"History item requested: <" + destinationUrl + ">.");
};
RequestProcessor.prototype.registerFormSubmitted = function(originUrl,
destinationUrl) {
- var originUrl = requestpolicy.mod.DomainUtil
- .ensureUriHasPath(requestpolicy.mod.DomainUtil.stripFragment(originUrl));
- var destinationUrl = requestpolicy.mod.DomainUtil
- .ensureUriHasPath(requestpolicy.mod.DomainUtil
- .stripFragment(destinationUrl));
+ var originUrl = rp.mod.DomainUtil
+ .ensureUriHasPath(rp.mod.DomainUtil.stripFragment(originUrl));
+ var destinationUrl = rp.mod.DomainUtil.ensureUriHasPath(
+ rp.mod.DomainUtil.stripFragment(destinationUrl));
- requestpolicy.mod.Logger.info(requestpolicy.mod.Logger.TYPE_INTERNAL,
+ rp.mod.Logger.info(rp.mod.Logger.TYPE_INTERNAL,
"Form submitted from <" + originUrl + "> to <" + destinationUrl + ">.");
// Drop the query string from the destination url because form GET requests
@@ -914,13 +882,12 @@ RequestProcessor.prototype.registerFormSubmitted = function(originUrl,
RequestProcessor.prototype.registerLinkClicked = function(originUrl,
destinationUrl) {
- var originUrl = requestpolicy.mod.DomainUtil
- .ensureUriHasPath(requestpolicy.mod.DomainUtil.stripFragment(originUrl));
- var destinationUrl = requestpolicy.mod.DomainUtil
- .ensureUriHasPath(requestpolicy.mod.DomainUtil
- .stripFragment(destinationUrl));
+ var originUrl = rp.mod.DomainUtil.ensureUriHasPath(
+ rp.mod.DomainUtil.stripFragment(originUrl));
+ var destinationUrl = rp.mod.DomainUtil.ensureUriHasPath(
+ rp.mod.DomainUtil.stripFragment(destinationUrl));
- requestpolicy.mod.Logger.info(requestpolicy.mod.Logger.TYPE_INTERNAL,
+ rp.mod.Logger.info(rp.mod.Logger.TYPE_INTERNAL,
"Link clicked from <" + originUrl + "> to <" + destinationUrl + ">.");
if (this._clickedLinks[originUrl] == undefined) {
@@ -951,13 +918,12 @@ RequestProcessor.prototype.registerLinkClicked = function(originUrl,
RequestProcessor.prototype.registerAllowedRedirect = function(originUrl,
destinationUrl) {
- var originUrl = requestpolicy.mod.DomainUtil
- .ensureUriHasPath(requestpolicy.mod.DomainUtil.stripFragment(originUrl));
- var destinationUrl = requestpolicy.mod.DomainUtil
- .ensureUriHasPath(requestpolicy.mod.DomainUtil
- .stripFragment(destinationUrl));
+ var originUrl = rp.mod.DomainUtil.ensureUriHasPath(
+ rp.mod.DomainUtil.stripFragment(originUrl));
+ var destinationUrl = rp.mod.DomainUtil.ensureUriHasPath(
+ rp.mod.DomainUtil.stripFragment(destinationUrl));
- requestpolicy.mod.Logger.info(requestpolicy.mod.Logger.TYPE_INTERNAL,
+ rp.mod.Logger.info(rp.mod.Logger.TYPE_INTERNAL,
"User-allowed redirect from <" + originUrl + "> to <" + destinationUrl
+ ">.");
@@ -970,7 +936,7 @@ RequestProcessor.prototype.registerAllowedRedirect = function(originUrl,
};
RequestProcessor.prototype.isAllowedRedirect = function(originURI, destURI) {
- var request = new requestpolicy.mod.RedirectRequest(originURI, destURI);
+ var request = new rp.mod.RedirectRequest(originURI, destURI);
return (true === this.checkRedirect(request).isAllowed);
};
@@ -987,8 +953,8 @@ RequestProcessor.prototype.checkRedirect = function(request) {
var originURI = request.originURI;
var destURI = request.destURI;
- var originURIObj = requestpolicy.mod.DomainUtil.getUriObject(originURI);
- var destURIObj = requestpolicy.mod.DomainUtil.getUriObject(destURI);
+ var originURIObj = rp.mod.DomainUtil.getUriObject(originURI);
+ var destURIObj = rp.mod.DomainUtil.getUriObject(destURI);
var result = this._rpService._policyMgr.checkRequestAgainstUserPolicies(
originURIObj, destURIObj);
@@ -1018,8 +984,7 @@ RequestProcessor.prototype.checkRedirect = function(request) {
|| destURI.indexOf(":") == -1) {
// Redirect is to a relative url.
// ==> allow.
- return new requestpolicy.mod.RequestResult(true,
- requestpolicy.mod.REQUEST_REASON_RELATIVE_URL);
+ return new rp.mod.RequestResult(true, rp.mod.REQUEST_REASON_RELATIVE_URL);
}
for (var i = 0; i < this._rpService._compatibilityRules.length; i++) {
@@ -1027,8 +992,8 @@ RequestProcessor.prototype.checkRedirect = function(request) {
var allowOrigin = rule[0] ? originURI.indexOf(rule[0]) == 0 : true;
var allowDest = rule[1] ? destURI.indexOf(rule[1]) == 0 : true;
if (allowOrigin && allowDest) {
- return new requestpolicy.mod.RequestResult(true,
- requestpolicy.mod.REQUEST_REASON_COMPATIBILITY);
+ return new rp.mod.RequestResult(true,
+ rp.mod.REQUEST_REASON_COMPATIBILITY);
}
}
@@ -1047,7 +1012,7 @@ RequestProcessor.prototype.addRequestObserver = function(observer) {
throw "Observer passed to addRequestObserver does "
+ "not have an observeBlockedRequest() method.";
}
- requestpolicy.mod.Logger.debug(requestpolicy.mod.Logger.TYPE_INTERNAL,
+ rp.mod.Logger.debug(rp.mod.Logger.TYPE_INTERNAL,
"Adding request observer: " + observer.toString());
this._requestObservers.push(observer);
};
@@ -1060,13 +1025,13 @@ RequestProcessor.prototype.addRequestObserver = function(observer) {
RequestProcessor.prototype.removeRequestObserver = function(observer) {
for (var i = 0; i < this._requestObservers.length; i++) {
if (this._requestObservers[i] == observer) {
- requestpolicy.mod.Logger.debug(requestpolicy.mod.Logger.TYPE_INTERNAL,
+ rp.mod.Logger.debug(rp.mod.Logger.TYPE_INTERNAL,
"Removing request observer: " + observer.toString());
delete this._requestObservers[i];
return;
}
}
- requestpolicy.mod.Logger.warning(requestpolicy.mod.Logger.TYPE_INTERNAL,
+ rp.mod.Logger.warning(rp.mod.Logger.TYPE_INTERNAL,
"Could not find observer to remove " + "in removeRequestObserver()");
};
@@ -1075,7 +1040,7 @@ RequestProcessor.prototype.removeRequestObserver = function(observer) {
// We always call this from shouldLoad to reject a request.
RequestProcessor.prototype.reject = function(reason, request) {
- requestpolicy.mod.Logger.warning(requestpolicy.mod.Logger.TYPE_CONTENT,
+ rp.mod.Logger.warning(rp.mod.Logger.TYPE_CONTENT,
"** BLOCKED ** reason: " + reason + ". " + request.detailsToString());
if (this._rpService._blockingDisabled) {
@@ -1115,7 +1080,7 @@ RequestProcessor.prototype._recordRejectedRequest = function(request) {
* @param {boolean} unforbidable
*/
RequestProcessor.prototype.accept = function(reason, request, unforbidable) {
- requestpolicy.mod.Logger.warning(requestpolicy.mod.Logger.TYPE_CONTENT,
+ rp.mod.Logger.warning(rp.mod.Logger.TYPE_CONTENT,
"** ALLOWED ** reason: " + reason + ". " + request.detailsToString());
this._cacheShouldLoadResult(CP_OK, request.originURI, request.destURI);
@@ -1161,26 +1126,26 @@ RequestProcessor.prototype._cacheShouldLoadResult = function(result, originUri,
RequestProcessor.prototype._checkByDefaultPolicy = function(originUri,
destUri) {
if (this._rpService._defaultAllow) {
- var result = new requestpolicy.mod.RequestResult(true,
- requestpolicy.mod.REQUEST_REASON_DEFAULT_POLICY);
+ var result = new rp.mod.RequestResult(true,
+ rp.mod.REQUEST_REASON_DEFAULT_POLICY);
return result;
}
if (this._rpService._defaultAllowSameDomain) {
- var originDomain = requestpolicy.mod.DomainUtil.getDomain(
+ var originDomain = rp.mod.DomainUtil.getDomain(
originUri);
- var destDomain = requestpolicy.mod.DomainUtil.getDomain(destUri);
- return new requestpolicy.mod.RequestResult(originDomain == destDomain,
- requestpolicy.mod.REQUEST_REASON_DEFAULT_SAME_DOMAIN);
+ var destDomain = rp.mod.DomainUtil.getDomain(destUri);
+ return new rp.mod.RequestResult(originDomain == destDomain,
+ rp.mod.REQUEST_REASON_DEFAULT_SAME_DOMAIN);
}
// We probably want to allow requests from http:80 to https:443 of the same
// domain. However, maybe this is so uncommon it's not worth any extra
// complexity.
- var originIdent = requestpolicy.mod.DomainUtil.getIdentifier(
- originUri, requestpolicy.mod.DomainUtil.LEVEL_SOP);
- var destIdent = requestpolicy.mod.DomainUtil.getIdentifier(destUri,
- requestpolicy.mod.DomainUtil.LEVEL_SOP);
- return new requestpolicy.mod.RequestResult(originIdent == destIdent,
- requestpolicy.mod.REQUEST_REASON_DEFAULT_SAME_DOMAIN);
+ var originIdent = rp.mod.DomainUtil.getIdentifier(
+ originUri, rp.mod.DomainUtil.LEVEL_SOP);
+ var destIdent = rp.mod.DomainUtil.getIdentifier(destUri,
+ rp.mod.DomainUtil.LEVEL_SOP);
+ return new rp.mod.RequestResult(originIdent == destIdent,
+ rp.mod.REQUEST_REASON_DEFAULT_SAME_DOMAIN);
};
/**
@@ -1199,13 +1164,13 @@ RequestProcessor.prototype._isDuplicateRequest = function(request) {
var date = new Date();
if (date.getTime() - this._lastShouldLoadCheck.time <
this._lastShouldLoadCheckTimeout) {
- requestpolicy.mod.Logger.debug(requestpolicy.mod.Logger.TYPE_CONTENT,
+ rp.mod.Logger.debug(rp.mod.Logger.TYPE_CONTENT,
"Using cached shouldLoad() result of " +
this._lastShouldLoadCheck.result + " for request to <" +
request.destURI + "> from <" + request.originURI + ">.");
return true;
} else {
- requestpolicy.mod.Logger.debug(requestpolicy.mod.Logger.TYPE_CONTENT,
+ rp.mod.Logger.debug(rp.mod.Logger.TYPE_CONTENT,
"shouldLoad() cache expired for result of " +
this._lastShouldLoadCheck.result + " for request to <" +
request.destURI + "> from <" + request.originURI + ">.");
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/requestpolicy.git
More information about the Pkg-mozext-commits
mailing list