Remove some old components that are not used. (6a5998a5) · Commits · The Tor Project / Applications / torbutton

makexpi.sh

+2 −2

Original line number	Diff line number	Diff line
		@@ -18,8 +18,8 @@ cd ../..
		# create .xpi
		echo ---------- create $APP_NAME.xpi ----------
		cd src
		echo zip -X -9r ../pkg/$XPI_NAME ./ -x "certDialogsOverride.js" -x "chrome/" -x ".diff" -x ".svn/"
		zip -X -9r ../pkg/$XPI_NAME ./ -x "components/certDialogsOverride.js" -x ".svn/" -x ".diff" -x "components/torRefSpoofer.js" #-x "chrome/"
		echo zip -X -9r ../pkg/$XPI_NAME ./ -x "chrome/" -x ".diff" -x ".svn/"
		zip -X -9r ../pkg/$XPI_NAME ./ -x ".svn/" -x ".diff" -x "components/torRefSpoofer.js" #-x "chrome/"
		#mv ../$APP_NAME.jar ./chrome
		#zip -9m ../pkg/$XPI_NAME chrome/$APP_NAME.jar
		cd ..

src/components/certDialogsOverride.js

deleted100644 → 0

+0 −170

Original line number	Diff line number	Diff line
		// Bug 1506 P0: This component is unused. Ignore it.

		/*************************************************************************
		* Hack to disable CA cert trust dialog popup during CA cert import
		* during Tor toggle (since we save the trust bits to disk).
		*
		*************************************************************************/

		// Module specific constants
		const kMODULE_NAME = "CA Cert Dialogs";
		const kMODULE_CONTRACTID = "@mozilla.org/nsCertificateDialogs;1";
		const kMODULE_CID = Components.ID("6AB9E86E-2459-11DD-AEBC-679A55D89593");

		/* Mozilla defined interfaces for FF3.0 and 2.0 */
		const kREAL_CERTDIALOG_CID = "{518e071f-1dd2-11b2-937e-c45f14def778}";

		const kCertDialogsInterfaces2 = [ "nsIBadCertListener", "nsIClientAuthDialogs",
		"nsIDOMCryptoDialogs",
		"nsICertificateDialogs", "nsITokenPasswordDialogs",
		"nsITokenDialogs", "nsICertPickDialogs",
		"nsIGeneratingKeypairInfoDialogs"];

		const kCertDialogsInterfaces3 =
		[ "nsIClientAuthDialogs", "nsIDOMCryptoDialogs",
		"nsICertificateDialogs", "nsITokenPasswordDialogs",
		"nsITokenDialogs", "nsICertPickDialogs",
		"nsIGeneratingKeypairInfoDialogs"];

		const Cr = Components.results;

		function CertDialogsWrapper() {
		// assuming we're running under Firefox
		var appInfo = Components.classes["@mozilla.org/xre/app-info;1"]
		.getService(Components.interfaces.nsIXULAppInfo);
		var versionChecker = Components.classes["@mozilla.org/xpcom/version-comparator;1"]
		.getService(Components.interfaces.nsIVersionComparator);

		this._real_certdlg = Components.classesByID[kREAL_CERTDIALOG_CID];
		if(versionChecker.compare(appInfo.version, "3.0a1") >= 0) {
		this._interfaces = kCertDialogsInterfaces3;
		} else {
		this._interfaces = kCertDialogsInterfaces2;
		}

		this._prefs = Components.classes["@mozilla.org/preferences-service;1"]
		.getService(Components.interfaces.nsIPrefBranch);
		this.logger = Components.classes["@torproject.org/torbutton-logger;1"]
		.getService(Components.interfaces.nsISupports).wrappedJSObject;

		this._certdlg = function() {
		var certdlg = this._real_certdlg.getService();
		for (var i = 0; i < this._interfaces.length; i++) {
		certdlg.QueryInterface(Components.interfaces[this._interfaces[i]]);
		}
		return certdlg;
		};

		this.copyMethods(this._certdlg());
		}

		CertDialogsWrapper.prototype =
		{
		QueryInterface: function(iid) {
		if (/*iid.equals(Components.interfaces.nsIClassInfo)
		\|\| */iid.equals(Components.interfaces.nsISupports)) {
		return this;
		}

		var certdlg = this._certdlg().QueryInterface(iid);
		this.copyMethods(certdlg);
		return this;
		},

		/*
		* Copies methods from the true history object we are wrapping
		*/
		copyMethods: function(wrapped) {
		var mimic = function(newObj, method) {
		if(typeof(wrapped[method]) == "function") {
		// Code courtesy of timeless:
		// http://www.webwizardry.net/~timeless/windowStubs.js
		var params = [];
		params.length = wrapped[method].length;
		var x = 0;
		var call;
		if(params.length) call = "("+params.join().replace(/(?:)/g,function(){return "p"+(++x)})+")";
		else call = "()";
		var fun = "(function "+call+"{"+
		"if (arguments.length < "+wrapped[method].length+")"+
		" throw Components.results.NS_ERROR_XPC_NOT_ENOUGH_ARGS;"+
		"return wrapped."+method+".apply(wrapped, arguments);})";
		newObj[method] = eval(fun);
		//dump("wrapped: "+method+": "+fun+"\n");
		} else {
		newObj.__defineGetter__(method, function() { return wrapped[method]; });
		newObj.__defineSetter__(method, function(val) { wrapped[method] = val; });
		}
		};
		for (var method in wrapped) {
		if(typeof(this[method]) == "undefined") mimic(this, method);
		}
		},

		confirmDownloadCACert: function(ctx, cert, trust) {
		this.logger.log(2, "Cert window");
		if(this._prefs.getBoolPref("extensions.torbutton.block_cert_dialogs")) {
		this.logger.log(3, "Blocking cert window");
		return true;
		}
		return this._certdlg().confirmDownloadCACert(ctx, cert, trust);
		}

		};

		var CertDialogsWrapperSingleton = null;
		var CertDialogsWrapperFactory = new Object();

		CertDialogsWrapperFactory.createInstance = function (outer, iid)
		{
		if (outer != null) {
		Components.returnCode = Cr.NS_ERROR_NO_AGGREGATION;
		return null;
		}

		if(!CertDialogsWrapperSingleton)
		CertDialogsWrapperSingleton = new CertDialogsWrapper();

		return CertDialogsWrapperSingleton;
		};


		/**
		* JS XPCOM component registration goop:
		*
		* Everything below is boring boilerplate and can probably be ignored.
		*/

		var CertDialogsWrapperModule = new Object();

		CertDialogsWrapperModule.registerSelf =
		function (compMgr, fileSpec, location, type) {
		var nsIComponentRegistrar = Components.interfaces.nsIComponentRegistrar;
		compMgr = compMgr.QueryInterface(nsIComponentRegistrar);
		compMgr.registerFactoryLocation(kMODULE_CID,
		kMODULE_NAME,
		kMODULE_CONTRACTID,
		fileSpec,
		location,
		type);
		};

		CertDialogsWrapperModule.getClassObject = function (compMgr, cid, iid)
		{
		if (cid.equals(kMODULE_CID))
		return CertDialogsWrapperFactory;

		Components.returnCode = Cr.NS_ERROR_NOT_REGISTERED;
		return null;
		};

		CertDialogsWrapperModule.canUnload = function (compMgr)
		{
		return true;
		};

		function NSGetModule(compMgr, fileSpec)
		{
		return CertDialogsWrapperModule;
		}

src/components/ignore-history.js

deleted100644 → 0

+0 −368

Original line number	Diff line number	Diff line
		// Bug 1506 P0: This code is a relic from FF < 3.5 days and can be totally
		// ignored.

		/*************************************************************************
		* Ignore History (JavaScript XPCOM component)
		* Disables reading and writing history. This component is implemented as a
		* wrapper around the true history object that sometimes lies about isVisited
		* queries and sometimes ignores addURI commands.
		* Designed as a component of FoxTor, http://cups.cs.cmu.edu/foxtor/
		* Copyright 2006, distributed under the same (open source) license as FoxTor
		*
		* Contributor(s):
		* Collin Jackson <mozilla@collinjackson.com>
		*
		*************************************************************************/

		// Module specific constants
		const kMODULE_NAME = "Ignore History";
		const kMODULE_CONTRACTID2 = "@mozilla.org/browser/global-history;2";
		const kMODULE_CONTRACTID3 = "@mozilla.org/browser/nav-history-service;1";
		const kMODULE_CONTRACTID3D = "@mozilla.org/browser/download-history;1";
		const kMODULE_CID = Components.ID("bc666d45-a9a1-4096-9511-f6db6f686881");

		/* Mozilla defined interfaces for FF3.0 and 2.0 */
		const kREAL_HISTORY_CID3 = "{88cecbb7-6c63-4b3b-8cd4-84f3b8228c69}";
		const kREAL_HISTORY_CID2 = "{59648a91-5a60-4122-8ff2-54b839c84aed}";

		const kHistoryInterfaces2 = [ "nsIBrowserHistory", "nsIGlobalHistory2" ];

		const kHistoryInterfaces3 = [ "nsIBrowserHistory", "nsIGlobalHistory2",
		"nsIAutoCompleteSearch", "nsIGlobalHistory3",
		"nsIDownloadHistory",
		"nsIAutoCompleteSimpleResultListener",
		"nsINavHistoryService" ];

		const kHistoryInterfaces35 = [ "nsIAutoCompleteSearch",
		"nsIBrowserHistory",
		"nsIObserver",
		"nsIGlobalHistory3",
		"nsIBrowserHistory_MOZILLA_1_9_1_ADDITIONS",
		"nsPIPlacesDatabase",
		"nsIDownloadHistory",
		"nsIGlobalHistory2",
		"nsINavHistoryService",
		"nsISupportsWeakReference",
		"nsIAutoCompleteSimpleResultListener",
		"nsICharsetResolver" ];

		const kHistoryInterfaces36 = [
		"nsICharsetResolver",
		"nsIGlobalHistory3",
		"nsIObserver",
		"nsPIPlacesDatabase",
		"nsIDownloadHistory",
		"nsIBrowserHistory",
		"nsIGlobalHistory2",
		"nsPIPlacesHistoryListenersNotifier",
		"nsISupportsWeakReference",
		"nsINavHistoryService"
		];

		const Cr = Components.results;

		var appInfo = Components.classes["@mozilla.org/xre/app-info;1"]
		.getService(Components.interfaces.nsIXULAppInfo);
		var versionChecker = Components.classes["@mozilla.org/xpcom/version-comparator;1"]
		.getService(Components.interfaces.nsIVersionComparator);
		var is_ff3 = (versionChecker.compare(appInfo.version, "3.0a1") >= 0);



		function HistoryWrapper() {
		this.logger = Components.classes["@torproject.org/torbutton-logger;1"]
		.getService(Components.interfaces.nsISupports).wrappedJSObject;
		this.logger.log(3, "Component Load 3: New HistoryWrapper "+kMODULE_CONTRACTID3);

		// assuming we're running under Firefox
		var appInfo = Components.classes["@mozilla.org/xre/app-info;1"]
		.getService(Components.interfaces.nsIXULAppInfo);
		var versionChecker = Components.classes["@mozilla.org/xpcom/version-comparator;1"]
		.getService(Components.interfaces.nsIVersionComparator);

		if(versionChecker.compare(appInfo.version, "3.6a1") >= 0) {
		this._real_history = Components.classesByID[kREAL_HISTORY_CID3];
		this._interfaces = kHistoryInterfaces36;
		} else if(versionChecker.compare(appInfo.version, "3.5a1") >= 0) {
		this._real_history = Components.classesByID[kREAL_HISTORY_CID3];
		this._interfaces = kHistoryInterfaces35;
		} else if(versionChecker.compare(appInfo.version, "3.0a1") >= 0) {
		this._real_history = Components.classesByID[kREAL_HISTORY_CID3];
		this._interfaces = kHistoryInterfaces3;
		} else {
		this._real_history = Components.classesByID[kREAL_HISTORY_CID2];
		this._interfaces = kHistoryInterfaces2;
		}

		this._prefs = Components.classes["@mozilla.org/preferences-service;1"]
		.getService(Components.interfaces.nsIPrefBranch);

		this._history = function() {
		var history = this._real_history.getService();
		for (var i = 0; i < this._interfaces.length; i++) {
		history.QueryInterface(Components.interfaces[this._interfaces[i]]);
		}
		return history;
		};

		this.copyMethods(this._history());
		}

		HistoryWrapper.prototype =
		{
		QueryInterface: function(iid) {
		if (iid.equals(Components.interfaces.nsIClassInfo)
		\|\| iid.equals(Components.interfaces.nsISupports)) {
		return this;
		}

		var history = this._history().QueryInterface(iid);
		this.copyMethods(history);
		return this;
		},

		// make this an nsIClassInfo object
		flags: Components.interfaces.nsIClassInfo.DOM_OBJECT,

		// method of nsIClassInfo
		classDescription: "@mozilla.org/browser/global-history;2",
		contractID: "@mozilla.org/browser/global-history;2",
		classID: kMODULE_CID,

		// method of nsIClassInfo
		getInterfaces: function(count) {
		var interfaceList = [Components.interfaces.nsIClassInfo];
		for (var i = 0; i < this._interfaces.length; i++) {
		interfaceList.push(Components.interfaces[this._interfaces[i]]);
		}

		count.value = interfaceList.length;
		return interfaceList;
		},

		// method of nsIClassInfo
		getHelperForLanguage: function(count) { return null; },


		/*
		* Determine whether we should hide visited links
		*/
		// FIXME: Make observer?
		blockReadHistory: function() {
		return ((this._prefs.getBoolPref("extensions.torbutton.block_thread")
		&& this._prefs.getBoolPref("extensions.torbutton.tor_enabled"))
		\|\|
		(this._prefs.getBoolPref("extensions.torbutton.block_nthread")
		&& !this._prefs.getBoolPref("extensions.torbutton.tor_enabled")));
		},

		blockWriteHistory: function() {
		return ((this._prefs.getBoolPref("extensions.torbutton.block_thwrite")
		&& this._prefs.getBoolPref("extensions.torbutton.tor_enabled"))
		\|\|
		(this._prefs.getBoolPref("extensions.torbutton.block_nthwrite")
		&& !this._prefs.getBoolPref("extensions.torbutton.tor_enabled")));
		},


		/*
		* Copies methods from the true history object we are wrapping
		*/
		copyMethods: function(wrapped) {
		var mimic = function(newObj, method) {
		if(method == "getURIGeckoFlags" \|\| method == "setURIGeckoFlags"
		\|\| method == "hidePage") {
		// XXX: Due to https://developer.mozilla.org/en/Exception_logging_in_JavaScript
		// this is necessary to prevent error console noise on the return to C++ code.
		// It is not technically correct, but as far as I can tell, the return values
		// for these calls are never checked anyway.
		var fun = "(function (){return Components.results.NS_ERROR_NOT_IMPLEMENTED; })";
		newObj[method] = eval(fun);
		} else if(typeof(wrapped[method]) == "function") {
		// Code courtesy of timeless:
		// http://www.webwizardry.net/~timeless/windowStubs.js
		var params = [];
		params.length = wrapped[method].length;
		var x = 0;
		var call;
		if(params.length) call = "("+params.join().replace(/(?:)/g,function(){return "p"+(++x)})+")";
		else call = "()";
		var fun = "(function "+call+"{"+
		"if (arguments.length < "+wrapped[method].length+")"+
		" throw Components.results.NS_ERROR_XPC_NOT_ENOUGH_ARGS;"+
		"return wrapped."+method+".apply(wrapped, arguments);})";
		newObj[method] = eval(fun);
		} else {
		newObj.__defineGetter__(method, function() { return wrapped[method]; });
		newObj.__defineSetter__(method, function(val) { wrapped[method] = val; });
		}
		};
		for (var method in wrapped) {
		if(typeof(this[method]) == "undefined") mimic(this, method);
		}
		},

		/*
		* Maybe lie about whether link was visited
		*/
		isVisited: function(aURI) {
		return (!this.blockReadHistory() &&
		this._history().isVisited(aURI));
		},

		/*
		* Maybe add the URI to the history
		*/
		addURI: function(aURI, redirect, toplevel, referrer) {
		if(!this.blockWriteHistory())
		this._history().addURI(aURI, redirect, toplevel, referrer);
		},

		/*
		* Maybe set the title of a URI in the history
		*/
		setPageTitle: function(URI, title) {
		if(!this.blockWriteHistory())
		this._history().setPageTitle(URI, title);
		},

		markPageAsTyped: function(aUri) {
		if(this.blockWriteHistory()) {
		return;
		}
		return this._history().markPageAsTyped(aUri);
		},

		addPageWithDetails: function(aUri, aTitle, aVisited) {
		if(this.blockWriteHistory()) {
		return;
		}
		return this._history().addPageWithDetails(aUri, aTitle, aVisited);
		},

		setPageTitle: function(aUri, aTitle) {
		if(this.blockWriteHistory()) {
		return;
		}
		return this._history().setPageTitle(aUri, aTitle);
		},

		count getter: function() { return this._history().count; },
		};

		// Block firefox3 history writes..
		if(is_ff3) {
		// addDocumentRedirect() - currently not needed. It does not touch the DB


		// XXX: hrmm...
		HistoryWrapper.prototype.setPageDetails = function(aUri, aTitle, aVisitCnt, aHidden, aTyped) {
		if(this.blockWriteHistory()) {
		return;
		}
		return this._history().setPageDetails(aUri, aTitle, aVisitCnt, aHidden, aTyped);
		};

		HistoryWrapper.prototype.markPageAsFollowedBookmark = function(aUri) {
		if(this.blockWriteHistory()) {
		return;
		}
		return this._history().markPageAsFollowedBookmark(aUri);
		};

		// This gets addVisited
		HistoryWrapper.prototype.canAddURI = function(aUri) {
		if(this.blockWriteHistory()) {
		return false;
		}
		return this._history().canAddURI(aUri);
		};

		}

		var HistoryWrapperSingleton = null;
		var HistoryWrapperFactory = new Object();

		HistoryWrapperFactory.createInstance = function (outer, iid)
		{
		if (outer != null) {
		Components.returnCode = Cr.NS_ERROR_NO_AGGREGATION;
		return null;
		}
		/*
		if (!iid.equals(Components.interfaces.nsIGlobalHistory2) &&
		!iid.equals(Components.interfaces.nsIBrowserHistory) &&
		!iid.equals(Components.interfaces.nsISupports)) {

		dump("Holla noint: "+iid.toString() +"\n");
		Components.returnCode = Cr.NS_ERROR_NO_INTERFACE;
		return null;
		}*/

		if(!HistoryWrapperSingleton)
		HistoryWrapperSingleton = new HistoryWrapper();

		return HistoryWrapperSingleton;
		};


		/**
		* JS XPCOM component registration goop:
		*
		* Everything below is boring boilerplate and can probably be ignored.
		*/

		var HistoryWrapperModule = new Object();

		HistoryWrapperModule.registerSelf =
		function (compMgr, fileSpec, location, type) {
		var nsIComponentRegistrar = Components.interfaces.nsIComponentRegistrar;
		compMgr = compMgr.QueryInterface(nsIComponentRegistrar);
		compMgr.registerFactoryLocation(kMODULE_CID,
		kMODULE_NAME,
		kMODULE_CONTRACTID2,
		fileSpec,
		location,
		type);

		var appInfo = Components.classes["@mozilla.org/xre/app-info;1"]
		.getService(Components.interfaces.nsIXULAppInfo);
		var versionChecker = Components.classes["@mozilla.org/xpcom/version-comparator;1"]
		.getService(Components.interfaces.nsIVersionComparator);
		if(versionChecker.compare(appInfo.version, "3.0a1") >= 0) {
		compMgr.registerFactoryLocation(kMODULE_CID,
		kMODULE_NAME,
		kMODULE_CONTRACTID3,
		fileSpec,
		location,
		type);
		compMgr.registerFactoryLocation(kMODULE_CID,
		kMODULE_NAME,
		kMODULE_CONTRACTID3D,
		fileSpec,
		location,
		type);
		}
		};

		HistoryWrapperModule.getClassObject = function (compMgr, cid, iid)
		{
		if (cid.equals(kMODULE_CID))
		return HistoryWrapperFactory;

		Components.returnCode = Cr.NS_ERROR_NOT_REGISTERED;
		return null;
		};

		HistoryWrapperModule.canUnload = function (compMgr)
		{
		return true;
		};

		// We only need to support Firefox 3.x here. Firefox 4's history behavior
		// is now tunable into a safe state for Tor that actually matches
		// our own internal options. Yay, progress.
		function NSGetModule(compMgr, fileSpec)
		{
		return HistoryWrapperModule;
		}

src/components/nsSessionStore2.diff

deleted100644 → 0

+0 −80

Original line number	Diff line number	Diff line
		--- ./nsSessionStore2-ff.js 2008-07-10 13:31:04.000000000 -0700
		+++ nsSessionStore2.js 2008-06-22 03:35:58.000000000 -0700
		@@ -777,11 +777,26 @@
		var browsers = tabbrowser.browsers;
		var tabs = this._windows[aWindow.__SSi].tabs = [];
		this._windows[aWindow.__SSi].selected = 0;
		+ var prefs = Components.classes["@mozilla.org/preferences-service;1"]
		+ .getService(Components.interfaces.nsIPrefBranch);
		+ var bypass_tor = prefs.getBoolPref("extensions.torbutton.notor_sessionstore");
		+ var bypass_nontor = prefs.getBoolPref("extensions.torbutton.nonontor_sessionstore");

		for (var i = 0; i < browsers.length; i++) {
		var tabData = { entries: [], index: 0 };

		var browser = browsers[i];
		+ if(bypass_tor && typeof(browser.__tb_tor_fetched) != "undefined" &&
		+ browser.__tb_tor_fetched) {
		+ //dump("bypassing tor tab\n");
		+ //tabs.push(tabData);
		+ continue;
		+ }
		+ if(bypass_nontor && typeof(browser.__tb_tor_fetched) != "undefined" &&
		+ !browser.__tb_tor_fetched) {
		+ continue;
		+ }
		+
		if (!browser \|\| !browser.currentURI) {
		// can happen when calling this function right after .addTab()
		tabs.push(tabData);
		@@ -801,6 +816,7 @@

		if (history && browser.parentNode.__SS_data && browser.parentNode.__SS_data.entries[history.index]) {
		tabData = browser.parentNode.__SS_data;
		+ if(!tabData) continue;
		tabData.index = history.index + 1;
		}
		else if (history && history.count > 0) {
		@@ -991,7 +1007,7 @@
		Array.forEach(aWindow.getBrowser().browsers, function(aBrowser, aIx) {
		try {
		var tabData = this._windows[aWindow.__SSi].tabs[aIx];
		- if (tabData.entries.length == 0 \|\|
		+ if (!tabData \|\| tabData.entries.length == 0 \|\|
		aBrowser.parentNode.__SS_data && aBrowser.parentNode.__SS_data._tab)
		return; // ignore incompletely initialized tabs

		@@ -2183,6 +2199,32 @@
		}
		};

		+const NoModule = {
		+ getClassObject: function(aCompMgr, aCID, aIID) {
		+ Components.returnCode = Cr.NS_ERROR_NOT_REGISTERED;
		+ return null;
		+ },
		+ registerSelf: function(aCompMgr, aFileSpec, aLocation, aType) { return; },
		+ unregisterSelf: function(aCompMgr, aLocation, aType) { return; },
		+ canUnload: function(aCompMgr) { return true; }
		+};
		+
		+
		function NSGetModule(aComMgr, aFileSpec) {
		- return SessionStoreModule;
		+ var prefs = Components.classes["@mozilla.org/preferences-service;1"]
		+ .getService(Components.interfaces.nsIPrefBranch);
		+
		+ var appInfo = Components.classes["@mozilla.org/xre/app-info;1"]
		+ .getService(Components.interfaces.nsIXULAppInfo);
		+ var versionChecker = Components.classes["@mozilla.org/xpcom/version-comparator;1"]
		+ .getService(Components.interfaces.nsIVersionComparator);
		+
		+ // Only hook the sessionstore if the pref is enabled and we're firefox 2.
		+ if((prefs.getBoolPref("extensions.torbutton.notor_sessionstore")
		+ \|\| prefs.getBoolPref("extensions.torbutton.nonontor_sessionstore"))
		+ && versionChecker.compare(appInfo.version, "3.0a1") <= 0) {
		+ return SessionStoreModule;
		+ } else {
		+ return NoModule;
		+ }
		}

src/components/nsSessionStore2.js

deleted100644 → 0

+0 −2233

File deleted.

Preview size limit exceeded, changes collapsed.