February 2015 - tor-commits - lists.torproject.org

[ooni-probe/master] Add to requirements.txt previously missing requirements
by art＠torproject.org 04 Feb '15

04 Feb '15

commit 64c9c78b7c268b43da0a6a19443a39344f4abd0e Author: Arturo Filastò <art(a)fuffa.org> 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

1 0

[ooni-probe/master] Ignore settings.ini
by art＠torproject.org 04 Feb '15

04 Feb '15

commit ee0f2aaefce0e998a406215a35d9febf619375ec Author: Arturo Filastò <art(a)fuffa.org> 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

1 0

[ooni-probe/master] Skip calculating the version of the geoip files that are not found
by art＠torproject.org 04 Feb '15

04 Feb '15

commit be5eb6e9288ecb82d152aff18dcab533919ccf4a Author: Arturo Filastò <art(a)fuffa.org> 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

1 0

[ooni-probe/master] Remove unused reports_directory
by art＠torproject.org 04 Feb '15

04 Feb '15

commit 6ea67e000088e536f59bf48dc76612b18bf8e411 Author: Arturo Filastò <art(a)fuffa.org> 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

1 0

[ooni-probe/master] Add support for Linux Mint
by art＠torproject.org 04 Feb '15

04 Feb '15

commit 4dbe80786f16108e26573c2e4d1a59b20726e183 Author: anadahz <kojgelo(a)inbox.com> 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..."

1 0

[ooni-probe/master] Add install package libdumbnet-dev
by art＠torproject.org 04 Feb '15

04 Feb '15

commit 9ac1e777be78efbdd32c7804a130a82071bac279 Author: anadahz <kojgelo(a)inbox.com> 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..."

1 0

[ooni-probe/master] Add install of pyasn1 and pyasn1-modules to setup-dependencies script
by art＠torproject.org 04 Feb '15

04 Feb '15

commit 725e0fd136fe50610ac5b75d39616864146c1b5b Author: Arturo Filastò <art(a)fuffa.org> 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"

1 0

[ooni-probe/master] Merge pull request #375 from anadahz/feature/linuxmint_setup
by art＠torproject.org 04 Feb '15

04 Feb '15

commit f4ba7f1e2ef1b5240f350e84dd00b9e69d379c1f Merge: df6a518 4dbe807 Author: Arturo Filastò <arturo(a)filasto.net> 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(+)

1 0

[ooni-probe/master] Remove deb.ooni.nu installation method from README.rst
by art＠torproject.org 04 Feb '15

04 Feb '15

commit 17e388a7b9c92c9f1dbba5a82afd3731c7cb365d Author: Arturo Filastò <art(a)fuffa.org> 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 -----

1 0

[ooni-probe/master] Merge branch 'master' of github.com:TheTorProject/ooni-probe
by art＠torproject.org 04 Feb '15

04 Feb '15

commit 4e83a9c1345cb9b594156d901de489932037809c Merge: 17e388a f4ba7f1 Author: Arturo Filastò <art(a)fuffa.org> 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(-)

1 0