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

[torbutton/master] Merge remote-tracking branch 'gk/bug_9901_v5'
by mikeperry＠torproject.org 27 Feb '14

27 Feb '14

commit 1e1210fd40638cc63b9450a4323cce42ebe5ee21 Merge: 18aba4a d7cb80e Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Feb 27 15:02:24 2014 -0800 Merge remote-tracking branch 'gk/bug_9901_v5' src/chrome/content/torbutton.js | 100 ++++++++++++++++++++++++++++++++ src/components/external-app-blocker.js | 24 ++------ 2 files changed, 106 insertions(+), 18 deletions(-)

1 0

[torbutton/master] Bug #9901: Prefix console handling functions to avoid potential namespace collisions.
by mikeperry＠torproject.org 27 Feb '14

27 Feb '14

commit f6552194e927ef8902c252322dc3442341650744 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Feb 27 15:03:23 2014 -0800 Bug #9901: Prefix console handling functions to avoid potential namespace collisions. --- src/chrome/content/torbutton.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index f2fcb77..c7a8274 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -2523,7 +2523,7 @@ function torbutton_is_windowed(wind) { // This is the console observer used for getting unwanted error messages // resulting from JS -> C++ transition filtered out. -var consoleObserver = { +var torbutton_console_observer = { obs : null, @@ -2568,8 +2568,8 @@ var consoleObserver = { // overriding Devtool methods. Thus, we patch the code path that is called when // the browser console is already open AND additionally the one when cached // messages are displayed. -function handleConsole() { - consoleObserver.register(); +function torbutton_handle_console() { + torbutton_console_observer.register(); try { // Filtering using the "web-console-created" notification is not enough as // the cached messages are already loaded when it is fired. Therefore, @@ -2618,7 +2618,7 @@ function torbutton_new_window(event) { torbutton_log(3, "New window"); // Working around #9901, sigh... - handleConsole(); + torbutton_handle_console(); var browser = getBrowser(); if(!browser) { @@ -2657,7 +2657,7 @@ function torbutton_new_window(event) function torbutton_close_window(event) { torbutton_window_pref_observer.unregister(); torbutton_tor_check_observer.unregister(); - consoleObserver.unregister(); + torbutton_console_observer.unregister(); // TODO: This is a real ghetto hack.. When the original window // closes, we need to find another window to handle observing

1 0

[tor-launcher/master] Bug #11077: Always show wizard if TOR_FORCE_NET_CONFIG=1
by brade＠torproject.org 27 Feb '14

27 Feb '14

commit a232915ecdeab54881cc96214f31752dc2134bda Author: Tails developers <amnesia(a)boum.org> Date: Mon Feb 17 20:36:20 2014 +0100 Bug #11077: Always show wizard if TOR_FORCE_NET_CONFIG=1 --- src/components/tl-process.js | 10 ++-------- src/modules/tl-util.jsm | 16 ++++++++++++++++ 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/src/components/tl-process.js b/src/components/tl-process.js index 2517ae5..48f0126 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -270,9 +270,6 @@ TorProcessService.prototype = { this.mTorProcessStatus = this.kStatusUnknown; - var isInitialBootstrap = - TorLauncherUtil.getBoolPref(this.kPrefPromptAtStartup); - try { // Ideally, we would cd to the Firefox application directory before @@ -329,7 +326,7 @@ TorProcessService.prototype = args.push("" + pid); } - if (isInitialBootstrap) + if (TorLauncherUtil.shouldShowNetworkSettings) { args.push("DisableNetwork"); args.push("1"); @@ -360,14 +357,11 @@ TorProcessService.prototype = _controlTor: function() { - var isInitialBootstrap = - TorLauncherUtil.getBoolPref(this.kPrefPromptAtStartup); - try { this._monitorTorProcessStartup(); - if (isInitialBootstrap) + if (TorLauncherUtil.shouldShowNetworkSettings) { if (this.mProtocolSvc) this._openNetworkSettings(true); // Blocks until dialog is closed. diff --git a/src/modules/tl-util.jsm b/src/modules/tl-util.jsm index 5b1c6c0..0c31aa5 100644 --- a/src/modules/tl-util.jsm +++ b/src/modules/tl-util.jsm @@ -197,6 +197,22 @@ let TorLauncherUtil = // Public return this.getBoolPref(kPrefStartTor, true); }, + get shouldShowNetworkSettings() + { + const kPrefPromptAtStartup = "extensions.torlauncher.prompt_at_startup"; + try + { + const kEnvForceShowNetConfig = "TOR_FORCE_NET_CONFIG"; + + var env = Cc["@mozilla.org/process/environment;1"] + .getService(Ci.nsIEnvironment); + if (env.exists(kEnvForceShowNetConfig)) + return ("1" == env.get(kEnvForceShowNetConfig)); + } catch(e) {} + + return this.getBoolPref(kPrefPromptAtStartup, true); + }, + get shouldOnlyConfigureTor() { const kPrefOnlyConfigureTor = "extensions.torlauncher.only_configure_tor";

1 0

[tor-browser-bundle/master] Ensure we call py2exe_zip_timestomp for fteproxy.zip
by mikeperry＠torproject.org 27 Feb '14

27 Feb '14

commit 83a3d0f1bbd2f15c33691bd9082dff3e44a00fd9 Author: Kevin P. Dyer <kpdyer(a)gmail.com> Date: Wed Feb 12 10:00:46 2014 -0800 Ensure we call py2exe_zip_timestomp for fteproxy.zip --- gitian/descriptors/windows/gitian-pluggable-transports.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/descriptors/windows/gitian-pluggable-transports.yml b/gitian/descriptors/windows/gitian-pluggable-transports.yml index 92dddeb..c03c46d 100644 --- a/gitian/descriptors/windows/gitian-pluggable-transports.yml +++ b/gitian/descriptors/windows/gitian-pluggable-transports.yml @@ -216,13 +216,13 @@ script: | make thirdparty/re2/obj/libre2.a LD_PRELOAD= $INSTPYTHON setup.py build_ext -c mingw32 --inplace LD_PRELOAD= $INSTPYTHON setup.py py2exe + py2exe_zip_timestomp dist/fteproxy.zip mkdir -p $PTDIR/fte mkdir -p $PTDIR/fte/tests cp -an dist/{*.pyd,*.exe,*.zip} $PTDIR/ cp -an fte/VERSION $PTDIR/fte cp -ran fte/defs $PTDIR/fte cp -ran fte/tests/dfas $PTDIR/fte/tests - cp -an thirdparty/gmp/bin/*.dll $PTDIR/ mkdir -p $INSTDIR/Docs/fteproxy cp -an {COPYING,README.md} $INSTDIR/Docs/fteproxy cd ..

1 0

[tor-browser-bundle/master] Initial fteproxy integration
by mikeperry＠torproject.org 27 Feb '14

27 Feb '14

commit 8f8a4cd59bfe07e5b8c12e3990627544d9caeab4 Author: Kevin P. Dyer <kpdyer(a)gmail.com> Date: Sun Feb 9 11:47:03 2014 -0800 Initial fteproxy integration --- Bundle-Data/beta/linux/torrc-defaults-appendix | 5 +++ gitian/build-helpers/wine-wrappers/g++.py | 39 +++++++++++++++++++ gitian/build-helpers/wine-wrappers/setup.py | 2 +- .../linux/gitian-pluggable-transports.yml | 22 +++++++++++ .../mac/gitian-pluggable-transports.yml | 28 ++++++++++++- .../windows/gitian-pluggable-transports.yml | 41 +++++++++++++++++++- gitian/fetch-inputs.sh | 8 ++-- gitian/mkbundle-linux.sh | 2 +- gitian/mkbundle-mac.sh | 2 +- gitian/mkbundle-windows.sh | 2 +- gitian/versions.beta | 9 ++++- 11 files changed, 149 insertions(+), 11 deletions(-) diff --git a/Bundle-Data/beta/linux/torrc-defaults-appendix b/Bundle-Data/beta/linux/torrc-defaults-appendix index 2f5ad32..b43cd59 100644 --- a/Bundle-Data/beta/linux/torrc-defaults-appendix +++ b/Bundle-Data/beta/linux/torrc-defaults-appendix @@ -1,4 +1,9 @@ +## fteproxy configuration +# Bridge fte bridges.fteproxy.org:8080 + +ClientTransportPlugin fte exec ./Tor/PluggableTransports/fteproxy --managed + ## obfsproxy configuration # # Bridge obfs3 83.212.101.2:42782 2ADFE7AA8D272C520D1FBFBF4E413F3A1B26313D diff --git a/gitian/build-helpers/wine-wrappers/g++.py b/gitian/build-helpers/wine-wrappers/g++.py new file mode 100755 index 0000000..4738420 --- /dev/null +++ b/gitian/build-helpers/wine-wrappers/g++.py @@ -0,0 +1,39 @@ +#!/usr/bin/env python + +# A wrapper for i686-w64-mingw32-g++ that removes -mno-cygwin and converts +# Windows paths to Unix paths, so that the w64-mingw32 g++ can be called by +# Python distutils. + +import os +import subprocess +import sys + +import common + +args = ["/usr/bin/i686-w64-mingw32-g++"] +sys.argv.pop(0) +while sys.argv: + a = sys.argv.pop(0) + if not a.startswith("-"): + args.append(common.winepath(a)) + continue + if a == "-mno-cygwin": + continue + if a == "--output-lib": + o = sys.argv.pop(0) + a = "-out-implib="+o + if a in ("-I", "-L"): + args.append(a) + args.append(common.winepath(sys.argv.pop(0))) + continue + o = common.search_startswith(a, ("-I", "-L")) + if o is not None: + path = a[len(o):] + args.append("%s%s" % (o, common.winepath(path))) + continue + args.append(a) +p = common.popen_faketime(args, stderr=subprocess.PIPE) +stderr = p.stderr.read() +sys.stderr.write(stderr) +if " error: " in stderr: + sys.exit(1) diff --git a/gitian/build-helpers/wine-wrappers/setup.py b/gitian/build-helpers/wine-wrappers/setup.py index 797015e..77a9526 100644 --- a/gitian/build-helpers/wine-wrappers/setup.py +++ b/gitian/build-helpers/wine-wrappers/setup.py @@ -1,7 +1,7 @@ from distutils.core import setup import py2exe setup( - console=["gcc.py", "dllwrap.py", "swig.py"], + console=["gcc.py", "g++.py", "dllwrap.py", "swig.py"], zipfile=None, options={"py2exe": {"bundle_files": 1, "compressed": True}} ) diff --git a/gitian/descriptors/linux/gitian-pluggable-transports.yml b/gitian/descriptors/linux/gitian-pluggable-transports.yml index 9aafc57..c6c65dd 100644 --- a/gitian/descriptors/linux/gitian-pluggable-transports.yml +++ b/gitian/descriptors/linux/gitian-pluggable-transports.yml @@ -10,6 +10,7 @@ packages: - "unzip" - "zip" - "swig" +- "m4" - "python-setuptools" - "python-dev" - "faketime" @@ -22,8 +23,11 @@ remotes: "dir": "obfsproxy" - "url": "https://git.torproject.org/flashproxy.git" "dir": "flashproxy" +- "url": "https://github.com/kpdyer/fteproxy.git" + "dir": "fteproxy" files: - "openssl.tar.gz" +- "gmp.tar.bz2" - "pycrypto.tar.gz" - "argparse.tar.gz" - "zope.interface.zip" @@ -50,6 +54,15 @@ script: | mkdir -p $PTDIR mkdir -p $INSTDIR/Debug/ # + tar xvf gmp.tar.bz2 + cd gmp-* + find -type f | xargs touch --date="$REFERENCE_DATETIME" + ./configure --prefix=$INSTDIR/gmp --disable-static --enable-shared --enable-cxx + make + make install + cp -an $INSTDIR/gmp/lib/*.so* $INSTDIR/Tor + cd .. + # cd pyptlib find -type f | xargs touch --date="$REFERENCE_DATETIME" python setup.py build --build-lib build @@ -118,6 +131,15 @@ script: | cp -a {doc/*,README,LICENSE,ChangeLog} $INSTDIR/Docs/FlashProxy cd .. # + cd fteproxy + find -type f | xargs touch --date="$REFERENCE_DATETIME" + CFLAGS="-L$INSTDIR/Tor -I$INSTDIR/gmp/include" CXXFLAGS="-L$INSTDIR/Tor -I$INSTDIR/gmp/include" make + cp -a bin/fteproxy $PTDIR/ + cp -ra fte $PTDIR/ + mkdir -p $INSTDIR/Docs/fteproxy + cp -a {COPYING,README.md} $INSTDIR/Docs/fteproxy + cd .. + # cd $INSTDIR # ~/build/dzip.sh pluggable-transports-linux$GBUILD_BITS-gbuilt.zip Tor/ Docs/ diff --git a/gitian/descriptors/mac/gitian-pluggable-transports.yml b/gitian/descriptors/mac/gitian-pluggable-transports.yml index d44193c..5aaf364 100644 --- a/gitian/descriptors/mac/gitian-pluggable-transports.yml +++ b/gitian/descriptors/mac/gitian-pluggable-transports.yml @@ -9,7 +9,9 @@ packages: - "unzip" - "zip" - "swig" +- "m4" - "python-setuptools" +- "python-dev" - "faketime" - "libtool" #- "libssl0.9.8" @@ -21,8 +23,11 @@ remotes: "dir": "obfsproxy" - "url": "https://git.torproject.org/flashproxy.git" "dir": "flashproxy" +- "url": "https://github.com/kpdyer/fteproxy.git" + "dir": "fteproxy" files: - "openssl.tar.gz" +- "gmp.tar.bz2" - "pycrypto.tar.gz" - "argparse.tar.gz" - "zope.interface.zip" @@ -47,10 +52,13 @@ script: | #export CXXFLAGS=$CFLAGS #export LDFLAGS=$CFLAGS export PATH="$PATH:/usr/apple-osx/bin/" + export AR=/usr/apple-osx/bin/i686-apple-darwin11-ar export CC=/usr/apple-osx/bin/i686-apple-darwin11-gcc + export CXX=/usr/apple-osx/bin/i686-apple-darwin11-g++ # http://bugs.python.org/issue9437 export LDSHARED="$CC -pthread -shared" - export CFLAGS="-I/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/include/ -I/usr/lib/gcc/i686-apple-darwin10/4.2.1/include/ -I. -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -F/usr/lib/apple/SDKs/MacOSX10.6.sdk/System/Library/Frameworks -mmacosx-version-min=10.5" + export CFLAGS="-I/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/include/ -I/usr/lib/gcc/i686-apple-darwin10/4.2.1/include/ -I. -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -F/usr/lib/apple/SDKs/MacOSX10.6.sdk/System/Library/Frameworks -mmacosx-version-min=10.5 -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/i686-apple-darwin10/4.2.1 -I$INSTDIR/gmp/include -L$INSTDIR/gmp/lib" + export CXXFLAGS="-I/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/include/ -I/usr/lib/gcc/i686-apple-darwin10/4.2.1/include/ -I. -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -F/usr/lib/apple/SDKs/MacOSX10.6.sdk/System/Library/Frameworks -mmacosx-version-min=10.5 -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/i686-apple-darwin10/4.2.1 -I$INSTDIR/gmp/include -L$INSTDIR/gmp/lib" export LDFLAGS="-L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -F/usr/lib/apple/SDKs/MacOSX10.6.sdk/System/Library/Frameworks -mmacosx-version-min=10.5" # mkdir -p $PTDIR/ @@ -63,6 +71,15 @@ script: | # For OpenSSL sudo ln -s /usr/apple-osx/bin/apple-osx-gcc /usr/apple-osx/bin/i686-apple-darwin11-cc # + tar xvf gmp.tar.bz2 + cd gmp-* + find -type f | xargs touch --date="$REFERENCE_DATETIME" + ./configure --host=i686-apple-darwin11 --prefix=$INSTDIR/gmp --disable-static --enable-shared --enable-cxx + make + make install + cp $INSTDIR/gmp/lib/*dylib* $INSTDIR/TorBrowserBundle.app/Tor/ + cd .. + # cd pyptlib find -type f | xargs touch --date="$REFERENCE_DATETIME" python setup.py build --build-lib build @@ -141,6 +158,15 @@ script: | cp -a {doc/*,README,LICENSE,ChangeLog} $INSTDIR/TorBrowserBundle.app/Docs/FlashProxy cd .. # + cd fteproxy + find -type f | xargs touch --date="$REFERENCE_DATETIME" + CFLAGS="-L$INSTDIR/Tor -I$INSTDIR/gmp/include $CFLAGS" CXXFLAGS="-L$INSTDIR/Tor -I$INSTDIR/gmp/include $CXXFLAGS" make + cp -a bin/fteproxy $PTDIR/ + cp -ra fte $PTDIR/ + mkdir -p $INSTDIR/Docs/fteproxy + cp -a {COPYING,README.md} $INSTDIR/Docs/fteproxy + cd .. + # cd $INSTDIR ~/build/dzip.sh pluggable-transports-mac$GBUILD_BITS-gbuilt.zip TorBrowserBundle.app cp pluggable-transports-mac$GBUILD_BITS-gbuilt.zip $OUTDIR/ diff --git a/gitian/descriptors/windows/gitian-pluggable-transports.yml b/gitian/descriptors/windows/gitian-pluggable-transports.yml index a8535c6..92dddeb 100644 --- a/gitian/descriptors/windows/gitian-pluggable-transports.yml +++ b/gitian/descriptors/windows/gitian-pluggable-transports.yml @@ -10,7 +10,10 @@ packages: - "zip" - "swig" - "p7zip-full" +- "m4" - "mingw-w64" +- "g++-mingw-w64" +- "python-dev" - "faketime" - "libtool" reference_datetime: "2000-01-01 00:00:00" @@ -21,8 +24,11 @@ remotes: "dir": "obfsproxy" - "url": "https://git.torproject.org/flashproxy.git" "dir": "flashproxy" +- "url": "https://github.com/kpdyer/fteproxy.git" + "dir": "fteproxy" files: - "openssl.tar.gz" +- "gmp.tar.bz2" - "setuptools.tar.gz" - "pycrypto.tar.gz" - "zope.interface.zip" @@ -71,6 +77,18 @@ script: | rm -rf "$tmpdir" } # + # + tar xvf gmp.tar.bz2 + cd gmp-* + find -type f | xargs touch --date="$REFERENCE_DATETIME" + ./configure --prefix=$INSTDIR/gmp --host=i686-w64-mingw32 --enable-cxx --disable-static --enable-shared + make + make install + cp -an $INSTDIR/gmp/bin/*dll* $INSTDIR/Tor + cp -an $INSTDIR/gmp/lib/*dll* $INSTDIR/Tor + cd .. + # + # # Install a Wine new enough to have a fix for http://bugs.winehq.org/show_bug.cgi?id=29764; # otherwise Python run under Wine constantly crashes in _PyVerify_fd, which is # called by such common operations as io.open and os.fstat (anything involving @@ -103,7 +121,7 @@ script: | mkdir -p build/bdist.win32/winexe/bundle-2.7/ cp -a $INSTDIR/python/python27.dll build/bdist.win32/winexe/bundle-2.7/ LD_PRELOAD= $INSTPYTHON setup.py py2exe - cp -a dist/gcc.exe dist/dllwrap.exe dist/swig.exe $WINEROOT/windows/ + cp -a dist/gcc.exe dist/g++.exe dist/dllwrap.exe dist/swig.exe $WINEROOT/windows/ cd .. # tar xzf setuptools.tar.gz @@ -156,6 +174,7 @@ script: | cd obfsproxy find -type f | xargs touch --date="$REFERENCE_DATETIME" LD_PRELOAD= $INSTPYTHON setup_py2exe.py py2exe + LD_PRELOAD= $INSTPYTHON setup.py install py2exe_zip_timestomp py2exe_bundle/dist/obfsproxy.zip cp -an py2exe_bundle/dist/{*.pyd,*.exe,*.zip} $PTDIR/ mkdir -p $INSTDIR/Docs/Obfsproxy @@ -188,6 +207,26 @@ script: | cp {doc/*,README,LICENSE,ChangeLog} $INSTDIR/Docs/FlashProxy cd .. # + cd fteproxy + cp $INSTDIR/gmp/bin/*dll* . + cp $INSTDIR/gmp/lib/*dll* . + ln -s $INSTDIR/gmp thirdparty/gmp + find -type f | xargs touch --date="$REFERENCE_DATETIME" + make win32 + make thirdparty/re2/obj/libre2.a + LD_PRELOAD= $INSTPYTHON setup.py build_ext -c mingw32 --inplace + LD_PRELOAD= $INSTPYTHON setup.py py2exe + mkdir -p $PTDIR/fte + mkdir -p $PTDIR/fte/tests + cp -an dist/{*.pyd,*.exe,*.zip} $PTDIR/ + cp -an fte/VERSION $PTDIR/fte + cp -ran fte/defs $PTDIR/fte + cp -ran fte/tests/dfas $PTDIR/fte/tests + cp -an thirdparty/gmp/bin/*.dll $PTDIR/ + mkdir -p $INSTDIR/Docs/fteproxy + cp -an {COPYING,README.md} $INSTDIR/Docs/fteproxy + cd .. + # # http://bugs.winehq.org/show_bug.cgi?id=3591 cp -a $INSTDIR/python/python27.dll $PTDIR/ # diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index d4eda0e..d757f4d 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -132,7 +132,7 @@ do fi done -for i in BINUTILS GCC PYTHON PYCRYPTO M2CRYPTO PYTHON_MSI +for i in BINUTILS GCC PYTHON PYCRYPTO M2CRYPTO PYTHON_MSI GMP do PACKAGE="${i}_PACKAGE" URL="${i}_URL" @@ -151,7 +151,6 @@ do fi done - for i in TOOLCHAIN4 OSXSDK MSVCR100 do PACKAGE="${i}_PACKAGE" @@ -195,6 +194,7 @@ do exit 1 fi done + cd .. # NoScript and PDF.JS are magikal and special: @@ -217,7 +217,7 @@ fi # Verify packages with weak or no signatures via direct sha256 check # (OpenSSL is signed with MD5, and OSXSDK is not signed at all) -for i in OSXSDK TOOLCHAIN4 NOSCRIPT MINGW MSVCR100 PYCRYPTO ARGPARSE ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL +for i in OSXSDK TOOLCHAIN4 NOSCRIPT MINGW MSVCR100 PYCRYPTO ARGPARSE ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" @@ -265,6 +265,7 @@ ln -sf "$TWISTED_PACKAGE" twisted.tar.bz2 ln -sf "$M2CRYPTO_PACKAGE" m2crypto.tar.gz ln -sf "$PY2EXE_PACKAGE" py2exe.exe ln -sf "$SETUPTOOLS_PACKAGE" setuptools.tar.gz +ln -sf "$GMP_PACKAGE" gmp.tar.bz2 # Fetch latest gitian-builder itself # XXX - this is broken if a non-standard inputs dir is selected using the command line flag. @@ -290,6 +291,7 @@ tor-browser https://git.torproject.org/tor-browser.git $TORBR pyptlib https://git.torproject.org/pluggable-transports/pyptlib.git obfsproxy https://git.torproject.org/pluggable-transports/obfsproxy.git flashproxy https://git.torproject.org/flashproxy.git +fteproxy https://github.com/kpdyer/fteproxy.git EOF exit 0 diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index 960d33c..d2901d8 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -129,7 +129,7 @@ then echo "****** Starting Pluggable Transports Component of Linux Bundle (3/4 for Linux) ******" echo - ./bin/gbuild -j $NUM_PROCS --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG $DESCRIPTOR_DIR/linux/gitian-pluggable-transports.yml + ./bin/gbuild -j $NUM_PROCS --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,fteproxy=$FTEPROXY_TAG $DESCRIPTOR_DIR/linux/gitian-pluggable-transports.yml if [ $? -ne 0 ]; then #mv var/build.log ./pluggable-transports-fail-linux.log.`date +%Y%m%d%H%M%S` diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh index 21e88d2..1f5eb18 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -126,7 +126,7 @@ then echo "****** Starting Pluggable Transports Component of Mac Bundle (3/4 for Mac) ******" echo - ./bin/gbuild -j $NUM_PROCS --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG $DESCRIPTOR_DIR/mac/gitian-pluggable-transports.yml + ./bin/gbuild -j $NUM_PROCS --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,fteproxy=$FTEPROXY_TAG $DESCRIPTOR_DIR/mac/gitian-pluggable-transports.yml if [ $? -ne 0 ]; then #mv var/build.log ./firefox-fail-mac.log.`date +%Y%m%d%H%M%S` diff --git a/gitian/mkbundle-windows.sh b/gitian/mkbundle-windows.sh index 3760b01..c30ccf1 100755 --- a/gitian/mkbundle-windows.sh +++ b/gitian/mkbundle-windows.sh @@ -127,7 +127,7 @@ then echo "****** Starting Pluggable Transports Component of Windows Bundle (3/4 for Windows) ******" echo - ./bin/gbuild -j $NUM_PROCS --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG $DESCRIPTOR_DIR/windows/gitian-pluggable-transports.yml + ./bin/gbuild -j $NUM_PROCS --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,fteproxy=$FTEPROXY_TAG $DESCRIPTOR_DIR/windows/gitian-pluggable-transports.yml if [ $? -ne 0 ]; then #mv var/build.log ./pluggable-transports-fail-win32.log.`date +%Y%m%d%H%M%S` diff --git a/gitian/versions.beta b/gitian/versions.beta index 7cb474e..775d7f9 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -13,13 +13,15 @@ NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable MINGW_REV=6184 -PYPTLIB_TAG=pyptlib-0.0.4 -OBFSPROXY_TAG=obfsproxy-0.2.3 +PYPTLIB_TAG=pyptlib-0.0.5 +OBFSPROXY_TAG=obfsproxy-0.2.4 FLASHPROXY_TAG=1.4 +FTEPROXY_TAG=0.2.6 GITIAN_TAG=tor-browser-builder-3.0-4 OPENSSL_VER=1.0.1f +GMP_VER=5.1.3 FIREFOX_LANG_VER=24.3.0esr BINUTILS_VER=2.22 GCC_VER=4.6.3 @@ -34,6 +36,7 @@ SETUPTOOLS_VER=1.4 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz +GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.13-fn+sm+fx.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb @@ -53,6 +56,7 @@ SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz # Hashes for packages with weak sigs or no sigs OPENSSL_HASH=6cc2a80b17d64de6b7bac985745fdaba971d54ffd7d38d3556f998d7c0c9cb5a +GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 NOSCRIPT_HASH=0d90f283ee9e3be5bb1ebc315fab12994ff5a15380bd3a2fdff62750286b4ea1 @@ -68,6 +72,7 @@ SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} +GMP_URL=https://ftp.gnu.org/gnu/gmp/${GMP_PACKAGE} TOOLCHAIN4_URL=https://people.torproject.org/~mikeperry/mirrors/sources/${T… OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE}

1 0

[tor-browser-bundle/master] GMP gpg key
by mikeperry＠torproject.org 27 Feb '14

27 Feb '14

commit 1492e883352a749e3ef08d3439a47dc65d64d066 Author: Kevin P. Dyer <kpdyer(a)gmail.com> Date: Sun Feb 9 12:30:05 2014 -0800 GMP gpg key --- gitian/gpg/GMP.gpg | Bin 0 -> 1527 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gitian/gpg/GMP.gpg b/gitian/gpg/GMP.gpg new file mode 100644 index 0000000..3423dbe Binary files /dev/null and b/gitian/gpg/GMP.gpg differ

1 0

[tor-browser-bundle/master] Merge remote-tracking branch 'kpdyer/fte'
by mikeperry＠torproject.org 27 Feb '14

27 Feb '14

commit 61e89f20a8d8ff5c8eda89526a70ae11769723af Merge: 7db9add 83a3d0f Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Feb 27 13:48:46 2014 -0800 Merge remote-tracking branch 'kpdyer/fte' Conflicts: gitian/mkbundle-linux.sh gitian/mkbundle-mac.sh gitian/mkbundle-windows.sh gitian/versions.beta Bundle-Data/beta/linux/torrc-defaults-appendix | 5 +++ Bundle-Data/beta/mac/torrc-defaults-appendix | 5 +++ Bundle-Data/beta/windows/torrc-defaults-appendix | 4 ++ Bundle-Data/mac-tor.sh | 1 + gitian/build-helpers/wine-wrappers/g++.py | 39 +++++++++++++++++++ gitian/build-helpers/wine-wrappers/setup.py | 2 +- .../linux/gitian-pluggable-transports.yml | 22 +++++++++++ .../mac/gitian-pluggable-transports.yml | 28 ++++++++++++- .../windows/gitian-pluggable-transports.yml | 41 +++++++++++++++++++- gitian/fetch-inputs.sh | 8 ++-- gitian/gpg/GMP.gpg | Bin 0 -> 1527 bytes gitian/mkbundle-linux.sh | 2 +- gitian/mkbundle-mac.sh | 2 +- gitian/mkbundle-windows.sh | 2 +- gitian/versions.beta | 9 ++++- 15 files changed, 159 insertions(+), 11 deletions(-) diff --cc gitian/descriptors/windows/gitian-pluggable-transports.yml index de105b1,c03c46d..48efba5 --- a/gitian/descriptors/windows/gitian-pluggable-transports.yml +++ b/gitian/descriptors/windows/gitian-pluggable-transports.yml @@@ -193,12 -201,32 +212,32 @@@ script: cd flashproxy find -type f | xargs touch --date="$REFERENCE_DATETIME" make dist-exe DISTNAME=flashproxy-client PYTHON="LD_PRELOAD= $INSTPYTHON" - py2exe_zip_timestomp dist/flashproxy-client/py2exe-flashproxy.zip - cp -an dist/flashproxy-client/{*.pyd,*.exe,*.zip} $PTDIR/ + py2exe_zip_timestomp dist/flashproxy-client-win32/py2exe-flashproxy.zip + cp -an dist/flashproxy-client-win32/{*.pyd,*.exe,*.zip} $PTDIR/ mkdir -p $INSTDIR/Docs/FlashProxy - cp {doc/*,README,LICENSE,ChangeLog} $INSTDIR/Docs/FlashProxy + cp dist/flashproxy-client-win32/{doc/*,README,LICENSE,ChangeLog} $INSTDIR/Docs/FlashProxy cd .. # + cd fteproxy + cp $INSTDIR/gmp/bin/*dll* . + cp $INSTDIR/gmp/lib/*dll* . + ln -s $INSTDIR/gmp thirdparty/gmp + find -type f | xargs touch --date="$REFERENCE_DATETIME" + make win32 + make thirdparty/re2/obj/libre2.a + LD_PRELOAD= $INSTPYTHON setup.py build_ext -c mingw32 --inplace + LD_PRELOAD= $INSTPYTHON setup.py py2exe + py2exe_zip_timestomp dist/fteproxy.zip + mkdir -p $PTDIR/fte + mkdir -p $PTDIR/fte/tests + cp -an dist/{*.pyd,*.exe,*.zip} $PTDIR/ + cp -an fte/VERSION $PTDIR/fte + cp -ran fte/defs $PTDIR/fte + cp -ran fte/tests/dfas $PTDIR/fte/tests + mkdir -p $INSTDIR/Docs/fteproxy + cp -an {COPYING,README.md} $INSTDIR/Docs/fteproxy + cd .. + # # http://bugs.winehq.org/show_bug.cgi?id=3591 cp -a $INSTDIR/python/python27.dll $PTDIR/ # diff --cc gitian/mkbundle-linux.sh index c7e730a,d2901d8..34485ae --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@@ -134,7 -129,7 +134,7 @@@ the echo "****** Starting Pluggable Transports Component of Linux Bundle (3/4 for Linux) ******" echo - ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG $DESCRIPTOR_DIR/linux/gitian-pluggable-transports.yml - ./bin/gbuild -j $NUM_PROCS --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,fteproxy=$FTEPROXY_TAG $DESCRIPTOR_DIR/linux/gitian-pluggable-transports.yml ++ ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,fteproxy=$FTEPROXY_TAG $DESCRIPTOR_DIR/linux/gitian-pluggable-transports.yml if [ $? -ne 0 ]; then #mv var/build.log ./pluggable-transports-fail-linux.log.`date +%Y%m%d%H%M%S` diff --cc gitian/mkbundle-mac.sh index 6c0fb52,1f5eb18..e8b3aa1 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@@ -131,7 -126,7 +131,7 @@@ the echo "****** Starting Pluggable Transports Component of Mac Bundle (3/4 for Mac) ******" echo - ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG $DESCRIPTOR_DIR/mac/gitian-pluggable-transports.yml - ./bin/gbuild -j $NUM_PROCS --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,fteproxy=$FTEPROXY_TAG $DESCRIPTOR_DIR/mac/gitian-pluggable-transports.yml ++ ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,fteproxy=$FTEPROXY_TAG $DESCRIPTOR_DIR/mac/gitian-pluggable-transports.yml if [ $? -ne 0 ]; then #mv var/build.log ./firefox-fail-mac.log.`date +%Y%m%d%H%M%S` diff --cc gitian/mkbundle-windows.sh index e6d2cf9,c30ccf1..037b031 --- a/gitian/mkbundle-windows.sh +++ b/gitian/mkbundle-windows.sh @@@ -132,7 -127,7 +132,7 @@@ the echo "****** Starting Pluggable Transports Component of Windows Bundle (3/4 for Windows) ******" echo - ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG $DESCRIPTOR_DIR/windows/gitian-pluggable-transports.yml - ./bin/gbuild -j $NUM_PROCS --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,fteproxy=$FTEPROXY_TAG $DESCRIPTOR_DIR/windows/gitian-pluggable-transports.yml ++ ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,fteproxy=$FTEPROXY_TAG $DESCRIPTOR_DIR/windows/gitian-pluggable-transports.yml if [ $? -ne 0 ]; then #mv var/build.log ./pluggable-transports-fail-win32.log.`date +%Y%m%d%H%M%S` diff --cc gitian/versions.beta index 3977261,775d7f9..97bf8ca --- a/gitian/versions.beta +++ b/gitian/versions.beta @@@ -13,9 -13,10 +13,10 @@@ NSIS_TAG=v0. ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable MINGW_REV=6184 - PYPTLIB_TAG=pyptlib-0.0.4 - OBFSPROXY_TAG=obfsproxy-0.2.3 + PYPTLIB_TAG=pyptlib-0.0.5 + OBFSPROXY_TAG=obfsproxy-0.2.4 -FLASHPROXY_TAG=1.4 +FLASHPROXY_TAG=1.6 + FTEPROXY_TAG=0.2.6 GITIAN_TAG=tor-browser-builder-3.0-4

1 0

[tor-browser-bundle/master] missing files from initial fteproxy commit
by mikeperry＠torproject.org 27 Feb '14

27 Feb '14

commit 01cd8b3cda018d85e8dbd4bd60f1b8c6ab48e42f Author: Kevin P. Dyer <kpdyer(a)gmail.com> Date: Sun Feb 9 12:07:05 2014 -0800 missing files from initial fteproxy commit --- Bundle-Data/beta/mac/torrc-defaults-appendix | 5 +++++ Bundle-Data/beta/windows/torrc-defaults-appendix | 4 ++++ Bundle-Data/mac-tor.sh | 1 + 3 files changed, 10 insertions(+) diff --git a/Bundle-Data/beta/mac/torrc-defaults-appendix b/Bundle-Data/beta/mac/torrc-defaults-appendix index 3738142..d3e211d 100644 --- a/Bundle-Data/beta/mac/torrc-defaults-appendix +++ b/Bundle-Data/beta/mac/torrc-defaults-appendix @@ -1,4 +1,9 @@ +## fteproxy configuration +# Bridge fte bridges.fteproxy.org:8080 + +ClientTransportPlugin fte exec PluggableTransports/fteproxy --managed + ## obfsproxy configuration # # Bridge obfs3 83.212.101.2:42782 2ADFE7AA8D272C520D1FBFBF4E413F3A1B26313D diff --git a/Bundle-Data/beta/windows/torrc-defaults-appendix b/Bundle-Data/beta/windows/torrc-defaults-appendix index 550e7b5..965b98a 100644 --- a/Bundle-Data/beta/windows/torrc-defaults-appendix +++ b/Bundle-Data/beta/windows/torrc-defaults-appendix @@ -1,3 +1,7 @@ +## fteproxy configuration +# Bridge fte bridges.fteproxy.org:8080 + +ClientTransportPlugin fte exec Tor\PluggableTransports\fteproxy --managed ## obfsproxy configuration # diff --git a/Bundle-Data/mac-tor.sh b/Bundle-Data/mac-tor.sh index fb9c4f4..9a22096 100755 --- a/Bundle-Data/mac-tor.sh +++ b/Bundle-Data/mac-tor.sh @@ -2,6 +2,7 @@ # Compiled Python modules require a compatible Python, which means 32-bit 2.6. export VERSIONER_PYTHON_VERSION=2.6 export VERSIONER_PYTHON_PREFER_32_BIT=yes +export DYLD_LIBRARY_PATH=.:$DYLD_LIBRARY_PATH # Set the current working directory to the directory containing this executable, # so that pluggable transport executables can be given with relative paths. This # works around a change in OS X 10.9, where the current working directory is

1 0

[tor-launcher/master] Bug #10894: Help desk is not a bridge autoresponder.
by brade＠torproject.org 27 Feb '14

27 Feb '14

commit d53bcc2e772b3ff9e949ec8f961023f11f903991 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Feb 27 14:58:56 2014 -0500 Bug #10894: Help desk is not a bridge autoresponder. Use revised Bridge Relay Help text/layout in Network Settings dialog. --- src/chrome/content/network-settings-overlay.xul | 23 ++++++++++++++++++++++- src/chrome/content/network-settings-wizard.xul | 19 +------------------ src/chrome/content/network-settings.xul | 6 +----- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/chrome/content/network-settings-overlay.xul b/src/chrome/content/network-settings-overlay.xul index efbc3c6..b7141f0 100644 --- a/src/chrome/content/network-settings-overlay.xul +++ b/src/chrome/content/network-settings-overlay.xul @@ -8,7 +8,8 @@ <!DOCTYPE overlay SYSTEM "chrome://torlauncher/locale/network-settings.dtd"> <overlay id="TorNetworkSettingsOverlay" - xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> + xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" + xmlns:html="http://www.w3.org/1999/xhtml"> <groupbox id="proxySpecificSettings"> <grid flex="1"> @@ -92,6 +93,26 @@ --> </hbox> </groupbox> + + <vbox id="bridgeHelpContent"> + <hbox align="middle"><label>&torsettings.bridgeHelpTitle;</label></hbox> + <description>&torsettings.bridgeHelp1;</description> + <description class="prelist">&torsettings.bridgeHelp1B;</description> + <html:ol> + <html:li> + <html:div class="heading">&torsettings.bridgeHelp2Heading;</html:div> + <html:div>&torsettings.bridgeHelp2;</html:div> + </html:li> + <html:li> + <html:div class="heading">&torsettings.bridgeHelp3Heading;</html:div> + <html:div>&torsettings.bridgeHelp3;</html:div> + </html:li> + <html:li> + <html:div class="heading">&torsettings.bridgeHelp4Heading;</html:div> + <html:div class="endOfHelp">&torsettings.bridgeHelp4;</html:div> + </html:li> + </html:ol> + </vbox> </overlay> diff --git a/src/chrome/content/network-settings-wizard.xul b/src/chrome/content/network-settings-wizard.xul index dcc169e..b1c5c82 100644 --- a/src/chrome/content/network-settings-wizard.xul +++ b/src/chrome/content/network-settings-wizard.xul @@ -15,7 +15,6 @@ <wizard id="TorNetworkSettings" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" - xmlns:html="http://www.w3.org/1999/xhtml" title="&torsettings.dialog.title;" windowtype="TorLauncher:NetworkSettings" persist="screenX screenY" @@ -148,23 +147,7 @@ <wizardpage class="help" label=" " pageid="bridgeHelp" next="notUsed" onpageadvanced="closeHelp(); return false;"> - <hbox align="middle"><label>&torsettings.bridgeHelpTitle;</label></hbox> - <description>&torsettings.bridgeHelp1;</description> - <description class="prelist">&torsettings.bridgeHelp1B;</description> - <html:ol> - <html:li> - <html:div class="heading">&torsettings.bridgeHelp2Heading;</html:div> - <html:div>&torsettings.bridgeHelp2;</html:div> - </html:li> - <html:li> - <html:div class="heading">&torsettings.bridgeHelp3Heading;</html:div> - <html:div>&torsettings.bridgeHelp3;</html:div> - </html:li> - <html:li> - <html:div class="heading">&torsettings.bridgeHelp4Heading;</html:div> - <html:div class="endOfHelp">&torsettings.bridgeHelp4;</html:div> - </html:li> - </html:ol> + <vbox id="bridgeHelpContent" /> </wizardpage> <hbox pack="start"> diff --git a/src/chrome/content/network-settings.xul b/src/chrome/content/network-settings.xul index ae4eb8d..4c4eeed 100644 --- a/src/chrome/content/network-settings.xul +++ b/src/chrome/content/network-settings.xul @@ -70,11 +70,7 @@ </vbox> <vbox id="errorPanel"/> <vbox id="bridgeHelp" class="help"> - <hbox align="middle"><label>&torsettings.bridgeHelpTitle;</label></hbox> - <description>&torsettings.bridgeHelp1;</description> - <description>&torsettings.bridgeHelp2;</description> - <description>&torsettings.bridgeHelp3;</description> - <description class="endOfHelp">&torsettings.bridgeHelp4;</description> + <vbox id="bridgeHelpContent" /> </vbox> </deck> <spring flex="1" />

1 0

r26627: {website} Adding Tor and Orbot project ideas Yikes, between Nick and N (website/trunk/getinvolved/en)
by Damian Johnson 27 Feb '14

27 Feb '14

Author: atagar Date: 2014-02-27 17:19:03 +0000 (Thu, 27 Feb 2014) New Revision: 26627 Modified: website/trunk/getinvolved/en/volunteer.wml Log: Adding Tor and Orbot project ideas Yikes, between Nick and Nathan there's quite a few! Adding GSoC project ideas from them both for Tor and Orbot. Modified: website/trunk/getinvolved/en/volunteer.wml =================================================================== --- website/trunk/getinvolved/en/volunteer.wml 2014-02-26 16:19:35 UTC (rev 26626) +++ website/trunk/getinvolved/en/volunteer.wml 2014-02-27 17:19:03 UTC (rev 26627) @@ -425,7 +425,13 @@ Project Ideas: <a href="#torCleanup">Tor Codebase Cleanup</a> - <a href="#chutneyExpansion">Make Chutney Do More, More Reliably</a> + <a href="#chutneyExpansion">Make Chutney Do More, More Reliably</a> + <a href="#improveTorTestCoverage">Improve test coverage in Tor</a> + <a href="#useMoreCores">Have the Tor daemon use more cores</a> + <a href="#improveHiddenServices">Help improve Tor hidden services</a> + <a href="#consensusDiffs">Implement consensus diffs</a> + <a href="#improvedDnsSupport">Improved DNS support for Tor</a> + <a href="#torSandboxing">Help improve Tor sandboxing</a> <a id="project-orchid"></a> @@ -516,6 +522,12 @@ date with all changes in Android and mobile threats. + + Project Ideas: + <a href="#orbotVPN">Orbot Android VPN</a> + <a href="#orfox">Orfox - Firefox/Gecko-based Android Browser for Tor</a> + + <a id="project-tails"></a> <h3><a href="https://tails.boum.org/">The Amnesic Incognito Live System</a> (<a href="https://git-tails.immerda.ch/tails/">code</a>, <a @@ -1306,7 +1318,427 @@ </li> + <a id="orbotVPN"></a> <li> + Orbot Android VPN + + Effort Level: Medium + + Skill Level: High + + Likely Mentors: Nathan (n8fr8) + +Android offers the ability for any application to establish a +VPNService through which all traffic on the device is sent. We want to +implement this type of service in order to route all traffic through +the Tor network. This is a feature that will be implemented directly +into Orbot: Tor for Android if successfully implemented. + + + +The deliverables for the project will be a working Android VPN +implementation that routes traffic through Tor, and integration of VPN +code into the Orbot app. There must also be time made for reporting on +the project through blog posts, network auditing of tracking to ensure +leakage is not occurring. + + + +Useful links and documentation to study: + + + <ul> + <li><a href="https://gitweb.torproject.org/orbot.git">Orbot</a></li> + <li><a href="http://developer.android.com/reference/android/net/VpnService.html">Android VPNService API</a></li> + <li><a href="https://github.com/guardianproject/OrbotVPN">Existing work on Orbot VPN</a></li> + </ul> + + +Applicant should have the ability to build Orbot application from +source using Android SDK and NDK tools. A solid understanding of IP +routing, iptables, netfilter and VPN protocols would also be very +helpful. The ability to use Wireshark or other network monitoring +software to test and verify solution is something that can be taught, +but if you already know how, bonus! Finally, understanding how the +exiting Tor software can be used with various transparent proxying +configurations is a good first step to understanding this problem. + + </li> + + <a id="orfox"></a> + <li> + Orfox - Firefox/Gecko-based Android Browser for Tor + + Effort Level: High + + Skill Level: Medium + + Likely Mentors: Nathan (n8fr8) + +With almost 1 million downloads, our Orweb browser has been a popular +solution for easily accessing the web via Tor or any other HTTP or +SOCKS proxy, while also ensuring local data caches are cleared and +cookies are properly managed. Orweb is based on WebView, which has its +limitations unfortunately. We would like to move to a +Firefox/Fennec/GeckoView based browser, and have created a prototype +for it. Mozilla has begun releasing GeckoView as a standalone +component, as well, but it needs more testing, debugging and work on +integration into our streamlined browser app model. Our end goal is to +have a mobile browser that matches Tor Browser in terms of privacy +enhancing features and security. + + + +The deliverables for the project are expected to be the creation of a +alpha quality release of Orfox, a GeckoView-based browser with feature +parity of Orweb browser. A bonus goal is to implement additional +features and capabilities based on Tor Browser patches for +Fennec/Mozilla core. Finally, as always, a required activity is a +network audit testing of implemented solution with write-ups, reports +posted publicly. + + + +Useful links to review: + + + <ul> + <li><a href="https://github.com/guardianproject/orfox">Orfox (gecko prototype)</a></li> + <li><a href="https://github.com/guardianproject/orweb">Orweb (production browser on WebView)</a></li> + <li><a href="http://starkravingfinkle.org/blog/2013/10/geckoview-embedding-gecko-in-your…">GeckoView info</a></li> + <li><a href="https://www.torproject.org/projects/torbrowser.html.en">Tor Browser (desktop)</a></li> + </ul> + + +Applicant should have the ability to build Fennec and GeckoView +libraries from source using Android SDK and NDK. Some experince with +browser security models and threats would be a useful background to +have. Ability to do network audits to ensure browser proxying is not +leaking DNS, media streams or other network traffic, as well as tests +against common browser de-anonymizing attacks are necessary. + + </li> + + <a id="improveTorTestCoverage"></a> + <li> + Improve test coverage in Tor + + Effort Level: Medium + + Skill Level: Medium + + Likely Mentors: Nick (nickm) + +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 +unit tests. Improving this test coverage could make Tor development +much more reliable. + + + +So we need better unit tests, and we need better integration tests too. + + + +Improving unit tests would would involve refactoring functions to be more +testable, and writing a bunch of unit tests. + + + +Improving integratino tests would involve refactoring and improving +the "chutney" program that launches a test tor network, and writing a +bunch of tests to see what works and what doesn't work on such a +network. It could also involve writing tests using the library "<a +href="https://stem.torproject.org/">stem</a>" to script individual clients on a +Chutney network. + + + +To get a feel for how testing works in Tor today, download Tor and +Chutney, and make sure you can build Tor and use Chutney. See how the +unit tests work by skimming some of the test code in the src/test +subdirectory. Try computing test coverage (according to the +instructions in the doc/HACKING file. + + + +Also, have a look at the one current integration test that works on +chutney today: it is a shell script distributed with Tor as +src/test/test-tor-network.sh . We probably don't want to have all of +our integration tests be written as shell scripts, but it's interesting +to see how one works. + + + +If working on designs for an improved or refactored Chutney, watch out for <a +href="http://www.joelonsoftware.com/articles/fog0000000018.html">"archicture +astronautics"</a>: while it's important that we have a well-designed and +maintainable Chutney architecture, it wouldn't be very useful if a good +architecture were the only outcome here: we need tests too. + + + +As part of the application process, please contribute a patch that makes +a non-trivial improvement to chutney, and/or include a new test for some +interesting Tor function. (Please pick a function that isn't completely +easy to test.) + + </li> + + <a id="useMoreCores"></a> + <li> + Have the Tor daemon use more cores + + Effort Level: Medium + + Skill Level: Medium + + Likely Mentors: Nick (nickm) + +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 +expensive computations into worker threads, but that mechanism is +currently only used for a small fraction of our cryptography. Moving +more work into the worker threads could improve performance immensely. + + + +So it would be great to parallelize our cryptography more in order to +better handle more cores. See +<a href="https://trac.torproject.org/projects/tor/wiki/org/projects/Tor/Multithreade…">MultithreadedCrypto</a> +for some background info, and +<a href="https://trac.torproject.org/projects/tor/ticket/7572">ticket 7572</a> for some subtickets +on our tracker. + + + +(If you're reading through the code to see how it works today, you will +also want to have a look at the new implementation for cpuworkers +described in <a href="https://trac.torproject.org/projects/tor/ticket/9682">9682</a>.) + + + +Completing the implementation of ticket #7572 --which would move our +circuit crypto onto separate threads-- could be a good summer project. +Alternatively, moving all of the signature generation and verification +code onto the cpuworkers could be fun. In either case, you will have +some important architectural decisions to make about how to minimize +shared data between the main thread and the workers, how to avoid +race conditions between them, and how to test it all to make sure it has +no hidden failure cases. + + + +As part of the application process for this project, please contribute a +nontrivial patch to Tor -- ideally, one that will affect some part of +the codebase that you want to work on. + + </li> + + <a id="improveHiddenServices"></a> + <li> + Help improve Tor hidden services + + Effort Level: Medium + + Skill Level: Medium + + Likely Mentors: Nick (nickm) + +We're working on a revamp of the entire Tor hidden service design to +improve the security and reliability of the hidden service system. + + + +This is a big project: see +<a href="https://gitweb.torproject.org/torspec.git/blob_plain/refs/heads/master:/pro…">proposal +224</a> for the latest design. Are you interested in implementing some +part of that? + + + +This is a very ambitious project, so we're deliberately not suggesting +particular sub-topics. If you're interested in participating, try to +read and understand the <a +href="https://gitweb.torproject.org/torspec.git/blob_plain/refs/heads/master:/ren…">existing +design</a> and the design proposal for the new design, and then talk to +us about what part you want to work on. + + + +As part of the application process for this project, please contribute a +nontrivial patch to Tor -- ideally, one that will affect some part of +the codebase that you want to work on. + + </li> + + <a id="consensusDiffs"></a> + <li> + Implement consensus diffs + + Effort Level: Medium + + Skill Level: Medium + + Likely Mentors: Nick (nickm) + +Right now, every few hours, a Tor client downloads a new signed "consensus +document" that describes the state of the network. Even though these +documents are compressed, thisstill takes almost half a megabyte. + + + +<a +href="https://gitweb.torproject.org/torspec.git/blob_plain/refs/heads/master:/pro…">Proposal +140</a> describes a design to save a lot of bandwidth by transferring +compressed <a href="http://en.wikipedia.org/wiki/Diff">diff</a>s instead +of transferring the entire consensus document. + + + +That's an attractive idea, but it presents some programming challenges. +We probably don't want to ship a 'diff' and 'patch' along with Tor. Is +there a free, safe, robust implementation of one of the +good diff algorithms that we can use? + + + +Alternatively, can we take advantage of regularities in the descriptor +format in order to generate diffs more simply? + + + +As part of the application process for this project, please contribute a +nontrivial patch to Tor -- ideally, one that will affect some part of +the codebase that you want to work on. Make sure that your application +describes which implementations of the diff and patch algorithms you +intend to use, and that your coding samples show strong evidence that +you can do secure string manipulation in C. + + </li> + + <a id="improvedDnsSupport"></a> + <li> + Improved DNS support for Tor + + Effort Level: Medium + + Skill Level: Medium + + Likely Mentors: Nick (nickm) + +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! + + + +<a +href="https://gitweb.torproject.org/torspec.git/blob_plain/refs/heads/master:/pro…">Proposal +219</a> describes some new cell types that Tor could use to support +more types of DNS over Tor. + + + +To see how Tor implements its existing DNS lookups, start by tracing the +the connection_exit_begin_resolve() function in src/or/connection_edge.c , +and see how we pass these requests downwards through src/or/dns.c to the +underlying resolver. It's not too complicated, but there are some +tricky parts to understand. + + + +As part of the application process for this project, please contribute a +nontrivial patch to Tor -- ideally, one that will affect some part of +the codebase that you want to work on. + + </li> + + <a id="torSandboxing"></a> + <li> + Help improve Tor sandboxing + + Effort Level: Medium + + Skill Level: Medium + + Likely Mentors: Nick (nickm) + +The seccomp2 mechanism on Linux lets programs improve their robustness +against unforseen bugs by running with restrictions on which system +calls they can invoke and how they can call them. This can help +security a lot. + + + +Thanks to a GSOC student from last year, we now have seccomp2 support on +Linux, which we use to restrict the capabilities of the entire Tor +process. (For implementation details, see src/commmon/sandbox.c in the +Tor source.) + + + +But since the restrictions are done over the whole process, all pieces +of the Tor code have permission to do things that only small parts of +the Tor program need to do. Also, since we use seccomp2, these +restrictions only work on Linux. + + + +It would be great to instead divide the main Tor program into multiple +processes with a robust IPC mechanism and assign each process its own +minimal set of privileges; and to have this work (as best we can) on +systems that don't have seccomp2 (eg Windows, Mac). + + + +Either of these could be a whole GSOC project. + + + +To get started, make sure you understand the existing sandboxing code. +If you're interested in splitting Tor into multiple processes, think +about the architecture, and think about how we could reach this +architecture without completely rewriting the codebase. (Remember that +even if you're focusing on Linux, Tor still needs to work on other +operating systems.) + + + +If you're interested in supporting more platforms, make sure you +understand and can explain what sandboxing mechansisms you want to use, +and what they're capable of. (You might want to investigate the way +that other open-source programs, like the Chrome web browser, do their +sandboxing on different platforms.) + + + +As part of the application process for this project, please contribute a +nontrivial patch to Tor -- ideally, one that will affect some part of +the codebase that you want to work on. + + </li> + + + + <li> Bring up new ideas! Don't like any of these? Look at the <a

1 0