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

[translation/whisperback] Update translations for whisperback
by translation＠torproject.org 21 Jan '15

21 Jan '15

commit 4c0a45964751760e50c96821bfe1fa2a97c29596 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 21 03:15:10 2015 +0000 Update translations for whisperback --- id/id.po | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/id/id.po b/id/id.po index efef46e..b21e271 100644 --- a/id/id.po +++ b/id/id.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Astryd Viandila Dahlan <astrydviandila(a)yahoo.com>, 2015 # berespost <berespost(a)gmail.com>, 2013 # Fathan Imanudin <night.ataraxia(a)gmail.com>, 2014 # hermawan <hermawanadhis(a)gmail.com>, 2014 @@ -13,8 +14,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-03-17 17:40+0100\n" -"PO-Revision-Date: 2015-01-16 10:01+0000\n" -"Last-Translator: Rendiyono Wahyu Saputro <rendi.7936(a)gmail.com>\n" +"PO-Revision-Date: 2015-01-21 03:11+0000\n" +"Last-Translator: Astryd Viandila Dahlan <astrydviandila(a)yahoo.com>\n" "Language-Team: Indonesian (http://www.transifex.com/projects/p/torproject/language/id/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -108,7 +109,7 @@ msgid "" "As a work-around you can save the bug report as a file on a USB drive and try to send it to us at %s from your email account using another system. Note that your bug report will not be anonymous when doing so unless you take further steps yourself (e.g. using Tor with a throw-away email account).\n" "\n" "Do you want to save the bug report to a file?" -msgstr "" +msgstr "Laporan kesalahan tidak dapat dikirim, mungkin karena maslaah jaringan.\n\nSebagai pekerjaan-sekitar Anda dapat menyimpan laporan kesalahan sebagai dokumen di USB dan coba untuk mengirimkannya kepada kami di %s dari akun email Anda dengan menggunakan sistem lain. Perhatikan bahwa laporan kesalahan Anda tidak akan tanpa nama ketika melakukan itu kecuali Anda mengambil langka selanjutnya sendiri (contoh menggunakan Tor dengan akun email buangan).\n\nApakah Anda ingin menyimpan laporan kesalahan kedalam sebuah dokumen?" #: ../whisperBack/gui.py:389 ../data/whisperback.ui.h:21 msgid "WhisperBack" @@ -116,7 +117,7 @@ msgstr "WhisperBack" #: ../whisperBack/gui.py:390 ../data/whisperback.ui.h:2 msgid "Send feedback in an encrypted mail." -msgstr "" +msgstr "Kirim umpan balik dalam email terenkripsi." #: ../whisperBack/gui.py:393 msgid "Copyright © 2009-2012 Tails developpers (tails(a)boum.org)" @@ -124,15 +125,15 @@ msgstr "Hak cipta © 2009-2012 Tails developpers (tails(a)boum.org)" #: ../whisperBack/gui.py:394 msgid "Tails developers <tails(a)boum.org>" -msgstr "" +msgstr "Tail developer <tails(a)boum.org>" #: ../whisperBack/gui.py:395 msgid "translator-credits" -msgstr "" +msgstr "kredit-penerjemah" #: ../whisperBack/gui.py:422 msgid "This doesn't seem to be a valid URL or OpenPGP key." -msgstr "" +msgstr "Ini tidak terlihat sebagai URL yang benar atau kunci OpenPGP." #: ../data/whisperback.ui.h:1 msgid "Copyright © 2009-2012 tails(a)boum.org" @@ -165,7 +166,7 @@ msgstr "" msgid "" "If you want us to encrypt messages when we respond to you, add your key ID, " "a link to your key, or the key as a public key block:" -msgstr "" +msgstr "Jika Anda ingin kami untuk mengenkripsi pesan ketika kami merespon Anda, tambahkan kunci ID Anda, tautan ke kunci Anda, atau tombol sebagai blok kunci publik:" #: ../data/whisperback.ui.h:22 msgid "Summary" @@ -181,19 +182,19 @@ msgstr "Alamat surel pilihan untuk menghubungi Anda" #: ../data/whisperback.ui.h:25 msgid "optional PGP key" -msgstr "" +msgstr "pilihan kunci PGP" #: ../data/whisperback.ui.h:26 msgid "Technical details to include" -msgstr "" +msgstr "Detail teknis dimasukkan" #: ../data/whisperback.ui.h:27 msgid "headers" -msgstr "" +msgstr "header" #: ../data/whisperback.ui.h:28 msgid "debugging info" -msgstr "" +msgstr "info debugging" #: ../data/whisperback.ui.h:29 msgid "Help"

1 0

[translation/liveusb-creator_completed] Update translations for liveusb-creator_completed
by translation＠torproject.org 20 Jan '15

20 Jan '15

commit 136d510cafeb086e961fd13a39cddc9d36696452 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 20 22:15:21 2015 +0000 Update translations for liveusb-creator_completed --- ca/ca.po | 57 +++++++++++++++++++++++++++++++-------------------------- 1 file changed, 31 insertions(+), 26 deletions(-) diff --git a/ca/ca.po b/ca/ca.po index 97d6dc6..85854d1 100644 --- a/ca/ca.po +++ b/ca/ca.po @@ -8,15 +8,16 @@ # dartmalak <alvar.sevilla(a)gmail.com>, 2014 # David Anglada <codiobert(a)codiobert.es>, 2014 # F Xavier Castane <electromigracion(a)gmail.com>, 2013 +# Guillem Arias Fauste <oficialredstonehelper(a)gmail.com>, 2015 # Pau Sellés i Garcia <pau.selles(a)josoc.cat>, 2013 # F Xavier Castane <electromigracion(a)gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-12-01 18:01+0100\n" -"PO-Revision-Date: 2014-12-03 11:44+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"POT-Creation-Date: 2015-01-13 18:07+0100\n" +"PO-Revision-Date: 2015-01-20 22:01+0000\n" +"Last-Translator: Guillem Arias Fauste <oficialredstonehelper(a)gmail.com>\n" "Language-Team: Catalan (http://www.transifex.com/projects/p/torproject/language/ca/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -29,17 +30,17 @@ msgstr "" msgid "%(distribution)s Installer" msgstr "Instal·lador de %(distribution)s" -#: ../liveusb/gui.py:773 +#: ../liveusb/gui.py:775 #, python-format msgid "%(filename)s selected" msgstr "%(filename)s seleccionat" -#: ../liveusb/gui.py:423 +#: ../liveusb/gui.py:425 #, python-format msgid "%(size)s %(label)s" msgstr "%(size)s %(label)s" -#: ../liveusb/gui.py:429 +#: ../liveusb/gui.py:431 #, python-format msgid "%(vendor)s %(model)s (%(details)s) - %(device)s" msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s" @@ -134,7 +135,7 @@ msgstr "Clona\n&&\nActualitza" msgid "Creating %sMB persistent overlay" msgstr "Creant una capa persistent de %sMB" -#: ../liveusb/gui.py:551 +#: ../liveusb/gui.py:553 msgid "" "Device is not yet mounted, so we cannot determine the amount of free space." msgstr "El dispositiu no està muntat; no es pot determinar l'espai disponible." @@ -144,11 +145,11 @@ msgstr "El dispositiu no està muntat; no es pot determinar l'espai disponible." msgid "Download %(distribution)s" msgstr "Baixada %(distribution)s" -#: ../liveusb/gui.py:747 +#: ../liveusb/gui.py:749 msgid "Download complete!" msgstr "Baixada completa!" -#: ../liveusb/gui.py:751 +#: ../liveusb/gui.py:753 msgid "Download failed: " msgstr "Ha fallat la baixada:" @@ -209,7 +210,7 @@ msgstr "Si no selecciona una imatge ISO autoarrencable que existeix, la versió msgid "Install Tails" msgstr "Instal·lar Tails" -#: ../liveusb/gui.py:614 +#: ../liveusb/gui.py:616 msgid "Installation complete!" msgstr "Instal·lació complerta!" @@ -218,7 +219,7 @@ msgstr "Instal·lació complerta!" msgid "Installation complete! (%s)" msgstr "Instal·lació complerta! (%s)" -#: ../liveusb/gui.py:615 +#: ../liveusb/gui.py:617 msgid "Installation was completed. Press OK to close this program." msgstr "La instal·lació s'ha completat. Prem OK per tancar aquest programa." @@ -246,7 +247,7 @@ msgstr "Assegureu-vos que la vostra clau USB estigui connectada i que tingui un msgid "Mount %s exists after unmounting" msgstr "El punt de muntatge %s segueix existint després de desmuntar-lo" -#: ../liveusb/gui.py:557 +#: ../liveusb/gui.py:559 #, python-format msgid "No free space on device %(device)s" msgstr "No queda espai lliure al dispositiu %(device)s" @@ -262,11 +263,11 @@ msgid "" "%dMB ISO + %dMB overlay > %dMB free space" msgstr "Espai disponible insuficient.\n%dMB ISO + %dMB overlay > %dMB d'espai lliure" -#: ../liveusb/gui.py:538 +#: ../liveusb/gui.py:540 msgid "Partition is FAT16; Restricting overlay size to 2G" msgstr "La partició es Fat16: Restringida a menys de 2G per arxiu." -#: ../liveusb/gui.py:534 +#: ../liveusb/gui.py:536 msgid "Partition is FAT32; Restricting overlay size to 4G" msgstr "La partició és de FAT32; restringida a menys de 4g per fitxer" @@ -275,7 +276,7 @@ msgstr "La partició és de FAT32; restringida a menys de 4g per fitxer" msgid "Partitioning device %(device)s" msgstr "Creant particions a %(device)s" -#: ../liveusb/gui.py:605 +#: ../liveusb/gui.py:607 msgid "Persistent Storage" msgstr "Emmagatzematge persistent" @@ -283,15 +284,15 @@ msgstr "Emmagatzematge persistent" msgid "Persistent Storage (0 MB)" msgstr "Emmagatzemament persistent (0 MB)" -#: ../liveusb/gui.py:667 ../liveusb/gui.py:696 +#: ../liveusb/gui.py:669 ../liveusb/gui.py:698 msgid "Please confirm your device selection" msgstr "Confirmeu la vostra elecció de dispositiu" -#: ../liveusb/gui.py:451 +#: ../liveusb/gui.py:453 msgid "Refreshing releases..." msgstr "Cercant noves versions..." -#: ../liveusb/gui.py:456 +#: ../liveusb/gui.py:458 msgid "Releases updated!" msgstr "Noves versions cercades!" @@ -309,7 +310,7 @@ msgstr "Eliminant el Live OS existent." msgid "Resetting Master Boot Record of %s" msgstr "Reconfigurant el Master Boot Record de %s" -#: ../liveusb/gui.py:758 +#: ../liveusb/gui.py:760 msgid "Select Live ISO" msgstr "Seleccioneu la ISO Live" @@ -337,7 +338,7 @@ msgstr "Se sincronitzen les dates en el disc..." msgid "Target Device" msgstr "Dispositiu de destí" -#: ../liveusb/gui.py:761 +#: ../liveusb/gui.py:763 msgid "" "The selected file is unreadable. Please fix its permissions or select " "another file." @@ -385,6 +386,10 @@ msgstr "Aquesta és la consola d'estat, on s'escriuen tots els missatges." msgid "Trying to continue anyway." msgstr "Provant de continuar de totes maneres." +#: ../liveusb/gui.py:407 +msgid "USB drive found" +msgstr "Dispositiu USB trobat" + #: ../liveusb/creator.py:954 #, python-format msgid "Unable to change volume label: %(message)s" @@ -417,7 +422,7 @@ msgid "" "Unable to get Win32_LogicalDisk; win32com query did not return any results" msgstr "No es pot trobar el Win32_LogicalDisk; la consulta win32com no ofereix cap resultat" -#: ../liveusb/gui.py:660 +#: ../liveusb/gui.py:662 msgid "Unable to mount device" msgstr "Incapaç de muntar el dispositiu." @@ -441,7 +446,7 @@ msgid "" "Unable to reset MBR. You may not have the `syslinux` package installed." msgstr "No s'ha pogut restablir el MBR. Podria no tenir instal·lat el paquet `syslinux`" -#: ../liveusb/gui.py:767 +#: ../liveusb/gui.py:769 msgid "" "Unable to use the selected file. You may have better luck if you move your " "ISO to the root of your drive (ie: C:\\)" @@ -533,7 +538,7 @@ msgstr "Verificant SHA256 cheksum de l'imatge LiveCD..." msgid "Verifying filesystem..." msgstr "Comprovant sistema de fitxers..." -#: ../liveusb/gui.py:694 +#: ../liveusb/gui.py:696 msgid "" "Warning: Creating a new persistent overlay will delete your existing one." msgstr "Atenció: si creeu una nova capa persistent, n'esborrareu l'existent." @@ -550,14 +555,14 @@ msgstr "Atenció: Aquesta eina necessita ser executada com Administrador. Per fe msgid "Wrote to device at %(speed)d MB/sec" msgstr "Escrit al dispositiu a %(speed)d MB/seg" -#: ../liveusb/gui.py:668 +#: ../liveusb/gui.py:670 #, python-format msgid "" "You are going to install Tails on the %(size)s %(vendor)s %(model)s device " "(%(device)s). All data on the selected device will be lost. Continue?" msgstr "Vostè instal·larà els Tails a %(size)s %(vendor)s %(model)s dispositiu (%(device)s). Es perdran totes les dades al dispositiu seleccionat. Voleu continuar?" -#: ../liveusb/gui.py:684 +#: ../liveusb/gui.py:686 #, python-format msgid "" "You are going to upgrade Tails on the %(parent_size)s %(vendor)s %(model)s " @@ -571,7 +576,7 @@ msgid "" "ext4 filesystem" msgstr "Utilitza una versió antiga de syslinux-extlinux que no permet l'ús del sistema de fitxers ext4." -#: ../liveusb/gui.py:752 +#: ../liveusb/gui.py:754 msgid "You can try again to resume your download" msgstr "Podeu tornar-ho a intentar per continuar la vostra baixada"

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 20 Jan '15

20 Jan '15

commit 60ade21e99345be6a7d3843a689460f42c9fb903 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 20 22:15:17 2015 +0000 Update translations for liveusb-creator --- ca/ca.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ca/ca.po b/ca/ca.po index 0cae474..85854d1 100644 --- a/ca/ca.po +++ b/ca/ca.po @@ -8,6 +8,7 @@ # dartmalak <alvar.sevilla(a)gmail.com>, 2014 # David Anglada <codiobert(a)codiobert.es>, 2014 # F Xavier Castane <electromigracion(a)gmail.com>, 2013 +# Guillem Arias Fauste <oficialredstonehelper(a)gmail.com>, 2015 # Pau Sellés i Garcia <pau.selles(a)josoc.cat>, 2013 # F Xavier Castane <electromigracion(a)gmail.com>, 2013 msgid "" @@ -15,8 +16,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-01-13 18:07+0100\n" -"PO-Revision-Date: 2015-01-14 08:41+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2015-01-20 22:01+0000\n" +"Last-Translator: Guillem Arias Fauste <oficialredstonehelper(a)gmail.com>\n" "Language-Team: Catalan (http://www.transifex.com/projects/p/torproject/language/ca/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -387,7 +388,7 @@ msgstr "Provant de continuar de totes maneres." #: ../liveusb/gui.py:407 msgid "USB drive found" -msgstr "" +msgstr "Dispositiu USB trobat" #: ../liveusb/creator.py:954 #, python-format

1 0

[tor-browser-bundle/master] Fix emailing of log files and remove a couple of default values.
by gk＠torproject.org 20 Jan '15

20 Jan '15

commit db856ac0155791bbca283da574b14ed4ae5bd515 Author: Linus Nordberg <linus(a)torproject.org> Date: Tue Jan 20 16:32:36 2015 +0100 Fix emailing of log files and remove a couple of default values. --- tools/continuous-builds/build-tbb.sh | 33 ++++++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/tools/continuous-builds/build-tbb.sh b/tools/continuous-builds/build-tbb.sh index 010b41d..ab8d36f 100755 --- a/tools/continuous-builds/build-tbb.sh +++ b/tools/continuous-builds/build-tbb.sh @@ -18,12 +18,29 @@ BUILDDIR=$4; [ -z "$BUILDDIR" ] && BUILDDIR=~/usr/src/tor-browser-bundle/gitian DESTDIR=$5; [ -z "$DESTDIR" ] && DESTDIR=$BUILDDIR/tbb-$TARGET N=$6; [ -z "$N" ] && N=16 -[ -z "$PGPKEYID" ] && PGPKEYID=0x984496E7 +# Set PGPKEYID="--local-user KEY-ID" to override default PGP key used +# for signing. +[ -z "$PGPKEYID" ] && PGPKEYID="" +# mail(1) from Debian package bsd-mailx lost `-f envelope-sender' in +# DSA-3104-1. Install package heirloom-mailx and set +# MAILX=/usr/bin/heirloom-mailx in order to override envelope sender +# using `-r' in LOGSENDER. +[ -z "$MAILX" ] && MAILX="" + +# Name of log file. logfile=$(date -u +%s).log -logrecipients="gk(a)torproject.org linus(a)torproject.org" -. ~/setup-gitian-build-env.sh +# LOGRECIPIENTS is a space separated list of email addresses or an +# empty string. +[ -z "$LOGRECIPIENTS" ] && LOGRECIPIENTS="" + +# Set LOGSENDER to "-r user@domain" to override envelope sender. If +# empty the default envelope sender is used. +[ -z "$LOGSENDER" ] && LOGSENDER="" + +[ -f ~/setup-gitian-build-env.sh ] && . ~/setup-gitian-build-env.sh + cd $BUILDDIR || exit 1 status=init n=0 @@ -45,11 +62,17 @@ if [ $status = done ]; then mv $DESTDIR $NEWDESTDIR cd $NEWDESTDIR || exit 3 sha256sum *.tar.xz *.zip *.dmg *.exe > sha256sums.txt - gpg -a --clearsign --local-user $PGPKEYID sha256sums.txt || exit 2 + gpg -a --clearsign $PGPKEYID sha256sums.txt || exit 2 cd .. D=$(basename $NEWDESTDIR) tar cf - $D/sha256sums* $D/*.tar.xz $D/*.zip $D/*.exe $D/*.dmg | ssh -i $PUBLISH_SSH_KEY $PUBLISH_HOST | tee -a $logfile else echo "$0: giving up after $n tries" | tee -a $logfile - tail -n 50 $logfile ../../gitian-builder/var/build.log ../../gitian-builder/var/target.log | mail -s "Nightly build failure -- $(date +%F)" $logrecipients + if [ -n "$LOGRECIPIENTS" ]; then + FILES="$logfile \ + ../../gitian-builder/var/build.log \ + ../../gitian-builder/var/target.log" + tail -n 50 $FILES | $MAILX -E -s "Nightly build failure -- $(date +%F)" \ + $sender -- $LOGRECIPIENTS + fi fi

1 0

[tor-browser-bundle/master] Fix a log printout.
by gk＠torproject.org 20 Jan '15

20 Jan '15

commit d39450e0386b211b7e813d43320100067e08f0e6 Author: Linus Nordberg <linus(a)torproject.org> Date: Tue Jan 20 16:42:58 2015 +0100 Fix a log printout. --- tools/continuous-builds/build-tbb.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/continuous-builds/build-tbb.sh b/tools/continuous-builds/build-tbb.sh index ab8d36f..271f1ec 100755 --- a/tools/continuous-builds/build-tbb.sh +++ b/tools/continuous-builds/build-tbb.sh @@ -51,7 +51,7 @@ while [ $status != done ]; do date | tee -a $logfile killall qemu-system-i386 qemu-system-x86_64 make $MAKE_TARGET > build-$(date -u +%s).log && status=done - printf "%s: Tried building $TARGET %d times. Status: %s.\n" $0 $n $status | tee -a $logfile + printf "%s: Tried building $MAKE_TARGET %d times. Status: %s.\n" $0 $n $status | tee -a $logfile MAKE_TARGET=build-$TARGET [ $n -ge $N ] && break done

1 0

[tor/master] New option "HiddenServiceAllowUnknownPorts"
by nickm＠torproject.org 20 Jan '15

20 Jan '15

commit 74cd57517c10fd99345ffcc90d9376f9144e675a Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Jan 3 12:34:52 2015 -0500 New option "HiddenServiceAllowUnknownPorts" This allows hidden services to disable the anti-scanning feature introduced in 0.2.6.2-alpha. With this option not set, a connection to an unlisted port closes the circuit. With this option set, only a RELAY_DONE cell is sent. Closes ticket #14084. --- changes/bug14084 | 6 ++++++ doc/tor.1.txt | 4 ++++ src/or/config.c | 1 + src/or/connection_edge.c | 9 +++++++-- src/or/rendservice.c | 26 +++++++++++++++++++++++--- 5 files changed, 41 insertions(+), 5 deletions(-) diff --git a/changes/bug14084 b/changes/bug14084 new file mode 100644 index 0000000..c7f053e --- /dev/null +++ b/changes/bug14084 @@ -0,0 +1,6 @@ + o Minor features: + - New option "HiddenServiceAllowUnknownPorts" to allow hidden + services to disable the anti-scanning feature introduced in + 0.2.6.2-alpha. With this option not set, a connection to an + unlisted port closes the circuit. With this option set, only a + RELAY_DONE cell is sent. Closes ticket #14084. \ No newline at end of file diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 4e3e07e..92a6a6a 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -2071,6 +2071,10 @@ The following options are used to configure a hidden service. found in the hostname file. Clients need to put this authorization data in their configuration file using **HidServAuth**. +[[HiddenServiceAllowUnknownPorts]] **HiddenServiceAllowUnknownPorts** **0**|**1**:: + If set to 1, then connections to unrecognized ports do not cause the + current hidden service to close rendezvous circuits. (Default: 0) + [[RendPostPeriod]] **RendPostPeriod** __N__ **seconds**|**minutes**|**hours**|**days**|**weeks**:: Every time the specified period elapses, Tor uploads any rendezvous service descriptors to the directory servers. This information is also diff --git a/src/or/config.c b/src/or/config.c index d70d6ac..e0043d8 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -269,6 +269,7 @@ static config_var_t option_vars_[] = { VAR("HiddenServicePort", LINELIST_S, RendConfigLines, NULL), VAR("HiddenServiceVersion",LINELIST_S, RendConfigLines, NULL), VAR("HiddenServiceAuthorizeClient",LINELIST_S,RendConfigLines, NULL), + VAR("HiddenServiceAllowUnknownPorts",LINELIST_S, RendConfigLines, NULL), V(HiddenServiceStatistics, BOOL, "0"), V(HidServAuth, LINELIST, NULL), V(CloseHSClientCircuitsImmediatelyOnTimeout, BOOL, "0"), diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index d8f397b..8c3b161 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -2610,7 +2610,9 @@ connection_exit_begin_conn(cell_t *cell, circuit_t *circ) n_stream->rend_data = rend_data_dup(origin_circ->rend_data); tor_assert(connection_edge_is_rendezvous_stream(n_stream)); assert_circuit_ok(circ); - if (rend_service_set_connection_addr_port(n_stream, origin_circ) < 0) { + + const int r = rend_service_set_connection_addr_port(n_stream, origin_circ); + if (r < 0) { log_info(LD_REND,"Didn't find rendezvous service (port %d)", n_stream->base_.port); /* Send back reason DONE because we want to make hidden service port @@ -2629,7 +2631,10 @@ connection_exit_begin_conn(cell_t *cell, circuit_t *circ) * scanning the hidden service ports. Note that this mitigates port * scanning by adding more work on the attacker side to successfully * scan but does not fully solve it. */ - return END_CIRC_AT_ORIGIN; + if (r < -1) + return END_CIRC_AT_ORIGIN; + else + return 0; } assert_circuit_ok(circ); log_debug(LD_REND,"Finished assigning addr/port"); diff --git a/src/or/rendservice.c b/src/or/rendservice.c index b9d9875..e14831e 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -129,6 +129,9 @@ typedef struct rend_service_t { * when they do, this keeps us from launching multiple simultaneous attempts * to connect to the same rend point. */ replaycache_t *accepted_intro_dh_parts; + /** If true, we don't close circuits for making requests to unsupported + * ports. */ + int allow_unknown_ports; } rend_service_t; /** A list of rend_service_t's for services run on this OP. @@ -397,6 +400,19 @@ rend_config_services(const or_options_t *options, int validate_only) return -1; } smartlist_add(service->ports, portcfg); + } else if (!strcasecmp(line->key, "HiddenServiceAllowUnknownPorts")) { + service->allow_unknown_ports = (int)tor_parse_long(line->value, + 10, 0, 1, &ok, NULL); + if (!ok) { + log_warn(LD_CONFIG, + "HiddenServiceAllowUnknownPorts should be 0 or 1, not %s", + line->value); + rend_service_free(service); + return -1; + } + log_info(LD_CONFIG, + "HiddenServiceAllowUnknownPorts=%d for %s", + (int)service->allow_unknown_ports, service->directory); } else if (!strcasecmp(line->key, "HiddenServiceDirGroupReadable")) { service->dir_group_readable = (int)tor_parse_long(line->value, @@ -3382,7 +3398,8 @@ rend_service_dump_stats(int severity) /** Given <b>conn</b>, a rendezvous exit stream, look up the hidden service for * 'circ', and look up the port and address based on conn-\>port. - * Assign the actual conn-\>addr and conn-\>port. Return -1 if failure, + * Assign the actual conn-\>addr and conn-\>port. Return -2 on failure + * for which the circuit should be closed, -1 on other failure, * or 0 for success. */ int @@ -3405,7 +3422,7 @@ rend_service_set_connection_addr_port(edge_connection_t *conn, log_warn(LD_REND, "Couldn't find any service associated with pk %s on " "rendezvous circuit %u; closing.", serviceid, (unsigned)circ->base_.n_circ_id); - return -1; + return -2; } matching_ports = smartlist_new(); SMARTLIST_FOREACH(service->ports, rend_service_port_config_t *, p, @@ -3423,6 +3440,9 @@ rend_service_set_connection_addr_port(edge_connection_t *conn, } log_info(LD_REND, "No virtual port mapping exists for port %d on service %s", conn->base_.port,serviceid); - return -1; + if (service->allow_unknown_ports) + return -1; + else + return -2; }

1 0

[tor/master] Expand manpage for HiddenServiceAllowUnknownPorts based on suggestions from qwerty1 and dgoulet
by nickm＠torproject.org 20 Jan '15

20 Jan '15

commit 18a15747efe29d2df7a8ea852439fd30886cf9b3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 20 14:07:22 2015 -0500 Expand manpage for HiddenServiceAllowUnknownPorts based on suggestions from qwerty1 and dgoulet --- doc/tor.1.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 92a6a6a..a10ce16 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -2073,7 +2073,9 @@ The following options are used to configure a hidden service. [[HiddenServiceAllowUnknownPorts]] **HiddenServiceAllowUnknownPorts** **0**|**1**:: If set to 1, then connections to unrecognized ports do not cause the - current hidden service to close rendezvous circuits. (Default: 0) + current hidden service to close rendezvous circuits. (Setting this to 0 is + not an authorization mechanism; it is instead meant to be a mild + inconvenience to port-scanners.) (Default: 0) [[RendPostPeriod]] **RendPostPeriod** __N__ **seconds**|**minutes**|**hours**|**days**|**weeks**:: Every time the specified period elapses, Tor uploads any rendezvous

1 0

[tor/master] Merge branch 'bug14084'
by nickm＠torproject.org 20 Jan '15

20 Jan '15

commit e7e33d4b04be508e327f79786e1e0a885afd7a6d Merge: 9ddc1fb 18a1574 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 20 14:07:37 2015 -0500 Merge branch 'bug14084' changes/bug14084 | 6 ++++++ doc/tor.1.txt | 6 ++++++ src/or/config.c | 1 + src/or/connection_edge.c | 9 +++++++-- src/or/rendservice.c | 26 +++++++++++++++++++++++--- 5 files changed, 43 insertions(+), 5 deletions(-)

1 0

[tor/master] Fix: close intro circuit if no more intro points are usable
by nickm＠torproject.org 20 Jan '15

20 Jan '15

commit b3c1152bae9e021e10dd014970913114753ac74d Author: David Goulet <dgoulet(a)ev0ke.net> Date: Fri Jan 16 17:43:33 2015 -0500 Fix: close intro circuit if no more intro points are usable Once a NACK is received on the intro circuit, tor tries an other usable one by extending the current circuit to it. If no more intro points are usable, now close the circuit. Fixes #14224 Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- src/or/rendclient.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/or/rendclient.c b/src/or/rendclient.c index 19a8cef..1353ee3 100644 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@ -468,6 +468,10 @@ rend_client_introduction_acked(origin_circuit_t *circ, /* XXXX If that call failed, should we close the rend circuit, * too? */ return result; + } else { + /* Close circuit because no more intro points are usable thus this + * circuit is not useful anymore. */ + circuit_mark_for_close(TO_CIRCUIT(circ), END_CIRC_REASON_FINISHED); } } return 0;

1 0

[tor/master] Fix: close intro circuit if no more intro points are usable
by nickm＠torproject.org 20 Jan '15

20 Jan '15

commit b5525476f5fea4b97d562247dbad117068eb4fbb Author: David Goulet <dgoulet(a)ev0ke.net> Date: Mon Jan 19 10:23:58 2015 -0500 Fix: close intro circuit if no more intro points are usable Once a NACK is received on the intro circuit, tor tries an other usable one by extending the current circuit to it. If no more intro points are usable, now close the circuit. Also, it's reason is changed before closing it so we don't report again an intro point failure and trigger an extra HS fetch. Fixes #14224 Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- changes/bug14224 | 4 ++++ src/or/rendclient.c | 7 +++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/changes/bug14224 b/changes/bug14224 new file mode 100644 index 0000000..0608940 --- /dev/null +++ b/changes/bug14224 @@ -0,0 +1,4 @@ + o Minor Bugfix + - Close the intro circuit once we don't have any more usable intro + points instead of making it timeout at some point. This also make sure + no extra HS descriptor fetch is triggered. diff --git a/src/or/rendclient.c b/src/or/rendclient.c index 1353ee3..31e220a 100644 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@ -469,8 +469,11 @@ rend_client_introduction_acked(origin_circuit_t *circ, * too? */ return result; } else { - /* Close circuit because no more intro points are usable thus this - * circuit is not useful anymore. */ + /* Close circuit because no more intro points are usable thus not + * useful anymore. Change it's purpose before so we don't report an + * intro point failure again triggering an extra descriptor fetch. */ + circuit_change_purpose(TO_CIRCUIT(circ), + CIRCUIT_PURPOSE_C_INTRODUCE_ACKED); circuit_mark_for_close(TO_CIRCUIT(circ), END_CIRC_REASON_FINISHED); } }

1 0