tor-commits January 2016

tor-commits@lists.torproject.org

19 participants
1449 discussions

[tor-browser-bundle/master] Bug 15578: drop our Python build
by gk＠torproject.org 22 Jan '16

22 Jan '16

commit ac9da1d5965169f91973d57737fcd20e06351b08 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Sun Jan 10 17:09:43 2016 +0100 Bug 15578: drop our Python build After switching to Debian Wheezy, we don't need to build Python since the version provided by the distribution is recent enough. --- gitian/descriptors/linux/gitian-bundle.yml | 9 +-------- gitian/descriptors/linux/gitian-firefox.yml | 8 +------- gitian/descriptors/linux/gitian-utils.yml | 25 ------------------------- gitian/fetch-inputs.sh | 7 ++----- gitian/mkbundle-linux.sh | 12 ------------ gitian/verify-tags.sh | 5 ++--- gitian/versions | 5 ----- gitian/versions.alpha | 5 ----- gitian/versions.beta | 5 ----- gitian/versions.nightly | 5 ----- 10 files changed, 6 insertions(+), 80 deletions(-) diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml index bfecb0f..e44635e 100644 --- a/gitian/descriptors/linux/gitian-bundle.yml +++ b/gitian/descriptors/linux/gitian-bundle.yml @@ -14,6 +14,7 @@ packages: - "libxslt1.1" - "libxml2-utils" - "sqlite3" +- "python-lxml" reference_datetime: "2000-01-01 00:00:00" remotes: - "url": "https://git.torproject.org/tor-launcher.git" @@ -35,10 +36,6 @@ files: - "tor-linux64-gbuilt.zip" - "pluggable-transports-linux32-gbuilt.zip" - "pluggable-transports-linux64-gbuilt.zip" -- "python-linux32-utils.zip" -- "python-linux64-utils.zip" -- "lxml-linux32-utils.zip" -- "lxml-linux64-utils.zip" - "torrc-defaults-appendix-linux" - "bridge_prefs.js" - "meek-http-helper-user.js" @@ -83,10 +80,6 @@ script: | mkdir -p ${TB_STAGE_DIR}/Browser/TorBrowser/Data/Browser/profile.meek-http-helper/extensions mkdir -p ${TB_STAGE_DIR}/Browser/TorBrowser/Data/Browser/Caches mkdir -p ${TB_STAGE_DIR}/Browser/TorBrowser/Docs/sources/ - # Preparing Python for HTTPS-Everywhere. - unzip -d $INSTDIR python-linux$GBUILD_BITS-utils.zip - export PATH=$INSTDIR/python/bin:$PATH - unzip -d $INSTDIR/python/lib/python2.7 lxml-linux$GBUILD_BITS-utils.zip # # Extract the MAR tools. unzip -d ~/build ~/build/mar-tools-linux${GBUILD_BITS}.zip diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index 468d6e5..f7ea1c6 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -17,6 +17,7 @@ packages: - "libgstreamer-plugins-base0.10-dev" - "libxt-dev" - "hardening-wrapper" +- "python-dev" # To pass configure since ESR 31. - "libpulse-dev" # We built GCC but not the libmpc2, thus we need to install it. @@ -32,8 +33,6 @@ files: - "binutils-linux64-utils.zip" - "gcc-linux32-utils.zip" - "gcc-linux64-utils.zip" -- "python-linux32-utils.zip" -- "python-linux64-utils.zip" - "re-dzip.sh" - "dzip.sh" - "versions" @@ -53,11 +52,6 @@ script: | export DEB_BUILD_HARDENING_FORMAT=1 export DEB_BUILD_HARDENING_PIE=1 # - # Preparing Python for Tor Browser - unzip -d $INSTDIR python-linux$GBUILD_BITS-utils.zip - # TODO: We might want to have a smarter solution than hard-coding the version. - ln -sf $INSTDIR/python/bin/python2.7 $INSTDIR/python/bin/python - export PATH=$INSTDIR/python/bin:$PATH # Preparing Binutils and GCC for Tor Browser unzip -d $INSTDIR binutils-linux$GBUILD_BITS-utils.zip # Make sure gold is used with the hardening wrapper for full RELRO, see diff --git a/gitian/descriptors/linux/gitian-utils.yml b/gitian/descriptors/linux/gitian-utils.yml index 34e93dc..e8801cc 100644 --- a/gitian/descriptors/linux/gitian-utils.yml +++ b/gitian/descriptors/linux/gitian-utils.yml @@ -33,8 +33,6 @@ files: - "binutils.tar.bz2" - "gcc.tar.bz2" - "openssl.tar.gz" -- "python.tar.bz2" -- "lxml.tar.gz" - "gmp.tar.bz2" - "versions" - "dzip.sh" @@ -117,29 +115,7 @@ script: | make install cd .. - # Building Python - # Fx 24 ESR and HTTPS Everywhere >= 3.5 do not work with Python < 2.7 anymore. - # But 10.04 does only ship with Python 2.6. Thus, we compile 2.7 ourselves... - tar xjf python.tar.bz2 - cd Python-* - ./configure - make $MAKEOPTS altinstall prefix=$INSTDIR/python exec-prefix=$INSTDIR/python - cd .. - - # Building lxml - export LD_PRELOAD="" - tar xzf lxml.tar.gz - cd lxml-* - # Make sure we use our freshly built python binary here. Otherwise bad things - # may happen when we do so in the bundle step assembling the HTTPS-Everywhere - # rules. - $INSTDIR/python/bin/python2.7 setup.py build - cd build/lib* - export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 - ~/build/dzip.sh lxml-$LXML_VER-linux$GBUILD_BITS-utils.zip lxml export LD_PRELOAD="" - cp *utils.zip $OUTDIR - cd ../../../ # Building GMP tar xjf gmp.tar.bz2 @@ -161,6 +137,5 @@ script: | ~/build/dzip.sh gcc-$GCC_VER-linux$GBUILD_BITS-utils.zip gcc ~/build/dzip.sh openssl-$OPENSSL_VER-linux$GBUILD_BITS-utils.zip openssl ~/build/dzip.sh libevent-${LIBEVENT_TAG#release-}-linux$GBUILD_BITS-utils.zip libevent - ~/build/dzip.sh python-$PYTHON_VER-linux$GBUILD_BITS-utils.zip python ~/build/dzip.sh gmp-$GMP_VER-linux$GBUILD_BITS-utils.zip gmp cp *utils.zip $OUTDIR/ diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 206023b..9d6f2f3 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -112,12 +112,11 @@ update_git() { ############################################################################## # Get+verify sigs that exist -for i in OPENSSL BINUTILS GCC PYTHON PYCRYPTO PYTHON_MSI GMP LXML +for i in OPENSSL BINUTILS GCC PYCRYPTO PYTHON_MSI GMP do PACKAGE="${i}_PACKAGE" URL="${i}_URL" - if [ "${i}" == "PYTHON" -o "${i}" == "PYCRYPTO" -o "${i}" == "PYTHON_MSI" -o \ - "${i}" == "LXML" -o "${i}" == "OPENSSL" ]; then + if [ "${i}" == "PYCRYPTO" -o "${i}" == "PYTHON_MSI" -o "${i}" == "OPENSSL" ]; then SUFFIX="asc" else SUFFIX="sig" @@ -226,7 +225,6 @@ ln -sf "$NOSCRIPT_PACKAGE" noscript(a)noscript.net.xpi ln -sf "$OPENSSL_PACKAGE" openssl.tar.gz ln -sf "$BINUTILS_PACKAGE" binutils.tar.bz2 ln -sf "$GCC_PACKAGE" gcc.tar.bz2 -ln -sf "$PYTHON_PACKAGE" python.tar.bz2 ln -sf "$PYTHON_MSI_PACKAGE" python.msi ln -sf "$PYCRYPTO_PACKAGE" pycrypto.tar.gz ln -sf "$ARGPARSE_PACKAGE" argparse.tar.gz @@ -236,7 +234,6 @@ ln -sf "$TWISTED_PACKAGE" twisted.tar.bz2 ln -sf "$PY2EXE_PACKAGE" py2exe.exe ln -sf "$SETUPTOOLS_PACKAGE" setuptools.tar.gz ln -sf "$GMP_PACKAGE" gmp.tar.bz2 -ln -sf "$LXML_PACKAGE" lxml.tar.gz ln -sf "$PARSLEY_PACKAGE" parsley.tar.gz ln -sf "$GO_PACKAGE" go.tar.gz diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index 0c70732..f8aaec1 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -108,10 +108,6 @@ if [ ! -f inputs/binutils-$BINUTILS_VER-linux32-utils.zip -o \ ! -f inputs/openssl-$OPENSSL_VER-linux64-utils.zip -o \ ! -f inputs/libevent-${LIBEVENT_TAG_ORIG#release-}-linux32-utils.zip -o \ ! -f inputs/libevent-${LIBEVENT_TAG_ORIG#release-}-linux64-utils.zip -o \ - ! -f inputs/python-$PYTHON_VER-linux32-utils.zip -o \ - ! -f inputs/python-$PYTHON_VER-linux64-utils.zip -o \ - ! -f inputs/lxml-$LXML_VER-linux32-utils.zip -o \ - ! -f inputs/lxml-$LXML_VER-linux64-utils.zip -o \ ! -f inputs/gmp-$GMP_VER-linux32-utils.zip -o \ ! -f inputs/gmp-$GMP_VER-linux64-utils.zip ]; then @@ -136,10 +132,6 @@ then ln -sf openssl-$OPENSSL_VER-linux64-utils.zip openssl-linux64-utils.zip ln -sf libevent-${LIBEVENT_TAG_ORIG#release-}-linux32-utils.zip libevent-linux32-utils.zip ln -sf libevent-${LIBEVENT_TAG_ORIG#release-}-linux64-utils.zip libevent-linux64-utils.zip - ln -sf python-$PYTHON_VER-linux32-utils.zip python-linux32-utils.zip - ln -sf python-$PYTHON_VER-linux64-utils.zip python-linux64-utils.zip - ln -sf lxml-$LXML_VER-linux32-utils.zip lxml-linux32-utils.zip - ln -sf lxml-$LXML_VER-linux64-utils.zip lxml-linux64-utils.zip ln -sf gmp-$GMP_VER-linux32-utils.zip gmp-linux32-utils.zip ln -sf gmp-$GMP_VER-linux64-utils.zip gmp-linux64-utils.zip cd .. @@ -159,10 +151,6 @@ else ln -sf openssl-$OPENSSL_VER-linux64-utils.zip openssl-linux64-utils.zip ln -sf libevent-${LIBEVENT_TAG_ORIG#release-}-linux32-utils.zip libevent-linux32-utils.zip ln -sf libevent-${LIBEVENT_TAG_ORIG#release-}-linux64-utils.zip libevent-linux64-utils.zip - ln -sf python-$PYTHON_VER-linux32-utils.zip python-linux32-utils.zip - ln -sf python-$PYTHON_VER-linux64-utils.zip python-linux64-utils.zip - ln -sf lxml-$LXML_VER-linux32-utils.zip lxml-linux32-utils.zip - ln -sf lxml-$LXML_VER-linux64-utils.zip lxml-linux64-utils.zip ln -sf gmp-$GMP_VER-linux32-utils.zip gmp-linux32-utils.zip ln -sf gmp-$GMP_VER-linux64-utils.zip gmp-linux64-utils.zip cd .. diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh index 82a810a..fc62344 100755 --- a/gitian/verify-tags.sh +++ b/gitian/verify-tags.sh @@ -121,12 +121,11 @@ noto-fonts $NOTOFONTS_TAG EOF # Verify signatures on signed packages -for i in OPENSSL BINUTILS GCC PYTHON PYCRYPTO PYTHON_MSI GMP LXML +for i in OPENSSL BINUTILS GCC PYCRYPTO PYTHON_MSI GMP do PACKAGE="${i}_PACKAGE" URL="${i}_URL" - if [ "${i}" == "PYTHON" -o "${i}" == "PYCRYPTO" -o "${i}" == "PYTHON_MSI" -o \ - "${i}" == "LXML" -o "${i}" == "OPENSSL" ]; then + if [ "${i}" == "PYCRYPTO" -o "${i}" == "PYTHON_MSI" -o "${i}" == "OPENSSL" ]; then SUFFIX="asc" else SUFFIX="sig" diff --git a/gitian/versions b/gitian/versions index 7ff094e..bd484bb 100755 --- a/gitian/versions +++ b/gitian/versions @@ -52,7 +52,6 @@ ZOPEINTERFACE_VER=4.0.5 TWISTED_VER=13.2.0 PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 -LXML_VER=3.3.5 PARSLEY_VER=1.2 GO_VER=1.4.2 NOTOCJKFONT_VER=1.004 @@ -68,7 +67,6 @@ OSXSDK_OLD_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb MSVCR100_PACKAGE=msvcr100.dll BINUTILS_PACKAGE=binutils-${BINUTILS_VER}.tar.bz2 GCC_PACKAGE=gcc-${GCC_VER}.tar.bz2 -PYTHON_PACKAGE=Python-${PYTHON_VER}.tar.bz2 PYTHON_MSI_PACKAGE=python-${PYTHON_VER}.msi PYCRYPTO_PACKAGE=pycrypto-${PYCRYPTO_VER}.tar.gz ARGPARSE_PACKAGE=argparse-${ARGPARSE_VER}.tar.gz @@ -77,7 +75,6 @@ ZOPEINTERFACE_PACKAGE=zope.interface-${ZOPEINTERFACE_VER}.zip TWISTED_PACKAGE=Twisted-${TWISTED_VER}.tar.bz2 PY2EXE_PACKAGE=py2exe-${PY2EXE_VER}.win32-py2.7.exe SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz -LXML_PACKAGE=lxml-${LXML_VER}.tar.gz PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz NOTOCJKFONT_PACKAGE=NotoSansCJKsc-Regular.otf @@ -114,7 +111,6 @@ OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE} NOSCRIPT_URL=https://addons.cdn.mozilla.net/user-media/addons/722/${NOSCRIP… -PYTHON_URL=https://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_PACKAGE} PYTHON_MSI_URL=https://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_MSI… PYCRYPTO_URL=https://pypi.python.org/packages/source/p/pycrypto/${PYCRYPTO_… ARGPARSE_URL=https://argparse.googlecode.com/files/${ARGPARSE_PACKAGE} @@ -124,7 +120,6 @@ TWISTED_URL=https://pypi.python.org/packages/source/T/Twisted/${TWISTED_PAC… # TWISTED_URL=https://twistedmatrix.com/Releases/Twisted/$(echo ${TWISTED_VER} | awk -F. '{print $1"."$2}')/${TWISTED_PACKAGE} PY2EXE_URL=http://liquidtelecom.dl.sourceforge.net/project/py2exe/py2exe/${… SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… -LXML_URL=https://pypi.python.org/packages/source/l/lxml/${LXML_PACKAGE} PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… GO_URL=https://golang.org/dl/${GO_PACKAGE} NOTOCJKFONT_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a… diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 95ca078..5b7ef02 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -52,7 +52,6 @@ ZOPEINTERFACE_VER=4.0.5 TWISTED_VER=13.2.0 PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 -LXML_VER=3.3.5 PARSLEY_VER=1.2 GO_VER=1.4.2 NOTOCJKFONT_VER=1.004 @@ -68,7 +67,6 @@ OSXSDK_OLD_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb MSVCR100_PACKAGE=msvcr100.dll BINUTILS_PACKAGE=binutils-${BINUTILS_VER}.tar.bz2 GCC_PACKAGE=gcc-${GCC_VER}.tar.bz2 -PYTHON_PACKAGE=Python-${PYTHON_VER}.tar.bz2 PYTHON_MSI_PACKAGE=python-${PYTHON_VER}.msi PYCRYPTO_PACKAGE=pycrypto-${PYCRYPTO_VER}.tar.gz ARGPARSE_PACKAGE=argparse-${ARGPARSE_VER}.tar.gz @@ -77,7 +75,6 @@ ZOPEINTERFACE_PACKAGE=zope.interface-${ZOPEINTERFACE_VER}.zip TWISTED_PACKAGE=Twisted-${TWISTED_VER}.tar.bz2 PY2EXE_PACKAGE=py2exe-${PY2EXE_VER}.win32-py2.7.exe SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz -LXML_PACKAGE=lxml-${LXML_VER}.tar.gz PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz NOTOCJKFONT_PACKAGE=NotoSansCJKsc-Regular.otf @@ -114,7 +111,6 @@ OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE} NOSCRIPT_URL=https://addons.cdn.mozilla.net/user-media/addons/722/${NOSCRIP… -PYTHON_URL=https://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_PACKAGE} PYTHON_MSI_URL=https://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_MSI… PYCRYPTO_URL=https://pypi.python.org/packages/source/p/pycrypto/${PYCRYPTO_… ARGPARSE_URL=https://argparse.googlecode.com/files/${ARGPARSE_PACKAGE} @@ -124,7 +120,6 @@ TWISTED_URL=https://pypi.python.org/packages/source/T/Twisted/${TWISTED_PAC… # TWISTED_URL=https://twistedmatrix.com/Releases/Twisted/$(echo ${TWISTED_VER} | awk -F. '{print $1"."$2}')/${TWISTED_PACKAGE} PY2EXE_URL=http://liquidtelecom.dl.sourceforge.net/project/py2exe/py2exe/${… SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… -LXML_URL=https://pypi.python.org/packages/source/l/lxml/${LXML_PACKAGE} PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… GO_URL=https://golang.org/dl/${GO_PACKAGE} NOTOCJKFONT_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a… diff --git a/gitian/versions.beta b/gitian/versions.beta index 43c5fde..1bde7e5 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -48,7 +48,6 @@ TWISTED_VER=13.2.0 M2CRYPTO_VER=0.21.1 PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 -LXML_VER=3.3.5 PARSLEY_VER=1.2 GO_VER=1.4.2 NOTOCJKFONT_VER=1.004 @@ -64,7 +63,6 @@ MINGW_PACKAGE=mingw-w64-svn-snapshot.zip MSVCR100_PACKAGE=msvcr100.dll BINUTILS_PACKAGE=binutils-${BINUTILS_VER}.tar.bz2 GCC_PACKAGE=gcc-${GCC_VER}.tar.bz2 -PYTHON_PACKAGE=Python-${PYTHON_VER}.tar.bz2 PYTHON_MSI_PACKAGE=python-${PYTHON_VER}.msi PYCRYPTO_PACKAGE=pycrypto-${PYCRYPTO_VER}.tar.gz ARGPARSE_PACKAGE=argparse-${ARGPARSE_VER}.tar.gz @@ -74,7 +72,6 @@ TWISTED_PACKAGE=Twisted-${TWISTED_VER}.tar.bz2 M2CRYPTO_PACKAGE=M2Crypto-${M2CRYPTO_VER}.tar.gz PY2EXE_PACKAGE=py2exe-${PY2EXE_VER}.win32-py2.7.exe SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz -LXML_PACKAGE=lxml-${LXML_VER}.tar.gz PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz NOTOCJKFONT_PACKAGE=NotoSansCJKsc-Regular.otf @@ -111,7 +108,6 @@ OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE} NOSCRIPT_URL=https://addons.cdn.mozilla.net/storage/public-staging/722/${NO… -PYTHON_URL=https://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_PACKAGE} PYTHON_MSI_URL=https://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_MSI… PYCRYPTO_URL=https://pypi.python.org/packages/source/p/pycrypto/${PYCRYPTO_… ARGPARSE_URL=https://argparse.googlecode.com/files/${ARGPARSE_PACKAGE} @@ -122,7 +118,6 @@ TWISTED_URL=https://pypi.python.org/packages/source/T/Twisted/${TWISTED_PAC… M2CRYPTO_URL=https://pypi.python.org/packages/source/M/M2Crypto/${M2CRYPTO_… PY2EXE_URL=http://softlayer-dal.dl.sourceforge.net/project/py2exe/py2exe/${… SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… -LXML_URL=https://pypi.python.org/packages/source/l/lxml/${LXML_PACKAGE} PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… GO_URL=https://golang.org/dl/${GO_PACKAGE} NOTOCJKFONT_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a… diff --git a/gitian/versions.nightly b/gitian/versions.nightly index b1c7387..c64d4bb 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -59,7 +59,6 @@ ZOPEINTERFACE_VER=4.0.5 TWISTED_VER=13.2.0 PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 -LXML_VER=3.3.5 PARSLEY_VER=1.2 GO_VER=1.4.2 NOTOCJKFONT_VER=1.004 @@ -75,7 +74,6 @@ OSXSDK_OLD_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb MSVCR100_PACKAGE=msvcr100.dll BINUTILS_PACKAGE=binutils-${BINUTILS_VER}.tar.bz2 GCC_PACKAGE=gcc-${GCC_VER}.tar.bz2 -PYTHON_PACKAGE=Python-${PYTHON_VER}.tar.bz2 PYTHON_MSI_PACKAGE=python-${PYTHON_VER}.msi PYCRYPTO_PACKAGE=pycrypto-${PYCRYPTO_VER}.tar.gz ARGPARSE_PACKAGE=argparse-${ARGPARSE_VER}.tar.gz @@ -84,7 +82,6 @@ ZOPEINTERFACE_PACKAGE=zope.interface-${ZOPEINTERFACE_VER}.zip TWISTED_PACKAGE=Twisted-${TWISTED_VER}.tar.bz2 PY2EXE_PACKAGE=py2exe-${PY2EXE_VER}.win32-py2.7.exe SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz -LXML_PACKAGE=lxml-${LXML_VER}.tar.gz PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz NOTOCJKFONT_PACKAGE=NotoSansCJKsc-Regular.otf @@ -121,7 +118,6 @@ OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE} NOSCRIPT_URL=https://addons.cdn.mozilla.net/user-media/addons/722/${NOSCRIP… -PYTHON_URL=https://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_PACKAGE} PYTHON_MSI_URL=https://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_MSI… PYCRYPTO_URL=https://pypi.python.org/packages/source/p/pycrypto/${PYCRYPTO_… ARGPARSE_URL=https://argparse.googlecode.com/files/${ARGPARSE_PACKAGE} @@ -131,7 +127,6 @@ TWISTED_URL=https://pypi.python.org/packages/source/T/Twisted/${TWISTED_PAC… # TWISTED_URL=https://twistedmatrix.com/Releases/Twisted/$(echo ${TWISTED_VER} | awk -F. '{print $1"."$2}')/${TWISTED_PACKAGE} PY2EXE_URL=http://liquidtelecom.dl.sourceforge.net/project/py2exe/py2exe/${… SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… -LXML_URL=https://pypi.python.org/packages/source/l/lxml/${LXML_PACKAGE} PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… GO_URL=https://golang.org/dl/${GO_PACKAGE} NOTOCJKFONT_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a…

1 0

[translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed
by translation＠torproject.org 21 Jan '16

21 Jan '16

commit 79a20ba337b4f621cd5d50dcd3bbbcc91c0ac7c4 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 21 23:48:52 2016 +0000 Update translations for tor-launcher-network-settings_completed --- zh_CN/network-settings.dtd | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/zh_CN/network-settings.dtd b/zh_CN/network-settings.dtd index 8afb952..3adf58a 100644 --- a/zh_CN/network-settings.dtd +++ b/zh_CN/network-settings.dtd @@ -13,26 +13,32 @@ <!ENTITY torSettings.firstQuestion "以下哪个描述与你的情况最为匹配？"> <!ENTITY torSettings.configurePrompt1 "网络连接受到审查或需要代理。"> -<!ENTITY torSettings.configurePrompt2 "需要添加网桥或对本地代理进行配置。"> +<!ENTITY torSettings.configurePrompt2 "我需要配置网桥或本地代理设置才能连接到 Tor 网络。"> <!ENTITY torSettings.configure "配置"> -<!ENTITY torSettings.connectPrompt2 "我想要直接连接 Tor 网络。"> +<!ENTITY torSettings.connectPrompt2 "我想直接连接 Tor 网络。"> <!ENTITY torSettings.connectPrompt3 "通常这种方式是有效的。"> <!ENTITY torSettings.connect "连接"> <!ENTITY torSettings.proxyPageTitle "本地代理配置"> <!ENTITY torSettings.proxyQuestion "是否需要本地代理访问互联网？">  -<!ENTITY torSettings.proxyHelp "如果不知道如何回答该问题，请检查其他浏览器中的互联网设置，查看是否使用本地代理。"> +<!ENTITY torSettings.proxyExplanation1 "大多数情况下不需要使用本地代理，但在使用公司、校园等网络时这可能必需。"> +<!ENTITY torSettings.proxyExplanation2 "如果您不确定此问题的答案，请查看其他网络浏览器或者您的系统中的网络设置，检查其是否使用了一个本地代理。"> <!ENTITY torSettings.enterProxy "输入代理设置。"> <!ENTITY torSettings.bridgePageTitle "Tor 网桥配置"> <!ENTITY torSettings.bridgeQuestion "互联网服务提供商 (ISP) 是否对 Tor 网络连接进行了封锁或审查？"> -<!ENTITY torSettings.bridgeHelp "如果不理解该问题，请选择“否”。如果选择“是”，那么需要对 Tor 网桥进行配置。网桥指用于连接 Tor 网络的非公开网络中继，更难于封锁。"> +<!ENTITY torSettings.bridgeExplanation1 "如果您不确定此问题的答案，请选择否（如果您在不使用网桥时无法连接到 Tor 网络，您可以在稍后回来添加一个）"> +<!ENTITY torSettings.bridgeExplanation2 "如果您选择“是”，那么需要对 Tor 网桥进行配置。网桥指用于连接 Tor 网络的非公开网络中继，更难被封锁。"> <!ENTITY torSettings.bridgeSettingsPrompt "可以使用集成的网桥，也可以获取网桥，以自定义方式手动输入。">  <!ENTITY torsettings.startingTor "等待 Tor 启动..."> <!ENTITY torsettings.restartTor "重新启动 Tor"> +<!ENTITY torsettings.reconfigTor "重新配置"> + +<!ENTITY torsettings.discardSettings.prompt "您已配置 Tor 网桥，或者您已输入本地代理设置。若要直接连接到 Tor 网络，这些设置必须被移除。"> +<!ENTITY torsettings.discardSettings.proceed "移除设置并连接"> <!ENTITY torsettings.optional "可选"> @@ -50,6 +56,7 @@ <!ENTITY torsettings.firewall.allowedPorts "允许的端口："> <!ENTITY torsettings.useBridges.checkbox "我的互联网服务提供商 (ISP) 封锁了 Tor 网络连接"> <!ENTITY torsettings.useBridges.default "使用集成的网桥进行连接"> +<!ENTITY torsettings.useBridges.note "每种网桥使用不同的方法以避免被封锁。如果某个网桥不工作，请换用另一种重试。"> <!ENTITY torsettings.useBridges.type "传输类型："> <!ENTITY torsettings.useBridges.custom "输入自定义网桥"> <!ENTITY torsettings.useBridges.label "输入一个或多个网桥中继(一行一个)。">

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 21 Jan '16

21 Jan '16

commit 1f22756a6f3daa48ffaaa7f197aaed68cfec21db Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 21 23:45:36 2016 +0000 Update translations for tor-launcher-network-settings --- zh_CN/network-settings.dtd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/zh_CN/network-settings.dtd b/zh_CN/network-settings.dtd index 2b51d68..3adf58a 100644 --- a/zh_CN/network-settings.dtd +++ b/zh_CN/network-settings.dtd @@ -22,12 +22,12 @@ <!ENTITY torSettings.proxyPageTitle "本地代理配置"> <!ENTITY torSettings.proxyQuestion "是否需要本地代理访问互联网？">  -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> +<!ENTITY torSettings.proxyExplanation1 "大多数情况下不需要使用本地代理，但在使用公司、校园等网络时这可能必需。"> +<!ENTITY torSettings.proxyExplanation2 "如果您不确定此问题的答案，请查看其他网络浏览器或者您的系统中的网络设置，检查其是否使用了一个本地代理。"> <!ENTITY torSettings.enterProxy "输入代理设置。"> <!ENTITY torSettings.bridgePageTitle "Tor 网桥配置"> <!ENTITY torSettings.bridgeQuestion "互联网服务提供商 (ISP) 是否对 Tor 网络连接进行了封锁或审查？"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> +<!ENTITY torSettings.bridgeExplanation1 "如果您不确定此问题的答案，请选择否（如果您在不使用网桥时无法连接到 Tor 网络，您可以在稍后回来添加一个）"> <!ENTITY torSettings.bridgeExplanation2 "如果您选择“是”，那么需要对 Tor 网桥进行配置。网桥指用于连接 Tor 网络的非公开网络中继，更难被封锁。"> <!ENTITY torSettings.bridgeSettingsPrompt "可以使用集成的网桥，也可以获取网桥，以自定义方式手动输入。"> @@ -56,7 +56,7 @@ <!ENTITY torsettings.firewall.allowedPorts "允许的端口："> <!ENTITY torsettings.useBridges.checkbox "我的互联网服务提供商 (ISP) 封锁了 Tor 网络连接"> <!ENTITY torsettings.useBridges.default "使用集成的网桥进行连接"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> +<!ENTITY torsettings.useBridges.note "每种网桥使用不同的方法以避免被封锁。如果某个网桥不工作，请换用另一种重试。"> <!ENTITY torsettings.useBridges.type "传输类型："> <!ENTITY torsettings.useBridges.custom "输入自定义网桥"> <!ENTITY torsettings.useBridges.label "输入一个或多个网桥中继(一行一个)。">

1 0

[snowflake/master] Test on Travis
by arlo＠torproject.org 21 Jan '16

21 Jan '16

commit 133f6579284e49c925b2874d7039d008aa485ec3 Author: Arlo Breault <arlolra(a)gmail.com> Date: Thu Jan 21 15:33:42 2016 -0800 Test on Travis * Closes #10 --- .travis.yml | 12 ++++++++++++ Makefile | 5 +++++ README.md | 2 ++ client/meek-webrtc.go | 2 +- 4 files changed, 20 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..68c2493 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,12 @@ +language: go + +go: + - 1.5 + +before_script: + npm install -g coffee-script + +script: + - make check + - go test -v -race ./broker + - cd proxy && cake test \ No newline at end of file diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..688e273 --- /dev/null +++ b/Makefile @@ -0,0 +1,5 @@ +.SILENT: check +.PHONY: check +check: + ! gofmt -l . 2>&1 | read + go vet ./broker ./client ./server \ No newline at end of file diff --git a/README.md b/README.md index 077a900..7228264 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ # snowflake-pt +[![Build Status](https://travis-ci.org/keroserene/snowflake.svg?branch=master)](http… + A Pluggable Transport using WebRTC ### Status diff --git a/client/meek-webrtc.go b/client/meek-webrtc.go index 369987d..34ff185 100644 --- a/client/meek-webrtc.go +++ b/client/meek-webrtc.go @@ -64,7 +64,7 @@ func (mc *MeekChannel) Negotiate(offer *webrtc.SessionDescription) ( return nil, err } defer resp.Body.Close() - log.Printf("MeekChannel Response:\n%s\n\n", resp) + log.Printf("MeekChannel Response:\n%s\n\n", resp.Status) body, err := ioutil.ReadAll(resp.Body) if nil != err { return nil, err

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 21 Jan '16

21 Jan '16

commit 2a60a0d4310b615bb3f1b8fc0d007c7d709dcbbb Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 21 23:15:36 2016 +0000 Update translations for tor-launcher-network-settings --- zh_CN/network-settings.dtd | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/zh_CN/network-settings.dtd b/zh_CN/network-settings.dtd index 813cd80..2b51d68 100644 --- a/zh_CN/network-settings.dtd +++ b/zh_CN/network-settings.dtd @@ -13,9 +13,9 @@ <!ENTITY torSettings.firstQuestion "以下哪个描述与你的情况最为匹配？"> <!ENTITY torSettings.configurePrompt1 "网络连接受到审查或需要代理。"> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.configurePrompt2 "我需要配置网桥或本地代理设置才能连接到 Tor 网络。"> <!ENTITY torSettings.configure "配置"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> +<!ENTITY torSettings.connectPrompt2 "我想直接连接 Tor 网络。"> <!ENTITY torSettings.connectPrompt3 "通常这种方式是有效的。"> <!ENTITY torSettings.connect "连接"> @@ -28,17 +28,17 @@ <!ENTITY torSettings.bridgePageTitle "Tor 网桥配置"> <!ENTITY torSettings.bridgeQuestion "互联网服务提供商 (ISP) 是否对 Tor 网络连接进行了封锁或审查？"> <!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> +<!ENTITY torSettings.bridgeExplanation2 "如果您选择“是”，那么需要对 Tor 网桥进行配置。网桥指用于连接 Tor 网络的非公开网络中继，更难被封锁。"> <!ENTITY torSettings.bridgeSettingsPrompt "可以使用集成的网桥，也可以获取网桥，以自定义方式手动输入。">  <!ENTITY torsettings.startingTor "等待 Tor 启动..."> <!ENTITY torsettings.restartTor "重新启动 Tor"> -<!ENTITY torsettings.reconfigTor "Reconfigure"> +<!ENTITY torsettings.reconfigTor "重新配置"> -<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> -<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect"> +<!ENTITY torsettings.discardSettings.prompt "您已配置 Tor 网桥，或者您已输入本地代理设置。若要直接连接到 Tor 网络，这些设置必须被移除。"> +<!ENTITY torsettings.discardSettings.proceed "移除设置并连接"> <!ENTITY torsettings.optional "可选">

1 0

[snowflake/master] Fix broker test
by arlo＠torproject.org 21 Jan '16

21 Jan '16

commit 26803437908b058f452dc61f42381ee0a4f6bc91 Author: Arlo Breault <arlolra(a)gmail.com> Date: Thu Jan 21 14:59:02 2016 -0800 Fix broker test --- broker/snowflake-broker.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/broker/snowflake-broker.go b/broker/snowflake-broker.go index c2bde7b..13b0586 100644 --- a/broker/snowflake-broker.go +++ b/broker/snowflake-broker.go @@ -118,7 +118,7 @@ func clientHandler(w http.ResponseWriter, r *http.Request) { // TODO: Needs improvement. snowflake := heap.Pop(snowflakes).(*Snowflake) if nil == snowflake { - w.Header().Set("Status", http.StatusServiceUnavailable) + w.WriteHeader(http.StatusServiceUnavailable) // w.Write([]byte("no snowflake proxies available")) return }

1 0

[snowflake/master] Automatic 100% bootstrap using meek-signaling broker works.
by arlo＠torproject.org 21 Jan '16

21 Jan '16

commit c0b6383f26d2b721ce5896a4c8a52646ea89ba5e Author: Serene Han <keroserene+git(a)gmail.com> Date: Thu Jan 21 13:54:43 2016 -0800 Automatic 100% bootstrap using meek-signaling broker works. Minimum viable webrtc pt now exists. (close #1) --- README.md | 113 ++++++++++++++++++++++++++++--------------------- client/meek-webrtc.go | 54 ++++++++--------------- client/snowflake.go | 40 +++++------------ client/torrc | 5 ++- client/torrc-manual | 6 +++ 5 files changed, 103 insertions(+), 115 deletions(-) diff --git a/README.md b/README.md index 4213ba7..077a900 100644 --- a/README.md +++ b/README.md @@ -4,25 +4,78 @@ A Pluggable Transport using WebRTC ### Status -- Successfully bootstraps over WebRTC, both directly to a server plugin, - as well as through the browser which proxies WebRTC to websocket. -- Needs work on signaling with the broker. +- Successful automatic bootstraps with a WebRTC transport, + using HTTP signaling (with optional domain fronting) speaking to + a multitude of volunteer "snowflakes". +- Needs a lot more work though. ### Usage -There are currently two ways to try this: -- Directly to the go-webrtc server plugin. -- Through a browser snowflake proxy. + + +``` +cd client/ +go build +tor -f torrc +``` + +And it will start the client plugin with the following `torrc` +options: +``` +ClientTransportPlugin snowflake exec ./client \ +--url https://snowflake-reg.appspot.com/ \ +--front www.google.com +``` + +It will speak to the Broker, get matched with a "snowflake" browser proxy, +and negotiate a WebRTC PeerConnection. +After that, it should bootstrap to 100%. + +To see logs, do `tail -F snowflake.log` in a second terminal. + +You can modify the `torrc` to use your own broker, +or remove the options entirely which will default to the old copy paste +method (see `torrc-manual`): + +``` +ClientTransportPlugin snowflake exec ./client --meek +``` + +Also, it is possible to connect directly to the go-webrtc server plugin +(skipping all the browser snowflake / broker stuff - see appendix) + +### Building a Snowflake Proxy + +This will only work if there are any browser snowflakes running at all. +To run your own, first make sure coffeescript is installed. +Then, build with: + +``` +cd proxy/ +cake build +``` +(Type `cake` by itself to see possible commands) + +Then, start a local http server in the `proxy/build/` in any way you like. +For instance: + +``` +cd build/ +python -m http.server +``` + +Open a browser tab to `0.0.0.0:8000/snowflake.html`. + +TODO: Turn the snowflake proxy into a more deployable badge. + +### Appendix + +##### -- Testing directly via WebRTC Server -- Using the server plugin uses an HTTP server that simulates the interaction that a client would have with a broker. Using the browser proxy (which will soon be the only way) requires copy and pasting between 3 terminals and a browser tab. -Once a signaling broker is implemented -([issue #1](https://github.com/keroserene/snowflake/issues/1)) -this will become much simpler to use. - -##### -- Via WebRTC Server -- Edit server/torrc and add "-http 127.0.0.1:8080" to the end of the ServerTransportPlugin line: @@ -42,14 +95,6 @@ ClientTransportPlugin line: ClientTransportPlugin snowflake exec ./client -url http://127.0.0.1:8080/ ``` -``` -cd client/ -go build -tor -f torrc -``` - -At this point the tor client should bootstrap to 100%. - ##### -- Via Browser Proxy -- Open up three terminals for the **client:** @@ -60,39 +105,11 @@ B: `cat > signal` C: `tail -F snowflake.log` - -To connect through the WebRTC browser proxy, first make sure -coffeescript is installed. Then, build with: -``` -cd proxy/ -cake build -``` - -Then start a local http server in the `proxy/build/` in any way you like. -For instance: - -``` -cd build/ -python -m http.server -``` - -Open a browser tab to `0.0.0.0:8000/snowflake.html`. -Input your desired relay address, or nothing/gibberish, which will cause -snowflake to just use a default relay. +Then, in the browser proxy: - Look for the offer in terminal C; copy and paste it into the browser. - Copy and paste the answer generated in the browser back to terminal B. - Once WebRTC successfully connects, the browser terminal should turn green. Shortly after, the tor client should bootstrap to 100%. - -### More - -To try using the Meek signaling channel (which will soon be fully ready), -add the `--meek` flag like so: - -``` -ClientTransportPlugin snowflake exec ./client --meek -``` - More documentation on the way. diff --git a/client/meek-webrtc.go b/client/meek-webrtc.go index 2d68770..369987d 100644 --- a/client/meek-webrtc.go +++ b/client/meek-webrtc.go @@ -16,28 +16,25 @@ import ( type MeekChannel struct { // The Host header to put in the HTTP request (optional and may be // different from the host name in URL). - Host string - Method string - trueURL *url.URL - externalUrl string - transport http.Transport // Used to make all requests. + Host string + url *url.URL + transport http.Transport // Used to make all requests. } -// Construct a new MeekChannel, where -// |broker| is the URL of the facilitating program which assigns proxies -// to clients, and -// |front| is URL of the front domain. +// Construct a new MeekChannel, where: +// |broker| is the full URL of the facilitating program which assigns proxies +// to clients, and |front| is the option fronting domain. func NewMeekChannel(broker string, front string) *MeekChannel { - targetUrl, err := url.Parse(broker) + targetURL, err := url.Parse(broker) if nil != err { return nil } mc := new(MeekChannel) - mc.Host = front - mc.Method = "POST" - - mc.trueURL = targetUrl - mc.externalUrl = front + "/client" + mc.url = targetURL + if "" != front { // Optional front domain. + mc.Host = mc.url.Host + mc.url.Host = front + } // We make a copy of DefaultTransport because we want the default Dial // and TLSHandshakeTimeout settings. But we want to disable the default @@ -54,39 +51,24 @@ func NewMeekChannel(broker string, front string) *MeekChannel { func (mc *MeekChannel) Negotiate(offer *webrtc.SessionDescription) ( *webrtc.SessionDescription, error) { data := bytes.NewReader([]byte(offer.Serialize())) - request, err := http.NewRequest(mc.Method, mc.externalUrl, data) + // Suffix with broker's client registration handler. + request, err := http.NewRequest("POST", mc.url.String()+"client", data) if nil != err { return nil, err } - request.Host = mc.trueURL.String() + if "" != mc.Host { // Set true host if necessary. + request.Host = mc.Host + } resp, err := mc.transport.RoundTrip(request) if nil != err { return nil, err } defer resp.Body.Close() - log.Println("MeekChannel Response: ", resp) - + log.Printf("MeekChannel Response:\n%s\n\n", resp) body, err := ioutil.ReadAll(resp.Body) if nil != err { return nil, err } - log.Println("Body: ", string(body)) - answer := webrtc.DeserializeSessionDescription(string(body)) - return answer, nil -} - -// Simple interim non-fronting HTTP POST negotiation, to be removed when more -// general fronting is present. -func sendOfferHTTP(url string, offer *webrtc.SessionDescription) (*webrtc.SessionDescription, error) { - resp, err := http.Post(url, "", bytes.NewBuffer([]byte(offer.Serialize()))) - if err != nil { - return nil, err - } - defer resp.Body.Close() - body, err := ioutil.ReadAll(resp.Body) - if err != nil { - return nil, err - } answer := webrtc.DeserializeSessionDescription(string(body)) return answer, nil } diff --git a/client/snowflake.go b/client/snowflake.go index ad496f9..83179a3 100644 --- a/client/snowflake.go +++ b/client/snowflake.go @@ -22,18 +22,10 @@ import ( "git.torproject.org/pluggable-transports/goptlib.git" ) -// Hard-coded meek signalling channel for now. -// TODO: expose as param -const ( - // Go fully requires the protocol to make url spec - FRONT_URL = "https://www.google.com" - BROKER_URL = "snowflake-reg.appspot.com" -) - var ptInfo pt.ClientInfo var logFile *os.File -var offerURL string -var meekEnabled bool +var brokerURL string +var frontDomain string // When a connection handler starts, +1 is written to this channel; when it // ends, -1 is written. @@ -180,9 +172,9 @@ func dialWebRTC(config *webrtc.Configuration, meek *MeekChannel) ( fmt.Fprintln(logFile, "\n"+offer.Serialize()+"\n") log.Printf("----------------") go func() { - if meekEnabled { - log.Println("Sending offer via meek channel...\nTarget URL: ", BROKER_URL, - "\nFront URL: ", FRONT_URL) + if "" != brokerURL { + log.Println("Sending offer via meek channel...\nTarget URL: ", brokerURL, + "\nFront URL: ", frontDomain) answer, err := meek.Negotiate(pc.LocalDescription()) if nil != err { log.Printf("MeekChannel signaling error: %s", err) @@ -190,17 +182,6 @@ func dialWebRTC(config *webrtc.Configuration, meek *MeekChannel) ( if nil == answer { log.Printf("MeekChannel: No answer received.") } else { - log.Println("Recieved answer from Meek channel: \n\n", - answer.Serialize(), "\n") - // TODO: Once this is correct, uncomment and remove copy-paste stuff. - // signalChan <- answer - } - } - if offerURL != "" { - answer, err := sendOfferHTTP(offerURL, offer) - if err != nil { - log.Println(err) - } else { signalChan <- answer } } @@ -214,7 +195,7 @@ func dialWebRTC(config *webrtc.Configuration, meek *MeekChannel) ( pc.Close() return nil, fmt.Errorf("no answer received") } - log.Printf("Received Answer: %s", answer.Serialize()) + log.Printf("Received Answer:\n\n%s\n", answer.Sdp) err = pc.SetRemoteDescription(answer) if err != nil { pc.Close() @@ -257,7 +238,7 @@ func handler(conn *pt.SocksConn) error { config := webrtc.NewConfiguration( webrtc.OptionIceServer("stun:stun.l.google.com:19302")) - meek := NewMeekChannel(BROKER_URL, FRONT_URL) + meek := NewMeekChannel(brokerURL, frontDomain) remote, err := dialWebRTC(config, meek) if err != nil { conn.Reject() @@ -318,8 +299,8 @@ func readSignalingMessages(f *os.File) { func main() { var err error - flag.StringVar(&offerURL, "url", "", "do signalling through URL") - flag.BoolVar(&meekEnabled, "meek", false, "use domain fronted signaling") + flag.StringVar(&brokerURL, "url", "", "URL of signaling broker") + flag.StringVar(&frontDomain, "front", "", "front domain") flag.Parse() logFile, err = os.OpenFile("snowflake.log", os.O_CREATE|os.O_APPEND|os.O_WRONLY, 0600) @@ -328,10 +309,9 @@ func main() { } defer logFile.Close() log.SetOutput(logFile) - log.Println("starting") - if offerURL == "" && !meekEnabled { + if "" == brokerURL { log.Println("No HTTP signaling detected. Waiting for a \"signal\" pipe...") // This FIFO receives signaling messages. err = syscall.Mkfifo("signal", 0600) diff --git a/client/torrc b/client/torrc index 63c88a4..9af942b 100644 --- a/client/torrc +++ b/client/torrc @@ -1,5 +1,8 @@ UseBridges 1 DataDirectory datadir -ClientTransportPlugin snowflake exec ./client +ClientTransportPlugin snowflake exec ./client \ +-url https://snowflake-reg.appspot.com/ \ +-front www.google.com + Bridge snowflake 0.0.3.0:1 diff --git a/client/torrc-manual b/client/torrc-manual new file mode 100644 index 0000000..014b539 --- /dev/null +++ b/client/torrc-manual @@ -0,0 +1,6 @@ +UseBridges 1 +DataDirectory datadir + +ClientTransportPlugin snowflake exec ./client + +Bridge snowflake 0.0.3.0:1

1 0

[snowflake/master] broker tracking a heap of snowflakes
by arlo＠torproject.org 21 Jan '16

21 Jan '16

commit 0cd6852ad0060fad40aaf31d5ba1f6951127fc35 Author: Serene Han <keroserene+git(a)gmail.com> Date: Thu Jan 21 10:44:14 2016 -0800 broker tracking a heap of snowflakes --- broker/snowflake-broker.go | 130 +++++++++++++++++++++++++++++++++++---- broker/snowflake-broker_test.go | 59 ++++++++++++++++++ client/meek-webrtc.go | 3 +- proxy/broker.coffee | 7 +-- proxy/snowflake.coffee | 2 +- 5 files changed, 182 insertions(+), 19 deletions(-) diff --git a/broker/snowflake-broker.go b/broker/snowflake-broker.go index 4c0e62f..279b2b6 100644 --- a/broker/snowflake-broker.go +++ b/broker/snowflake-broker.go @@ -1,13 +1,13 @@ package snowflake_broker import ( - // "io" + "container/heap" + "fmt" "io/ioutil" "log" "net" "net/http" - "path" - + "time" // "appengine" // "appengine/urlfetch" ) @@ -15,7 +15,64 @@ import ( // This is an intermediate step - a basic hardcoded appengine rendezvous // to a single browser snowflake. -var snowflakeProxy = "" +// This is minimum viable client-proxy registration. +// TODO: better, more secure registration corresponding to what's in +// the python flashproxy facilitator. + +// Slice of available snowflake proxies. +// var snowflakes []chan []byte + +type Snowflake struct { + id string + sigChannel chan []byte + clients int + index int +} + +// Implements heap.Interface, and holds Snowflakes. +type SnowflakeHeap []*Snowflake + +func (sh SnowflakeHeap) Len() int { return len(sh) } + +func (sh SnowflakeHeap) Less(i, j int) bool { + // Snowflakes serving less clients should sort earlier. + return sh[i].clients < sh[j].clients +} + +func (sh SnowflakeHeap) Swap(i, j int) { + sh[i], sh[j] = sh[j], sh[i] + sh[i].index = i + sh[j].index = j +} + +func (sh *SnowflakeHeap) Push(s interface{}) { + n := len(*sh) + snowflake := s.(*Snowflake) + snowflake.index = n + *sh = append(*sh, snowflake) +} + +// Only valid when Len() > 0. +func (sh *SnowflakeHeap) Pop() interface{} { + flakes := *sh + n := len(flakes) + snowflake := flakes[n-1] + snowflake.index = -1 + *sh = flakes[0 : n-1] + return snowflake +} + +var snowflakes *SnowflakeHeap + +// Create and add a Snowflake to the heap. +func AddSnowflake(id string) *Snowflake { + snowflake := new(Snowflake) + snowflake.id = id + snowflake.clients = 0 + snowflake.sigChannel = make(chan []byte) + heap.Push(snowflakes, snowflake) + return snowflake +} func robotsTxtHandler(w http.ResponseWriter, r *http.Request) { w.Header().Set("Content-Type", "text/plain; charset=utf-8") @@ -36,29 +93,76 @@ Expects a WebRTC SDP offer in the Request to give to an assigned snowflake proxy, which responds with the SDP answer to be sent in the HTTP response back to the client. */ -func regHandler(w http.ResponseWriter, r *http.Request) { - // TODO: Maybe don't pass anything on path, since it will always be bidirectional - dir, _ := path.Split(path.Clean(r.URL.Path)) - if dir != "/reg/" { - http.NotFound(w, r) +func clientHandler(w http.ResponseWriter, r *http.Request) { + offer, err := ioutil.ReadAll(r.Body) + if nil != err { + log.Println("Invalid data.") + return + } + w.Header().Set("Access-Control-Allow-Origin", "*") + // Pop the most available snowflake proxy, and pass the offer to it. + // TODO: Make this much better. + snowflake := heap.Pop(snowflakes).(*Snowflake) + if nil == snowflake { + w.Write([]byte("no snowflake proxies available")) + // w.WriteHeader(http.StatusServiceUnavailable) return } + // snowflakes = snowflakes[1:] + snowflake.sigChannel <- offer + w.Write([]byte("sent offer to proxy!")) + // TODO: Get browser snowflake to talkto this appengine instance + // so it can reply with an answer, and not just the offer again :) + // TODO: Real broker which matches clients and snowflake proxies. + w.Write(offer) +} + +/* +A snowflake browser proxy requests a client from the Broker. +*/ +func proxyHandler(w http.ResponseWriter, r *http.Request) { body, err := ioutil.ReadAll(r.Body) if nil != err { + log.Println("Invalid data.") return + } + w.Header().Set("Access-Control-Allow-Origin", "*") + snowflakeSession := body + log.Println("Received snowflake: ", snowflakeSession) + snowflake := AddSnowflake(string(snowflakeSession)) + select { + case offer := <-snowflake.sigChannel: + log.Println("Passing client offer to snowflake.") + w.Write(offer) + case <-time.After(time.Second * 10): + s := fmt.Sprintf("%d snowflakes left.", snowflakes.Len()) + w.Write([]byte("timed out. " + s)) + heap.Remove(snowflakes, snowflake.index) + // w.WriteHeader(http.StatusRequestTimeout) + } +} + +func reflectHandler(w http.ResponseWriter, r *http.Request) { + body, err := ioutil.ReadAll(r.Body) + if nil != err { log.Println("Invalid data.") + return } w.Header().Set("Access-Control-Allow-Origin", "*") - // TODO: Get browser snowflake to talkto this appengine instance - // so it can reply with an answer, and not just the offer again :) - // TODO: Real broker which matches clients and snowflake proxies. w.Write(body) } func init() { + // snowflakes = make([]chan []byte, 0) + snowflakes = new(SnowflakeHeap) + heap.Init(snowflakes) + http.HandleFunc("/robots.txt", robotsTxtHandler) http.HandleFunc("/ip", ipHandler) - http.HandleFunc("/reg/", regHandler) + + http.HandleFunc("/client", clientHandler) + http.HandleFunc("/proxy", proxyHandler) + http.HandleFunc("/reflect", reflectHandler) // if SNOWFLAKE_BROKER == "" { // panic("SNOWFLAKE_BROKER empty; did you forget to edit config.go?") // } diff --git a/broker/snowflake-broker_test.go b/broker/snowflake-broker_test.go new file mode 100644 index 0000000..03f876b --- /dev/null +++ b/broker/snowflake-broker_test.go @@ -0,0 +1,59 @@ +package snowflake_broker + +import ( + "container/heap" + "testing" +) + +func TestSnowflakeHeap(t *testing.T) { + h := new(SnowflakeHeap) + heap.Init(h) + if 0 != h.Len() { + t.Error("Unexpected length.") + } + s1 := new(Snowflake) + s2 := new(Snowflake) + s3 := new(Snowflake) + s4 := new(Snowflake) + + s1.clients = 4 + s2.clients = 5 + s3.clients = 3 + s4.clients = 1 + + heap.Push(h, s1) + heap.Push(h, s2) + heap.Push(h, s3) + heap.Push(h, s4) + + if 4 != h.Len() { + t.Error("Unexpected length.") + } + + heap.Remove(h, 0) + if 3 != h.Len() { + t.Error("Unexpected length.") + } + + r := heap.Pop(h).(*Snowflake) + if r.clients != 3 { + t.Error("Unexpected clients: ", r.clients) + } + if r.index != -1 { + t.Error("Unexpected index: ", r.index) + } + + r = heap.Pop(h).(*Snowflake) + if r.clients != 4 { + t.Error("Unexpected clients: ", r.clients) + } + + r = heap.Pop(h).(*Snowflake) + if r.clients != 5 { + t.Error("Unexpected clients: ", r.clients) + } + + if 0 != h.Len() { + t.Error("Unexpected length.") + } +} diff --git a/client/meek-webrtc.go b/client/meek-webrtc.go index df59e98..2d68770 100644 --- a/client/meek-webrtc.go +++ b/client/meek-webrtc.go @@ -37,7 +37,7 @@ func NewMeekChannel(broker string, front string) *MeekChannel { mc.Method = "POST" mc.trueURL = targetUrl - mc.externalUrl = front + "/reg/test" // TODO: Have a better suffix. + mc.externalUrl = front + "/client" // We make a copy of DefaultTransport because we want the default Dial // and TLSHandshakeTimeout settings. But we want to disable the default @@ -70,6 +70,7 @@ func (mc *MeekChannel) Negotiate(offer *webrtc.SessionDescription) ( if nil != err { return nil, err } + log.Println("Body: ", string(body)) answer := webrtc.DeserializeSessionDescription(string(body)) return answer, nil } diff --git a/proxy/broker.coffee b/proxy/broker.coffee index fb2add9..9432e5c 100644 --- a/proxy/broker.coffee +++ b/proxy/broker.coffee @@ -21,7 +21,6 @@ class Broker xhr = new XMLHttpRequest() try xhr.open 'POST', @url - xhr catch err ### An exception happens here when, for example, NoScript allows the domain on @@ -35,14 +34,14 @@ class Broker # xhr.responseType = 'text' xhr.onreadystatechange = -> if xhr.DONE == xhr.readyState + log 'Broker: ' + xhr.status if 200 == xhr.status - log 'Broker: success' log 'Response: ' + xhr.responseText - # @fac_complete xhr.responseText + log xhr else log 'Broker error ' + xhr.status + ' - ' + xhr.statusText - xhr.send 'snowflake-testing' + log "Broker: sent a registration message, waiting for reply..." sendAnswer: (answer) -> log 'Sending answer to broker.' diff --git a/proxy/snowflake.coffee b/proxy/snowflake.coffee index ac59419..1b837d5 100644 --- a/proxy/snowflake.coffee +++ b/proxy/snowflake.coffee @@ -8,7 +8,7 @@ Assume that the webrtc client plugin is always the offerer, in which case this must always act as the answerer. ### DEFAULT_WEBSOCKET = '192.81.135.242:9901' -DEFAULT_BROKER = 'https://snowflake-reg.appspot.com/reg/test' +DEFAULT_BROKER = 'https://snowflake-reg.appspot.com/proxy' DEFAULT_PORTS = http: 80 https: 443

1 0

[snowflake/master] answer successfully roundtripped back from snowflake proxy through broker to client (#1)
by arlo＠torproject.org 21 Jan '16

21 Jan '16

commit c9013b2f80aeda0aa6e86d984f1d7e9b89aabd46 Author: Serene Han <keroserene+git(a)gmail.com> Date: Thu Jan 21 13:02:46 2016 -0800 answer successfully roundtripped back from snowflake proxy through broker to client (#1) --- broker/config.go | 16 ------ broker/snowflake-broker.go | 123 +++++++++++++++++++++++++++++++------------- proxy/broker.coffee | 42 ++++++++++++--- proxy/proxypair.coffee | 5 +- proxy/snowflake.coffee | 11 +--- 5 files changed, 127 insertions(+), 70 deletions(-) diff --git a/broker/config.go b/broker/config.go deleted file mode 100644 index 7e250aa..0000000 --- a/broker/config.go +++ /dev/null @@ -1,16 +0,0 @@ -/* -This is the server-side code that runs on Google App Engine for the -"appspot" registration method. - -See doc/appspot-howto.txt for more details about setting up an -application, and advice on running one. - -To upload a new version: -$ torify ~/go_appengine/appcfg.py --no_cookies -A $YOUR_APP_ID update . -*/ -package snowflake_broker - -// host:port/basepath of the broker you want to register with -// for example, fp-broker.org or example.com:12345/broker -// https:// and /reg/ will be prepended and appended respectively. -const SNOWFLAKE_BROKER = "" diff --git a/broker/snowflake-broker.go b/broker/snowflake-broker.go index 1d26eb1..c2bde7b 100644 --- a/broker/snowflake-broker.go +++ b/broker/snowflake-broker.go @@ -1,3 +1,12 @@ +/* +Broker acts as the HTTP signaling channel. +It matches clients and snowflake proxies by passing corresponding +SessionDescriptions in order to negotiate a WebRTC connection. + +TODO(serene): This code is currently the absolute minimum required to +cause a successful negotiation. +It's otherwise very unsafe and problematic, and needs quite some work... +*/ package snowflake_broker import ( @@ -8,8 +17,6 @@ import ( "net" "net/http" "time" - // "appengine" - // "appengine/urlfetch" ) // This is an intermediate step - a basic hardcoded appengine rendezvous @@ -23,10 +30,11 @@ import ( // var snowflakes []chan []byte type Snowflake struct { - id string - sigChannel chan []byte - clients int - index int + id string + offerChannel chan []byte + answerChannel chan []byte + clients int + index int } // Implements heap.Interface, and holds Snowflakes. @@ -63,14 +71,17 @@ func (sh *SnowflakeHeap) Pop() interface{} { } var snowflakes *SnowflakeHeap +var snowflakeMap map[string]*Snowflake // Create and add a Snowflake to the heap. func AddSnowflake(id string) *Snowflake { snowflake := new(Snowflake) snowflake.id = id snowflake.clients = 0 - snowflake.sigChannel = make(chan []byte) + snowflake.offerChannel = make(chan []byte) + snowflake.answerChannel = make(chan []byte) heap.Push(snowflakes, snowflake) + snowflakeMap[id] = snowflake return snowflake } @@ -97,65 +108,108 @@ func clientHandler(w http.ResponseWriter, r *http.Request) { offer, err := ioutil.ReadAll(r.Body) if nil != err { log.Println("Invalid data.") + w.WriteHeader(http.StatusBadRequest) return } w.Header().Set("Access-Control-Allow-Origin", "*") - // Pop the most available snowflake proxy, and pass the offer to it. - // TODO: Make this much better. + w.Header().Set("Access-Control-Allow-Headers", "X-Session-ID") + + // Find the most available snowflake proxy, and pass the offer to it. + // TODO: Needs improvement. snowflake := heap.Pop(snowflakes).(*Snowflake) if nil == snowflake { - // w.Header().Set("Status", http.StatusServiceUnavailable) - w.Write([]byte("no snowflake proxies available")) + w.Header().Set("Status", http.StatusServiceUnavailable) + // w.Write([]byte("no snowflake proxies available")) return } - // snowflakes = snowflakes[1:] - snowflake.sigChannel <- offer - w.Write([]byte("sent offer to proxy!")) - // TODO: Get browser snowflake to talkto this appengine instance - // so it can reply with an answer, and not just the offer again :) - // TODO: Real broker which matches clients and snowflake proxies. - w.Write(offer) + snowflake.offerChannel <- offer + + // Wait for the answer to be returned on the channel. + select { + case answer := <-snowflake.answerChannel: + log.Println("Retrieving answer") + w.Write(answer) + // Only remove from the snowflake map once the answer is set. + delete(snowflakeMap, snowflake.id) + + case <-time.After(time.Second * 10): + w.WriteHeader(http.StatusGatewayTimeout) + w.Write([]byte("timed out waiting for answer!")) + } } /* -A snowflake browser proxy requests a client from the Broker. +For snowflake proxies to request a client from the Broker. */ func proxyHandler(w http.ResponseWriter, r *http.Request) { + w.Header().Set("Access-Control-Allow-Origin", "*") + w.Header().Set("Access-Control-Allow-Headers", "Origin, X-Session-ID") + // For CORS preflight. + if "OPTIONS" == r.Method { + return + } + + id := r.Header.Get("X-Session-ID") body, err := ioutil.ReadAll(r.Body) if nil != err { log.Println("Invalid data.") + w.WriteHeader(http.StatusBadRequest) return } - w.Header().Set("Access-Control-Allow-Origin", "*") - snowflakeSession := body - log.Println("Received snowflake: ", snowflakeSession) - snowflake := AddSnowflake(string(snowflakeSession)) + if string(body) != id { // Mismatched IDs! + w.WriteHeader(http.StatusBadRequest) + } + // Maybe confirm that X-Session-ID is the same. + log.Println("Received snowflake: ", id) + snowflake := AddSnowflake(id) + + // Wait for a client to avail an offer to the snowflake, or timeout + // and ask the snowflake to poll later. select { - case offer := <-snowflake.sigChannel: + case offer := <-snowflake.offerChannel: log.Println("Passing client offer to snowflake.") w.Write(offer) + case <-time.After(time.Second * 10): - // s := fmt.Sprintf("%d snowflakes left.", snowflakes.Len()) - // w.Write([]byte("timed out. " + s)) - // w.Header().Set("Status", http.StatusRequestTimeout) - w.WriteHeader(http.StatusGatewayTimeout) heap.Remove(snowflakes, snowflake.index) + w.WriteHeader(http.StatusGatewayTimeout) } } -func reflectHandler(w http.ResponseWriter, r *http.Request) { +/* +Expects snowflake proxes which have previously successfully received +an offer from proxyHandler to respond with an answer in an HTTP POST, +which the broker will pass back to the original client. +*/ +func answerHandler(w http.ResponseWriter, r *http.Request) { + w.Header().Set("Access-Control-Allow-Origin", "*") + w.Header().Set("Access-Control-Allow-Headers", "X-Session-ID") + // For CORS preflight. + if "OPTIONS" == r.Method { + return + } + + id := r.Header.Get("X-Session-ID") + snowflake, ok := snowflakeMap[id] + if !ok || nil == snowflake { + // The snowflake took too long to respond with an answer, + // and the designated client is no longer around / recognized by the Broker. + w.WriteHeader(http.StatusGone) + return + } body, err := ioutil.ReadAll(r.Body) if nil != err { log.Println("Invalid data.") + w.WriteHeader(http.StatusBadRequest) return } - w.Header().Set("Access-Control-Allow-Origin", "*") - w.Write(body) + log.Println("Received answer: ", body) + snowflake.answerChannel <- body } func init() { - // snowflakes = make([]chan []byte, 0) snowflakes = new(SnowflakeHeap) + snowflakeMap = make(map[string]*Snowflake) heap.Init(snowflakes) http.HandleFunc("/robots.txt", robotsTxtHandler) @@ -163,8 +217,5 @@ func init() { http.HandleFunc("/client", clientHandler) http.HandleFunc("/proxy", proxyHandler) - http.HandleFunc("/reflect", reflectHandler) - // if SNOWFLAKE_BROKER == "" { - // panic("SNOWFLAKE_BROKER empty; did you forget to edit config.go?") - // } + http.HandleFunc("/answer", answerHandler) } diff --git a/proxy/broker.coffee b/proxy/broker.coffee index 688d45d..91a81d2 100644 --- a/proxy/broker.coffee +++ b/proxy/broker.coffee @@ -6,19 +6,25 @@ to get assigned to clients. ### STATUS_OK = 200 +STATUS_GONE = 410 STATUS_GATEWAY_TIMEOUT = 504 +genSnowflakeID = -> + Math.random().toString(36).substring(2) + # Represents a broker running remotely. class Broker clients: 0 + id: null # When interacting with the Broker, snowflake must generate a unique session # ID so the Broker can keep track of which signalling channel it's speaking # to. constructor: (@url) -> - log 'Using Broker at ' + @url - clients = 0 + @clients = 0 + @id = genSnowflakeID() + log 'Contacting Broker at ' + @url + '\nSnowflake ID: ' + @id # Snowflake registers with the broker using an HTTP POST request, and expects # a response from the broker containing some client offer. @@ -27,7 +33,8 @@ class Broker new Promise (fulfill, reject) => xhr = new XMLHttpRequest() try - xhr.open 'POST', @url + xhr.open 'POST', @url + 'proxy' + xhr.setRequestHeader('X-Session-ID', @id) catch err ### An exception happens here when, for example, NoScript allows the domain @@ -47,10 +54,29 @@ class Broker else log 'Broker ERROR: Unexpected ' + xhr.status + ' - ' + xhr.statusText - - xhr.send 'snowflake-testing' - log "Broker: polling for client offer..." + xhr.send @id + log @id + " - polling for client offer..." sendAnswer: (answer) -> - log 'Sending answer to broker.' - log answer + log @id + ' - Sending answer back to broker...\n' + log answer.sdp + xhr = new XMLHttpRequest() + try + xhr.open 'POST', @url + 'answer' + xhr.setRequestHeader('X-Session-ID', @id) + catch err + log 'Broker: exception while connecting: ' + err.message + return + xhr.onreadystatechange = -> + return if xhr.DONE != xhr.readyState + log xhr + switch xhr.status + when STATUS_OK + log 'Broker: Successfully replied with answer.' + log xhr.responseText + when STATUS_GONE + log 'Broker: No longer valid to reply with answer.' + else + log 'Broker ERROR: Unexpected ' + xhr.status + + ' - ' + xhr.statusText + xhr.send JSON.stringify(answer) diff --git a/proxy/proxypair.coffee b/proxy/proxypair.coffee index a27ac92..f78e9f6 100644 --- a/proxy/proxypair.coffee +++ b/proxy/proxypair.coffee @@ -32,7 +32,10 @@ class ProxyPair # TODO: Use a promise.all to tell Snowflake about all offers at once, # once multiple proxypairs are supported. log 'Finished gathering ICE candidates.' - Signalling.send @pc.localDescription + if COPY_PASTE_ENABLED + Signalling.send @pc.localDescription + else + snowflake.broker.sendAnswer @pc.localDescription # OnDataChannel triggered remotely from the client when connection succeeds. @pc.ondatachannel = (dc) => console.log dc diff --git a/proxy/snowflake.coffee b/proxy/snowflake.coffee index 646b9b4..cc34f81 100644 --- a/proxy/snowflake.coffee +++ b/proxy/snowflake.coffee @@ -8,7 +8,7 @@ Assume that the webrtc client plugin is always the offerer, in which case this must always act as the answerer. ### DEFAULT_WEBSOCKET = '192.81.135.242:9901' -DEFAULT_BROKER = 'https://snowflake-reg.appspot.com/proxy' +DEFAULT_BROKER = 'https://snowflake-reg.appspot.com/' COPY_PASTE_ENABLED = false DEFAULT_PORTS = http: 80 @@ -104,8 +104,8 @@ class Snowflake poll = => recv = broker.getClientOffer() recv.then((desc) => - log 'Received:\n\n' + desc + '\n' offer = JSON.parse desc + log 'Received:\n\n' + offer.sdp + '\n' @receiveOffer offer , (err) -> log err @@ -113,13 +113,6 @@ class Snowflake ) poll() - # if @proxyPairs.length >= MAX_NUM_CLIENTS * CONNECTIONS_PER_CLIENT - # setTimeout(@proxyMain, @broker_poll_interval * 1000) - # return - # params = [['r', '1']] - # params.push ['transport', 'websocket'] - # params.push ['transport', 'webrtc'] - # Receive an SDP offer from client plugin. receiveOffer: (desc) => sdp = new RTCSessionDescription desc

1 0

[snowflake/master] broker successfully passing client offers to snowflake proxy (#1)
by arlo＠torproject.org 21 Jan '16

21 Jan '16

commit 7081e6328c34db31fec437aabaac829a9280e0f9 Author: Serene Han <keroserene+git(a)gmail.com> Date: Thu Jan 21 11:40:42 2016 -0800 broker successfully passing client offers to snowflake proxy (#1) --- broker/snowflake-broker.go | 11 ++++---- proxy/broker.coffee | 64 +++++++++++++++++++++++++------------------- proxy/snowflake.coffee | 48 +++++++++++++++++++++++---------- 3 files changed, 76 insertions(+), 47 deletions(-) diff --git a/broker/snowflake-broker.go b/broker/snowflake-broker.go index 279b2b6..1d26eb1 100644 --- a/broker/snowflake-broker.go +++ b/broker/snowflake-broker.go @@ -2,7 +2,7 @@ package snowflake_broker import ( "container/heap" - "fmt" + // "fmt" "io/ioutil" "log" "net" @@ -104,8 +104,8 @@ func clientHandler(w http.ResponseWriter, r *http.Request) { // TODO: Make this much better. snowflake := heap.Pop(snowflakes).(*Snowflake) if nil == snowflake { + // w.Header().Set("Status", http.StatusServiceUnavailable) w.Write([]byte("no snowflake proxies available")) - // w.WriteHeader(http.StatusServiceUnavailable) return } // snowflakes = snowflakes[1:] @@ -135,10 +135,11 @@ func proxyHandler(w http.ResponseWriter, r *http.Request) { log.Println("Passing client offer to snowflake.") w.Write(offer) case <-time.After(time.Second * 10): - s := fmt.Sprintf("%d snowflakes left.", snowflakes.Len()) - w.Write([]byte("timed out. " + s)) + // s := fmt.Sprintf("%d snowflakes left.", snowflakes.Len()) + // w.Write([]byte("timed out. " + s)) + // w.Header().Set("Status", http.StatusRequestTimeout) + w.WriteHeader(http.StatusGatewayTimeout) heap.Remove(snowflakes, snowflake.index) - // w.WriteHeader(http.StatusRequestTimeout) } } diff --git a/proxy/broker.coffee b/proxy/broker.coffee index 9432e5c..688d45d 100644 --- a/proxy/broker.coffee +++ b/proxy/broker.coffee @@ -5,43 +5,51 @@ Browser snowflakes must register with the broker in order to get assigned to clients. ### +STATUS_OK = 200 +STATUS_GATEWAY_TIMEOUT = 504 + # Represents a broker running remotely. class Broker + + clients: 0 + # When interacting with the Broker, snowflake must generate a unique session # ID so the Broker can keep track of which signalling channel it's speaking # to. constructor: (@url) -> log 'Using Broker at ' + @url + clients = 0 # Snowflake registers with the broker using an HTTP POST request, and expects - # a response from the broker containing some client offer - register: -> - # base_url = this.fac_url.replace(/\?.*/, ""); - # url = base_url + "?" + build_query_string(params); - xhr = new XMLHttpRequest() - try - xhr.open 'POST', @url - catch err - ### - An exception happens here when, for example, NoScript allows the domain on - which the proxy badge runs, but not the domain to which it's trying to - make the HTTP request. The exception message is like "Component returned - failure code: 0x805e0006 [nsIXMLHttpRequest.open]" on Firefox. - ### - log 'Broker: exception while connecting: ' + err.message - return - - # xhr.responseType = 'text' - xhr.onreadystatechange = -> - if xhr.DONE == xhr.readyState - log 'Broker: ' + xhr.status - if 200 == xhr.status - log 'Response: ' + xhr.responseText - log xhr - else - log 'Broker error ' + xhr.status + ' - ' + xhr.statusText - xhr.send 'snowflake-testing' - log "Broker: sent a registration message, waiting for reply..." + # a response from the broker containing some client offer. + # TODO: Actually support multiple clients. + getClientOffer: -> + new Promise (fulfill, reject) => + xhr = new XMLHttpRequest() + try + xhr.open 'POST', @url + catch err + ### + An exception happens here when, for example, NoScript allows the domain + on which the proxy badge runs, but not the domain to which it's trying + to make the HTTP request. The exception message is like "Component + returned failure code: 0x805e0006 [nsIXMLHttpRequest.open]" on Firefox. + ### + log 'Broker: exception while connecting: ' + err.message + return + xhr.onreadystatechange = -> + return if xhr.DONE != xhr.readyState + switch xhr.status + when STATUS_OK + fulfill xhr.responseText # Should contain offer. + when STATUS_GATEWAY_TIMEOUT + reject 'Timed out waiting for a client to serve. Retrying...' + else + log 'Broker ERROR: Unexpected ' + xhr.status + + ' - ' + xhr.statusText + + xhr.send 'snowflake-testing' + log "Broker: polling for client offer..." sendAnswer: (answer) -> log 'Sending answer to broker.' diff --git a/proxy/snowflake.coffee b/proxy/snowflake.coffee index 1b837d5..646b9b4 100644 --- a/proxy/snowflake.coffee +++ b/proxy/snowflake.coffee @@ -9,6 +9,7 @@ this must always act as the answerer. ### DEFAULT_WEBSOCKET = '192.81.135.242:9901' DEFAULT_BROKER = 'https://snowflake-reg.appspot.com/proxy' +COPY_PASTE_ENABLED = false DEFAULT_PORTS = http: 80 https: 443 @@ -58,7 +59,7 @@ class Snowflake $badge: null state: MODE.INIT - constructor: -> + constructor: (@broker) -> if HEADLESS # No badge else if DEBUG @@ -98,6 +99,27 @@ class Snowflake @makeProxyPair @relayAddr @proxyPair = @proxyPairs[0] + # Poll broker for clients. + findClients: -> + poll = => + recv = broker.getClientOffer() + recv.then((desc) => + log 'Received:\n\n' + desc + '\n' + offer = JSON.parse desc + @receiveOffer offer + , (err) -> + log err + setTimeout(poll, 1000) + ) + poll() + + # if @proxyPairs.length >= MAX_NUM_CLIENTS * CONNECTIONS_PER_CLIENT + # setTimeout(@proxyMain, @broker_poll_interval * 1000) + # return + # params = [['r', '1']] + # params.push ['transport', 'websocket'] + # params.push ['transport', 'webrtc'] + # Receive an SDP offer from client plugin. receiveOffer: (desc) => sdp = new RTCSessionDescription desc @@ -117,14 +139,6 @@ class Snowflake promise = @proxyPair.pc.createAnswer next promise.then next if promise - # Poll broker when this snowflake can support more clients. - proxyMain: -> - if @proxyPairs.length >= MAX_NUM_CLIENTS * CONNECTIONS_PER_CLIENT - setTimeout(@proxyMain, @broker_poll_interval * 1000) - return - params = [['r', '1']] - params.push ['transport', 'websocket'] - params.push ['transport', 'webrtc'] makeProxyPair: (relay) -> pair = new ProxyPair null, relay, @rateLimit @@ -156,6 +170,7 @@ class Snowflake @badge.die() if @badge snowflake = null +broker = null # ## -- DOM & Inputs -- # @@ -170,7 +185,9 @@ Interface = # Local input from keyboard into message window. acceptInput: -> msg = $input.value - switch snowflake.state + if !COPY_PASTE_ENABLED + log 'No input expected - Copy Paste Signalling disabled.' + else switch snowflake.state when MODE.INIT # Set target relay. if !(snowflake.setRelayAddr msg) @@ -224,10 +241,13 @@ init = -> $input.onkeydown = (e) -> $send.onclick() if 13 == e.keyCode # enter log '== snowflake browser proxy ==' - snowflake = new Snowflake() - window.snowflake = snowflake broker = new Broker DEFAULT_BROKER - broker.register() - log 'Input desired relay address:' + snowflake = new Snowflake(broker) + window.snowflake = snowflake + if COPY_PASTE_ENABLED + log 'Input desired relay address:' + else + snowflake.setRelayAddr DEFAULT_WEBSOCKET + snowflake.findClients() window.onload = init if window

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits January 2016