[tor-commits] [ooni-probe/master] Restructure directories where ooni software writes/reads from

2015-02-04 Thread art 
commit 2db26224cc0e79a8b144bd590287cd688c7891e0
Author: Arturo Filastò 
Date:   Sat Jan 3 17:48:18 2015 +0100

Restructure directories where ooni software writes/reads from

This implements: https://trac.torproject.org/projects/tor/ticket/14086
---
 data/ooniprobe.conf.sample   |2 -
 ooni/deckgen/cli.py  |4 +-
 ooni/deckgen/processors/citizenlab_test_lists.py |   16 ++--
 ooni/deckgen/processors/namebench_dns_servers.py |8 +-
 ooni/geoip.py|6 +-
 ooni/resources/__init__.py   |   24 --
 ooni/resources/update.py |5 +-
 ooni/settings.py |   88 +++---
 setup.py |   25 +-
 9 files changed, 118 insertions(+), 60 deletions(-)

diff --git a/data/ooniprobe.conf.sample b/data/ooniprobe.conf.sample
index 831525a..3c9cea9 100644
--- a/data/ooniprobe.conf.sample
+++ b/data/ooniprobe.conf.sample
@@ -45,8 +45,6 @@ advanced:
 reporting_retries: 3
 # How many reports to perform concurrently
 reporting_concurrency: 15
-# Specify here a custom data_dir path
-data_dir: /usr/share/ooni
 oonid_api_port: 8042
 tor:
 #socks_port: 8801
diff --git a/ooni/deckgen/cli.py b/ooni/deckgen/cli.py
index 216b9a7..3f4342a 100644
--- a/ooni/deckgen/cli.py
+++ b/ooni/deckgen/cli.py
@@ -118,6 +118,7 @@ def generate_deck(options):
 
 @defer.inlineCallbacks
 def get_user_country_code():
+config.privacy.includecountry = True
 probe_ip = ProbeIP()
 yield probe_ip.lookup()
 defer.returnValue(probe_ip.geodata['countrycode'])
@@ -155,9 +156,6 @@ def run():
   "deck-%s" % options['country-code'])
 options['output'] = output_dir
 
-config.initialize_ooni_home()
-config.read_config_file()
-
 try:
 os.makedirs(options['output'])
 except OSError as exception:
diff --git a/ooni/deckgen/processors/citizenlab_test_lists.py 
b/ooni/deckgen/processors/citizenlab_test_lists.py
index b36e726..b455008 100644
--- a/ooni/deckgen/processors/citizenlab_test_lists.py
+++ b/ooni/deckgen/processors/citizenlab_test_lists.py
@@ -26,10 +26,10 @@ def generate_country_input(country_code, dst):
 country_code = country_code.lower()
 filename = os.path.join(dst, "citizenlab-urls-%s.txt" % country_code)
 
-input_list = os.path.join(config.resources_directory,
-  "citizenlab-test-lists",
-  "test-lists-master",
-  "csv", country_code + ".csv")
+input_list = config.get_data_file_path("resources/"
+   "citizenlab-test-lists/"
+   "test-lists-master/csv/"
+   + country_code + ".csv")
 
 if not os.path.exists(input_list):
 raise Exception("Could not find list for country %s" % country_code)
@@ -42,10 +42,10 @@ def generate_country_input(country_code, dst):
 def generate_global_input(dst):
 filename = os.path.join(dst, "citizenlab-urls-global.txt")
 
-input_list = os.path.join(config.resources_directory,
-  "citizenlab-test-lists",
-  "test-lists-master",
-  "csv", "global.csv")
+input_list = config.get_data_file_path("resources/"
+   "citizenlab-test-lists/"
+   "test-lists-master/csv/"
+   "global.csv")
 
 load_input(input_list, filename)
 
diff --git a/ooni/deckgen/processors/namebench_dns_servers.py 
b/ooni/deckgen/processors/namebench_dns_servers.py
index e434f72..f35ca93 100644
--- a/ooni/deckgen/processors/namebench_dns_servers.py
+++ b/ooni/deckgen/processors/namebench_dns_servers.py
@@ -14,8 +14,7 @@ class GeoIPDB(object):
 self.__dict__ = self._borg
 if not self.country:
 try:
-country_file = os.path.join(config.advanced.geoip_data_dir,
-'GeoIP.dat')
+country_file = config.get_data_file_path('GeoIP/GeoIP.dat')
 self.country = GeoIP.open(country_file,
   GeoIP.GEOIP_STANDARD)
 except:
@@ -25,8 +24,9 @@ class GeoIPDB(object):
 
 def generate_country_input(country_code, dst):
 
-csv_file = os.path.join(config.resources_directory,
-"namebench-dns-servers.csv")
+csv_file = config.get_data_file_path("resources/"
+   "namebench-dns-servers.csv")
+
 filename = os.path.join(dst, "dns-server-%s.txt" % country_code)
 fw = open(filename, "w")
 geoip_db = GeoIPDB()
diff --git a/ooni/geoip.py b/ooni/geoip.py
index 48e1134..9c3ee31 100644
--

[tor-commits] [ooni-probe/master] Remove deb.ooni.nu installation method from README.rst

2015-02-04 Thread art 
commit 17e388a7b9c92c9f1dbba5a82afd3731c7cb365d
Author: Arturo Filastò 
Date:   Tue Jan 20 11:27:11 2015 +0100

Remove deb.ooni.nu installation method from README.rst
---
 README.rst |8 
 1 file changed, 8 deletions(-)

diff --git a/README.rst b/README.rst
index 63b8a6d..4566993 100644
--- a/README.rst
+++ b/README.rst
@@ -108,14 +108,6 @@ You will be warned that the packages are unauthenticated. 
This is due to the
 PPA not being signed and is normal behaviour. If you would prefer to verify the
 integrity of the package, use our private Debian repository below.
 
-For other Debian based systems, we also have our own Debian repository. To
-install it from there run this::
-
-sudo sh -c 'echo "deb http://deb.ooni.nu/ooni wheezy main" >> 
/etc/apt/sources.list'
-gpg --keyserver pgp.mit.edu --recv-key 0x49B8CDF4
-gpg --export 89AB86D4788F3785FE9EDA31F9E2D9B049B8CDF4 | sudo apt-key add -
-sudo apt-get update && sudo apt-get install ooniprobe
-
 Linux
 -
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [ooni-probe/master] Re-add manpages to manifest

2015-02-04 Thread art 
commit 8d7a40ce66777b5ff49569c9ed2c51ed79b74159
Author: Arturo Filastò 
Date:   Sun Jan 4 12:18:24 2015 +0100

Re-add manpages to manifest
---
 MANIFEST.in |4 
 1 file changed, 4 insertions(+)

diff --git a/MANIFEST.in b/MANIFEST.in
index 9b70d09..71c4a58 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,5 +1,9 @@
 include README.rst ChangeLog.rst requirements.txt LICENSE
 recursive-include data/decks *
 include data/inputs/
+include data/oonideckgen.1
+include data/ooniprobe.1
+include data/oonireport.1
+include data/ooniresources.1
 include data/ooniprobe.conf.sample
 include ooni/settings.ini



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [ooni-probe/master] Add to requirements.txt previously missing requirements

2015-02-04 Thread art 
commit 64c9c78b7c268b43da0a6a19443a39344f4abd0e
Author: Arturo Filastò 
Date:   Sat Jan 3 17:49:03 2015 +0100

Add to requirements.txt previously missing requirements
---
 requirements.txt |4 
 1 file changed, 4 insertions(+)

diff --git a/requirements.txt b/requirements.txt
index e28a08d..40a010f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,3 +10,7 @@ scapy-real>=2.2.0-dev
 pypcap>=1.1
 service-identity
 pydumbnet
+pyasn1
+characteristic
+zope.interface
+cryptography



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [ooni-probe/master] Use the new function for determining the geoip data files path

2015-02-04 Thread art 
commit 6d2d12aee6513b69795777505a51685d3e5e06de
Author: Arturo Filastò 
Date:   Sat Jan 3 18:04:07 2015 +0100

Use the new function for determining the geoip data files path
---
 ooni/geoip.py |6 +-
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/ooni/geoip.py b/ooni/geoip.py
index 9c3ee31..1ff90a7 100644
--- a/ooni/geoip.py
+++ b/ooni/geoip.py
@@ -81,12 +81,8 @@ def database_version():
 }
 }
 
-geoip_data_dir = config.advanced.get("geoip_data_dir")
-if not geoip_data_dir:
-return version
-
 for key in version.keys():
-geoip_file = os.path.join(geoip_data_dir, key + ".dat")
+geoip_file = config.get_data_file_path("GeoIP/" + key + ".dat")
 if not os.path.isfile(geoip_file):
 continue
 timestamp = os.stat(geoip_file).st_mtime



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [ooni-probe/master] Ignore settings.ini

2015-02-04 Thread art 
commit ee0f2aaefce0e998a406215a35d9febf619375ec
Author: Arturo Filastò 
Date:   Sun Jan 4 12:20:39 2015 +0100

Ignore settings.ini
---
 .gitignore |2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index 1e2dba3..dacf46d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,3 +43,5 @@ docs/build/*
 
 cover/*
 ooni_home/*
+
+ooni/settings.ini



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [ooni-probe/master] Add install of pyasn1 and pyasn1-modules to setup-dependencies script

2015-02-04 Thread art 
commit 725e0fd136fe50610ac5b75d39616864146c1b5b
Author: Arturo Filastò 
Date:   Wed Jan 14 19:51:53 2015 +0100

Add install of pyasn1 and pyasn1-modules to setup-dependencies script
---
 setup-dependencies.sh |2 ++
 1 file changed, 2 insertions(+)

diff --git a/setup-dependencies.sh b/setup-dependencies.sh
index bf7eb44..ffe385a 100755
--- a/setup-dependencies.sh
+++ b/setup-dependencies.sh
@@ -940,6 +940,8 @@ case $DISTRO_VERSION in
   fi
   
 
+  # First install pyasn1 and pyasn1-modules to avoid bugs
+  DO "pip install -v --timeout 60 pyasn1 pyasn1-modules" "0"
   # Install all of the out of package manager dependencies
   DO "pip install -v --timeout 60 -r ${REPO_ROOT}/requirements.txt" "0"
   



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [ooni-probe/master] Merge branch 'master' of github.com:TheTorProject/ooni-probe

2015-02-04 Thread art 
commit 4e83a9c1345cb9b594156d901de489932037809c
Merge: 17e388a f4ba7f1
Author: Arturo Filastò 
Date:   Tue Jan 20 11:27:48 2015 +0100

Merge branch 'master' of github.com:TheTorProject/ooni-probe

* 'master' of github.com:TheTorProject/ooni-probe:
  Point the http header field manipulation test to a working backend
  Add support for Linux Mint
  Add install package libdumbnet-dev
  Add install of pyasn1 and pyasn1-modules to setup-dependencies script
  Remove unused reports_directory
  Skip calculating the version of the geoip files that are not found
  Ignore settings.ini
  Re-add manpages to manifest
  Use the new function for determining the geoip data files path
  Add to requirements.txt previously missing requirements
  Restructure directories where ooni software writes/reads from

 .gitignore   |2 +
 MANIFEST.in  |4 +
 data/ooniprobe.conf.sample   |2 -
 ooni/deckgen/cli.py  |4 +-
 ooni/deckgen/processors/citizenlab_test_lists.py |   16 ++--
 ooni/deckgen/processors/namebench_dns_servers.py |8 +-
 ooni/geoip.py|   14 ++--
 ooni/resources/__init__.py   |   24 --
 ooni/resources/update.py |5 +-
 ooni/settings.py |   91 +++---
 ooni/tests/test_oonicli.py   |2 +-
 requirements.txt |4 +
 setup-dependencies.sh|   11 ++-
 setup.py |   25 +-
 14 files changed, 141 insertions(+), 71 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [ooni-probe/master] Fix typo

2015-02-04 Thread art 
commit 9bc66e72853a473aa46639e2227e55bd6d5f9e67
Author: anadahz 
Date:   Wed Feb 4 01:35:32 2015 +0100

Fix typo
---
 setup-dependencies.sh |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup-dependencies.sh b/setup-dependencies.sh
index 28593db..d96f2cf 100755
--- a/setup-dependencies.sh
+++ b/setup-dependencies.sh
@@ -20,7 +20,7 @@ elif [ -r /lib/lsb/init-functions ]; then
   elif [ "$( lsb_release -is )" == "LinuxMint" ]; then
 source $MINT_RELEASE_VARS
 DISTRO="$ID"
-DISTRO_VERSION="$( echo $VERSION | cut -d' ' -f2 | tr [:upper:] [:lower:] 
)"
+DISTRO_VERSION="$( echo $VERSION | cut -d' ' -f3 | tr [:upper:] [:lower:] 
)"
   else
 DISTRO="debian"
   fi



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [ooni-probe/master] Merge pull request #372 from TheTorProject/fix/14086

2015-02-04 Thread art 
commit 2ff381e5276fef1fdd203fc0662aebd6957a113d
Merge: a609558 8330d9f
Author: Arturo Filastò 
Date:   Thu Jan 15 14:58:30 2015 +0100

Merge pull request #372 from TheTorProject/fix/14086

Fix/14086

 .gitignore   |2 +
 MANIFEST.in  |4 +
 data/ooniprobe.conf.sample   |2 -
 ooni/deckgen/cli.py  |4 +-
 ooni/deckgen/processors/citizenlab_test_lists.py |   16 ++--
 ooni/deckgen/processors/namebench_dns_servers.py |8 +-
 ooni/geoip.py|   14 ++--
 ooni/resources/__init__.py   |   24 --
 ooni/resources/update.py |5 +-
 ooni/settings.py |   91 +++---
 ooni/tests/test_oonicli.py   |2 +-
 requirements.txt |4 +
 setup-dependencies.sh|2 +
 setup.py |   25 +-
 14 files changed, 133 insertions(+), 70 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [ooni-probe/master] Merge pull request #375 from anadahz/feature/linuxmint_setup

2015-02-04 Thread art 
commit f4ba7f1e2ef1b5240f350e84dd00b9e69d379c1f
Merge: df6a518 4dbe807
Author: Arturo Filastò 
Date:   Thu Jan 15 14:59:18 2015 +0100

Merge pull request #375 from anadahz/feature/linuxmint_setup

Add support for Linux Mint

 setup-dependencies.sh |5 +
 1 file changed, 5 insertions(+)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [ooni-probe/master] Add support for Linux Mint

2015-02-04 Thread art 
commit 4dbe80786f16108e26573c2e4d1a59b20726e183
Author: anadahz 
Date:   Thu Jan 15 03:02:16 2015 +0100

Add support for Linux Mint

Add support for Linux Mint, tested on Linux Mint 17, but it should work for
other versions too.
---
 setup-dependencies.sh |9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/setup-dependencies.sh b/setup-dependencies.sh
index bf7eb44..3c07745 100755
--- a/setup-dependencies.sh
+++ b/setup-dependencies.sh
@@ -7,6 +7,7 @@ TMP_KEYRING=${BUILD_DIR}/tmpkeyring.gpg
 DISTRO='unknown'
 DISTRO_VERSION='unknown'
 REPO_ROOT="$(pwd)"
+MINT_RELEASE_VARS="/etc/os-release"
 
 # Discover our Distro release
 if [ -f /etc/redhat-release ]; then
@@ -16,6 +17,10 @@ elif [ -r /lib/lsb/init-functions ]; then
   DISTRO_VERSION="$( lsb_release -cs )"
   if [ "$( lsb_release -is )" == "Ubuntu" ]; then
 DISTRO="ubuntu"
+  elif [ "$( lsb_release -is )" == "LinuxMint" ]; then
+source $MINT_RELEASE_VARS
+DISTRO="$ID"
+DISTRO_VERSION="$( echo $VERSION | cut -d' ' -f2 | tr [:upper:] [:lower:] 
)"
   else
 DISTRO="debian"
   fi
@@ -906,7 +911,9 @@ case $DISTRO_VERSION in
   echo "[+] Updating OS package list...";
   sudo sudo apt-get update 2>&1 > /dev/null;
   echo "[+] Installing packages for your system...";
-  DO "sudo apt-get -y install curl git-core python python-dev 
python-setuptools build-essential libdumbnet1 python-dumbnet python-libpcap tor 
tor-geoipdb libgeoip-dev libpcap0.8-dev libssl-dev libffi-dev" "0"
+  DO "sudo apt-get -y install curl git-core python python-dev python-setuptools
+  build-essential libdumbnet1 python-dumbnet python-libpcap tor tor-geoipdb
+  libgeoip-dev libpcap0.8-dev libssl-dev libffi-dev libdumbnet-dev" "0"
 
   if [ "$PRIV_MODE" -eq "0" ]; then
 echo "[+] Using virtualenvironment..."



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [ooni-probe/master] Add install package libdumbnet-dev

2015-02-04 Thread art 
commit 9ac1e777be78efbdd32c7804a130a82071bac279
Author: anadahz 
Date:   Thu Jan 15 02:17:30 2015 +0100

Add install package libdumbnet-dev

The package libdumbnet-dev is required by pydumbnet
---
 setup-dependencies.sh |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/setup-dependencies.sh b/setup-dependencies.sh
index bf7eb44..524a5da 100755
--- a/setup-dependencies.sh
+++ b/setup-dependencies.sh
@@ -906,7 +906,9 @@ case $DISTRO_VERSION in
   echo "[+] Updating OS package list...";
   sudo sudo apt-get update 2>&1 > /dev/null;
   echo "[+] Installing packages for your system...";
-  DO "sudo apt-get -y install curl git-core python python-dev 
python-setuptools build-essential libdumbnet1 python-dumbnet python-libpcap tor 
tor-geoipdb libgeoip-dev libpcap0.8-dev libssl-dev libffi-dev" "0"
+  DO "sudo apt-get -y install curl git-core python python-dev python-setuptools
+  build-essential libdumbnet1 python-dumbnet python-libpcap tor tor-geoipdb
+  libgeoip-dev libpcap0.8-dev libssl-dev libffi-dev libdumbnet-dev" "0"
 
   if [ "$PRIV_MODE" -eq "0" ]; then
 echo "[+] Using virtualenvironment..."



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [ooni-probe/master] Skip calculating the version of the geoip files that are not found

2015-02-04 Thread art 
commit be5eb6e9288ecb82d152aff18dcab533919ccf4a
Author: Arturo Filastò 
Date:   Sun Jan 4 12:29:03 2015 +0100

Skip calculating the version of the geoip files that are not found
---
 ooni/geoip.py |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ooni/geoip.py b/ooni/geoip.py
index 1ff90a7..1dbc7c2 100644
--- a/ooni/geoip.py
+++ b/ooni/geoip.py
@@ -83,7 +83,7 @@ def database_version():
 
 for key in version.keys():
 geoip_file = config.get_data_file_path("GeoIP/" + key + ".dat")
-if not os.path.isfile(geoip_file):
+if not geoip_file or not os.path.isfile(geoip_file):
 continue
 timestamp = os.stat(geoip_file).st_mtime
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [ooni-probe/master] Remove unused reports_directory

2015-02-04 Thread art 
commit 6ea67e88e536f59bf48dc76612b18bf8e411
Author: Arturo Filastò 
Date:   Mon Jan 5 16:27:04 2015 +0100

Remove unused reports_directory
---
 ooni/settings.py |3 ---
 1 file changed, 3 deletions(-)

diff --git a/ooni/settings.py b/ooni/settings.py
index 71b449e..4dc2221 100644
--- a/ooni/settings.py
+++ b/ooni/settings.py
@@ -98,7 +98,6 @@ class OConfig(object):
 
 self.inputs_directory = os.path.join(self.ooni_home, 'inputs')
 self.decks_directory = os.path.join(self.ooni_home, 'decks')
-self.reports_directory = os.path.join(self.ooni_home, 'reports')
 self.report_log_file = os.path.join(self.ooni_home, 'reporting.yml')
 self.resources_directory = os.path.join(self.data_directory,
 'resources')
@@ -123,8 +122,6 @@ class OConfig(object):
 os.mkdir(self.ooni_home)
 os.mkdir(self.inputs_directory)
 os.mkdir(self.decks_directory)
-if not os.path.isdir(self.reports_directory):
-os.mkdir(self.reports_directory)
 
 def _create_config_file(self):
 target_config_file = self.config_file



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [ooni-probe/master] Merge pull request #374 from anadahz/fix/setup_deps

2015-02-04 Thread art 
commit df6a518728a4378b94a4c67780f86c3fe5b81619
Merge: 2ff381e 9ac1e77
Author: Arturo Filastò 
Date:   Thu Jan 15 14:58:51 2015 +0100

Merge pull request #374 from anadahz/fix/setup_deps

Add install package libdumbnet-dev

 setup-dependencies.sh |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [ooni-probe/master] Implement a hotfix for https://github.com/habnabit/txsocksx/issues/9

2015-02-04 Thread art 
commit 96391035de250a2d5842c5c0e68879f1838eb874
Author: Arturo Filastò 
Date:   Wed Feb 4 11:18:05 2015 +0100

Implement a hotfix for https://github.com/habnabit/txsocksx/issues/9
---
 ooni/oonibclient.py   |3 ++-
 ooni/reporter.py  |2 +-
 ooni/utils/hacks.py   |   29 +
 ooni/utils/trueheaders.py |2 +-
 4 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/ooni/oonibclient.py b/ooni/oonibclient.py
index a26b771..126eeb7 100644
--- a/ooni/oonibclient.py
+++ b/ooni/oonibclient.py
@@ -203,7 +203,8 @@ class OONIBClient(object):
 try:
 test_collector = yield self.queryBackend('POST', 
'/bouncer/net-tests',
  query={'net-tests': 
net_tests})
-except Exception:
+except Exception as exc:
+log.exception(exc)
 raise e.CouldNotFindTestCollector
 
 defer.returnValue(test_collector)
diff --git a/ooni/reporter.py b/ooni/reporter.py
index 34ff333..bf4a645 100644
--- a/ooni/reporter.py
+++ b/ooni/reporter.py
@@ -287,7 +287,7 @@ class OONIBReporter(OReporter):
 # do this with some deferred kung foo or instantiate the reporter after
 # tor is started.
 
-from txsocksx.http import SOCKS5Agent
+from ooni.utils.hacks import SOCKS5Agent
 from twisted.internet import reactor
 
 if self.collectorAddress.startswith('httpo://'):
diff --git a/ooni/utils/hacks.py b/ooni/utils/hacks.py
index 2c84a23..e001d3f 100644
--- a/ooni/utils/hacks.py
+++ b/ooni/utils/hacks.py
@@ -2,6 +2,9 @@
 # hackish way, we put it in here. This one day will be empty.
 
 import copy_reg
+from twisted.web.client import SchemeNotSupported
+
+from txsocksx.http import SOCKS5Agent as SOCKS5AgentOriginal
 
 
 def patched_reduce_ex(self, proto):
@@ -56,3 +59,29 @@ def patched_reduce_ex(self, proto):
 else:
 return copy_reg._reconstructor, args
 
+
+class SOCKS5Agent(SOCKS5AgentOriginal):
+"""
+This is a quick hack to fix:
+https://github.com/habnabit/txsocksx/issues/9
+"""
+def _getEndpoint(self, scheme_or_uri, host=None, port=None):
+if host is not None:
+scheme = scheme_or_uri
+else:
+scheme = scheme_or_uri.scheme
+host = scheme_or_uri.host
+port = scheme_or_uri.port
+if scheme not in ('http', 'https'):
+raise SchemeNotSupported('unsupported scheme', scheme)
+endpoint = self.endpointFactory(
+host, port, self.proxyEndpoint, **self.endpointArgs)
+if scheme == 'https':
+if hasattr(self, '_wrapContextFactory'):
+tlsPolicy = self._wrapContextFactory(host, port)
+elif hasattr(self, '_policyForHTTPS'):
+tlsPolicy = self._policyForHTTPS.creatorForNetloc(host, port)
+else:
+raise NotImplementedError("can't figure out how to make a 
context factory")
+endpoint = self._tlsWrapper(tlsPolicy, endpoint)
+return endpoint
diff --git a/ooni/utils/trueheaders.py b/ooni/utils/trueheaders.py
index e5dcd0a..f015b62 100644
--- a/ooni/utils/trueheaders.py
+++ b/ooni/utils/trueheaders.py
@@ -12,7 +12,7 @@ from twisted.web._newclient import RequestNotSent, 
RequestGenerationFailed, Tran
 from twisted.internet import reactor
 from twisted.internet.defer import Deferred, fail, maybeDeferred, failure
 
-from txsocksx.http import SOCKS5Agent
+from ooni.utils.hacks import SOCKS5Agent
 from txsocksx.client import SOCKS5ClientFactory
 
 SOCKS5ClientFactory.noisy = False



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [ooni-probe/master] Point the http header field manipulation test to a working backend

2015-02-04 Thread art 
commit 8330d9fc5699242890cfb1cb2ceab7b544511993
Author: Arturo Filastò 
Date:   Thu Jan 15 14:13:42 2015 +0100

Point the http header field manipulation test to a working backend
---
 ooni/tests/test_oonicli.py |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ooni/tests/test_oonicli.py b/ooni/tests/test_oonicli.py
index a01aade..2ca94e3 100644
--- a/ooni/tests/test_oonicli.py
+++ b/ooni/tests/test_oonicli.py
@@ -163,7 +163,7 @@ class TestRunDirector(ConfigTestCase):
 assert 'total' in entry['tampering']
 
 yield self.run_helper('manipulation/http_header_field_manipulation',
-  ['-b', 'http://64.9.225.208'],
+  ['-b', 'http://4.15.35.157:80'],
   verify_function)
 
 @defer.inlineCallbacks



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [ooni-probe/master] Merge pull request #377 from anadahz/fix/typo

2015-02-04 Thread art 
commit d3981afad5d1820260f40d59bd7c7f434535bb1d
Merge: 4e83a9c 9bc66e7
Author: Arturo Filastò 
Date:   Wed Feb 4 11:19:11 2015 +0100

Merge pull request #377 from anadahz/fix/typo

Fix typo

 setup-dependencies.sh |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [ooni-probe/master] Properly set exit code when doing oonideckgen

2015-02-04 Thread art 
commit 7116e88e97954b15883fb26cb0e1503b1846e07b
Author: Arturo Filastò 
Date:   Mon Jan 19 12:29:54 2015 +0100

Properly set exit code when doing oonideckgen
(patch by Lunar^)
---
 bin/oonideckgen |   10 ++
 1 file changed, 10 insertions(+)

diff --git a/bin/oonideckgen b/bin/oonideckgen
index 74ea8de..017a5d8 100755
--- a/bin/oonideckgen
+++ b/bin/oonideckgen
@@ -11,14 +11,23 @@ from twisted.internet import defer, reactor
 from ooni.utils import log
 from ooni.deckgen import cli
 
+exitCode = 128
 def failed(failure):
+global exitCode
+
 r = failure.trap(exceptions.SystemExit)
 if r != exceptions.SystemExit:
 log.err("Failed to run oonideckgen")
 log.exception(failure)
+exitCode = 127
+else:
+exitCode = failure.value.code
 reactor.stop()
 
 def done(result):
+global exitCode
+
+exitCode = 0
 reactor.stop()
 
 def start():
@@ -28,3 +37,4 @@ def start():
 
 reactor.callWhenRunning(start)
 reactor.run()
+sys.exit(exitCode)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [ooni-probe/master] Set a default bouncer

2015-02-04 Thread art 
commit bc638e8c477b87933cf31bd6f5623a5dfeeb7630
Author: Arturo Filastò 
Date:   Wed Feb 4 14:19:00 2015 +0100

Set a default bouncer
---
 ooni/report/cli.py  |2 +-
 ooni/report/tool.py |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ooni/report/cli.py b/ooni/report/cli.py
index e52b022..c1b4a22 100644
--- a/ooni/report/cli.py
+++ b/ooni/report/cli.py
@@ -20,7 +20,7 @@ class Options(usage.Options):
  "Specify the configuration file to use."],
 ["collector", "c", None,
  "Specify the collector to upload the result to."],
-["bouncer", "b", None,
+["bouncer", "b", "httpo://nkvphnp3p6agi5qq.onion",
  "Specify the bouncer to query for a collector."]
 ]
 
diff --git a/ooni/report/tool.py b/ooni/report/tool.py
index 9eaad5e..a16794a 100644
--- a/ooni/report/tool.py
+++ b/ooni/report/tool.py
@@ -20,7 +20,7 @@ def upload(report_file, collector=None, bouncer=None):
 report_log = yaml.safe_load(f)
 
 report = parser.ReportLoader(report_file)
-if bouncer:
+if bouncer and not collector:
 oonib_client = OONIBClient(bouncer)
 net_tests = [{
 'test-helpers': [],



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [ooni-probe/master] Exit cleanly if we can't find the probes IP address

2015-02-04 Thread art 
commit 9c2802dc85d14e9a4e03b61bbf61abfd0e88c25f
Author: Arturo Filastò 
Date:   Mon Jan 19 10:50:12 2015 +0100

Exit cleanly if we can't find the probes IP address
---
 ooni/deckgen/cli.py |8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/ooni/deckgen/cli.py b/ooni/deckgen/cli.py
index 3f4342a..1f618b7 100644
--- a/ooni/deckgen/cli.py
+++ b/ooni/deckgen/cli.py
@@ -8,6 +8,7 @@ import yaml
 from twisted.internet import defer
 from twisted.python import usage
 
+from ooni import errors
 from ooni.geoip import ProbeIP
 from ooni.settings import config
 
@@ -138,7 +139,12 @@ def run():
 options['output'] = os.getcwd()
 
 if not options['country-code']:
-options['country-code'] = yield get_user_country_code()
+try:
+options['country-code'] = yield get_user_country_code()
+except errors.ProbeIPUnknown:
+print "Could not determine your IP address."
+print "Check your internet connection or specify a country code 
with -c."
+sys.exit(4)
 
 if len(options['country-code']) != 2:
 print "%s: --country-code must be 2 characters" % sys.argv[0]



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [ooni-probe/master] Make the DNS Consistency test handle errors better

2015-02-04 Thread art 
commit 0cc9e06f7fc037c648a6a6ddca56e43e2b34a687
Author: Arturo Filastò 
Date:   Sat Jan 31 13:01:24 2015 +0100

Make the DNS Consistency test handle errors better
---
 ooni/nettests/blocking/dns_consistency.py |   31 +++--
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/ooni/nettests/blocking/dns_consistency.py 
b/ooni/nettests/blocking/dns_consistency.py
index c4cae56..88e5d5e 100644
--- a/ooni/nettests/blocking/dns_consistency.py
+++ b/ooni/nettests/blocking/dns_consistency.py
@@ -112,17 +112,23 @@ class DNSConsistencyTest(dnst.DNSTest):
 
 self.report['tampering'] = {}
 
-control_answers = yield self.performALookup(hostname,
-self.control_dns_server)
-if not control_answers:
-log.err(
-"Got no response from control DNS server %s:%d, "
-"perhaps the DNS resolver is down?" %
-self.control_dns_server)
+try:
+control_answers = yield self.performALookup(hostname,
+
self.control_dns_server)
+
+if not control_answers:
+log.err(
+"Got no response from control DNS server %s:%d, "
+"perhaps the DNS resolver is down?" %
+self.control_dns_server)
+self.report['tampering'][
+"%s:%d" %
+self.control_dns_server] = 'no_answer'
+except:
 self.report['tampering'][
 "%s:%d" %
-self.control_dns_server] = 'no_answer'
-return
+self.control_dns_server] = 'error'
+control_answers = None
 
 for test_resolver in self.test_resolvers:
 log.msg("Testing resolver: %s" % test_resolver)
@@ -156,7 +162,12 @@ class DNSConsistencyTest(dnst.DNSTest):
 log.debug(
 "Comparing %s with %s" %
 (experiment_answers, control_answers))
-if set(experiment_answers) & set(control_answers):
+
+if not control_answers:
+log.msg("Skipping control resolver comparison")
+self.report['tampering'][test_resolver] = None
+
+elif set(experiment_answers) & set(control_answers):
 lookup_details()
 log.msg("tampering: false")
 self.report['tampering'][test_resolver] = False



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [ooni-probe/master] Add config file parsing support to oonireport

2015-02-04 Thread art 
commit ec7a5291e31cb7d3bd0a1457fdef62085436b61b
Author: Arturo Filastò 
Date:   Wed Jan 21 14:10:56 2015 +0100

Add config file parsing support to oonireport

Properly pass error codes onward
---
 bin/oonireport |   19 +--
 ooni/report/cli.py |6 +-
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/bin/oonireport b/bin/oonireport
index 3a06b3b..84fc80d 100755
--- a/bin/oonireport
+++ b/bin/oonireport
@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 import os
 import sys
+import exceptions
 
 sys.path[:] = map(os.path.abspath, sys.path)
 sys.path.insert(0, os.path.abspath(os.getcwd()))
@@ -10,12 +11,25 @@ from twisted.internet import defer, reactor
 from ooni.utils import log
 from ooni.report import cli
 
+exitCode = 128
+
 def failed(failure):
-log.err("Failed to run ooni-report")
-log.exception(failure)
+global exitCode
+
+r = failure.trap(exceptions.SystemExit)
+if r != exceptions.SystemExit:
+log.err("Failed to run oonideckgen")
+log.exception(failure)
+exitCode = 127
+else:
+exitCode = failure.value.code
 reactor.stop()
 
+
 def done(result):
+global exitCode
+exitCode = 0
+
 reactor.stop()
 
 def start():
@@ -25,3 +39,4 @@ def start():
 
 reactor.callWhenRunning(start)
 reactor.run()
+sys.exit(exitCode)
diff --git a/ooni/report/cli.py b/ooni/report/cli.py
index 2523c4f..e52b022 100644
--- a/ooni/report/cli.py
+++ b/ooni/report/cli.py
@@ -16,6 +16,8 @@ class Options(usage.Options):
 """ % (os.path.basename(sys.argv[0]),)
 
 optParameters = [
+["configfile", "f", None,
+ "Specify the configuration file to use."],
 ["collector", "c", None,
  "Specify the collector to upload the result to."],
 ["bouncer", "b", None,
@@ -52,7 +54,6 @@ def tor_check():
 
 
 def run():
-config.read_config_file()
 options = Options()
 try:
 options.parseOptions()
@@ -60,6 +61,9 @@ def run():
 print("Error: %s" % exc)
 print(options)
 sys.exit(2)
+config.global_options = dict(options)
+config.set_paths()
+config.read_config_file()
 if options['command'] == "upload" and options['report_file']:
 tor_check()
 return tool.upload(options['report_file'],



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [ooni-probe/master] Add config file option for setting the location of the report_log

2015-02-04 Thread art 
commit a923800d13c0e2161692717114fa9103fd556e3b
Author: Arturo Filastò 
Date:   Wed Jan 21 12:23:10 2015 +0100

Add config file option for setting the location of the report_log
---
 data/ooniprobe.conf.sample |1 +
 ooni/report/tool.py|   12 
 ooni/reporter.py   |4 +++-
 ooni/settings.py   |9 +++--
 4 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/data/ooniprobe.conf.sample b/data/ooniprobe.conf.sample
index 3c9cea9..6c8f7f3 100644
--- a/data/ooniprobe.conf.sample
+++ b/data/ooniprobe.conf.sample
@@ -46,6 +46,7 @@ advanced:
 # How many reports to perform concurrently
 reporting_concurrency: 15
 oonid_api_port: 8042
+report_log_file: null
 tor:
 #socks_port: 8801
 #control_port: 8802
diff --git a/ooni/report/tool.py b/ooni/report/tool.py
index e86626e..11dbeda 100644
--- a/ooni/report/tool.py
+++ b/ooni/report/tool.py
@@ -10,11 +10,10 @@ from ooni.settings import config
 from ooni.oonibclient import OONIBClient
 
 
-oonib_report_log = OONIBReportLog()
-
-
 @defer.inlineCallbacks
 def upload(report_file, collector=None, bouncer=None):
+oonib_report_log = OONIBReportLog()
+
 print "Attempting to upload %s" % report_file
 
 with open(config.report_log_file) as f:
@@ -34,7 +33,8 @@ def upload(report_file, collector=None, bouncer=None):
 raise KeyError
 except KeyError:
 raise Exception(
-"No collector or bouncer specified and collector not in report 
log."
+"No collector or bouncer specified"
+" and collector not in report log."
 )
 
 oonib_reporter = OONIBReporter(report.header, collector)
@@ -51,6 +51,8 @@ def upload(report_file, collector=None, bouncer=None):
 
 @defer.inlineCallbacks
 def upload_all(collector=None, bouncer=None):
+oonib_report_log = OONIBReportLog()
+
 for report_file, value in oonib_report_log.reports_to_upload:
 try:
 yield upload(report_file, collector, bouncer)
@@ -64,6 +66,8 @@ def print_report(report_file, value):
 
 
 def status():
+oonib_report_log = OONIBReportLog()
+
 print "Reports to be uploaded"
 print "--"
 for report_file, value in oonib_report_log.reports_to_upload:
diff --git a/ooni/reporter.py b/ooni/reporter.py
index cbea9f7..34ff333 100644
--- a/ooni/reporter.py
+++ b/ooni/reporter.py
@@ -386,7 +386,9 @@ class OONIBReportLog(object):
 Used to keep track of report creation on a collector backend.
 """
 
-def __init__(self, file_name=config.report_log_file):
+def __init__(self, file_name=None):
+if file_name is None:
+file_name = config.report_log_file
 self.file_name = file_name
 self.create_report_log()
 
diff --git a/ooni/settings.py b/ooni/settings.py
index 4dc2221..b0b032c 100644
--- a/ooni/settings.py
+++ b/ooni/settings.py
@@ -98,9 +98,14 @@ class OConfig(object):
 
 self.inputs_directory = os.path.join(self.ooni_home, 'inputs')
 self.decks_directory = os.path.join(self.ooni_home, 'decks')
-self.report_log_file = os.path.join(self.ooni_home, 'reporting.yml')
+self.reports_directory = os.path.join(self.ooni_home, 'reports')
 self.resources_directory = os.path.join(self.data_directory,
-'resources')
+"resources")
+if self.advanced.report_log_file:
+self.report_log_file = self.advanced.report_log_file
+else:
+self.report_log_file = os.path.join(self.ooni_home,
+'reporting.yml')
 
 if self.global_options.get('configfile'):
 config_file = self.global_options['configfile']



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [ooni-probe/master] Merge pull request #376 from TheTorProject/fix/deckgen-stall

2015-02-04 Thread art 
commit cd8618aee6ed78c0d223ff6448b339ef11b9c696
Merge: d3981af 9639103
Author: Arturo Filastò 
Date:   Wed Feb 4 11:30:03 2015 +0100

Merge pull request #376 from TheTorProject/fix/deckgen-stall

Fix/deckgen stall

 bin/oonideckgen   |   10 ++
 bin/oonireport|   19 --
 data/ooniprobe.conf.sample|1 +
 ooni/deckgen/cli.py   |8 +++-
 ooni/nettests/blocking/dns_consistency.py |   31 +++--
 ooni/oonibclient.py   |3 ++-
 ooni/report/cli.py|6 +-
 ooni/report/tool.py   |   12 +++
 ooni/reporter.py  |6 --
 ooni/settings.py  |9 +++--
 ooni/utils/hacks.py   |   29 +++
 ooni/utils/trueheaders.py |2 +-
 12 files changed, 112 insertions(+), 24 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [ooni-probe/master] Update changelog for ooniprobe 1.2.3-rc1

2015-02-04 Thread art 
commit e358243b21fe8e88b8894cdd94aa4dab3d4f92ce
Author: Arturo Filastò 
Date:   Wed Feb 4 14:24:46 2015 +0100

Update changelog for ooniprobe 1.2.3-rc1
---
 ChangeLog.rst |   11 +++
 1 file changed, 11 insertions(+)

diff --git a/ChangeLog.rst b/ChangeLog.rst
index cddf18f..92f5109 100644
--- a/ChangeLog.rst
+++ b/ChangeLog.rst
@@ -1,6 +1,17 @@
 Changelog
 =
 
+v1.2.3-rc1 (Wed, 4 Feb 2015)
+
+* Restructure directories where ooni software writes/reads from
+  https://trac.torproject.org/projects/tor/ticket/14086
+
+* Properly set exit codes of oonideckgen
+
+* Exit cleanly if we can't find the probes IP address
+
+* Make the DNS Consistency test handle errors better
+
 v1.2.2 (Fri, 17 Oct 2014)
 -
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [ooni-probe/master] Run ooniresources only in post install

2015-02-04 Thread art 
commit f5ee5e39c337c31e75e011fc7dcec4e3cc8e342c
Author: Arturo Filastò 
Date:   Wed Feb 4 12:39:21 2015 +0100

Run ooniresources only in post install

Fix inclusion of inputs in MANIFEST
---
 MANIFEST.in |2 +-
 setup.py|   16 +---
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/MANIFEST.in b/MANIFEST.in
index 71c4a58..920f933 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,6 +1,6 @@
 include README.rst ChangeLog.rst requirements.txt LICENSE
 recursive-include data/decks *
-include data/inputs/
+recursive-include data/inputs *
 include data/oonideckgen.1
 include data/ooniprobe.1
 include data/oonireport.1
diff --git a/setup.py b/setup.py
index 62335d9..54ec4ee 100644
--- a/setup.py
+++ b/setup.py
@@ -10,7 +10,7 @@ from ConfigParser import SafeConfigParser
 from os.path import join as pj
 from setuptools import setup
 from setuptools.command.install import install as _st_install
-
+from distutils.spawn import find_executable
 
 class install(_st_install):
 def gen_config(self, share_path):
@@ -67,11 +67,18 @@ class install(_st_install):
 except OSError:
 pass
 
+def ooniresources(self):
+ooniresources = find_executable("ooniresources")
+from subprocess import Popen, PIPE
+process = Popen([ooniresources, '--update-inputs', '--update-geoip'],
+stdout=sys.stdout.fileno(), stderr=sys.stderr.fileno())
+process.wait()
+
 def run(self):
 prefix = os.path.abspath(self.prefix)
 self.set_data_files(prefix)
 self.do_egg_install()
-
+self.ooniresources()
 
 install_requires = []
 dependency_links = []
@@ -163,8 +170,3 @@ setup(
 "Topic :: System :: Networking :: Monitoring",
 )
 )
-
-from subprocess import Popen, PIPE
-process = Popen(['ooniresources', '--update-inputs', '--update-geoip'],
-stdout=sys.stdout.fileno(), stderr=sys.stderr.fileno())
-process.wait()



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [ooni-probe/master] Tag release candiate

2015-02-04 Thread art 
commit 5ad2ba0e790753b702e518ec2bd3c659d1989f59
Author: Arturo Filastò 
Date:   Wed Feb 4 12:39:47 2015 +0100

Tag release candiate
---
 ooni/__init__.py |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ooni/__init__.py b/ooni/__init__.py
index 305222c..a83105a 100644
--- a/ooni/__init__.py
+++ b/ooni/__init__.py
@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 
 __author__ = "Open Observatory of Network Interference"
-__version__ = "1.2.2"
+__version__ = "1.2.3-rc1"
 
 __all__ = ['config', 'inputunit', 'kit',
'lib', 'nettest', 'oonicli', 'report', 'reporter',



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [ooni-probe/master] Fix some bugs in oonireport

2015-02-04 Thread art 
commit eb1daf87240830d8c875455ad92a708ce8443d65
Author: Arturo Filastò 
Date:   Wed Feb 4 14:17:55 2015 +0100

Fix some bugs in oonireport
---
 ooni/report/tool.py |   13 ++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/ooni/report/tool.py b/ooni/report/tool.py
index 11dbeda..9eaad5e 100644
--- a/ooni/report/tool.py
+++ b/ooni/report/tool.py
@@ -22,9 +22,16 @@ def upload(report_file, collector=None, bouncer=None):
 report = parser.ReportLoader(report_file)
 if bouncer:
 oonib_client = OONIBClient(bouncer)
-collector = yield oonib_client.lookupTestCollector(
-report.header['test_name']
+net_tests = [{
+'test-helpers': [],
+'input-hashes': report.header['input_hashes'],
+'name': report.header['test_name'],
+'version': report.header['test_version'],
+}]
+result = yield oonib_client.lookupTestCollector(
+net_tests
 )
+collector = str(result['net-tests'][0]['collector'])
 
 if collector is None:
 try:
@@ -57,7 +64,7 @@ def upload_all(collector=None, bouncer=None):
 try:
 yield upload(report_file, collector, bouncer)
 except Exception as exc:
-print exc
+log.exception(exc)
 
 
 def print_report(report_file, value):



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [guardfraction/master] Fix tests that broke from adding more lines to the output file.

2015-02-04 Thread asn 
commit 47dad84c9e0ca6a77462d1effb5d013572883068
Author: George Kadianakis 
Date:   Wed Feb 4 13:37:42 2015 +

Fix tests that broke from adding more lines to the output file.
---
 guardiness/guard_ds.py |4 +++-
 test/test_guardfraction.py |   18 +++---
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/guardiness/guard_ds.py b/guardiness/guard_ds.py
index 19e8077..61907b0 100644
--- a/guardiness/guard_ds.py
+++ b/guardiness/guard_ds.py
@@ -60,10 +60,12 @@ class Guards(object):
 
 Might raise IOError.
 """
+now = datetime.datetime.now() # get the current date
+now = now.replace(microsecond=0) # leave out the microsecond part
+
 with open(output_fname, 'w+') as f:
 f_str = ""
 
-now = datetime.datetime.now()
 f_str += "guardfraction-file-version 1\n"
 f_str += "written-at %s\n" % now.isoformat(sep=" ") # separate 
year from time with space
 f_str += "n-inputs %d %d %d\n" % (consensuses_read_n, max_days, 
max_days*24)
diff --git a/test/test_guardfraction.py b/test/test_guardfraction.py
index 59024e2..0062b23 100644
--- a/test/test_guardfraction.py
+++ b/test/test_guardfraction.py
@@ -143,17 +143,21 @@ class testGuardFraction(unittest.TestCase):
 with open(temp_path) as test_fd:
 lines = test_fd.readlines()
 
-# One line for the header, one line for n-inputs and 4 guards
-self.assertEquals(len(lines), 6)
+# One line for the file version, one line for date, one
+# line for n-inputs and 4 guards.
+self.assertEquals(len(lines), 7)
+
+self.assertEquals(lines[0][:26], "guardfraction-file-version")
+self.assertEquals(lines[1][:10], "written-at")
 
 # Test the n-inputs line
-self.assertEquals(lines[1], "n-inputs 3 999 23976\n")
+self.assertEquals(lines[2], "n-inputs 3 999 23976\n")
 
 # Test guard lines
-self.assertIn("guard-seen  
100 3\n", lines[2:])
-self.assertIn("guard-seen  
67 2\n", lines[2:])
-self.assertIn("guard-seen  
33 1\n", lines[2:])
-self.assertIn("guard-seen  
33 1\n", lines[2:])
+self.assertIn("guard-seen  
100 3\n", lines[3:])
+self.assertIn("guard-seen  
67 2\n", lines[3:])
+self.assertIn("guard-seen  
33 1\n", lines[3:])
+self.assertIn("guard-seen  
33 1\n", lines[3:])
 
 db_conn.close()
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [webwml/master] Notice on 'Develop a Censorship Analyzer' to make a contribution

2015-02-04 Thread atagar 
commit ce43dfb442549b760a2ffc618c98862d499d748c
Author: Damian Johnson 
Date:   Wed Feb 4 09:00:27 2015 -0800

Notice on 'Develop a Censorship Analyzer' to make a contribution

Addition requested by phw.
---
 getinvolved/en/volunteer.wml |7 +++
 1 file changed, 7 insertions(+)

diff --git a/getinvolved/en/volunteer.wml b/getinvolved/en/volunteer.wml
index 4e8a7a8..c687d94 100644
--- a/getinvolved/en/volunteer.wml
+++ b/getinvolved/en/volunteer.wml
@@ -1131,6 +1131,13 @@ mean getting familiar with https://ooni.torproject.org";>OONI and
 http://twistedmatrix.com/trac/";>Twisted. After that, the tool
 should be implemented as a number of OONI-specific networking tests.
 
+
+
+Applicants should be familiar with Python and asynchronous programming,
+e.g., as it is used in Twisted.  As part of your application for this
+project please contribute a patch for a bug in https://trac.torproject.org/projects/tor/query?status=!closed&component=Ooni";>OONI.
+
 
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [webwml/master] Add David as a mentor for tor projects

2015-02-04 Thread atagar 
commit 186ff6fade2a7f2312b466bd3581681d22a08aec
Author: Damian Johnson 
Date:   Wed Feb 4 09:10:08 2015 -0800

Add David as a mentor for tor projects
---
 getinvolved/en/volunteer.wml |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/getinvolved/en/volunteer.wml b/getinvolved/en/volunteer.wml
index c687d94..d1ea4b4 100644
--- a/getinvolved/en/volunteer.wml
+++ b/getinvolved/en/volunteer.wml
@@ -950,7 +950,7 @@ meetings around the world.
 
 Skill Level: Medium to High
 
-Likely Mentors: Nick (nickm)
+Likely Mentors: Nick (nickm), David (dgoulet)
 
 The Tor code is more than 10 years old in places, and we haven't always had
 enough time or wisdom to write things as well as we could have.  Our unit
@@ -1275,7 +1275,7 @@ configurations is a good first step to understanding this 
problem.
 
 Skill Level: Medium
 
-Likely Mentors: Nick (nickm)
+Likely Mentors: Nick (nickm), David (dgoulet)
 
 Right now, our unit test coverage with the tests we ship is around 30%
 -- only 30% of the executable lines in our source are reached by the
@@ -1341,7 +1341,7 @@ easy to test.)
 
 Skill Level: Medium
 
-Likely Mentors: Nick (nickm)
+Likely Mentors: Nick (nickm), David (dgoulet)
 
 Right now, if you run a busy Tor server on a multicore computer, most of
 the cores are mostly unused.  We have a "cpuworker" mechanism to move
@@ -1391,7 +1391,7 @@ the codebase that you want to work on.
 
 Skill Level: Medium
 
-Likely Mentors: Nick (nickm)
+Likely Mentors: Nick (nickm), David (dgoulet)
 
 We're working on a revamp of the entire Tor hidden service design to
 improve the security and reliability of the hidden service system.
@@ -1428,7 +1428,7 @@ the codebase that you want to work on.
 
 Skill Level: Medium
 
-Likely Mentors: Nick (nickm)
+Likely Mentors: Nick (nickm), David (dgoulet)
 
 Right now, you can only use Tor's DNS support to look up IPv4 and IPv6
 addresses, and to fetch PTR records.  But DNS can do so much more!
@@ -1464,7 +1464,7 @@ the codebase that you want to work on.
 
 Skill Level: Medium
 
-Likely Mentors: Nick (nickm)
+Likely Mentors: Nick (nickm), David (dgoulet)
 
 The seccomp2 mechanism on Linux lets programs improve their robustness
 against unforseen bugs by running with restrictions on which system

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/https_everywhere_completed] Update translations for https_everywhere_completed

2015-02-04 Thread translation 
commit fd73a6c404352bf2029ed11a200dd3b17ac19281
Author: Translation commit bot 
Date:   Wed Feb 4 21:15:18 2015 +

Update translations for https_everywhere_completed
---
 pt_BR/ssl-observatory.dtd |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pt_BR/ssl-observatory.dtd b/pt_BR/ssl-observatory.dtd
index 371105d..02d3a20 100644
--- a/pt_BR/ssl-observatory.dtd
+++ b/pt_BR/ssl-observatory.dtd
@@ -26,7 +26,7 @@ to turn it on?">-->
 "Seguro, a não ser que você utilize uma rede corporativa cujos provedores de 
intranet possuam nomes secretos:">
 
 
+"Apresentar e verificar os certificados que tiverem sido assinados por 
Certificados de Autoridade (CA) de raiz não-padronizados">
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/https_everywhere] Update translations for https_everywhere

2015-02-04 Thread translation 
commit 0b4da69c23698adcaa77cc399ab2fb280af42796
Author: Translation commit bot 
Date:   Wed Feb 4 21:15:13 2015 +

Update translations for https_everywhere
---
 pt_BR/ssl-observatory.dtd |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pt_BR/ssl-observatory.dtd b/pt_BR/ssl-observatory.dtd
index 371105d..02d3a20 100644
--- a/pt_BR/ssl-observatory.dtd
+++ b/pt_BR/ssl-observatory.dtd
@@ -26,7 +26,7 @@ to turn it on?">-->
 "Seguro, a não ser que você utilize uma rede corporativa cujos provedores de 
intranet possuam nomes secretos:">
 
 
+"Apresentar e verificar os certificados que tiverem sido assinados por 
Certificados de Autoridade (CA) de raiz não-padronizados">
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed

2015-02-04 Thread translation 
commit 8c0ac147da50fbad828458ade20df25d962c865f
Author: Translation commit bot 
Date:   Wed Feb 4 21:15:43 2015 +

Update translations for tor-launcher-network-settings_completed
---
 pt_BR/network-settings.dtd |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pt_BR/network-settings.dtd b/pt_BR/network-settings.dtd
index 2b673b5..d772d57 100644
--- a/pt_BR/network-settings.dtd
+++ b/pt_BR/network-settings.dtd
@@ -8,8 +8,8 @@
 
 
 
-
-
+
+
 
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings

2015-02-04 Thread translation 
commit 2bd77d1fb612f8bb73990a0385cd932f5a255810
Author: Translation commit bot 
Date:   Wed Feb 4 21:15:39 2015 +

Update translations for tor-launcher-network-settings
---
 pt_BR/network-settings.dtd |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pt_BR/network-settings.dtd b/pt_BR/network-settings.dtd
index 2b673b5..d772d57 100644
--- a/pt_BR/network-settings.dtd
+++ b/pt_BR/network-settings.dtd
@@ -8,8 +8,8 @@
 
 
 
-
-
+
+
 
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/bridgedb_completed] Update translations for bridgedb_completed

2015-02-04 Thread translation 
commit d1eb9ff2c2559044e14d5df0427f7c059205b702
Author: Translation commit bot 
Date:   Wed Feb 4 21:45:06 2015 +

Update translations for bridgedb_completed
---
 pt_BR/LC_MESSAGES/bridgedb.po |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pt_BR/LC_MESSAGES/bridgedb.po b/pt_BR/LC_MESSAGES/bridgedb.po
index db7728f..138187b 100644
--- a/pt_BR/LC_MESSAGES/bridgedb.po
+++ b/pt_BR/LC_MESSAGES/bridgedb.po
@@ -14,7 +14,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
 "POT-Creation-Date: 2014-07-26 02:11+\n"
-"PO-Revision-Date: 2014-10-15 17:11+\n"
+"PO-Revision-Date: 2015-02-04 21:23+\n"
 "Last-Translator: Communia \n"
 "Language-Team: Portuguese (Brazil) 
(http://www.transifex.com/projects/p/torproject/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/bridgedb] Update translations for bridgedb

2015-02-04 Thread translation 
commit ac8a9fd02f581c5c4d5568f4fc846262a47740d0
Author: Translation commit bot 
Date:   Wed Feb 4 21:45:02 2015 +

Update translations for bridgedb
---
 pt_BR/LC_MESSAGES/bridgedb.po |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pt_BR/LC_MESSAGES/bridgedb.po b/pt_BR/LC_MESSAGES/bridgedb.po
index db7728f..138187b 100644
--- a/pt_BR/LC_MESSAGES/bridgedb.po
+++ b/pt_BR/LC_MESSAGES/bridgedb.po
@@ -14,7 +14,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
 "POT-Creation-Date: 2014-07-26 02:11+\n"
-"PO-Revision-Date: 2014-10-15 17:11+\n"
+"PO-Revision-Date: 2015-02-04 21:23+\n"
 "Last-Translator: Communia \n"
 "Language-Team: Portuguese (Brazil) 
(http://www.transifex.com/projects/p/torproject/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/mat-gui] Update translations for mat-gui

2015-02-04 Thread translation 
commit 3bd269a3370ecc0e9d57ea622c6f0db07403750d
Author: Translation commit bot 
Date:   Wed Feb 4 21:45:35 2015 +

Update translations for mat-gui
---
 pt_BR.po |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pt_BR.po b/pt_BR.po
index 0cd7411..84c72b8 100644
--- a/pt_BR.po
+++ b/pt_BR.po
@@ -14,7 +14,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-01-19 14:48+\n"
-"PO-Revision-Date: 2014-08-21 11:14+\n"
+"PO-Revision-Date: 2015-02-04 21:17+\n"
 "Last-Translator: Communia \n"
 "Language-Team: Portuguese (Brazil) 
(http://www.transifex.com/projects/p/torproject/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/mat-gui_completed] Update translations for mat-gui_completed

2015-02-04 Thread translation 
commit 1f841b569b837d1708237572e8619b95c8df4261
Author: Translation commit bot 
Date:   Wed Feb 4 21:45:38 2015 +

Update translations for mat-gui_completed
---
 pt_BR.po |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pt_BR.po b/pt_BR.po
index 0cd7411..84c72b8 100644
--- a/pt_BR.po
+++ b/pt_BR.po
@@ -14,7 +14,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-01-19 14:48+\n"
-"PO-Revision-Date: 2014-08-21 11:14+\n"
+"PO-Revision-Date: 2015-02-04 21:17+\n"
 "Last-Translator: Communia \n"
 "Language-Team: Portuguese (Brazil) 
(http://www.transifex.com/projects/p/torproject/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/https_everywhere_completed] Update translations for https_everywhere_completed

2015-02-04 Thread translation 
commit 8e2a8f55b4513618116c5b1bd86f260baab284f9
Author: Translation commit bot 
Date:   Wed Feb 4 22:45:19 2015 +

Update translations for https_everywhere_completed
---
 de/https-everywhere.dtd |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/de/https-everywhere.dtd b/de/https-everywhere.dtd
index f624ecb..742cfef 100644
--- a/de/https-everywhere.dtd
+++ b/de/https-everywhere.dtd
@@ -1,6 +1,6 @@
 
 
-
+
 
 
 
@@ -29,7 +29,7 @@
 
 
 
-
+
 
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/https_everywhere] Update translations for https_everywhere

2015-02-04 Thread translation 
commit d0e71b032e50d7ca1f85dbe40d58eca359fd666a
Author: Translation commit bot 
Date:   Wed Feb 4 22:45:13 2015 +

Update translations for https_everywhere
---
 de/https-everywhere.dtd |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/de/https-everywhere.dtd b/de/https-everywhere.dtd
index f624ecb..742cfef 100644
--- a/de/https-everywhere.dtd
+++ b/de/https-everywhere.dtd
@@ -1,6 +1,6 @@
 
 
-
+
 
 
 
@@ -29,7 +29,7 @@
 
 
 
-
+
 
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits