December 2012 - tor-commits - lists.torproject.org

[ooni-probe/master] Add config option for enabling tor2web mode on oonib
by art＠torproject.org 07 Dec '12

07 Dec '12

commit 93467bb98dc20ff08dceb65c03e1f85275888b85 Author: Arturo Filastò <art(a)fuffa.org> Date: Fri Dec 7 02:03:37 2012 +0100 Add config option for enabling tor2web mode on oonib --- oonib/config.py | 6 ++++++ oonib/runner.py | 2 ++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/oonib/config.py b/oonib/config.py index cdee45a..8598e00 100644 --- a/oonib/config.py +++ b/oonib/config.py @@ -24,6 +24,12 @@ main.db_threadpool_size = 10 #main.tor_binary = '/usr/sbin/tor' main.tor_binary = '/usr/local/bin/tor' +# This requires compiling Tor with tor2web mode enabled +# BEWARE!! THIS PROVIDES NO ANONYMITY!! +# ONLY DO IT IF YOU KNOW WHAT YOU ARE DOING!! +# HOSTING A COLLECTOR WITH TOR2WEB MODE GIVES YOU NO ANONYMITY!! +main.tor2webmode = True + helpers = Storage() helpers.http_return_request = Storage() diff --git a/oonib/runner.py b/oonib/runner.py index b13c8b2..44cfe9c 100644 --- a/oonib/runner.py +++ b/oonib/runner.py @@ -40,6 +40,8 @@ def startTor(): torconfig = txtorcon.TorConfig() torconfig.SocksPort = 9055 + if config.main.tor2webmode: + torconfig.Tor2webMode = True torconfig.save() d = txtorcon.launch_tor(torconfig, reactor, tor_binary=config.main.tor_binary,

1 0

[ooni-probe/master] Thiss
by art＠torproject.org 07 Dec '12

07 Dec '12

commit 45e0364a9b3815916fbbc0c876a7ec32b3f36f56 Author: Arturo Filastò <art(a)fuffa.org> Date: Fri Dec 7 01:52:04 2012 +0100 Thiss --- oonib/runner.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/oonib/runner.py b/oonib/runner.py index e406ce0..b13c8b2 100644 --- a/oonib/runner.py +++ b/oonib/runner.py @@ -42,6 +42,7 @@ def startTor(): torconfig.SocksPort = 9055 torconfig.save() d = txtorcon.launch_tor(torconfig, reactor, + tor_binary=config.main.tor_binary, progress_updates=updates) d.addCallback(setupCollector) d.addErrback(txSetupFailed)

1 0

[ooni-probe/master] Fix bugs in oonib reporter
by art＠torproject.org 07 Dec '12

07 Dec '12

commit 69c5d3a014212ce0c0899e256531fdfe3d179604 Author: Arturo Filastò <art(a)fuffa.org> Date: Fri Dec 7 01:51:11 2012 +0100 Fix bugs in oonib reporter * Add support for setting the tor binary path in oonib/config.py --- oonib/config.py | 4 +++ oonib/report/api.py | 6 +++- oonib/report/file_collector.py | 48 +++++++++++++++++++++++++++++++-------- 3 files changed, 46 insertions(+), 12 deletions(-) diff --git a/oonib/config.py b/oonib/config.py index 2736cd0..cdee45a 100644 --- a/oonib/config.py +++ b/oonib/config.py @@ -7,6 +7,8 @@ def get_root_path(): root = os.path.abspath(root) return root +backend_version = '0.0.1' + # XXX convert this to something that is a proper config file main = Storage() @@ -19,6 +21,8 @@ main.tor_datadir = os.path.join(get_root_path(), 'oonib', 'data', 'tor') main.database_uri = "sqlite:"+get_root_path()+"oonib_test_db.db" main.db_threadpool_size = 10 +#main.tor_binary = '/usr/sbin/tor' +main.tor_binary = '/usr/local/bin/tor' helpers = Storage() diff --git a/oonib/report/api.py b/oonib/report/api.py index 14a4bc1..b3d529d 100644 --- a/oonib/report/api.py +++ b/oonib/report/api.py @@ -1,9 +1,10 @@ """ -/new +/report /pcap -This is the async pcap reporting system. It requires the client to have created a report already, but can work independently from test progress. +This is the async pcap reporting system. It requires the client to have created +a report already, but can work independently from test progress. """ import random @@ -18,6 +19,7 @@ from cyclone import web from ooni import otime from ooni.utils import randomStr + from oonib import models, config from oonib.report import file_collector diff --git a/oonib/report/file_collector.py b/oonib/report/file_collector.py index 584a11d..636576b 100644 --- a/oonib/report/file_collector.py +++ b/oonib/report/file_collector.py @@ -6,10 +6,38 @@ import os from twisted.internet import fdesc -from oonib.report import MissingField, InvalidRequestField +from cyclone import web + from ooni.utils import randomStr +from ooni import otime + +from oonib.report import MissingField, InvalidRequestField + +from oonib import config + +def parseUpdateReportRequest(request): + #db_report_id_regexp = re.compile("[a-zA-Z0-9]+$") + + # this is the regexp for the reports that include the timestamp + report_id_regexp = re.compile("[a-zA-Z0-9_\-]+$") + + # XXX here we are actually parsing a json object that could be quite big. + # If we want this to scale properly we only want to look at the test_id + # field. + # We are also keeping in memory multiple copies of the same object. A lot + # of optimization can be done. + parsed_request = json.loads(request) + try: + report_id = parsed_request['report_id'] + except KeyError: + raise MissingField('report_id') + + if not re.match(report_id_regexp, report_id): + raise InvalidRequestField('report_id') + + return parsed_request + -from cyclone import web def parseNewReportRequest(request): """ @@ -99,7 +127,7 @@ class NewReportHandlerFile(web.RequestHandler): software_version = report_data['software_version'] test_name = report_data['test_name'] test_version = report_data['test_version'] - probe_asn = report_data['test_version'] + probe_asn = report_data['probe_asn'] content = report_data['content'] if not probe_asn: @@ -113,7 +141,7 @@ class NewReportHandlerFile(web.RequestHandler): # random nonce report_filename = os.path.join(config.main.report_dir, report_id) - response = {'backend_version': backend_version, + response = {'backend_version': config.backend_version, 'report_id': report_id } @@ -122,10 +150,10 @@ class NewReportHandlerFile(web.RequestHandler): self.write(response) - def writeToReport(report_filename, data): + def writeToReport(self, report_filename, data): with open(report_filename, 'w+') as fd: - fdesc.setNonBlocking(fd) - fdesc.writeToFD(data) + fdesc.setNonBlocking(fd.fileno()) + fdesc.writeToFD(fd.fileno(), data) def put(self): """ @@ -146,11 +174,11 @@ class NewReportHandlerFile(web.RequestHandler): self.updateReport(report_filename, parsed_request['content']) - def updateReport(report_filename, data): + def updateReport(self, report_filename, data): try: with open(report_filename, 'a+') as fd: - fdesc.setNonBlocking(fd) - fdesc.writeToFD(data) + fdesc.setNonBlocking(fd.fileno()) + fdesc.writeToFD(fd.fileno(), data) except IOError as e: web.HTTPError(404, "Report not found")

1 0

[ooni-probe/master] Update the reporting path in the ooniprobe
by art＠torproject.org 07 Dec '12

07 Dec '12

commit 8dbd73d2e72ce45c9cd5677d1c24fba393cb21d7 Author: Arturo Filastò <art(a)fuffa.org> Date: Fri Dec 7 01:49:33 2012 +0100 Update the reporting path in the ooniprobe --- ooni/reporter.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ooni/reporter.py b/ooni/reporter.py index 6ab32e8..460b584 100644 --- a/ooni/reporter.py +++ b/ooni/reporter.py @@ -269,7 +269,7 @@ class OONIBReporter(OReporter): content += safe_dump(entry) content += '...\n' - url = self.backend_url + '/report/new' + url = self.backend_url + '/report' request = {'report_id': self.report_id, 'content': content} @@ -294,7 +294,7 @@ class OONIBReporter(OReporter): """ Creates a report on the oonib collector. """ - url = self.backend_url + '/report/new' + url = self.backend_url + '/report' try: test_details = getTestDetails(options)

1 0

[ooni-probe/master] Use saner variable names
by art＠torproject.org 07 Dec '12

07 Dec '12

commit e552bb2ca2e5dff8e6a9ae1989eabeb3749dd5b1 Author: Flavio Amieiro <amieiro.flavio(a)gmail.com> Date: Thu Nov 29 11:38:35 2012 -0200 Use saner variable names --- setup.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index 0112d95..1b8ecc3 100644 --- a/setup.py +++ b/setup.py @@ -14,15 +14,15 @@ def get_requirements(): # satisfy the dependency using that url (as long as it is in standard sdist # format, a single .py file or an egg). pypi_packages = [] - external_links = [] + dependency_links = [] for package_desc in requirements: if '#egg=' in package_desc: - external_links.append(package_desc) + dependency_links.append(package_desc) pypi_packages.append(package_desc.split('#egg=')[-1]) else: pypi_packages.append(package_desc) - return pypi_packages, external_links + return pypi_packages, dependency_links install_requires, dependency_links = get_requirements()

1 0

[ooni-probe/master] Make scapy a soft depedency in the daphn3 kit
by art＠torproject.org 07 Dec '12

07 Dec '12

commit 585ec8784c4dc07da0aff86f8b17956d3647eeeb Author: Arturo Filastò <art(a)fuffa.org> Date: Fri Dec 7 01:49:11 2012 +0100 Make scapy a soft depedency in the daphn3 kit --- ooni/kit/daphn3.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ooni/kit/daphn3.py b/ooni/kit/daphn3.py index 36de664..ffe04f6 100644 --- a/ooni/kit/daphn3.py +++ b/ooni/kit/daphn3.py @@ -4,8 +4,6 @@ import yaml from twisted.internet import protocol, defer from twisted.internet.error import ConnectionDone -from scapy.all import IP, Raw, rdpcap - from ooni.utils import log def read_pcap(filename): @@ -15,6 +13,8 @@ def read_pcap(filename): Returns: [{"client": "\x17\x52\x15"}, {"server": "\x17\x15\x13"}] """ + from scapy.all import IP, Raw, rdpcap + packets = rdpcap(filename) checking_first_packet = True

1 0

[ooni-probe/master] First setup.py draft
by art＠torproject.org 07 Dec '12

07 Dec '12

commit aa54de948011eb45f494f3bca7a714d02a89da62 Author: Flavio Amieiro <amieiro.flavio(a)gmail.com> Date: Sun Nov 18 22:28:05 2012 -0200 First setup.py draft --- setup.py | 37 +++++++++++++++++++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 deletions(-) diff --git a/setup.py b/setup.py new file mode 100644 index 0000000..0112d95 --- /dev/null +++ b/setup.py @@ -0,0 +1,37 @@ +from __future__ import with_statement +from setuptools import setup, find_packages + +def get_requirements(): + with open('requirements.txt', 'r') as f: + requirements = f.read().splitlines() + + with open('oonib/requirements.txt', 'r') as f: + requirements += f.read().splitlines() + + # For urls such as https://hg.secdev.org/scapy/archive/tip.zip#egg=scapy in + # requirements.txt we need to add the package name to install_requires and + # the entire url to dependency_links. That way setuptools will be able to + # satisfy the dependency using that url (as long as it is in standard sdist + # format, a single .py file or an egg). + pypi_packages = [] + external_links = [] + for package_desc in requirements: + if '#egg=' in package_desc: + external_links.append(package_desc) + pypi_packages.append(package_desc.split('#egg=')[-1]) + else: + pypi_packages.append(package_desc) + + return pypi_packages, external_links + +install_requires, dependency_links = get_requirements() + +setup( + name="ooni-probe", + version="0.6", + url="http://ooni.nu/", + packages=find_packages(), + scripts=["bin/canary", "bin/oonib", "bin/ooniprobe"], + install_requires=install_requires, + dependency_links=dependency_links, +)

1 0

[ooni-probe/master] Merge pull request #12 from flavioamieiro/setup.py
by art＠torproject.org 07 Dec '12

07 Dec '12

commit 9ef17188bde7918fe9520f621f46a97751e486aa Merge: 7fa1cdf e552bb2 Author: Arturo Filastò <hellais(a)gmail.com> Date: Thu Dec 6 15:04:55 2012 -0800 Merge pull request #12 from flavioamieiro/setup.py Setup.py setup.py | 37 +++++++++++++++++++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 deletions(-)

1 0

[torbutton/master] It begins: Remove the content policy.
by mikeperry＠torproject.org 06 Dec '12

06 Dec '12

commit 1ba5a2cc5de0ee87636418d12b81baa315f197ea Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Thu Dec 6 15:16:27 2012 -0800 It begins: Remove the content policy. The content policy is old toggle code, and is mysteriously broken on FF17. We're going to be removing a ton of these old observers soon. --- src/chrome.manifest | 4 - src/components/cssblocker.js | 489 ------------------------------------------ src/install.rdf | 2 +- 3 files changed, 1 insertions(+), 494 deletions(-) diff --git a/src/chrome.manifest b/src/chrome.manifest index 2172815..5564804 100644 --- a/src/chrome.manifest +++ b/src/chrome.manifest @@ -143,9 +143,6 @@ contract @torproject.org/crash-observer;1 {06322def-6fde-4c06-aef6-47ae8e799629} component {e6204253-b690-4159-bfe8-d4eedab6b3be} components/cookie-jar-selector.js contract @torproject.org/cookie-jar-selector;1 {e6204253-b690-4159-bfe8-d4eedab6b3be} -component {23f4d9ba-023a-94ab-eb75-67aed7562a18} components/cssblocker.js -contract @torproject.org/cssblocker;1 {23f4d9ba-023a-94ab-eb75-67aed7562a18} - component {f36d72c9-9718-4134-b550-e109638331d7} components/torbutton-logger.js contract @torproject.org/torbutton-logger;1 {f36d72c9-9718-4134-b550-e109638331d7} @@ -161,7 +158,6 @@ contract @mozilla.org/network/protocol;1?name=tor {52183e20-4d4b-11de-8a39-08002 component {a5a4bc50-5e8d-11de-8a39-0800200c9a66} components/tors-protocol.js contract @mozilla.org/network/protocol;1?name=tors {a5a4bc50-5e8d-11de-8a39-0800200c9a66} -category content-policy ContentPolicy @torproject.org/cssblocker;1 category profile-after-change CookieJarSelector @torproject.org/cookie-jar-selector;1 # category profile-after-change RefSpoofer @torproject.org/torRefSpoofer;1 category profile-after-change TBSessionBlocker @torproject.org/torbutton-ss-blocker;1 diff --git a/src/components/cssblocker.js b/src/components/cssblocker.js deleted file mode 100644 index 4b79ae4..0000000 --- a/src/components/cssblocker.js +++ /dev/null @@ -1,489 +0,0 @@ -// Bug 1506 P0: All of this code is toggle specific and can be killed - -/* -*- Mode: javascript; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; -*- */ -/************************************************************************* - * Content policy to block stuff not handled by other components - * (such as CSS) - * - http://www.w3.org/TR/REC-CSS2/selector.html#dynamic-pseudo-classes - * - * Also serves as a safety net to catch content the other mechanisms - * somehow might be tricked into failing to block (this should not happen - * in normal operation though). - * - * Based on examples from: - * - http://adblockplus.org/en/faq_internal - * - http://developer.mozilla.org/en/docs/How_to_Build_an_XPCOM_Component_in_Jav… - * - http://www.xulplanet.com/references/xpcomref/ifaces/nsICategoryManager.html - * - http://www.xulplanet.com/references/xpcomref/ifaces/nsIContentPolicy.html - * - http://greasemonkey.devjavu.com/projects/greasemonkey/browser/trunk/src/com… - * - * Test cases: - * - http://www.tjkdesign.com/articles/css%20pop%20ups/default.asp - * - *************************************************************************/ - -// This is all local scope -const CSSB_CONTRACTID = "@torproject.org/cssblocker;1"; -const CSSB_CID = Components.ID("{23f4d9ba-023a-94ab-eb75-67aed7562a18}"); - -const DNode = Components.interfaces.nsIDOMNode; -const DWindow = Components.interfaces.nsIDOMWindow; -const ok = Components.interfaces.nsIContentPolicy.ACCEPT; -const block = Components.interfaces.nsIContentPolicy.REJECT_REQUEST; -const CPolicy = Components.interfaces.nsIContentPolicy; -const Cr = Components.results; -const Cc = Components.classes; -const Ci = Components.interfaces; - -Components.utils.import("resource://gre/modules/XPCOMUtils.jsm"); - -// Retrieves the window object for a node or returns null if it isn't possible -function getWindow(node) { - if (node && node.nodeType != DNode.DOCUMENT_NODE) - node = node.ownerDocument; - - if (!node || node.nodeType != DNode.DOCUMENT_NODE) - return null; - - return node.defaultView; -} - -//FIXME: can we kill this noise? -//HACKHACK: need a way to get an implicit wrapper for nodes because of bug 337095 (fixed in Gecko 1.8.0.5) -var fakeFactory = { - createInstance: function(outer, iid) { - return outer; - }, - - QueryInterface: function(iid) { - if (iid.equals(Components.interfaces.nsISupports) || - iid.equals(Components.interfaces.nsIFactory)) - return this; - - Components.returnCode = Cr.NS_ERROR_NO_INTERFACE; - return null; - } -}; -var array = Components.classes['@mozilla.org/supports-array;1'].createInstance(Components.interfaces.nsISupportsArray); -array.AppendElement(fakeFactory); -fakeFactory = array.GetElementAt(0).QueryInterface(Components.interfaces.nsIFactory); -array = null; - -function wrapNode(insecNode) { - return fakeFactory.createInstance(insecNode, Components.interfaces.nsISupports); -} - -function make_nsIURI(url) { - var nsiuri = Cc["@mozilla.org/network/standard-url;1"].createInstance(Ci.nsIStandardURL); - nsiuri.init(Ci.nsIStandardURL.URLTYPE_STANDARD, -1, url, null, null); - return nsiuri; -} - -// Unwraps jar:, view-source: and wyciwyg: URLs, returns the contained URL -function unwrapURL(url, changed) { - if (!url) - return url; - - var ret = url.replace(/^view-source:/, "").replace(/^wyciwyg:\/\/\d+\//, ""); - if (/^jar:(.*)!/.test(ret)) - ret = RegExp.$1; - - if (ret == url) - if(changed) return make_nsIURI(url); - else return url; - else - return unwrapURL(ret, true); -} - -var localSchemes = {"about" : true, "chrome" : true, "file" : true, - "resource" : true, "x-jsd" : true, "addbook" : true, - "mailbox" : true, "moz-icon" : true}; - -var browserSources = { "browser":true, "mozapps":true, "global":true, - "pippki":true, "branding":true, "cookie":true, "xbl-marquee":true, - "reporter":true, "global-region":true, "passwordmgr":true, - "global-platform":true}; - -var hostFreeSchemes = { "resource":true, "data":true, "cid":true, - "file":true, "view-source":true, "about":true}; - -var protectedChromeHosts = { "torbutton": true }; - -function ContentPolicy() { - this.logger = Components.classes["@torproject.org/torbutton-logger;1"] - .getService(Components.interfaces.nsISupports).wrappedJSObject; - this.logger.log(3, "Component Load 1: New ContentPolicy ("+CSSB_CONTRACTID+")"); - - this._prefs = Components.classes["@mozilla.org/preferences-service;1"] - .getService(Components.interfaces.nsIPrefBranch); - this.wm = Components.classes["@torproject.org/content-window-mapper;1"] - .getService(Components.interfaces.nsISupports) - .wrappedJSObject; - - // Register observer: - var pref_service = Components.classes["@mozilla.org/preferences-service;1"] - .getService(Components.interfaces.nsIPrefBranchInternal); - this._branch = pref_service.QueryInterface(Components.interfaces.nsIPrefBranchInternal); - this._branch.addObserver("extensions.torbutton", this, false); - - this.isolate_content = this._prefs.getBoolPref("extensions.torbutton.isolate_content"); - this.tor_enabled = this._prefs.getBoolPref("extensions.torbutton.tor_enabled"); - this.settings_applied = this._prefs.getBoolPref("extensions.torbutton.settings_applied"); - this.tor_enabling = this.tor_enabled || this.settings_applied; // Catch transition edge cases - this.block_tor_file_net = this._prefs.getBoolPref("extensions.torbutton.block_tor_file_net"); - this.block_nontor_file_net = this._prefs.getBoolPref("extensions.torbutton.block_nontor_file_net"); - this.no_tor_plugins = this._prefs.getBoolPref("extensions.torbutton.no_tor_plugins"); - - this.wrappedJSObject = this; - return; -} - -ContentPolicy.prototype = { - isLocalScheme: function(scheme) { - return (scheme in localSchemes); - }, - - // nsIContentPolicy interface implementation - shouldLoad: function(contentType, contentLocation, requestOrigin, insecNode, mimeTypeGuess, extra) { - /*. Debugging hack. DO NOT UNCOMMENT IN PRODUCTION ENVIRONMENTS - if(contentLocation.spec.search("venkman") != -1) { - this.logger.log(3, "chrome-venk"); - return ok; - }*/ - - if(!insecNode) { - // Happens on startup - this.logger.log(3, "Skipping no insec: "+contentLocation.spec); - return ok; - } - - if(!this.isolate_content) { - this.logger.eclog(2, "Content policy disabled"); - return ok; - } - - this.logger.log(1, "Cpolicy load of: "+contentLocation.spec+" from: "+ - (( null == requestOrigin ) ? "<null>" : requestOrigin.spec)); - - var utmp = null; - try { utmp = unwrapURL(contentLocation.spec, false); } - catch(e) { this.logger.log(5, "Exception on unwrap: "+e); } - - if(utmp instanceof Ci.nsIURI) { - utmp = utmp.QueryInterface(Ci.nsIURI); - contentLocation = utmp; - this.logger.log(2, "Unwrapped cpolicy load of: "+contentLocation.spec+" from: "+ - (( null == requestOrigin ) ? "<null>" : requestOrigin.spec)); - } - - if (!requestOrigin || !requestOrigin.scheme) { - if (this.tor_enabling) { - // in FF3, at startup requestOrigin is not set - if (("chrome" == contentLocation.scheme) && (contentLocation.host in browserSources)) { - this.logger.eclog(1, "Allowing browser chrome request from: " + - "<null>" + " for: " + - contentLocation.spec); - return ok; - } - this.logger.safe_log(4, "NO ORIGIN! Blockng request for: ", - contentLocation.spec); - return block; - } - } else { - // rules based on request origin: - // 1) privileged schemes can access local content but - // must be checked for network access (favicons) - // 2) locally privileged schemes can access local content - // 3) forbidden schemes should be blocked - // 4) all others cannot access any (unwrapped) local content - // exceptions: - // 4a) any content can potentially access 'about:blank' - // 4b) browser chrome requests are allowed - // - switch (requestOrigin.scheme) { - case "x-jsd": - case "chrome": - // privileged - if ((contentLocation.scheme in localSchemes) || - (contentLocation.scheme in hostFreeSchemes)) { - return ok; - } - // Chrome can source favicons from non-local protocols. - // This needs to be checked below. - break; - case "about": - case "resource": - // privileged - return ok; - break; - case "view-source": - case "file": - // locally privileged - if ((contentLocation.scheme in localSchemes) || - (contentLocation.scheme in hostFreeSchemes)) { - this.logger.eclog(1, "Accepted request from locally privileged scheme: " + - requestOrigin.scheme + " for: " + - contentLocation.spec); - return ok; - } else { - if (this.block_tor_file_net && this.tor_enabling || - this.block_nontor_file_net && !this.tor_enabling) { - this.logger.safe_log(4, "Blocking remote request from: ", - requestOrigin.spec+" for: " - +contentLocation.spec); - return block; - } - } - break; - case "moz-nullprincipal": - // forbidden to access anything but chrome - // (Chrome access needed for FoxyProxy context menu) - if (this.tor_enabling && - (contentLocation.scheme != "chrome")) { - this.logger.safe_log(4, - "Blocking nullprinciple request from: ", - requestOrigin.spec + " for: " + - contentLocation.spec); - return block; - } - break; - default: - if (contentLocation.scheme in localSchemes) { - var targetScheme = contentLocation.scheme; - var targetHost = ""; - if ( !(contentLocation.scheme in hostFreeSchemes) ) { - try { - targetHost = contentLocation.host; - } catch(e) { - this.logger.safe_log(4, "No host from: ", - requestOrigin.spec + " for: " + - contentLocation.spec); - } - } - - // Fix bug #2359: Firefox now loads dtd's from - // resource urls with a valid host. We must - // check for this and allow it. - if (contentLocation.scheme == "resource") { - try { - targetHost = contentLocation.host; - } catch(e) { - this.logger.safe_log(3, "No resource host from: ", - requestOrigin.spec + " for: " + - contentLocation.spec); - } - } - - if (("about:blank" == contentLocation.spec)) { - // ok, but don't return - } else if (("chrome" == targetScheme) && (targetHost in browserSources)) { - this.logger.eclog(1, "Allowing browser chrome request from: " + - requestOrigin.spec + " for: " + - contentLocation.spec); - return ok; - } else if ("file" == targetScheme || - ("resource" == targetScheme && targetHost == "gre")) { - // This fix is for bugs 1014+2359. XHTML documents need to source - // a special dtd as a file url. The same origin policy should - // prevent other access to file urls, so this should be ok - // to just allow. - this.logger.eclog(3, "Allowing browser file request from: " + - requestOrigin.spec + " for: " + - contentLocation.spec); - //return ok; - } else { - if (this.tor_enabling || (targetHost in protectedChromeHosts)) { - this.logger.safe_log(4, - "Blocking local request from: ", - requestOrigin.spec+" (" - +requestOrigin.scheme+") for: "+ - contentLocation.spec); - return block; - } - } - } - } - } - - var node = wrapNode(insecNode); - var wind = getWindow(node); - - // For frame elements go to their window - if (contentType == CPolicy.TYPE_SUBDOCUMENT && node.contentWindow) { - node = node.contentWindow; - wind = node; - } - - /* - * This clause does in fact occurr. It causes us to break hotmail - * by blocking some of their javascript.. - * - * https://trac.torproject.org/projects/tor/ticket/3580 - if (contentType == 5) { // Object - // Never seems to happen.. But it would be nice if we - // could handle it either here or shouldProcess, instead of in - // the webprogresslistener - if(this.tor_enabling && this.no_tor_plugins) { - this.logger.safe_log(4, "Blocking object at ", - contentLocation.spec); - return block; - } - } - */ - - if (!wind || !wind.top.location || !wind.top.location.href) { - this.logger.safe_log(4, "Skipping no location: ", - contentLocation.spec); - return ok; - } - - - var doc = wind.top.document; - if(!doc) { - // 1st load of a page in a new location - this.logger.log(3, "Skipping no doc: "+contentLocation.spec); - return ok; - } - - var browser; - if(wind.top.opener && - !(wind.top.opener instanceof Components.interfaces.nsIDOMChromeWindow)) { - this.logger.log(3, "Popup found: "+contentLocation.spec); - browser = this.wm.getBrowserForContentWindow(wind.top.opener.top) - } else { - browser = this.wm.getBrowserForContentWindow(wind.top); - } - - if(!browser) { - this.logger.log(5, "No window found: "+contentLocation.spec); - return block; - } - - // For javascript links (and others?) the normal http events - // for the weblistener in torbutton.js are suppressed - if(this.tor_enabling && node instanceof Ci.nsIDOMWindow) { - var wm = Cc["@mozilla.org/appshell/window-mediator;1"] - .getService(Components.interfaces.nsIWindowMediator); - var chrome = wm.getMostRecentWindow("navigator:browser"); - - this.logger.eclog(2, "Hooking iframe domwindow"); - // It doesn't really matter which chome window does the hooking. - chrome.torbutton_hookdoc(node, null); - } - - // source window of browser chrome window with a document content - // type means the user entered a new URL. - if(wind.top instanceof Components.interfaces.nsIDOMChromeWindow) { - // This happens on non-browser chrome: updates, dialogs, etc - if (!wind.top.browserDOMWindow - && typeof(browser.__tb_tor_fetched) == 'undefined') { - this.logger.log(3, "Untagged window for "+contentLocation.spec); - return ok; - } - - if(wind.top.browserDOMWindow - && contentType == CPolicy.TYPE_DOCUMENT) { - this.logger.log(3, "New location for "+contentLocation.spec+" (currently: "+wind.top.location+" and "+browser.currentURI.spec+")"); - // Workaround for Firefox Bug 409737. - // This disables window.location style redirects if the tor state - // has changed - if(requestOrigin) { - this.logger.log(3, "Origin: "+requestOrigin.spec); - if(!requestOrigin.schemeIs("chrome")) { - if(typeof(browser.__tb_tor_fetched) == 'undefined') { - // This happens for "open in new window" context menu - this.logger.safe_log(3, "Untagged window for redirect: ", contentLocation.spec); - return ok; - } - if(browser.__tb_tor_fetched == this.tor_enabled - && browser.__tb_tor_fetched == this.settings_applied) { - return ok; - } else { - this.logger.safe_log(4, "Blocking redirect: ", contentLocation.spec); - return block; - } - } - } - return ok; - } - } - - if(browser.__tb_tor_fetched == this.tor_enabled - && browser.__tb_tor_fetched == this.settings_applied) { - return ok; - } else { - this.logger.safe_log(4, "Blocking cross-state load of: ", - contentLocation.spec); - return block; - } - }, - - shouldProcess: function(contentType, contentLocation, requestOrigin, insecNode, mimeType, extra) { - // Were this actually ever called, it might be useful :( - // Instead, related functionality has been grafted onto the - // webprogresslistener :( - // See mozilla bugs 380556, 305699, 309524 - if(contentLocation) { - this.logger.log(2, "Process for "+contentLocation.spec); - } - return ok; - }, - - // Pref observer interface implementation - - // topic: what event occurred - // subject: what nsIPrefBranch we're observing - // data: which pref has been changed (relative to subject) - observe: function(subject, topic, data) - { - if (topic != "nsPref:changed") return; - switch (data) { - case "extensions.torbutton.isolate_content": - this.isolate_content = this._prefs.getBoolPref("extensions.torbutton.isolate_content"); - break; - case "extensions.torbutton.tor_enabled": - this.tor_enabled = this._prefs.getBoolPref("extensions.torbutton.tor_enabled"); - this.tor_enabling = this.tor_enabled || this.settings_applied; // Catch transition edge cases - break; - case "extensions.torbutton.settings_applied": - this.settings_applied = this._prefs.getBoolPref("extensions.torbutton.settings_applied"); - this.tor_enabling = this.tor_enabled || this.settings_applied; // Catch transition edge cases - break; - case "extensions.torbutton.block_tor_file_net": - this.block_tor_file_net = this._prefs.getBoolPref("extensions.torbutton.block_tor_file_net"); - break; - case "extensions.torbutton.block_nontor_file_net": - this.block_nontor_file_net = this._prefs.getBoolPref("extensions.torbutton.block_nontor_file_net"); - break; - case "extensions.torbutton.no_tor_plugins": - this.no_tor_plugins = this._prefs.getBoolPref("extensions.torbutton.no_tor_plugins"); - break; - } - }, - - // API to add another addon to be protected from discovery - addProtectedChromeHost: function(name) { - protectedChromeHosts[name] = true; - }, - - _xpcom_categories: [{category:"content-policy"}], - classID: CSSB_CID, - contractID: CSSB_CONTRACTID, - classDescription: "Torbutton Content Policy", - - // QueryInterface implementation, e.g. using the generateQI helper - QueryInterface: XPCOMUtils.generateQI( - [ Components.interfaces.nsIObserver, - Components.interfaces.nsISupports, - Components.interfaces.nsIContentPolicy ]) - -}; - -/** -* XPCOMUtils.generateNSGetFactory was introduced in Mozilla 2 (Firefox 4). -* XPCOMUtils.generateNSGetModule is for Mozilla 1.9.2 (Firefox 3.6). -*/ -if (XPCOMUtils.generateNSGetFactory) - var NSGetFactory = XPCOMUtils.generateNSGetFactory([ContentPolicy]); -else - var NSGetModule = XPCOMUtils.generateNSGetModule([ContentPolicy]); diff --git a/src/install.rdf b/src/install.rdf index 1c4c4df..6eff883 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -10,7 +10,7 @@ em:name="Torbutton" em:creator="Mike Perry" em:id="{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}" - em:version="1.4.6.3" + em:version="1.5.0pre" em:homepageURL="https://www.torproject.org/torbutton/" em:optionsURL="chrome://torbutton/content/preferences.xul" em:iconURL="chrome://torbutton/skin/tor.png"

1 0

[ooni-probe/master] Make pypcap a soft dependency
by art＠torproject.org 06 Dec '12

06 Dec '12

commit 7fa1cdf3339fcf0010b598642cdcd9b18e602868 Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Dec 6 23:25:59 2012 +0100 Make pypcap a soft dependency * Update before_i_commit script to point to the new test deck location --- ooni/utils/txscapy.py | 16 ++++++++++++---- scripts/before_i_commit.sh | 2 +- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/ooni/utils/txscapy.py b/ooni/utils/txscapy.py index c9cc87a..fc021f1 100644 --- a/ooni/utils/txscapy.py +++ b/ooni/utils/txscapy.py @@ -31,10 +31,16 @@ except ImportError, e: conf.use_pcap = False conf.use_dnet = False - from scapy.all import PcapWriter + class DummyPcapWriter: + def __init__(self, pcap_filename, *arg, **kw): + log.err("Initializing DummyPcapWriter. We will not actually write to a pcapfile") + + def write(self): + pass + + PcapWriter = DummyPcapWriter + -from scapy.all import BasePacketList, conf, PcapReader -from scapy.all import conf, Gen, SetGen, MTU def getNetworksFromRoutes(): """ Return a list of networks from the routing table """ @@ -80,6 +86,8 @@ class ScapyFactory(abstract.FileDescriptor): https://github.com/enki/muXTCP/blob/master/scapyLink.py """ def __init__(self, interface, super_socket=None, timeout=5): + from scapy.all import Gen, SetGen, MTU + abstract.FileDescriptor.__init__(self, reactor) if interface == 'auto': interface = getDefaultIface() @@ -146,7 +154,7 @@ class ScapyProtocol(object): class ScapySender(ScapyProtocol): timeout = 5 - + # This deferred will fire when we have finished sending a receiving packets. # Should we look for multiple answers for the same sent packet? multi = False diff --git a/scripts/before_i_commit.sh b/scripts/before_i_commit.sh index 8b8180f..69975ff 100755 --- a/scripts/before_i_commit.sh +++ b/scripts/before_i_commit.sh @@ -14,7 +14,7 @@ rm before_i_commit.log find . -type f -name "*.py[co]" -delete -./bin/ooniprobe -i before_i_commit.testdeck +./bin/ooniprobe -i decks/before_i_commit.testdeck echo "Below you should not see anything" echo "---------------------------------"

1 0