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

[ooni-probe/master] Improve pip installation
by art＠torproject.org 20 Nov '15

20 Nov '15

commit 9e093b2c6200627907e7035f4521c622819d2743 Author: Arturo Filastò <art(a)fuffa.org> Date: Fri Jul 3 17:36:57 2015 +0200 Improve pip installation * Fix some shell bugs --- scripts/install.sh | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/scripts/install.sh b/scripts/install.sh index 3c9fa82..46a6afa 100644 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -131,7 +131,7 @@ install_obfs4proxy() { } install_pluggable_transports() { - if [ -z "$INSTALL_PT" ];then + if [ "$INSTALL_PT" = "yes" ];then ( set -x $sh_c 'pip install obfsproxy fteproxy' @@ -140,13 +140,18 @@ install_pluggable_transports() { fi } +install_pip() { + $curl https://bootstrap.pypa.io/get-pip.py > /tmp/get-pip.py + $sh_c "python /tmp/get-pip.py > /dev/null 2>&1" +} + case "$lsb_dist" in Fedora) ( set -x $sh_c 'yum -y groupinstall "Development tools"' $sh_c 'yum -y install zlib-devel bzip2-devel openssl-devel sqlite-devel libpcap-devel libffi-devel libevent-devel libgeoip-devel tor' - $sh_c "$curl https://bootstrap.pypa.io/get-pip.py | python" + install_pip $sh_c 'pip install ooniprobe' ) @@ -182,13 +187,15 @@ case "$lsb_dist" in $sh_c 'apt-get update' ) - if [ "$lsb_dist" == 'Debian' ] && + install_pip + + if [ "$lsb_dist" = 'Debian' ] && [ "$(echo $distro_version | cut -d '.' -f1 )" -gt $MIN_DEBIAN_VERSION ]; then ( set -x $sh_c 'apt-get install -y -q ooniprobe' ) - elif [ "$lsb_dist" == 'Ubuntu' ] && + elif [ "$lsb_dist" = 'Ubuntu' ] && [ "$(echo $distro_version | cut -d '.' -f1 )" -gt $MIN_UBUNTU_VERSION ]; then ( set -x @@ -198,7 +205,6 @@ case "$lsb_dist" in ( set -x $sh_c 'apt-get install -y -q 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' - $sh_c "$curl https://bootstrap.pypa.io/get-pip.py | python" $sh_c 'pip install ooniprobe' ) fi

1 0

[ooni-probe/master] Use the special curl command
by art＠torproject.org 20 Nov '15

20 Nov '15

commit e49e21f19292b666f8c05cae626a3eb8a6bb869d Author: Arturo Filastò <art(a)fuffa.org> Date: Fri Jul 3 16:33:13 2015 +0200 Use the special curl command --- scripts/install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/install.sh b/scripts/install.sh index 8d9a1fa..e5b6862 100644 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -64,7 +64,7 @@ elif command_exists busybox && busybox --list-modules | grep -q wget; then curl='busybox wget --connect-timeout 20 -qO-' fi -if ! (curl $TOR_DEB_REPO | grep "Apache Server at deb.torproject.org");then +if ! ($curl $TOR_DEB_REPO | grep "Apache Server at deb.torproject.org");then echo ' The Tor Debian repository deb.torproject.org appears to be blocked.' echo ' Failing over to using the cloudfronted mirror.' TOR_DEB_REPO="https://d3skbh62gb3f3v.cloudfront.net/torproject.org" @@ -169,7 +169,7 @@ case "$lsb_dist" in https*) ( set -x - $sh_c 'apt-get install -y apt-transport-https' + $sh_c 'apt-get install -y -q apt-transport-https' ) ;; esac

1 0

[ooni-probe/master] Make the https repo detection cross sh-*
by art＠torproject.org 20 Nov '15

20 Nov '15

commit 77558d6be6c6b0ac049cd5d7894e20dfa9d07e8c Author: Arturo Filastò <art(a)fuffa.org> Date: Fri Jul 3 16:18:16 2015 +0200 Make the https repo detection cross sh-* --- scripts/install.sh | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/scripts/install.sh b/scripts/install.sh index b1a2f9d..8d9a1fa 100644 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -165,13 +165,15 @@ case "$lsb_dist" in fi } - if [ "$TOR_DEBIAN_REPOSITORY" == "https://*" ];then - ( - set -x - $sh_c 'apt-get install -y apt-transport-https' - ) - fi - + case "$TOR_DEB_REPO" in + https*) + ( + set -x + $sh_c 'apt-get install -y apt-transport-https' + ) + ;; + esac + ( set -x $sh_c 'apt-key adv --keyserver hkp://pool.sks-keyservers.net --recv-keys A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89'

1 0

[ooni-probe/master] Install pip using get-pip.py
by art＠torproject.org 20 Nov '15

20 Nov '15

commit f795f96da57197c2e1f42c7e6ea63a9600408e96 Author: Arturo Filastò <art(a)fuffa.org> Date: Fri Jul 3 17:29:01 2015 +0200 Install pip using get-pip.py --- scripts/install.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/install.sh b/scripts/install.sh index e5b6862..3c9fa82 100644 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -145,7 +145,8 @@ case "$lsb_dist" in ( set -x $sh_c 'yum -y groupinstall "Development tools"' - $sh_c 'yum -y install zlib-devel bzip2-devel openssl-devel sqlite-devel libpcap-devel libffi-devel libevent-devel libgeoip-devel tor python-pip' + $sh_c 'yum -y install zlib-devel bzip2-devel openssl-devel sqlite-devel libpcap-devel libffi-devel libevent-devel libgeoip-devel tor' + $sh_c "$curl https://bootstrap.pypa.io/get-pip.py | python" $sh_c 'pip install ooniprobe' ) @@ -197,6 +198,7 @@ case "$lsb_dist" in ( set -x $sh_c 'apt-get install -y -q 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' + $sh_c "$curl https://bootstrap.pypa.io/get-pip.py | python" $sh_c 'pip install ooniprobe' ) fi

1 0

[ooni-probe/master] Preserve evnironment in su and sudo commands
by art＠torproject.org 20 Nov '15

20 Nov '15

commit 235416252df23e0030a6cfa279cb37a5c0b60718 Author: anadahz <kojgelo(a)inbox.com> Date: Sun Jul 12 20:55:25 2015 +0200 Preserve evnironment in su and sudo commands --- scripts/install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/install.sh b/scripts/install.sh index 6efd19f..6dbe7c3 100644 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -81,9 +81,9 @@ user="$(id -un 2>/dev/null || true)" sh_c='sh -c' if [ "$user" != 'root' ]; then if command_exists sudo; then - sh_c='sudo sh -c' + sh_c='sudo sh -c -E' elif command_exists su; then - sh_c='su -c' + sh_c='su -c --preserve-environment' else echo >&2 'Error: this installer needs the ability to run commands as root.' echo >&2 'We are unable to find either "sudo" or "su" available to make this happen.'

1 0

[ooni-probe/master] Parametrise the mktemp call
by art＠torproject.org 20 Nov '15

20 Nov '15

commit 5c925d1d29b62a341945b85d497f73c905091167 Author: Arturo Filastò <art(a)fuffa.org> Date: Sun Jul 12 19:47:30 2015 +0200 Parametrise the mktemp call --- scripts/install.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/scripts/install.sh b/scripts/install.sh index 439112b..6efd19f 100644 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -100,6 +100,13 @@ elif command_exists busybox && busybox --list-modules | grep -q wget; then curl='busybox wget --connect-timeout 20 -qO-' fi +mktmp='' +if command_exists mktmp; then + mktmp='mktmp' +elif command_exists mktemp; then + mktmp='mktemp' +fi + if [ $CLOUDFRONT = "yes" ];then echo ' Using the cloudfronted tor mirror.' TOR_DEB_REPO="https://d3skbh62gb3f3v.cloudfront.net/torproject.org" @@ -136,7 +143,7 @@ install_obfs4proxy() { if command_exists go; then ( set -x - export GOPATH=$(mktmp -d) + export GOPATH=$($mktmp -d) go get git.torproject.org/pluggable-transports/obfs4.git/obfs4proxy $sh_c "cp $GOPATH/bin/obfs4proxy /usr/local/bin/obfs4proxy" $sh_c "chmod +x /usr/local/bin/obfs4proxy"

1 0

[ooni-probe/master] Add support for parsing command line arguments
by art＠torproject.org 20 Nov '15

20 Nov '15

commit 0cf4ee626cf3b2661ae6912d57fab63f53d9e70f Author: Arturo Filastò <art(a)fuffa.org> Date: Fri Jul 3 17:44:13 2015 +0200 Add support for parsing command line arguments --- scripts/install.sh | 47 ++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 44 insertions(+), 3 deletions(-) diff --git a/scripts/install.sh b/scripts/install.sh index 46a6afa..fbdeb93 100644 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -8,16 +8,53 @@ set -e # # It is heavily based upon the get.docker.io script +TOR_DEB_REPO="http://deb.torproject.org/torproject.org" +CLOUDFRONT="no" +INSTALL_PT="yes" + # These are the minimum ubuntu and debian version required to use the debian # package. # Currently you can only set the major version number. MIN_DEBIAN_VERSION=8 MIN_UBUNTU_VERSION=11 -TOR_DEB_REPO="http://deb.torproject.org/torproject.org" -INSTALL_PT="yes" url='https://get.ooni.io/' +function usage() +{ + echo "This is the ooniprobe install script" + echo "" + echo "./install.sh" + echo "\t-h --help" + echo "\t-n Do not install pluggable transports" + echo "\t-c Use the cloudfronted Tor debian repository" + echo "" +} + +while [ "$1" != "" ]; do + PARAM=`echo $1 | awk -F= '{print $1}'` + VALUE=`echo $1 | awk -F= '{print $2}'` + case $PARAM in + -h | --help) + usage + exit + ;; + -n) + INSTALL_PT="no" + ;; + -c) + CLOUDFRONT="yes" + ;; + *) + echo "ERROR: unknown parameter \"$PARAM\"" + usage + exit 1 + ;; + esac + shift +done + + command_exists() { command -v "$@" > /dev/null 2>&1 } @@ -64,7 +101,10 @@ elif command_exists busybox && busybox --list-modules | grep -q wget; then curl='busybox wget --connect-timeout 20 -qO-' fi -if ! ($curl $TOR_DEB_REPO | grep "Apache Server at deb.torproject.org");then +if [ $CLOUDFRONT = "yes" ];then + echo ' Using the cloudfronted tor mirror.' + TOR_DEB_REPO="https://d3skbh62gb3f3v.cloudfront.net/torproject.org" +elif ! ($curl $TOR_DEB_REPO | grep "Apache Server at deb.torproject.org");then echo ' The Tor Debian repository deb.torproject.org appears to be blocked.' echo ' Failing over to using the cloudfronted mirror.' TOR_DEB_REPO="https://d3skbh62gb3f3v.cloudfront.net/torproject.org" @@ -141,6 +181,7 @@ install_pluggable_transports() { } install_pip() { + echo ' Installing pip via get-pip.py' $curl https://bootstrap.pypa.io/get-pip.py > /tmp/get-pip.py $sh_c "python /tmp/get-pip.py > /dev/null 2>&1" }

1 0

[ooni-probe/master] Remove bashism
by art＠torproject.org 20 Nov '15

20 Nov '15

commit dafe5ca9963647da329ee0c7c421209d58dd1e1f Author: Arturo Filastò <art(a)fuffa.org> Date: Mon Jul 6 16:14:24 2015 +0200 Remove bashism --- scripts/install.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/install.sh b/scripts/install.sh index b1108b3..439112b 100644 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -20,8 +20,7 @@ MIN_UBUNTU_VERSION=11 url='https://get.ooni.io/' -function usage() -{ +usage() { echo "This is the ooniprobe install script" echo "" echo "./install.sh"

1 0

[ooni-probe/master] fteproxy requires also gmp-dev
by art＠torproject.org 20 Nov '15

20 Nov '15

commit 38883e35f7a76c2a3c5789a05d143aa1aace87ba Author: Arturo Filastò <art(a)fuffa.org> Date: Fri Jul 3 17:48:12 2015 +0200 fteproxy requires also gmp-dev --- scripts/install.sh | 47 ++++++++++++++++++++++++++++++----------------- 1 file changed, 30 insertions(+), 17 deletions(-) diff --git a/scripts/install.sh b/scripts/install.sh index fbdeb93..b1108b3 100644 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -134,23 +134,6 @@ fi install_obfs4proxy() { - if ! command_exists go; then - case "$lsb_dist" in - Fedora) - ( - set -x - $sh_c "yum -y install golang" - ) - ;; - Ubuntu|Debian) - ( - set -x - $sh_c "apt-get install -y -q golang" - ) - ;; - esac - fi - if command_exists go; then ( set -x @@ -170,8 +153,38 @@ install_obfs4proxy() { fi } +install_pluggable_transport_deps() { + case "$lsb_dist" in + Fedora) + if ! command_exists go; then + ( + set -x + $sh_c "yum -y install golang" + ) + fi + ( + set -x + $sh_c "yum -y install gmp-devel" + ) + ;; + Ubuntu|Debian) + if ! command_exists go; then + ( + set -x + $sh_c "apt-get install -y -q golang" + ) + fi + ( + set -x + $sh_c "apt-get install -y -q libgmp-dev" + ) + ;; + esac +} + install_pluggable_transports() { if [ "$INSTALL_PT" = "yes" ];then + install_pluggable_transport_deps ( set -x $sh_c 'pip install obfsproxy fteproxy'

1 0

[ooni-probe/master] Setup backports to install go
by art＠torproject.org 20 Nov '15

20 Nov '15

commit 0ed75b1bce3d11c1dc45cd7cf1c2be661a2e07f1 Author: Arturo Filastò <art(a)fuffa.org> Date: Mon Jul 13 10:41:02 2015 +0200 Setup backports to install go Install meek-client with go --- scripts/install.sh | 64 ++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 55 insertions(+), 9 deletions(-) diff --git a/scripts/install.sh b/scripts/install.sh index 6efd19f..ee9d957 100644 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -159,27 +159,72 @@ install_obfs4proxy() { fi } -install_pluggable_transport_deps() { +install_meek() { + + if command_exists go; then + ( + set -x + export GOPATH=$($mktmp -d) + go get git.torproject.org/pluggable-transports/meek.git/meek-client + $sh_c "cp $GOPATH/bin/meek-client /usr/local/bin/meek-client" + $sh_c "chmod +x /usr/local/bin/meek-client" + rm -rf $GOPATH + ) + else + echo >&2 + echo >&2 ' We failed to install go. obfs4proxy will not be installed.' + echo >&2 ' Please follow the instructions on this page to install it manually:' + echo >&2 + echo >&2 ' https://github.com/Yawning/obfs4' + echo >&2 + fi +} + + +setup_wheezy_backports() { + echo "deb http://ftp.de.debian.org/ wheezy-backports main" > /etc/apt/sources.list.d/stable.list + $sh_c "apt-get update" +} + +install_go() { + go_version=$(apt-cache policy golang | grep Installed | cut -d ':' -f3) case "$lsb_dist" in Fedora) - if ! command_exists go; then - ( - set -x - $sh_c "yum -y install golang" - ) - fi ( set -x - $sh_c "yum -y install gmp-devel" + $sh_c "yum -y install golang" ) ;; Ubuntu|Debian) - if ! command_exists go; then + if [ "$lsb_dist" = 'Debian' ] && + [ "$(echo $distro_version | cut -d '.' -f1 )" -lt $MIN_DEBIAN_VERSION ]; then + setup_wheezy_backports + ( + set -x + $sh_c "apt-get install -y -t wheezy-backports golang" + ) + else ( set -x $sh_c "apt-get install -y -q golang" ) fi + ;; + esac +} + +install_pluggable_transport_deps() { + if ! command_exists go; then + install_go + fi + case "$lsb_dist" in + Fedora) + ( + set -x + $sh_c "yum -y install gmp-devel" + ) + ;; + Ubuntu|Debian) ( set -x $sh_c "apt-get install -y -q libgmp-dev" @@ -196,6 +241,7 @@ install_pluggable_transports() { $sh_c 'pip install obfsproxy fteproxy' ) install_obfs4proxy + install_meek fi }

1 0