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

[obfsproxy/master] Add timestamps to log messages.
by nickm＠torproject.org 11 Feb '12

11 Feb '12

commit c2ef1e7028a4b5c6cf33373d41ae8a93e24ef425 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Feb 10 10:08:26 2012 +0100 Add timestamps to log messages. Fixes #5069. --- src/util.c | 28 ++++++++++------------------ src/util.h | 4 ++++ 2 files changed, 14 insertions(+), 18 deletions(-) diff --git a/src/util.c b/src/util.c index 70bd9b4..9a86ad2 100644 --- a/src/util.c +++ b/src/util.c @@ -21,6 +21,7 @@ #include <stdio.h> #include <unistd.h> #include <assert.h> +#include <time.h> #include <event2/dns.h> #ifndef _WIN32 @@ -436,21 +437,6 @@ close_obfsproxy_logfile(void) } /** - Writes a small prologue in the logfile 'fd' that mentions the - obfsproxy version and helps separate log instances. - - Returns 0 on success, -1 on failure. -*/ -static int -write_logfile_prologue(int logfile) -{ - static const char prologue[] = "\nBrand new obfsproxy log:\n"; - if (write(logfile, prologue, strlen(prologue)) != strlen(prologue)) - return -1; - return 0; -} - -/** Sets the global logging 'method' and also sets and open the logfile 'filename' in case we want to log into a file. It returns 1 on success and -1 on fail. @@ -461,11 +447,10 @@ log_set_method(int method, const char *filename) if (method == LOG_METHOD_FILE) { if (open_and_set_obfsproxy_logfile(filename) < 0) return -1; - if (write_logfile_prologue(logging_logfile) < 0) - return -1; } logging_method = method; + log_info("\nStarting."); return 0; } @@ -519,9 +504,16 @@ logv(int severity, const char *format, va_list ap) int r=0; char buf[MAX_LOG_ENTRY]; + time_t now = time(NULL); + struct tm *nowtm = localtime(&now); + char ts[ISO_TIME_LEN + 2]; size_t buflen = MAX_LOG_ENTRY-2; - r = obfs_snprintf(buf, buflen, "[%s] ", sev_to_string(severity)); + if (strftime(ts, sizeof(ts), "%Y-%m-%d %H:%M:%S ", nowtm) != + ISO_TIME_LEN + 1) + ts[0] = '\0'; + r = obfs_snprintf(buf, buflen, "%s[%s] ", ts, + sev_to_string(severity)); if (r < 0) n = strlen(buf); else diff --git a/src/util.h b/src/util.h index 6f3318d..3396abf 100644 --- a/src/util.h +++ b/src/util.h @@ -149,6 +149,10 @@ int obfs_snprintf(char *str, size_t size, /** We don't want no logs. */ #define LOG_METHOD_NULL 3 +/** Length of the date-time format that we use in log messages, which is + "yyyy-mm-dd hh:mm:ss" (without quotes). */ +#define ISO_TIME_LEN 19 + /** Set the log method, and open the logfile 'filename' if appropriate. */ int log_set_method(int method, const char *filename);

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 11 Feb '12

11 Feb '12

commit 5a186b885497916bcddc77eb5278b6a09706c722 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Feb 11 06:15:18 2012 +0000 Update translations for vidalia --- tr/vidalia_tr.po | 53 ++++++++++++++++++++++++++++++----------------------- 1 files changed, 30 insertions(+), 23 deletions(-) diff --git a/tr/vidalia_tr.po b/tr/vidalia_tr.po index 116a85e..be05ca1 100644 --- a/tr/vidalia_tr.po +++ b/tr/vidalia_tr.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-09-07 14:40+0000\n" -"PO-Revision-Date: 2012-02-10 15:08+0000\n" +"PO-Revision-Date: 2012-02-11 06:13+0000\n" "Last-Translator: Deniz <>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -184,11 +184,11 @@ msgstr "Uyarı" msgctxt "AdvancedPage" msgid "You changed torrc path, would you like to restart Tor?" -msgstr "" +msgstr "torrc konumunu değiştirdiniz, Tor'u yeniden başlatmak ister misiniz?" msgctxt "AdvancedPage" msgid "Tor Configuration File (torrc);;All Files (*)" -msgstr "" +msgstr "Tor Ayar Dosyası (torrc);; Bütün Dosyalar (*)" msgctxt "AdvancedPage" msgid "Select a file to use for Tor socket path" @@ -2089,6 +2089,9 @@ msgid "" "application's configuration and use only encrypted protocols, such as SSL, " "if possible." msgstr "" +"Bu bağlantı üzerinden gönderilen herhangi birşey izlenebilir. Lütfen " +"uygulamanızın ayarlarını kontrol edin ve eğer mümkünse, sadece SSL gibi " +"şifreli protokolleri kullanın." msgctxt "MainWindow" msgid "failed (%1)" @@ -2126,11 +2129,11 @@ msgstr "" msgctxt "MainWindow" msgid "(probably Telnet)" -msgstr "" +msgstr "(muhtemelen Telnet)" msgctxt "MainWindow" msgid "(probably an email client)" -msgstr "" +msgstr "(muhtemelen eposta istemcisi)" msgctxt "MainWindow" msgid "" @@ -3149,7 +3152,7 @@ msgstr "<a href=\"bridges.finding\">Nasıl bir köprü bulabilirim?</a>" msgctxt "ServerPage" msgid "<a href=\"#bridgeHelp\">What's this?</a>" -msgstr "" +msgstr "<a href=\"#bridgeHelp\">Bu nedir?</a>" msgctxt "ServerPage" msgid "Automatically distribute my bridge address" @@ -3265,7 +3268,7 @@ msgstr "Şu anda Tor yazılımının \"%1\" versiyonunu kullanmaktasınız." msgctxt "StatusEventWidget" msgid "The Tor Software is not Running" -msgstr "" +msgstr "Tor yazılımı çalışmıyor." msgctxt "StatusEventWidget" msgid "" @@ -3308,7 +3311,7 @@ msgstr "" msgctxt "StatusEventWidget" msgid "Tor Software Error" -msgstr "" +msgstr "Tor yazılım hatası" msgctxt "StatusEventWidget" msgid "" @@ -3334,7 +3337,7 @@ msgstr "" msgctxt "StatusEventWidget" msgid "Your Computer's Clock is Potentially Incorrect" -msgstr "" +msgstr "Bilgisayarınızın saati muhtemelen yanlış." msgctxt "StatusEventWidget" msgid "" @@ -3488,7 +3491,7 @@ msgstr "" msgctxt "StatusEventWidget" msgid "Your Relay is Online" -msgstr "" +msgstr "Aynanız Çevrimiçi" msgctxt "StatusEventWidget" msgid "" @@ -3497,6 +3500,10 @@ msgid "" " hours as more clients learn about your relay. Thank you for contributing to" " the Tor network!" msgstr "" +"Aynanız çevrimiçi ve diğer Tor kullanıcılarına açık. Birkaç saat içinde " +"diğer kullanıcılar aynanızı öğrendikçe ağ trafiğindeki artışı Genişbant " +"Grafiğinde görebilirsiniz. Tor ağına katkıda bulunduğunuz için teşekkür " +"ederiz!" msgctxt "Stream" msgid "New" @@ -3552,49 +3559,49 @@ msgstr "Kontrol şifresinin hash kodunda hata oluştu." msgctxt "TorrcDialog" msgid "Editing torrc" -msgstr "" +msgstr "torrc düzenleniyor" msgctxt "TorrcDialog" msgid "" "Save settings. If unchecked it will only apply settings to the current Tor " "instance." -msgstr "" +msgstr "Ayarları kaydet. Işaretlenmezse sadece şuanki Tor " msgctxt "TorrcDialog" msgid "Cut" -msgstr "" +msgstr "Kes" msgctxt "TorrcDialog" msgid "Copy" -msgstr "" +msgstr "Kopyala" msgctxt "TorrcDialog" msgid "Paste" -msgstr "" +msgstr "Yapıştır" msgctxt "TorrcDialog" msgid "Undo" -msgstr "" +msgstr "Geri al" msgctxt "TorrcDialog" msgid "Redo" -msgstr "" +msgstr "Yenile" msgctxt "TorrcDialog" msgid "Select All" -msgstr "" +msgstr "Hepsini Seç" msgctxt "TorrcDialog" msgid "Apply all" -msgstr "" +msgstr "Hepsini uygula" msgctxt "TorrcDialog" msgid "Apply selection only" -msgstr "" +msgstr "Seçimi uygula" msgctxt "TorrcDialog" msgid "Error connecting to Tor" -msgstr "" +msgstr "Tor'a bağlantı hatası" msgctxt "TorrcDialog" msgid "Selection is empty. Please select some text, or check \"Apply all\"" @@ -3606,11 +3613,11 @@ msgstr "" msgctxt "TorrcDialog" msgid "Error" -msgstr "" +msgstr "Hata" msgctxt "TorrcDialog" msgid "An error ocurred while opening torrc file" -msgstr "" +msgstr "torrc dosyasını açarken hata oluştu" msgctxt "UPNPControl" msgid "Success"

1 0

[obfsproxy/master] Patch from "wwaites" to build on freebsd
by nickm＠torproject.org 11 Feb '12

11 Feb '12

commit 04805f75263fad4a841276b8a4114db3d99f36f8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 10 20:51:02 2012 -0500 Patch from "wwaites" to build on freebsd --- configure.ac | 6 ++++++ src/util.h | 12 ++++++++++++ 2 files changed, 18 insertions(+), 0 deletions(-) diff --git a/configure.ac b/configure.ac index cb65863..38deb3d 100644 --- a/configure.ac +++ b/configure.ac @@ -17,6 +17,12 @@ fi PKG_PROG_PKG_CONFIG +### Headers ### + +AC_CHECK_HEADERS([sys/socket.h]) +AC_CHECK_HEADERS([sys/types.h]) +AC_CHECK_HEADERS([netinet/in.h]) + ### Libraries ### PKG_CHECK_MODULES([libevent], [libevent >= 2.0]) diff --git a/src/util.h b/src/util.h index 91f7585..6f3318d 100644 --- a/src/util.h +++ b/src/util.h @@ -25,6 +25,18 @@ but it doesn't) */ #endif +#ifdef HAVE_SYS_TYPES_H +#include <sys/types.h> +#endif + +#ifdef HAVE_SYS_SOCKET_H +#include <sys/socket.h> +#endif + +#ifdef HAVE_NETINET_IN_H +#include <netinet/in.h> +#endif + struct bufferevent; struct evbuffer; struct evconnlistener;

1 0

[ooni-probe/master] Fix torify decorator
by art＠torproject.org 10 Feb '12

10 Feb '12

commit 167756b4f3bc8453b61b761135c1a9aa9309b5a9 Author: Arturo Filastò <hellais(a)gmail.com> Date: Fri Feb 10 22:13:45 2012 +0100 Fix torify decorator --- refactor/plugoo.py | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/refactor/plugoo.py b/refactor/plugoo.py index 079a58f..20b418d 100644 --- a/refactor/plugoo.py +++ b/refactor/plugoo.py @@ -107,7 +107,7 @@ class Report: data to the reporting system """ #print "Writing report(s)" - dump = '---\n' + dump = '--- \n' dump += yaml.dump(data) reports = [] @@ -315,16 +315,19 @@ class Plugoo(): job.kill() jobs = [] -def torify(socksaddr): +def torify(socksaddr, modules=None): """This is the torify decorator. It should be used to decorate functions that should use to for connecting to the interwebz. The suggary syntax is the following: - @torify("127.0.0.1:9050") + @torify("127.0.0.1:9050", [urllib2]) + def myfunction(): + f = urllib2.urlopen('https://torproject.org/') """ def decorator(target): host, port = socksaddr.split(":") socks.setdefaultproxy(socks.PROXY_TYPE_SOCKS5, host, int(port)) - # Wrap the module into socks - socks.wrapmodule(target) + # Wrap the modules into socks + for module in modules: + socks.wrapmodule(module) return target return decorator

1 0

[ooni-probe/master] Import SocksiPy and handle erro
by art＠torproject.org 10 Feb '12

10 Feb '12

commit 23d5d1108fb8f550c0ffafb0b3255d600b864589 Author: Arturo Filastò <hellais(a)gmail.com> Date: Fri Feb 10 21:39:05 2012 +0100 Import SocksiPy and handle erro --- refactor/plugoo.py | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/refactor/plugoo.py b/refactor/plugoo.py index de33445..079a58f 100644 --- a/refactor/plugoo.py +++ b/refactor/plugoo.py @@ -15,6 +15,10 @@ import os import yaml +try: + import socks +except: + "Error SocksiPy is not installed!" import socket import logging

1 0

[ooni-probe/master] Implement descriptor reading and make Bridget comunicate with TorCtl
by art＠torproject.org 10 Feb '12

10 Feb '12

commit 7d07f33d56b53ecc0cce2b995a56eac0d04981a5 Author: Arturo Filastò <hellais(a)gmail.com> Date: Fri Feb 10 21:36:14 2012 +0100 Implement descriptor reading and make Bridget comunicate with TorCtl --- refactor/plugoo.py | 3 ++- refactor/tests/bridget.py | 44 +++++++++++++++++++++++++++++++++++++------- 2 files changed, 39 insertions(+), 8 deletions(-) diff --git a/refactor/plugoo.py b/refactor/plugoo.py index 1540034..de33445 100644 --- a/refactor/plugoo.py +++ b/refactor/plugoo.py @@ -103,7 +103,8 @@ class Report: data to the reporting system """ #print "Writing report(s)" - dump = "- " + yaml.dump(data) + dump = '---\n' + dump += yaml.dump(data) reports = [] if self.file: diff --git a/refactor/tests/bridget.py b/refactor/tests/bridget.py index 2d1126f..2f6df2c 100644 --- a/refactor/tests/bridget.py +++ b/refactor/tests/bridget.py @@ -17,6 +17,7 @@ import random import re from shutil import rmtree from subprocess import Popen, PIPE +from datetime import datetime import plugoo import gevent @@ -24,6 +25,11 @@ from gevent import socket import fcntl from plugoo import Plugoo, Asset +try: + from TorCtl import TorCtl +except: + print "Error TorCtl not installed!" + class BridgeTAsset(Asset): def __init__(self, file=None): self = Asset.__init__(self, file) @@ -36,6 +42,7 @@ class BridgeT(Plugoo): def writetorrc(self, bridge): # register Tor to an ephemeral port socksport = random.randint(49152, 65535) + controlport = random.randint(49152, 65535) randomname = "tor_"+str(random.randint(0, 424242424242)) datadir = "/tmp/" + randomname if bridge.startswith("obfs://"): @@ -45,8 +52,8 @@ UseBridges 1 Bridge obfs2 %s DataDirectory %s ClientTransportPlugin obfs2 exec /usr/local/bin/obfsproxy --managed -""" % (socksport, obfsbridge, datadir) - print torrc +ControlPort %s +""" % (socksport, obfsbridge, datadir, controlport) else: torrc = """SocksPort %s UseBridges 1 @@ -62,14 +69,24 @@ usemicrodescriptors 0 f.close() os.mkdir(datadir) - return (randomname, datadir) + return (randomname, datadir, controlport) + + def parsebridgeinfo(self, output): + ret = {} + fields = ['router', 'platform', 'opt', 'published', 'uptime', 'bandwidth'] + + for x in output.split("\n"): + cfield = x.split(' ') + if cfield[0] in fields: + ret[cfield[0]] = ' '.join(cfield[1:]) + return ret def connect(self, bridge, timeout=None): if not timeout: if self.config.tests.tor_bridges_timeout: self.timeout = self.config.tests.tor_bridges_timeout timeout = self.timeout - torrc, tordir = self.writetorrc(bridge) + torrc, tordir, controlport = self.writetorrc(bridge) cmd = ["tor", "-f", torrc] tupdate = time.time() @@ -84,16 +101,24 @@ usemicrodescriptors 0 o = p.stdout.read(4096) if re.search("100%", o): print "%s bridge works" % bridge + c = TorCtl.connect('127.0.0.1', controlport) + bridgeinfo = self.parsebridgeinfo(c.get_info('dir/server/all')['dir/server/all']) + c.close() p.stdout.close() os.unlink(os.path.join(os.getcwd(), torrc)) rmtree(tordir) p.terminate() - return [bridge, True] + return { + 'Time': datetime.now(), + 'Bridge': bridge, + 'Working': True, + 'Descriptor': bridgeinfo + } if re.search("%", o): # Keep updating the timeout if there is progress tupdate = time.time() - print o + print ".", continue except IOError: @@ -111,7 +136,12 @@ usemicrodescriptors 0 os.unlink(os.path.join(os.getcwd(), torrc)) rmtree(tordir) p.terminate() - return [bridge, False] + return { + 'Time': datetime.now(), + 'Bridge': bridge, + 'Working': False, + 'Descriptor': {} + } def experiment(self, *a, **kw): # this is just a dirty hack

1 0

[obfsproxy/master] Merge branch 'bug5078'
by nickm＠torproject.org 10 Feb '12

10 Feb '12

commit 0ba2d3bbb829cc71e38ecae6d5d9134af9045a22 Merge: 5f4b127 a195187 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 10 14:49:01 2012 -0500 Merge branch 'bug5078' configure.ac | 15 +++++++++++++++ src/managed.c | 11 +++++++++-- 2 files changed, 24 insertions(+), 2 deletions(-) diff --cc configure.ac index 5234911,4105990..cb65863 --- a/configure.ac +++ b/configure.ac @@@ -43,8 -49,22 +43,23 @@@ LIBS="$save_LIBS AC_C_INLINE AC_CHECK_SIZEOF(int) +AC_CHECK_SIZEOF(size_t) + dnl check for working va_copy. It could be a function or a macro. + AC_MSG_CHECKING([whether we have va_copy]) + AC_CACHE_VAL(obfs_cv_have_vacopy, + AC_TRY_LINK([#include <stdarg.h>], [ + va_list ap, ap2; + va_copy(ap, ap2); + ], [obfs_cv_have_vacopy=true], + [obfs_cv_have_vacopy=false])) + if test "$obfs_cv_have_vacopy" = true; then + AC_DEFINE(HAVE_VA_COPY, 1, [True if this platform has the standard va_copy macro]) + AC_MSG_RESULT(yes) + else + AC_MSG_RESULT(no) + fi + ### Output ### AC_CONFIG_FILES([Makefile])

1 0

[obfsproxy/master] Use va_copy; do not use the same va_list twice. fix bug 5078
by nickm＠torproject.org 10 Feb '12

10 Feb '12

commit a195187bfaea90324179a18aa87df2628d6b4ec3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 10 12:36:58 2012 -0500 Use va_copy; do not use the same va_list twice. fix bug 5078 --- configure.ac | 15 +++++++++++++++ src/managed.c | 11 +++++++++-- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 3809750..4105990 100644 --- a/configure.ac +++ b/configure.ac @@ -50,6 +50,21 @@ LIBS="$save_LIBS" AC_C_INLINE AC_CHECK_SIZEOF(int) +dnl check for working va_copy. It could be a function or a macro. +AC_MSG_CHECKING([whether we have va_copy]) +AC_CACHE_VAL(obfs_cv_have_vacopy, + AC_TRY_LINK([#include <stdarg.h>], [ + va_list ap, ap2; + va_copy(ap, ap2); + ], [obfs_cv_have_vacopy=true], + [obfs_cv_have_vacopy=false])) +if test "$obfs_cv_have_vacopy" = true; then + AC_DEFINE(HAVE_VA_COPY, 1, [True if this platform has the standard va_copy macro]) + AC_MSG_RESULT(yes) +else + AC_MSG_RESULT(no) +fi + ### Output ### AC_CONFIG_FILES([Makefile]) diff --git a/src/managed.c b/src/managed.c index dfd8a3f..01814f8 100644 --- a/src/managed.c +++ b/src/managed.c @@ -142,16 +142,23 @@ log_proxy_env(managed_proxy_t *proxy) static void print_protocol_line(const char *format, ...) { - va_list ap; + va_list ap, ap2; va_start(ap,format); +#ifdef HAVE_VA_COPY + va_copy(ap2, ap); +#else + memcpy(&ap2, &ap, sizeof(ap)); +#endif + vprintf(format, ap); fflush(stdout); /* log the protocol message */ log_debug("We sent:"); - log_debug_raw(format, ap); + log_debug_raw(format, ap2); va_end(ap); + va_end(ap2); } /**

1 0

[obfsproxy/master] Make SIZEOF_SIZE_T get defined
by nickm＠torproject.org 10 Feb '12

10 Feb '12

commit 5f4b127a97d38556f7b60bdffc490872f054d8dc Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 10 14:31:37 2012 -0500 Make SIZEOF_SIZE_T get defined Part of this was adding AC_CHECK_SIZEOF(size_t). The other part was removing the code to suppress AC_INCLUDE_DEFAULTS. That was a neat idea for making the configure script run faster, but apparently it makes lots of normal autoconf snippets stop working. I'd rather be slower than error-prone, so out _that_ goes. [And we're not so slow, really. The configure script still finishes in less than 4 seconds on my desktop.] This fixes bug 5074, which happened because SIZEOF_SIZE_T was not getting set, so smartlists could never get expanded. --- configure.ac | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index 3809750..5234911 100644 --- a/configure.ac +++ b/configure.ac @@ -3,12 +3,6 @@ AC_INIT([obfsproxy], [0.0]) AC_CONFIG_SRCDIR([src/main.c]) AM_INIT_AUTOMAKE([foreign nostdinc]) -dnl The stock definition of AC_INCLUDES_DEFAULT performs a whole bunch -dnl of completely unnecessary checks *even if* you override its -dnl mostly-useless default header list at invocation time. -dnl Replace it with a version that does nothing unless requested. -m4_pushdef([AC_INCLUDES_DEFAULT], [$1]) - ### Programs ### AC_PROG_CC @@ -49,6 +43,7 @@ LIBS="$save_LIBS" AC_C_INLINE AC_CHECK_SIZEOF(int) +AC_CHECK_SIZEOF(size_t) ### Output ###

1 0

[vidalia/master] Update the date for 0.2.16 to unknown
by chiiph＠torproject.org 10 Feb '12

10 Feb '12

commit 7874864629a90779a921947fde1a5dff550d86f5 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Fri Feb 10 15:18:42 2012 -0300 Update the date for 0.2.16 to unknown --- CHANGELOG | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 7087a8b..0056019 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,4 @@ -0.2.16 29-Jan-2012 +0.2.16 ??-Feb-2012 o Make the default data directory in windows be located in the Local AppData instead of the Roaming one. Fixes bug 2319. o Do not launch Firefox with every CIRCUIT_ESTABLISHED signal, do it

1 0