August 2014 - tor-commits - lists.torproject.org

[bridgedb/develop] Change EMAIL_SMTP_PORT to 2525 in copied bridgedb.conf for Travis.
by isis＠torproject.org 13 Aug '14

13 Aug '14

commit 353672434209b0fe58ba4e9ef1ae49942644f0b0 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Aug 7 12:17:40 2014 +0000 Change EMAIL_SMTP_PORT to 2525 in copied bridgedb.conf for Travis. --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 5f0aed2..6992f6e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -53,6 +53,8 @@ before_script: # Add '127.0.0.1' to EMAIL_DOMAINS in bridgedb.conf. This should ONLY be # done on testing servers, never on production servers. - sed -r -i -e "s/(EMAIL_DOMAINS)(.*)(])/\1\2\, '127.0.0.1']/" run/bridgedb.conf + # Change EMAIL_SMTP_PORT to 2525: + - sed -r -i -e "s/(EMAIL_SMTP_PORT = )([1-9]{2,5})/\12525/" run/bridgedb.conf - leekspin -n 100 - cp -t run networkstatus-bridges cached-extrainfo* bridge-descriptors - ./scripts/make-ssl-cert

1 0

[bridgedb/develop] Change obfs3 ipv6 integration test to vanilla ipv4; add scramblesuit test.
by isis＠torproject.org 13 Aug '14

13 Aug '14

commit d798533ff482bd7c1a149d1d38bcc9dfb53da3bc Author: trygve <tor-dev(a)lists.torproject.org> Date: Fri Aug 8 03:06:18 2014 +0000 Change obfs3 ipv6 integration test to vanilla ipv4; add scramblesuit test. The ipv6 bridge has been changed to a vanilla ipv4 bridge. I've also added a new test to check for a scramblesuit bridge. Both of these surprised me because they had a different number of fields in each bridge line, but I've adjusted the tests accordingly. --- lib/bridgedb/test/test_https.py | 33 +++++++++++++++++++++++---------- 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/lib/bridgedb/test/test_https.py b/lib/bridgedb/test/test_https.py index a154856..4ffbe08 100644 --- a/lib/bridgedb/test/test_https.py +++ b/lib/bridgedb/test/test_https.py @@ -114,7 +114,7 @@ class HTTPTests(unittest.TestCase): #print soup.prettify() return soup - def getBridgeLinesFromSoup(self, soup): + def getBridgeLinesFromSoup(self, soup, fieldsPerBridge): # Now we're looking for something like this in the response: # <div class="bridge-lines"> # obfs2 175.213.252.207:11125 5c6da7d927460317c6ff5420b75c2d0f431f18dd @@ -126,7 +126,7 @@ class HTTPTests(unittest.TestCase): text = bridge_line.text #print("Found bridge-line: %s" % text) items = text.split(' ') - self.assertEquals(len(items), 3, "Expected Pluggale Transport, Bridge and Fingerprint in %s" % str(items)) + self.assertEquals(len(items), fieldsPerBridge, "Expected %d fields in bridge line %s" % (fieldsPerBridge, str(items))) bridges.append(items) return bridges @@ -137,7 +137,7 @@ class HTTPTests(unittest.TestCase): PT = 'obfs2' soup = self.submitOptions(transport=PT, ipv6=False, captchaResponse=CAPTCHA_RESPONSE) - bridges = self.getBridgeLinesFromSoup(soup) + bridges = self.getBridgeLinesFromSoup(soup, fieldsPerBridge=3) for pt, bridge, fingerprint in bridges: self.assertEquals(PT, pt) @@ -148,19 +148,32 @@ class HTTPTests(unittest.TestCase): PT = 'obfs3' soup = self.submitOptions(transport=PT, ipv6=False, captchaResponse=CAPTCHA_RESPONSE) - bridges = self.getBridgeLinesFromSoup(soup) + bridges = self.getBridgeLinesFromSoup(soup, fieldsPerBridge=3) for pt, bridge, fingerprint in bridges: self.assertEquals(PT, pt) - def test_get_obfs3_ipv6(self): + def test_get_vanilla_ipv4(self): self.openBrowser() self.goToOptionsPage() - PT = 'obfs3' - soup = self.submitOptions(transport=PT, ipv6=True, captchaResponse=CAPTCHA_RESPONSE) + PT = '0' + soup = self.submitOptions(transport=PT, ipv6=False, captchaResponse=CAPTCHA_RESPONSE) - # at the time of writing, this test fails due to lack of ipv6 bridges - bridges = self.getBridgeLinesFromSoup(soup) - for pt, bridge, fingerprint in bridges: + bridges = self.getBridgeLinesFromSoup(soup, fieldsPerBridge=2) + for bridge, fingerprint in bridges: + # TODO: do more interesting checks + self.assertTrue(bridge != None) + + def test_get_scramblesuit_ipv4(self): + self.openBrowser() + self.goToOptionsPage() + + PT = 'scramblesuit' + soup = self.submitOptions(transport=PT, ipv6=False, captchaResponse=CAPTCHA_RESPONSE) + + bridges = self.getBridgeLinesFromSoup(soup, fieldsPerBridge=4) + for pt, bridge, fingerprint, password in bridges: self.assertEquals(PT, pt) + self.assertTrue(password.find("password=") != -1, "Password field missing expected text") +

1 0

[bridgedb/develop] Whitespace fixes for bridgedb.test.test_https.
by isis＠torproject.org 13 Aug '14

13 Aug '14

commit be93cb7c849990bf516c33c1a440ca406b2b3cb9 Author: trygve <tor-dev(a)lists.torproject.org> Date: Fri Aug 8 03:11:31 2014 +0000 Whitespace fixes for bridgedb.test.test_https. --- lib/bridgedb/test/test_https.py | 210 +++++++++++++++++++-------------------- 1 file changed, 105 insertions(+), 105 deletions(-) diff --git a/lib/bridgedb/test/test_https.py b/lib/bridgedb/test/test_https.py index 4ffbe08..cad0715 100644 --- a/lib/bridgedb/test/test_https.py +++ b/lib/bridgedb/test/test_https.py @@ -33,147 +33,147 @@ CAPTCHA_RESPONSE = 'Tvx74Pmy' class HTTPTests(unittest.TestCase): def setUp(self): - self.br = None + self.br = None def tearDown(self): - self.br = None + self.br = None def openBrowser(self): - # use mechanize to open the BridgeDB website in its browser - self.br = mechanize.Browser() - self.br.set_handle_robots(False) # prevents 'HTTP Error 403: request disallowed by robots.txt' - self.br.open(HTTPS_ROOT) - - # -------------- Home/Root page - self.assertTrue(self.br.viewing_html()) - self.assertEquals(self.br.response().geturl(), HTTPS_ROOT) - self.assertEquals(self.br.title(), "BridgeDB") - #for link in self.br.links(): print(link) - #for form in self.br.forms(): print(form) - return self.br + # use mechanize to open the BridgeDB website in its browser + self.br = mechanize.Browser() + self.br.set_handle_robots(False) # prevents 'HTTP Error 403: request disallowed by robots.txt' + self.br.open(HTTPS_ROOT) + + # -------------- Home/Root page + self.assertTrue(self.br.viewing_html()) + self.assertEquals(self.br.response().geturl(), HTTPS_ROOT) + self.assertEquals(self.br.title(), "BridgeDB") + #for link in self.br.links(): print(link) + #for form in self.br.forms(): print(form) + return self.br def goToOptionsPage(self): # check that we are on the root page - self.assertTrue(self.br.viewing_html()) - self.assertEquals(self.br.response().geturl(), HTTPS_ROOT) - - # follow the link with the word 'bridges' in it. - # Could also use: text='bridges' - # Could also use: url='/options' - self.br.follow_link(text_regex='bridges') - - # ------------- Options - self.assertEquals(self.br.response().geturl(), HTTPS_ROOT + "/options") - #print(self.br.response().read()) - #for form in self.br.forms(): print(form) - return self.br - + self.assertTrue(self.br.viewing_html()) + self.assertEquals(self.br.response().geturl(), HTTPS_ROOT) + + # follow the link with the word 'bridges' in it. + # Could also use: text='bridges' + # Could also use: url='/options' + self.br.follow_link(text_regex='bridges') + + # ------------- Options + self.assertEquals(self.br.response().geturl(), HTTPS_ROOT + "/options") + #print(self.br.response().read()) + #for form in self.br.forms(): print(form) + return self.br + def submitOptions(self, transport, ipv6, captchaResponse): - # check that we are on the options page - self.assertEquals(self.br.response().geturl(), HTTPS_ROOT + "/options") - - # At this point, we'd like to be able to set some values in - # the 'advancedOptions' form. Unfortunately the HTML form - # does not define a 'name' attribute, so the we have to rely on - # the fact that this is the only form on the page and will therefore - # always exist at index 0. - #br.select_form(name="advancedOptions") - self.br.select_form(nr=0) - - # change the pluggable transport to something else - #print(self.br.form) - self.br.form['transport'] = [transport] + # check that we are on the options page + self.assertEquals(self.br.response().geturl(), HTTPS_ROOT + "/options") + + # At this point, we'd like to be able to set some values in + # the 'advancedOptions' form. Unfortunately the HTML form + # does not define a 'name' attribute, so the we have to rely on + # the fact that this is the only form on the page and will therefore + # always exist at index 0. + #br.select_form(name="advancedOptions") + self.br.select_form(nr=0) + + # change the pluggable transport to something else + #print(self.br.form) + self.br.form['transport'] = [transport] if ipv6: self.br.form['ipv6'] = ['yes'] - self.br.submit() + self.br.submit() - # ------------- Captcha - EXPECTED_URL = HTTPS_ROOT + "/bridges?transport=%s" % transport + # ------------- Captcha + EXPECTED_URL = HTTPS_ROOT + "/bridges?transport=%s" % transport if ipv6: EXPECTED_URL += "&ipv6=yes" - self.assertEquals(self.br.response().geturl(), EXPECTED_URL) - #print(self.br.response().read()) - #for form in self.br.forms(): print(form) - - # As on the previous page, the form does not define a 'name' attribute, forcing - # us to use the index of the form i.e. 0 - #self.br.select_form(name="captchaSubmission") - self.br.select_form(nr=0) - - # input the required captcha response. There is only one captcha defined - # by default, so this should always be accepted. Note this will not be possible - # to automate if used with a real captcha systems (e.g. reCAPTCHA) - #self.br.form['captcha_response_field'] = 'Tvx74PMy' - self.br.form['captcha_response_field'] = captchaResponse - captcha_response = self.br.submit() - - # ------------- Results - # URL should be the same as last time - self.assertEquals(self.br.response().geturl(), EXPECTED_URL) - soup = BeautifulSoup(captcha_response.read()) - #print soup.prettify() - return soup + self.assertEquals(self.br.response().geturl(), EXPECTED_URL) + #print(self.br.response().read()) + #for form in self.br.forms(): print(form) + + # As on the previous page, the form does not define a 'name' attribute, forcing + # us to use the index of the form i.e. 0 + #self.br.select_form(name="captchaSubmission") + self.br.select_form(nr=0) + + # input the required captcha response. There is only one captcha defined + # by default, so this should always be accepted. Note this will not be possible + # to automate if used with a real captcha systems (e.g. reCAPTCHA) + #self.br.form['captcha_response_field'] = 'Tvx74PMy' + self.br.form['captcha_response_field'] = captchaResponse + captcha_response = self.br.submit() + + # ------------- Results + # URL should be the same as last time + self.assertEquals(self.br.response().geturl(), EXPECTED_URL) + soup = BeautifulSoup(captcha_response.read()) + #print soup.prettify() + return soup def getBridgeLinesFromSoup(self, soup, fieldsPerBridge): - # Now we're looking for something like this in the response: - # <div class="bridge-lines"> - # obfs2 175.213.252.207:11125 5c6da7d927460317c6ff5420b75c2d0f431f18dd - # </div> - bridges = [] - bridge_lines = soup.findAll(attrs={'class' : 'bridge-lines'}) - self.assertTrue(len(bridge_lines) > 0, "Found no bridge lines") - for bridge_line in bridge_lines: - text = bridge_line.text - #print("Found bridge-line: %s" % text) - items = text.split(' ') - self.assertEquals(len(items), fieldsPerBridge, "Expected %d fields in bridge line %s" % (fieldsPerBridge, str(items))) - bridges.append(items) - return bridges + # Now we're looking for something like this in the response: + # <div class="bridge-lines"> + # obfs2 175.213.252.207:11125 5c6da7d927460317c6ff5420b75c2d0f431f18dd + # </div> + bridges = [] + bridge_lines = soup.findAll(attrs={'class' : 'bridge-lines'}) + self.assertTrue(len(bridge_lines) > 0, "Found no bridge lines") + for bridge_line in bridge_lines: + text = bridge_line.text + #print("Found bridge-line: %s" % text) + items = text.split(' ') + self.assertEquals(len(items), fieldsPerBridge, "Expected %d fields in bridge line %s" % (fieldsPerBridge, str(items))) + bridges.append(items) + return bridges def test_get_obfs2_ipv4(self): - self.openBrowser() - self.goToOptionsPage() + self.openBrowser() + self.goToOptionsPage() - PT = 'obfs2' + PT = 'obfs2' soup = self.submitOptions(transport=PT, ipv6=False, captchaResponse=CAPTCHA_RESPONSE) - bridges = self.getBridgeLinesFromSoup(soup, fieldsPerBridge=3) + bridges = self.getBridgeLinesFromSoup(soup, fieldsPerBridge=3) for pt, bridge, fingerprint in bridges: - self.assertEquals(PT, pt) + self.assertEquals(PT, pt) def test_get_obfs3_ipv4(self): - self.openBrowser() - self.goToOptionsPage() + self.openBrowser() + self.goToOptionsPage() - PT = 'obfs3' + PT = 'obfs3' soup = self.submitOptions(transport=PT, ipv6=False, captchaResponse=CAPTCHA_RESPONSE) - bridges = self.getBridgeLinesFromSoup(soup, fieldsPerBridge=3) + bridges = self.getBridgeLinesFromSoup(soup, fieldsPerBridge=3) for pt, bridge, fingerprint in bridges: - self.assertEquals(PT, pt) + self.assertEquals(PT, pt) def test_get_vanilla_ipv4(self): - self.openBrowser() - self.goToOptionsPage() + self.openBrowser() + self.goToOptionsPage() - PT = '0' + PT = '0' soup = self.submitOptions(transport=PT, ipv6=False, captchaResponse=CAPTCHA_RESPONSE) - bridges = self.getBridgeLinesFromSoup(soup, fieldsPerBridge=2) - for bridge, fingerprint in bridges: + bridges = self.getBridgeLinesFromSoup(soup, fieldsPerBridge=2) + for bridge, fingerprint in bridges: # TODO: do more interesting checks - self.assertTrue(bridge != None) + self.assertTrue(bridge != None) def test_get_scramblesuit_ipv4(self): - self.openBrowser() - self.goToOptionsPage() + self.openBrowser() + self.goToOptionsPage() - PT = 'scramblesuit' - soup = self.submitOptions(transport=PT, ipv6=False, captchaResponse=CAPTCHA_RESPONSE) + PT = 'scramblesuit' + soup = self.submitOptions(transport=PT, ipv6=False, captchaResponse=CAPTCHA_RESPONSE) - bridges = self.getBridgeLinesFromSoup(soup, fieldsPerBridge=4) - for pt, bridge, fingerprint, password in bridges: - self.assertEquals(PT, pt) - self.assertTrue(password.find("password=") != -1, "Password field missing expected text") + bridges = self.getBridgeLinesFromSoup(soup, fieldsPerBridge=4) + for pt, bridge, fingerprint, password in bridges: + self.assertEquals(PT, pt) + self.assertTrue(password.find("password=") != -1, "Password field missing expected text")

1 0

r26918: {website} Add a downloads-alpha anchor. (website/trunk/projects/en)
by Mike Perry 13 Aug '14

13 Aug '14

Author: mikeperry Date: 2014-08-13 00:28:37 +0000 (Wed, 13 Aug 2014) New Revision: 26918 Modified: website/trunk/projects/en/torbrowser.wml Log: Add a downloads-alpha anchor. Modified: website/trunk/projects/en/torbrowser.wml =================================================================== --- website/trunk/projects/en/torbrowser.wml 2014-08-12 17:59:07 UTC (rev 26917) +++ website/trunk/projects/en/torbrowser.wml 2014-08-13 00:28:37 UTC (rev 26918) @@ -311,6 +311,7 @@  <hr> <p></p> + <div id="downloads-alpha" class="anchor"></div> <center><h3>Experimental Tor Browser</h3></center> <div class="pjtext"> <div class="dltable" style="margin-top: -35px;">

1 0

[ooni-probe/master] Pep8 fixes
by art＠torproject.org 12 Aug '14

12 Aug '14

commit 49150087dded2885a9eb17d07c436fefe06c9104 Author: Arturo Filastò <art(a)fuffa.org> Date: Sun Aug 10 20:10:54 2014 +0200 Pep8 fixes --- ooni/templates/scapyt.py | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/ooni/templates/scapyt.py b/ooni/templates/scapyt.py index c6dedd7..925a9d6 100644 --- a/ooni/templates/scapyt.py +++ b/ooni/templates/scapyt.py @@ -1,26 +1,23 @@ -import random -from zope.interface import implements -from twisted.plugin import IPlugin -from twisted.internet import protocol, defer, threads - -from scapy.all import send, sr, IP, TCP, config - -from ooni.reporter import createPacketReport from ooni.nettest import NetTestCase from ooni.utils import log from ooni.settings import config -from ooni.utils.txscapy import ScapySender, getDefaultIface, ScapyFactory +from ooni.utils.txscapy import ScapySender, ScapyFactory from ooni.utils.txscapy import hasRawSocketPermission class BaseScapyTest(NetTestCase): + """ The report of a test run with scapy looks like this: report: - sent_packets: [{'raw_packet': BASE64Encoding of packet, - 'summary': 'IP / TCP 192.168.2.66:ftp_data > 8.8.8.8:http S'}] + sent_packets: [ + { + 'raw_packet': BASE64Encoding of packet, + 'summary': 'IP / TCP 192.168.2.66:ftp_data > 8.8.8.8:http S' + } + ] answered_packets: [] @@ -31,12 +28,12 @@ class BaseScapyTest(NetTestCase): requiresRoot = not hasRawSocketPermission() baseFlags = [ ['ipsrc', 's', - 'Does *not* check if IP src and ICMP IP citation matches when processing answers'], + 'Does *not* check if IP src and ICMP IP citation ' + 'matches when processing answers'], ['seqack', 'k', - 'Check if TCP sequence number and ACK match in the ICMP citation when processing answers'], - ['ipid', 'i', - 'Check if the IPID matches when processing answers'] - ] + 'Check if TCP sequence number and ACK match in the ' + 'ICMP citation when processing answers'], + ['ipid', 'i', 'Check if the IPID matches when processing answers']] def _setUp(self): super(BaseScapyTest, self)._setUp() @@ -84,8 +81,10 @@ class BaseScapyTest(NetTestCase): received_packet = rcv if not config.privacy.includeip: - log.debug("Detected you would not like to include your ip in the report") - log.debug("Stripping source and destination IPs from the reports") + log.debug("Detected you would not like to " + "include your ip in the report") + log.debug( + "Stripping source and destination IPs from the reports") sent_packet.src = '127.0.0.1' received_packet.dst = '127.0.0.1'

1 0

[ooni-probe/master] Add rsync support to doc Makefile
by art＠torproject.org 12 Aug '14

12 Aug '14

commit b2a05794f32510fa79b7811685f30d882531993d Author: Arturo Filastò <art(a)fuffa.org> Date: Sun Aug 10 20:11:15 2014 +0200 Add rsync support to doc Makefile --- docs/Makefile | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/docs/Makefile b/docs/Makefile index 9ee92b1..b9582d9 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -14,6 +14,11 @@ ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) sou # the i18n builder cannot share the environment and doctrees with the others I18NSPHINXOPTS = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source +SSH_HOST=staticiforme.torproject.org +SSH_PORT=22 +SSH_USER=art +SSH_TARGET_DIR=/home/art/docs/ + .PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest gettext help: @@ -151,3 +156,6 @@ doctest: $(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest @echo "Testing of doctests in the sources finished, look at the " \ "results in $(BUILDDIR)/doctest/output.txt." + +rsync_upload: + rsync -e "ssh -p $(SSH_PORT)" -P -rvz $(BUILDDIR)/ $(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR) --cvs-exclude

1 0

[ooni-probe/master] Add details on how to contribute to the README.md
by art＠torproject.org 12 Aug '14

12 Aug '14

commit 137ddd824694f12686dab3c4c130334653f2c756 Author: Arturo Filastò <art(a)fuffa.org> Date: Tue Aug 12 20:07:33 2014 +0200 Add details on how to contribute to the README.md This closes https://trac.torproject.org/projects/tor/ticket/11980 --- README.md | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/README.md b/README.md index 5f07069..28c895c 100644 --- a/README.md +++ b/README.md @@ -232,3 +232,27 @@ tracker [filing them under the "Ooni" component](https://trac.torproject.org/pro You can either register an account or use the group account "cypherpunks" with password "writecode". +## Contributing + +You can download the code for ooniprobe from the following git repository: + +``` +git clone https://git.torproject.org/ooni-probe.git +``` + +It is also viewable on the web via [https://gitweb.torproject.org/ooni-probe.git](https://git.torproject.org/oo…. + +You should then submit patches for review as pull requests to this github repository: + +https://github.com/TheTorProject/ooni-probe + +Read this article to learn how to [create a pull request on github](https://help.github.com/articles/creating-a-pull-request). + +If you prefer not to use github (or don't have an account), you may also submit +patches as attachments to tickets. + +Be sure to format the patch (given that you are working on a feature branch that is different from master) with: + +``` +git format-patch master --stdout > my_first_ooniprobe.patch +```

1 0

[ooni-probe/master] Fix a bug that lead ooniprobe to require root when set_pcap was not used.
by art＠torproject.org 12 Aug '14

12 Aug '14

commit ba88ae7622f86a9ebe8a4af8d1825daf3ff78aab Author: Arturo Filastò <art(a)fuffa.org> Date: Sun Aug 10 20:01:47 2014 +0200 Fix a bug that lead ooniprobe to require root when set_pcap was not used. --- ooni/director.py | 5 ++++- ooni/oonicli.py | 2 +- ooni/templates/scapyt.py | 4 ++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ooni/director.py b/ooni/director.py index d81010a..43269cc 100644 --- a/ooni/director.py +++ b/ooni/director.py @@ -265,7 +265,10 @@ class Director(object): """ Start sniffing with Scapy. Exits if required privileges (root) are not available. """ - from ooni.utils.txscapy import ScapySniffer + from ooni.utils.txscapy import ScapySniffer, ScapyFactory + + if config.scapyFactory is None: + config.scapyFactory = ScapyFactory(config.advanced.interface) if not config.reports.pcap: prefix = 'report' diff --git a/ooni/oonicli.py b/ooni/oonicli.py index 2320dec..eef3112 100644 --- a/ooni/oonicli.py +++ b/ooni/oonicli.py @@ -125,10 +125,10 @@ def runWithDirector(logging=True, start_tor=True, check_incoherences=True): if logging: log.start(global_options['logfile']) - config.scapyFactory = ScapyFactory(config.advanced.interface) if config.privacy.includepcap: try: checkForRoot() + config.scapyFactory = ScapyFactory(config.advanced.interface) except errors.InsufficientPrivileges: log.err("Insufficient Privileges to capture packets." " See ooniprobe.conf privacy.includepcap") diff --git a/ooni/templates/scapyt.py b/ooni/templates/scapyt.py index d99ea3f..c6dedd7 100644 --- a/ooni/templates/scapyt.py +++ b/ooni/templates/scapyt.py @@ -41,6 +41,10 @@ class BaseScapyTest(NetTestCase): def _setUp(self): super(BaseScapyTest, self)._setUp() + if config.scapyFactory is None: + log.debug("Scapy factory not set, registering it.") + config.scapyFactory = ScapyFactory(config.advanced.interface) + self.report['answer_flags'] = [] if self.localOptions['ipsrc']: config.checkIPsrc = 0

1 0

r26917: {website} fix torbrowserbundlebetadir version (website/trunk/include)
by Erinn Clark 12 Aug '14

12 Aug '14

Author: erinn Date: 2014-08-12 17:59:07 +0000 (Tue, 12 Aug 2014) New Revision: 26917 Modified: website/trunk/include/versions.wmi Log: fix torbrowserbundlebetadir version Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2014-08-12 17:56:25 UTC (rev 26916) +++ website/trunk/include/versions.wmi 2014-08-12 17:59:07 UTC (rev 26917) @@ -24,7 +24,7 @@ <define-tag version-osx-ppc-alpha whitespace=delete>0.2.4.17-rc</define-tag> <define-tag version-torbrowserbundledir whitespace=delete>3.6.4</define-tag> -<define-tag version-torbrowserbundlebetadir whitespace=delete>3.6.4</define-tag> +<define-tag version-torbrowserbundlebetadir whitespace=delete>4.0-alpha-1</define-tag> <define-tag version-torbrowserbundle whitespace=delete>3.6.4</define-tag> <define-tag version-torbrowserbundlebeta whitespace=delete>4.0-alpha-1</define-tag>

1 0

r26916: {website} update versions for TB 3.6.4 and 4.0-alpha-1 and finish upda (in website/trunk: include projects/en)
by Erinn Clark 12 Aug '14

12 Aug '14

Author: erinn Date: 2014-08-12 17:56:25 +0000 (Tue, 12 Aug 2014) New Revision: 26916 Modified: website/trunk/include/versions.wmi website/trunk/projects/en/torbrowser.wml Log: update versions for TB 3.6.4 and 4.0-alpha-1 and finish updating the torbrowser page Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2014-08-12 16:32:36 UTC (rev 26915) +++ website/trunk/include/versions.wmi 2014-08-12 17:56:25 UTC (rev 26916) @@ -23,11 +23,11 @@ <define-tag version-osx-ppc-stable whitespace=delete>0.2.3.25</define-tag> <define-tag version-osx-ppc-alpha whitespace=delete>0.2.4.17-rc</define-tag> -<define-tag version-torbrowserbundledir whitespace=delete>3.6.3</define-tag> -<define-tag version-torbrowserbundlebetadir whitespace=delete>3.6.3</define-tag> +<define-tag version-torbrowserbundledir whitespace=delete>3.6.4</define-tag> +<define-tag version-torbrowserbundlebetadir whitespace=delete>3.6.4</define-tag> -<define-tag version-torbrowserbundle whitespace=delete>3.6.3</define-tag> -<define-tag version-torbrowserbundlebeta whitespace=delete>3.6-beta-2</define-tag> +<define-tag version-torbrowserbundle whitespace=delete>3.6.4</define-tag> +<define-tag version-torbrowserbundlebeta whitespace=delete>4.0-alpha-1</define-tag> <define-tag version-torbrowser-tor whitespace=delete>0.2.4.19</define-tag> <define-tag version-torbrowser-tor-components whitespace=delete>libevent-2.0.21-stable, zlib-1.2.8, openssl-1.0.1e</define-tag> <define-tag version-torbrowser-firefox whitespace=delete>24.2.0esr</define-tag> @@ -37,19 +37,19 @@ <define-tag version-torbrowser-vidalia whitespace=delete>0.2.21</define-tag> <define-tag version-torimbrowserbundle whitespace=delete>1.3.21</define-tag> -<define-tag version-torbrowserbundlelinux32 whitespace=delete>3.6.3</define-tag> -<define-tag version-torbrowserbundlelinux64 whitespace=delete>3.6.3</define-tag> -<define-tag version-torbrowserbundlelinux32beta whitespace=delete>3.6-beta-2</define-tag> -<define-tag version-torbrowserbundlelinux64beta whitespace=delete>3.6-beta-2</define-tag> +<define-tag version-torbrowserbundlelinux32 whitespace=delete>3.6.4</define-tag> +<define-tag version-torbrowserbundlelinux64 whitespace=delete>3.6.4</define-tag> +<define-tag version-torbrowserbundlelinux32beta whitespace=delete>4.0-alpha-1</define-tag> +<define-tag version-torbrowserbundlelinux64beta whitespace=delete>4.0-alpha-1</define-tag> <define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.4.19</define-tag> <define-tag version-gnu-torbrowser-tor-components whitespace=delete>libevent-2.0.21-stable, zlib-1.2.8, openssl-1.0.0k</define-tag> <define-tag version-gnu-torbrowser-firefox whitespace=delete>24.2.0esr</define-tag> <define-tag version-gnu-torbrowser-torbutton whitespace=delete>1.5.2</define-tag> <define-tag version-gnu-torbrowser-vidalia whitespace=delete>0.2.21</define-tag> -<define-tag version-torbrowserbundleosx32 whitespace=delete>3.6.3</define-tag> +<define-tag version-torbrowserbundleosx32 whitespace=delete>3.6.4</define-tag> <define-tag version-torbrowserbundleosx64 whitespace=delete>2.3.25-15</define-tag> -<define-tag version-torbrowserbundleosx32beta whitespace=delete>3.6-beta-2</define-tag> +<define-tag version-torbrowserbundleosx32beta whitespace=delete>4.0-alpha-1</define-tag> <define-tag version-osx-torbrowser-tor whitespace=delete>0.2.4.19</define-tag> <define-tag version-osx-torbrowser-firefox whitespace=delete>24.2.0esr</define-tag> <define-tag version-osx-torbrowser-torbutton whitespace=delete>1.5.2</define-tag> Modified: website/trunk/projects/en/torbrowser.wml =================================================================== --- website/trunk/projects/en/torbrowser.wml 2014-08-12 16:32:36 UTC (rev 26915) +++ website/trunk/projects/en/torbrowser.wml 2014-08-12 17:56:25 UTC (rev 26916) @@ -89,6 +89,8 @@ for your preferred language. This file can be saved wherever is convenient, e.g. the Desktop or a USB flash drive.</p></div> + <p></p> + <center><h3>Stable Tor Browser</h3></center> <div class="pjtext"> <div class="dltable" style="margin-top: -35px;"> <table> @@ -299,7 +301,18 @@ </tbody> </table> </div> + </div> +<p>See our instructions on <a href="<page docs/verifying-signatures>">how to verify package signatures</a>, + which allows you to make sure you've downloaded the file we intended + you to get. Also, note that the Firefox ESR in our bundles is + <a href="https://gitweb.torproject.org/torbrowser.git/tree/HEAD:/build-scripts/confi…">modified</a> from the <a + href="https://www.mozilla.org/en-US/firefox/organizations/">default + Firefox ESR</a></p>  +<hr> + <p></p> + <center><h3>Experimental Tor Browser</h3></center> + <div class="pjtext"> <div class="dltable" style="margin-top: -35px;"> <table> <thead> @@ -509,13 +522,7 @@ </tbody> </table> </div> - <> - <p>See our instructions on <a href="<page docs/verifying-signatures>">how to verify package signatures</a>, - which allows you to make sure you've downloaded the file we intended - you to get. Also, note that the Firefox ESR in our bundles is - <a href="https://gitweb.torproject.org/torbrowser.git/tree/HEAD:/build-scripts/confi…">modified</a> from the <a - href="https://www.mozilla.org/en-US/firefox/organizations/">default - Firefox ESR</a></p> + </div> </div> </div>

1 0