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

[ooni-probe/master] Merge branch 'rebase2-after'
by isis＠torproject.org 01 Nov '12

01 Nov '12

commit 6157aff26251fb6bcc09e85f10ca39db01cf3e79 Merge: f4b45f9 98ab8e8 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Oct 31 18:53:58 2012 +0000 Merge branch 'rebase2-after' nettests/core/captiveportal.py | 3 +- ooni/echo.py | 206 ++++++++++++++++++++++++++++++++++ ooni/inputunit.py | 132 +++++++++++++++++++++- ooni/nettest.py | 90 ++++++++++----- ooni/oonicli.py | 1 - ooni/reporter.py … [View More]

1 0

[ooni-probe/master] Refactor reporter, config and onion
by isis＠torproject.org 01 Nov '12

01 Nov '12

commit a17ea0cb44fc5d9f969e716ad5ddf8b7c164c5c8 Author: Arturo Filastò <arturo(a)filasto.net> Date: Wed Oct 24 16:12:23 2012 +0000 Refactor reporter, config and onion * Stop using newstyle super method on oldstyle class --- ooni/reporter.py | 17 ++++------- ooni/utils/config.py | 68 ++++++++++++++++++++++++++++++++++++++++++++- ooni/utils/onion.py | 76 +++++++++++++++++++++++++------------------------- 3 files changed, 111 insertions(+), 50 deletions(-) diff --… [View More]git a/ooni/reporter.py b/ooni/reporter.py index fc5dde9..4d09729 100644 --- a/ooni/reporter.py +++ b/ooni/reporter.py @@ -191,9 +191,6 @@ class OONIReporter(OReporter): tbformat=tbformat, realtime=realtime, publisher=publisher) self._tests = {} - self._publisher = publisher - if publisher is not None: - publisher.addObserver(self._observeWarnings) def getTestIndex(self, test): try: @@ -261,8 +258,6 @@ class OONIReporter(OReporter): and L{_separator} are all implemented. """ log.debug("Test run concluded") - if self._publisher is not None: - self._publisher.removeObserver(self._observeWarnings) if self._startTime is not None: self.report['startTime'] = self._startTime self.report['runTime'] = time.time() - self._startTime @@ -274,11 +269,11 @@ class OONIReporter(OReporter): self.writeYamlLine(self.report) def addSuccess(self, test): - super(OONIReporter, self).addSuccess(test) + OONIReporter.addSuccess(self, test) #self.report['result'] = {'value': 'success'} def addError(self, test, exception): - super(OONIReporter, self).addError(test, exception) + OONIReporter.addError(self, test, exception) exc_type, exc_value, exc_traceback = exception log.err(exc_type) log.err(str(exc_value)) @@ -287,19 +282,19 @@ class OONIReporter(OReporter): log.err(line) def addFailure(self, *args): - super(OONIReporter, self).addFailure(*args) + OONIReporter.addFailure(self, *args) log.warn(args) def addSkip(self, *args): - super(OONIReporter, self).addSkip(*args) + OONIReporter.addSkip(self, *args) #self.report['result'] = {'value': 'skip', 'args': args} def addExpectedFailure(self, *args): - super(OONIReporter, self).addExpectedFailure(*args) + OONIReporter.addExpectedFailure(self, *args) #self.report['result'] = {'value': 'expectedFailure', 'args': args} def addUnexpectedSuccess(self, *args): - super(OONIReporter, self).addUnexpectedSuccess(*args) + OONIReporter.addUnexpectedSuccess(self, *args) #self.report['result'] = {'args': args, 'value': 'unexpectedSuccess'} diff --git a/ooni/utils/config.py b/ooni/utils/config.py index a5b32f8..5a0782d 100644 --- a/ooni/utils/config.py +++ b/ooni/utils/config.py @@ -1,7 +1,7 @@ import ConfigParser import os -from ooni.utils import Storage +from ooni.utils import Storage, log class Config(Storage): """ @@ -53,3 +53,69 @@ class Config(Storage): self._cfgparser.write(cfgfile) finally: cfgfile.close() + +class ValueChecker(object): + """ + A class for general purpose value checks on commandline parameters + passed to subclasses of :class:`twisted.python.usage.Options`. + """ + def __init__(self, coerce_doc=None): + self.coerce_doc = coerce_doc + + def port_check(self, port, range_min=1024, range_max=65535): + """ + Check that given ports are in the allowed range for an unprivileged + user. + + :param port: + The port to check. + :param range_min: + The minimum allowable port number. + :param range_max: + The minimum allowable port number. + :param coerce_doc: + The documentation string to show in the optParameters menu, see + :class:`twisted.python.usage.Options`. + """ + if self.coerce_doc is not None: + coerceDoc = self.coerce_doc + + assert type(port) is int + if port not in range(range_min, range_max): + raise ValueError("Port out of range") + log.err() + + @staticmethod + def uid_check(error_message): + """ + Check that we're not root. If we are, setuid(1000) to normal user if + we're running on a posix-based system, and if we're on Windows just + tell the user that we can't be run as root with the specified options + and then exit. + + :param error_message: + The string to log as an error message when the uid check fails. + """ + uid, gid = os.getuid(), os.getgid() + if uid == 0 and gid == 0: + log.msg(error_message) + if os.name == 'posix': + log.msg("Dropping privileges to normal user...") + os.setgid(1000) + os.setuid(1000) + else: + sys.exit(0) + + @staticmethod + def dir_check(d): + """Check that the given directory exists.""" + if not os.path.isdir(d): + raise ValueError("%s doesn't exist, or has wrong permissions" + % d) + + @staticmethod + def file_check(f): + """Check that the given file exists.""" + if not os.path.isfile(f): + raise ValueError("%s does not exist, or has wrong permissions" + % f) diff --git a/ooni/utils/onion.py b/ooni/utils/onion.py index 3326c75..9c80f62 100644 --- a/ooni/utils/onion.py +++ b/ooni/utils/onion.py @@ -67,7 +67,7 @@ def write_torrc(conf, data_dir=None): """ Create a torrc in our data_dir. If we don't yet have a data_dir, create a temporary one. Any temporary files or folders are added to delete_list. - + :param conf: A :class:`ooni.lib.txtorcon.TorConfig` object, with all configuration values saved. @@ -82,12 +82,12 @@ def write_torrc(conf, data_dir=None): log.err(ie) delete_list = [] - + if data_dir is None: data_dir = mkdtemp(prefix='bridget-tordata') delete_list.append(data_dir) conf.DataDirectory = data_dir - + (fd, torrc) = mkstemp(dir=data_dir) delete_list.append(torrc) write(fd, conf.create_torrc()) @@ -136,7 +136,7 @@ def remove_public_relays(state, bridges): XXX FIXME: There is a problem in that Tor needs a Bridge line to already be configured in order to bootstrap. However, after bootstrapping, we grab the - microdescriptors of all the relays and check if any of our bridges are + microdescriptors of all the relays and check if any of our bridges are listed as public relays. Because of this, the first bridge does not get checked for being a relay. """ @@ -180,7 +180,7 @@ def state_complete(state): return state def updates(_progress, _tag, _summary): - """Log updates on the Tor bootstrapping process.""" + """Log updates on the Tor bootstrapping process.""" log.msg("%d%%: %s" % (_progress, _summary)) def bootstrap(ctrl): @@ -193,7 +193,7 @@ def bootstrap(ctrl): log.msg("Tor process connected, bootstrapping ...") def start_tor(reactor, config, control_port, tor_binary, data_dir, - report=None, progress=updates, + report=None, progress=updates, process_cb=None, process_eb=None): """ Use a txtorcon.TorConfig() instance, config, to write a torrc to a @@ -223,11 +223,11 @@ def start_tor(reactor, config, control_port, tor_binary, data_dir, A non-blocking function to handle bootstrapping updates, which takes three parameters: _progress, _tag, and _summary. :param process_cb: - The function to callback to after + The function to callback to after class:`ooni.lib.txtorcon.TorProcessProtocol` returns with the fully bootstrapped Tor process. :param process_eb: - The function to errback to if + The function to errback to if class:`ooni.lib.txtorcon.TorProcessProtocol` fails. :return: The result of the callback of a @@ -284,9 +284,9 @@ def start_tor(reactor, config, control_port, tor_binary, data_dir, def start_tor_filter_nodes(reactor, config, control_port, tor_binary, data_dir, bridges): """ - Bootstrap a Tor process and return a fully-setup + Bootstrap a Tor process and return a fully-setup :class:`ooni.lib.txtorcon.TorState`. Then search for our bridges - to test in the list of known public relays, + to test in the list of known public relays, :ivar:`ooni.lib.txtorcon.TorState.routers`, and remove any bridges which are known public relays. @@ -296,7 +296,7 @@ def start_tor_filter_nodes(reactor, config, control_port, tor_binary, An instance of :class:`ooni.lib.txtorcon.TorConfig`. :param control_port: The port to use for Tor's ControlPort. If already configured in - the TorConfig instance, this can be given as + the TorConfig instance, this can be given as TorConfig.config.ControlPort. :param tor_binary: The full path to the Tor binary to execute. @@ -309,7 +309,7 @@ def start_tor_filter_nodes(reactor, config, control_port, tor_binary, :return: A fully initialized :class:`ooni.lib.txtorcon.TorState`. """ - setup = yield start_tor(reactor, config, control_port, + setup = yield start_tor(reactor, config, control_port, tor_binary, data_dir, process_cb=setup_done, process_eb=setup_fail) filter_nodes = yield remove_public_relays(setup, bridges) @@ -333,7 +333,7 @@ def start_tor_with_timer(reactor, config, control_port, tor_binary, data_dir, An instance of :class:`ooni.lib.txtorcon.TorConfig`. :param control_port: The port to use for Tor's ControlPort. If already configured in - the TorConfig instance, this can be given as + the TorConfig instance, this can be given as TorConfig.config.ControlPort. :param tor_binary: The full path to the Tor binary to execute. @@ -347,7 +347,7 @@ def start_tor_with_timer(reactor, config, control_port, tor_binary, data_dir, The number of seconds to attempt to bootstrap the Tor process before raising a :class:`ooni.utils.timer.TimeoutError`. :return: - If the timeout limit is not exceeded, return a fully initialized + If the timeout limit is not exceeded, return a fully initialized :class:`ooni.lib.txtorcon.TorState`, else return None. """ error_msg = "Bootstrapping has exceeded the timeout limit..." @@ -365,9 +365,9 @@ def start_tor_with_timer(reactor, config, control_port, tor_binary, data_dir, else: state = yield remove_public_relays(setup, bridges) defer.returnValue(state) - + @defer.inlineCallbacks -def start_tor_filter_nodes_with_timer(reactor, config, control_port, +def start_tor_filter_nodes_with_timer(reactor, config, control_port, tor_binary, data_dir, bridges, timeout): """ Start bootstrapping a Tor process wrapped with an instance of the class @@ -386,7 +386,7 @@ def start_tor_filter_nodes_with_timer(reactor, config, control_port, An instance of :class:`ooni.lib.txtorcon.TorConfig`. :param control_port: The port to use for Tor's ControlPort. If already configured in - the TorConfig instance, this can be given as + the TorConfig instance, this can be given as TorConfig.config.ControlPort. :param tor_binary: The full path to the Tor binary to execute. @@ -400,13 +400,13 @@ def start_tor_filter_nodes_with_timer(reactor, config, control_port, The number of seconds to attempt to bootstrap the Tor process before raising a :class:`ooni.utils.timer.TimeoutError`. :return: - If the timeout limit is not exceeded, return a fully initialized + If the timeout limit is not exceeded, return a fully initialized :class:`ooni.lib.txtorcon.TorState`, else return None. """ error_msg = "Bootstrapping has exceeded the timeout limit..." with_timeout = deferred_timeout(timeout, e=error_msg)(start_tor_filter_nodes) try: - state = yield with_timeout(reactor, config, control_port, + state = yield with_timeout(reactor, config, control_port, tor_binary, data_dir, bridges) except TimeoutError, te: log.err(te) @@ -416,16 +416,16 @@ def start_tor_filter_nodes_with_timer(reactor, config, control_port, # defer.returnValue(None) else: defer.returnValue(state) - + class CustomCircuit(CircuitListenerMixin): """ - Utility class for controlling circuit building. See + Utility class for controlling circuit building. See 'attach_streams_by_country.py' in the txtorcon documentation. :param state: A fully bootstrapped instance of :class:`ooni.lib.txtorcon.TorState`. :param relays: - A dictionary containing a key 'all', which is a list of relays to + A dictionary containing a key 'all', which is a list of relays to test connecting to. :ivar waiting_circuits: The list of circuits which we are waiting to attach to. You shouldn't @@ -498,10 +498,10 @@ class CustomCircuit(CircuitListenerMixin): def check_circuit_route(self, router): """ - Check if a relay is a hop in one of our already built circuits. + Check if a relay is a hop in one of our already built circuits. :param router: - An item from the list + An item from the list :func:`ooni.lib.txtorcon.TorState.routers.values()`. """ for circ in self.state.circuits.values(): @@ -551,7 +551,7 @@ class CustomCircuit(CircuitListenerMixin): assert len(path) >= 3, \ "Circuit path must be at least three hops!" - log.msg("Requesting a circuit: %s" + log.msg("Requesting a circuit: %s" % '->'.join(map(lambda node: node, path))) class AppendWaiting: @@ -575,7 +575,7 @@ class CustomCircuit(CircuitListenerMixin): class TxtorconImportError(ImportError): """ Raised when ooni.lib.txtorcon cannot be imported from. Checks our current - working directory and the path given to see if txtorcon has been + working directory and the path given to see if txtorcon has been initialized via /ooni/lib/Makefile. """ from os import getcwd, path @@ -609,25 +609,25 @@ class PTNotFoundException(Exception): return sys.exit() @defer.inlineCallbacks -def __start_tor_with_timer__(reactor, config, control_port, tor_binary, +def __start_tor_with_timer__(reactor, config, control_port, tor_binary, data_dir, bridges=None, relays=None, timeout=None, retry=None): """ A wrapper for :func:`start_tor` which wraps the bootstrapping of a Tor - process and its connection to a reactor with a - :class:`twisted.internet.defer.Deferred` class decorator utility, + process and its connection to a reactor with a + :class:`twisted.internet.defer.Deferred` class decorator utility, :func:`ooni.utils.timer.deferred_timeout`, and a mechanism for resets. - + ## XXX fill me in """ raise NotImplementedError - + class RetryException(Exception): - pass + pass import sys from ooni.utils.timer import deferred_timeout, TimeoutError - + def __make_var__(old, default, _type): if old is not None: assert isinstance(old, _type) @@ -635,15 +635,15 @@ def __start_tor_with_timer__(reactor, config, control_port, tor_binary, else: new = default return new - + reactor = reactor timeout = __make_var__(timeout, 120, int) retry = __make_var__(retry, 1, int) with_timeout = deferred_timeout(timeout)(start_tor) - + @defer.inlineCallbacks - def __start_tor__(rc=reactor, cf=config, cp=control_port, tb=tor_binary, + def __start_tor__(rc=reactor, cf=config, cp=control_port, tb=tor_binary, dd=data_dir, br=bridges, rl=relays, cb=setup_done, eb=setup_fail, af=remove_public_relays, retry=retry): try: @@ -658,13 +658,13 @@ def __start_tor_with_timer__(reactor, config, control_port, tor_binary, setup = yield eb(setup) else: setup = setup - + if br is not None: state = af(setup,br) else: state = setup defer.returnValue(state) - + @defer.inlineCallbacks def __try_until__(tries): result = yield __start_tor__() [View Less]

1 0

[ooni-probe/master] Add requiresRoot attribute to test API
by isis＠torproject.org 01 Nov '12

01 Nov '12

commit 435b3e3f4376fe661a32c836717d5a3f8e53125e Author: Arturo Filastò <arturo(a)filasto.net> Date: Fri Oct 26 22:51:03 2012 +0000 Add requiresRoot attribute to test API * Will trigger error if trying to run a test that requires root --- nettests/examples/example_scapyt.py | 2 ++ ooni/__init__.py | 6 ++---- ooni/nettest.py | 5 +++-- ooni/runner.py | 5 ++++- 4 files changed, 11 insertions(+), 7 … [View More]deletions(-) diff --git a/nettests/examples/example_scapyt.py b/nettests/examples/example_scapyt.py index 403ddc5..cda3a10 100644 --- a/nettests/examples/example_scapyt.py +++ b/nettests/examples/example_scapyt.py @@ -5,6 +5,7 @@ from ooni.templates import scapyt from scapy.all import * + class ExampleScapy(scapyt.ScapyTest): name = "Example Scapy Test" author = "Arturo Filastò" @@ -13,6 +14,7 @@ class ExampleScapy(scapyt.ScapyTest): inputs = [IP(dst="8.8.8.8")/TCP(dport=31337), IP(dst="ooni.nu")/TCP(dport=31337)] + requiresRoot = True def test_sendReceive(self): log.msg("Running send receive") diff --git a/ooni/__init__.py b/ooni/__init__.py index 9a4e60f..1533244 100644 --- a/ooni/__init__.py +++ b/ooni/__init__.py @@ -1,5 +1,4 @@ from . import config -from . import input from . import inputunit from . import kit from . import lib @@ -14,10 +13,9 @@ from . import utils from . import ooniprobe from . import plugoo from . import plugins -from . import oonitests -__all__ = ['config', 'input', 'inputunit', 'kit', +__all__ = ['config', 'inputunit', 'kit', 'lib', 'nettest', 'oonicli', 'reporter', 'runner', 'templates', 'utils', # XXX below are legacy related modules - 'ooniprobe', 'plugoo', 'plugins', 'oonitests'] + 'ooniprobe', 'plugoo', 'plugins'] diff --git a/ooni/nettest.py b/ooni/nettest.py index 1d46218..bb9a404 100644 --- a/ooni/nettest.py +++ b/ooni/nettest.py @@ -96,6 +96,8 @@ class TestCase(unittest.TestCase): ``The Name <email(a)example.com>`` * version: is the version string of the test. + + * requiresRoot: set to True if the test must be run as root. """ name = "I Did Not Change The Name" author = "Jane Doe <foo(a)example.com>" @@ -108,8 +110,7 @@ class TestCase(unittest.TestCase): report['errors'] = [] optParameters = None - optFlags = None - subCommands = None + requiresRoot = False def deferSetUp(self, ignored, result): """ diff --git a/ooni/runner.py b/ooni/runner.py index ff5dd33..371f310 100644 --- a/ooni/runner.py +++ b/ooni/runner.py @@ -9,7 +9,7 @@ # :copyright: (c) 2012 Isis Lovecruft, Arturo Filasto, The Tor Project, Inc. # :version: 0.1.0-pre-alpha # - +import os import inspect from twisted.python import reflect, usage @@ -50,6 +50,9 @@ def processTest(obj, config): """ input_file = obj.inputFile + if obj.requiresRoot: + if os.getuid() != 0: + raise Exception("This test requires root to run") if obj.optParameters or input_file: if not obj.optParameters: [View Less]

1 0

[ooni-probe/master] * Fix import error.
by isis＠torproject.org 01 Nov '12

01 Nov '12

commit 91b397607979f797b399ccb13dea6011d851e016 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Oct 31 17:28:06 2012 +0000 * Fix import error. --- ooni/reporter.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ooni/reporter.py b/ooni/reporter.py index 14327ef..191708c 100644 --- a/ooni/reporter.py +++ b/ooni/reporter.py @@ -16,7 +16,7 @@ from twisted.python.util import untilConcludes from twisted.trial import reporter from twisted.internet … [View More]

1 0

[ooni-probe/master] Add glossary with list of terms we use in OONI
by isis＠torproject.org 01 Nov '12

01 Nov '12

commit 9d56a842363e0017992ba087f9b89547c893d163 Author: Arturo Filastò <arturo(a)filasto.net> Date: Fri Oct 26 21:17:23 2012 +0000 Add glossary with list of terms we use in OONI --- docs/source/glossary.rst | 16 ++++++++++++++++ docs/source/index.rst | 1 + 2 files changed, 17 insertions(+), 0 deletions(-) diff --git a/docs/source/glossary.rst b/docs/source/glossary.rst new file mode 100644 index 0000000..417d8a8 --- /dev/null +++ b/docs/source/glossary.rst @@ -0,0 +1,16 … [View More]

1 0

[ooni-probe/master] * Removed the optFlags from echo.py since they will not get parsed.
by isis＠torproject.org 01 Nov '12

01 Nov '12

commit 98ab8e82f0637d870798280361bcfc7a484f0fc7 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Oct 31 18:51:43 2012 +0000 * Removed the optFlags from echo.py since they will not get parsed. * Added debug statement to reporter. * Fixed misnamed variables in nettest.py. --- ooni/echo.py | 4 ++-- ooni/reporter.py | 1 + ooni/runner.py | 12 +++++------- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/ooni/echo.py b/ooni/echo.py index … [View More]c5f4f47..c4ef588 100644 --- a/ooni/echo.py +++ b/ooni/echo.py @@ -59,9 +59,9 @@ class EchoTest(ScapyTest): ['size', 's', 56, 'Number of bytes to send in ICMP data field', int], ['ttl', 'l', 25, 'Set the IP Time to Live', int], ['timeout', 't', 2, 'Seconds until timeout if no response', int], - ['pcap', 'p', None, 'Save pcap to this file'] + ['pcap', 'p', None, 'Save pcap to this file'], + ['receive', 'r', True, 'Receive response packets'] ] - optFlags = [['receive', 'r', True, 'Receive response packets']] def setUpClass(self, *a, **kw): ''' diff --git a/ooni/reporter.py b/ooni/reporter.py index 191708c..cedd016 100644 --- a/ooni/reporter.py +++ b/ooni/reporter.py @@ -179,6 +179,7 @@ class ReporterFactory(OReporter): def writeHeader(self): self.firstrun = False options = self.options + log.debug("reporter.ReporterFactory.writeHeader(): options = %s" % options) self._writeln("###########################################") self._writeln("# OONI Probe Report for %s test" % options['name']) self._writeln("# %s" % date.pretty_date()) diff --git a/ooni/runner.py b/ooni/runner.py index 371f310..e35ee02 100644 --- a/ooni/runner.py +++ b/ooni/runner.py @@ -174,8 +174,8 @@ def loadTestsAndOptions(classes, config): _old_class_type = LegacyOONITest - for cls in classes: - if isinstance(cls, _old_class_type): + for klass in classes: + if isinstance(klass, _old_class_type): try: cases = start_legacy_test(klass) if cases: @@ -187,7 +187,7 @@ def loadTestsAndOptions(classes, config): log.err(e) else: try: - opts = cls.local_options + opts = klass.local_options options.append(opts) except AttributeError, ae: options.append([]) @@ -201,15 +201,13 @@ def loadTestsAndOptions(classes, config): cases = makeTestCases(klass, tests, method_prefix) test_cases.append(cases) try: - #c = cls() - #cls, opts = processTestOptions(cls, config) - opts = processTestOptions(cls, config) + opts = processTestOptions(klass, config) except AttributeError, ae: options.append([]) log.err(ae) else: try: - instance = cls() + instance = klass() inputs = instance.__get_inputs__() except Exception, e: log.err(e) [View Less]

1 0

[ooni-probe/master] Move a super nested directory that contained old bash scripts to root
by isis＠torproject.org 01 Nov '12

01 Nov '12

commit f7ca2a935785bee75f03a9666286ddb3a8ced4b1 Author: Arturo Filastò <arturo(a)filasto.net> Date: Tue Oct 23 18:28:38 2012 +0000 Move a super nested directory that contained old bash scripts to root * Delete fluff --- .../ooni/plugins/old_stuff_to_convert/README | 47 - .../plugins/old_stuff_to_convert/README.automation | 11 - .../ooni/plugins/old_stuff_to_convert/TODO | 6 - .../plugins/old_stuff_to_convert/cached-consensus |11724 -------------------- … [View More]

1 0

[ooni-probe/master] * Script to automatically generate patches for submission.
by isis＠torproject.org 01 Nov '12

01 Nov '12

commit d0fc26388841afcbcea439adb32e02a53c8c6f19 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Oct 31 23:06:35 2012 +0000 * Script to automatically generate patches for submission. * Comment out the legacy modules for testing. --- ooni/__init__.py | 9 +++-- submit-patch | 95 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 100 insertions(+), 4 deletions(-) diff --git a/ooni/__init__.py b/ooni/__init__.py index 1533244..22ffb8b … [View More]100644 --- a/ooni/__init__.py +++ b/ooni/__init__.py @@ -10,12 +10,13 @@ from . import templates from . import utils # XXX below are legacy related modules -from . import ooniprobe -from . import plugoo -from . import plugins +#from . import ooniprobe +#from . import plugoo +#from . import plugins __all__ = ['config', 'inputunit', 'kit', 'lib', 'nettest', 'oonicli', 'reporter', 'runner', 'templates', 'utils', # XXX below are legacy related modules - 'ooniprobe', 'plugoo', 'plugins'] + #'ooniprobe', 'plugoo', 'plugins' + ] diff --git a/submit-patch b/submit-patch new file mode 100755 index 0000000..f794a2f --- /dev/null +++ b/submit-patch @@ -0,0 +1,95 @@ +#!/bin/bash +############################################################################## +# +# submit-patch +# ------------------- +# Submit a patch to the OONI developers! +# +# @authors: Isis Lovecruft, 0x2cdb8b35 <isis(a)torproject.org> +# @license: see included LICENSE file +# @version: 0.0.1 +# +# To apply these patches: +# +# $ git fetch <project> master:test-apply +# $ git checkout test-apply +# $ git reset --hard +# $ git am a.patch +# +# Note: +# Dear other OONI developers and contributors, +# if you would like patches emailed to you as well, then add your name and +# email to this script, commit the changes, and submit it as a patch. :) +# <(A)3 +# isis agora lovecruft +# + +DEVELOPERS="<isis(a)torproject.org>, " + +HEADERS="X-Git-Format-Patch: ooni " + +function usage () +{ + echo; + echo -e "\033[40m\033[0;32m OPEN OBSERVATORY of NETWORK INTERFERENCE \033[0m" + echo -e "\033[40m\033[0;32m ---------------------------------------- \033[0m" + echo -e "" + echo -e "\033[40m\033[0;32m This script will collect all committed changes in your current \033[0m" + echo -e "\033[40m\033[0;32m branch which are not in the upstream branch, format a patch or \033[0m" + echo -e "\033[40m\033[0;32m a series of patches from them, and, finally, email them to the \033[0m" + echo -e "\033[40m\033[0;32m OONI developers. \033[0m" + echo -e "\033[40m\033[0;32m Thanks for the patch\! \033[0m" +} + +function pullfirst () +{ + echo; + read -ep" Should we pull in changes from master before formatting patches? (Y/n) " -s choice + case "$choice" in + "n"|"N"|"no"|"No"|"NO"|"non"|"nein") + PULL=false + ;; + *) + PULL=true + ;; + esac + if $PULL; then + if test -n "$UPSTREAMPULL" ; then + echo; + echo -e "\033[40m\033[0;32m Pulling from upstream... \033[0m" + git pull $UPSTREAM + fi + fi +} + + +usage +echo -e "" +read -ep" Should we CC the generated patch emails to tor-dev(a)lists.torproject.org? (Y/n) " cctordev +if test -z "$cctordev" ; then + CC="tor-dev(a)lists.torproject.org, " +else + CC="" +fi + +#echo; +#echo -e +#read -ep" Which branch/revision/commit should we include up to? (Return for 'HEAD'): " upstream +#if test -n "$upstream" ; then +# UPSTREAM=$upstream +# UPSTREAMPULL=$upstream" master" +#else +# UPSTREAM="origin" +# UPSTREAMPULL="origin master" +#fi +#pullfirst +echo; +echo -e "\033[40m\033[0;32m THIS SCRIPT DOES NOT SEND THE PATCH FILES. \033[0m" +echo -e "\033[40m\033[0;32m You'll have to handle that bit on your own. \033[0m" +echo; + +git format-patch --full-index -o "./patches" --stat -l10 --ignore-submodules \ + --binary --cover-letter --numbered --ignore-if-in-upstream \ + --suffix=".patch" --to="$DEVELOPERS" --cc="$CC" master +#NEW=`git patch-id < patches/new.patch` +#echo "Patch id: $NEW" [View Less]

1 0

[ooni-probe/master] * Added check on import so that uninitialized /ooni/lib doesn't cause an
by isis＠torproject.org 01 Nov '12

01 Nov '12

commit 9577336bf05eee7e0a8c4bf78177f44fc046d169 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Oct 31 19:06:12 2012 +0000 * Added check on import so that uninitialized /ooni/lib doesn't cause an Exception. --- ooni/plugins/bridget.py | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ooni/plugins/bridget.py b/ooni/plugins/bridget.py index 188009c..fcb60bb 100644 --- a/ooni/plugins/bridget.py +++ b/ooni/plugins/bridget.py @@ -26,12 +26,… [View More]

1 0

[ooni-probe/master] Remove lot's of dead code and documentation, salvage the salvagable
by isis＠torproject.org 01 Nov '12

01 Nov '12

commit 91503dc8f5513d609634457bdbc9ab395524264b Author: Arturo Filastò <arturo(a)filasto.net> Date: Tue Oct 23 18:25:22 2012 +0000 Remove lot's of dead code and documentation, salvage the salvagable * It was on the point of rotting. --- CHANGES.yaml | 5 + old-to-be-ported-code/CHANGES.yaml | 5 - old-to-be-ported-code/HACKING | 21 - old-to-be-ported-code/INSTALL | 8 - … [View More]

1 0