October 2011 - tor-commits - lists.torproject.org

[torsocks/master] Bump the version to 2.1 in preparation for release
by hoganrobert＠torproject.org 24 Oct '11

24 Oct '11

commit 9476ecffdc93294c744999f5a7504b965133ea7a Author: Robert Hogan <robert(a)roberthogan.net> Date: Mon Oct 24 20:31:01 2011 +0100 Bump the version to 2.1 in preparation for release --- configure.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.in b/configure.in index bb98460..36e3ed8 100644 --- a/configure.in +++ b/configure.in @@ -9,7 +9,7 @@ AC_INIT() AC_CONFIG_HEADER(config.h) # Automake initialization -AM_INIT_AUTOMAKE(torsocks, 0.1) +AM_INIT_AUTOMAKE(torsocks, 1.2) # Get hostname and other information. AC_CANONICAL_HOST

1 0

[torsocks/master] Issue 27: Fix build system so 'make dist' works
by hoganrobert＠torproject.org 24 Oct '11

24 Oct '11

commit c9448f11280deade8fb2ae66ce10678dfa756144 Author: Robert Hogan <robert(a)roberthogan.net> Date: Mon Oct 24 20:27:23 2011 +0100 Issue 27: Fix build system so 'make dist' works "The current build system fails when trying to create a tarball using 'make dist'. There are two problems here: When creating a tarball for distribution with 'make dist', the header files at src/*.h are not included and so the build fails. These should be listed in libtorsocks_la_SOURCES. Similarly, not having the prefix dist_ for the installation directories in doc/ means that these will not be included in the distribution tarball. Also, there is no need to define custom *manpagedirs as the build system is man page aware." Patch by Anthony Basile <blueness(a)gentoo.org> --- doc/Makefile.am | 16 +++------------- src/Makefile.am | 3 ++- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/doc/Makefile.am b/doc/Makefile.am index ed6cbf4..222ba92 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,18 +1,8 @@ # Makefile used by configure to create real Makefile # Install configuration file -usewithtorconfdir = $(CONFDIR)/ -usewithtorconf_DATA = torsocks.conf +confdir = $(CONFDIR)/ +dist_conf_DATA = torsocks.conf # Install man pages -torsocksmanpagedir = $(mandir)/man1 -torsocksmanpage_DATA = torsocks.1 - -torsocks8manpagedir = $(mandir)/man8 -torsocks8manpage_DATA = torsocks.8 - -usewithtormanpagedir = $(mandir)/man1 -usewithtormanpage_DATA = usewithtor.1 - -torsocksconfmanpagedir = $(mandir)/man5 -torsocksconfmanpage_DATA = torsocks.conf.5 +dist_man_MANS = torsocks.1 torsocks.8 usewithtor.1 torsocks.conf.5 diff --git a/src/Makefile.am b/src/Makefile.am index 5f13f47..e3a01c9 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -9,7 +9,8 @@ INSTALL_SCRIPT = $(install_sh) -c -m 755 libtorsocks_la_LDFLAGS= $(TORSOCKSLDFLAGS) # Install main library to $(prefix)/lib/tor (must match torsocks.in) lib_LTLIBRARIES = libtorsocks.la -libtorsocks_la_SOURCES = torsocks.c common.c parser.c dead_pool.c darwin_warts.c socks.c +libtorsocks_la_SOURCES = torsocks.c common.c parser.c dead_pool.c darwin_warts.c socks.c\ + common.h dead_pool.h expansion_table.h parser.h socks.h DISTCLEANFILES=parser.lo dead_pool.lo common.lo libtorsocks.lo torsocks.lo darwin_warts.lo socks.lo\ config.cache config.log config.h Makefile \

1 0

[torsocks/master] Issue 29: tordns no worky? - Part 2
by hoganrobert＠torproject.org 24 Oct '11

24 Oct '11

commit 3d8c166b19c1150c5c0b69bf567f1c771f766957 Author: Robert Hogan <robert(a)roberthogan.net> Date: Mon Oct 24 19:44:11 2011 +0100 Issue 29: tordns no worky? - Part 2 This was a regression caused by splitting tsocks.c into socks.c and torsocks.c. The 'requests' variable was declared static in the socks.h header file with the result that the value was no longer shared between source files. Define 'requests' in socks.c and declare it extern in socks.h. Patch from foobi..(a)gmail.com --- src/socks.c | 1 + src/socks.h | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/socks.c b/src/socks.c index 41c19a9..8497728 100644 --- a/src/socks.c +++ b/src/socks.c @@ -84,6 +84,7 @@ static int send_socksv4a_request(struct connreq *conn, const char *onion_host); dead_pool *pool = NULL; +struct connreq *requests = NULL; struct connreq *new_socks_request(int sockid, struct sockaddr_in *connaddr, struct sockaddr_in *serveraddr, diff --git a/src/socks.h b/src/socks.h index 3a4b0cd..6dd497f 100644 --- a/src/socks.h +++ b/src/socks.h @@ -104,7 +104,7 @@ struct connreq { /* Global Declarations */ extern dead_pool *pool; -static struct connreq *requests = NULL; +extern struct connreq *requests; struct connreq *new_socks_request(int sockid, struct sockaddr_in *connaddr, struct sockaddr_in *serveraddr,

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 24 Oct '11

24 Oct '11

commit 65615c20f30cfa356a82d8e9bec53e7803073d03 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Oct 24 15:46:18 2011 +0000 Update translations for tsum --- fa/tsum.po | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/fa/tsum.po b/fa/tsum.po index 7c6ae79..4ca349d 100644 --- a/fa/tsum.po +++ b/fa/tsum.po @@ -6,13 +6,14 @@ # <hamid.azimy(a)gmail.com>, 2011. # <jonnect(a)yahoo.com>, 2011. # <mah.fat(a)gmail.com>, 2011. +# <vhd42f(a)gmail.com>, 2011. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-10-17 13:23+0200\n" -"PO-Revision-Date: 2011-10-17 13:05+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2011-10-24 15:17+0000\n" +"Last-Translator: ritid42 <vhd42f(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -373,12 +374,11 @@ msgid "" "want to make sure that the version number on the top line of the changelog " "file matches the version number in the filename." msgstr "" -"هنگامی که امضا را بررسی کردید و *\"Good signature\"* را دیدید، به سراغ بسته " -"رفته و آن را از حالت فشرده خارج کنید. شما باید با یک پوشه شبیه **tor-" -"browser_en-US** مواجه شوید. داخل آن پاشه، یک پوشه دیگر به نام **Docs** وجود " -"دارد که حاوی فایلی به نام **changelog** است. شما باید اطمینان حاصل کنید که " -"شماره‌ی نسخه‌ای که در خط اول این فایل نوشته شده، با شماره‌ی نسخه‌ای که در " -"نام فایل است، یکی باشد." +"هنگامی که شما کرده اند استفاده از امضا و * \"خوب امضا\" خروجی * دیده می شود " +"، برو جلو و عصاره آرشیو بسته. بعد از آن شما باید یک دایرکتوری مشابه ** «TOR " +"- browser_en - US **. در داخل است که دایرکتوری یکی دیگر از شاخه ای به نام **" +" اسناد ** ، که حاوی یک فایل با نام ** تغییرات **. شما می خواهید مطمئن شوید " +"که شماره نسخه بر روی خط بالای فایل تغییرات منطبق شماره نسخه را در نام فایل." #. type: Plain text #: tsum.text:139

1 0

[gettor/master] Allowed attachment size of your provider too small? Get a
by kaner＠torproject.org 24 Oct '11

24 Oct '11

commit 1ebe00e786a5a36856cd8db6c3ea54e8c0681907 Author: Christian Fromme <kaner(a)strace.org> Date: Sun Oct 16 21:04:29 2011 +0200 Allowed attachment size of your provider too small? Get a nice response by GetTor telling you so. Fixes #4166, #2520 and parts of #3920 --- gettor.conf | 5 +++++ lib/gettor/i18n.py | 10 +++++++++- lib/gettor/requests.py | 4 +++- lib/gettor/responses.py | 41 +++++++++++++++++++++++++++++++++++++++-- lib/gettor/utils.py | 34 +++++++++++++++++++++++++++++----- 5 files changed, 85 insertions(+), 9 deletions(-) diff --git a/gettor.conf b/gettor.conf index 56f8c35..c022e88 100644 --- a/gettor.conf +++ b/gettor.conf @@ -33,6 +33,11 @@ BLACKLIST_THRES = 3 # Which mirror to sync packages from RSYNC_MIRROR = "rsync.torproject.org" +# Which email provider allows for what size of attachments? (Size in MB) +PROVIDER_ATTACHMENT_SIZES = { "gmail.com": 25, + "yahoo.com": 25, + "yahoo.cn": 25 } + # Default locale DEFAULT_LOCALE = "en" diff --git a/lib/gettor/i18n.py b/lib/gettor/i18n.py index 64c9a5c..6c77fd2 100644 --- a/lib/gettor/i18n.py +++ b/lib/gettor/i18n.py @@ -269,5 +269,13 @@ _("""How do I extract the file(s) you sent me?"""), # GETTOR_TEXT[63] _("""QUESTION:"""), # GETTOR_TEXT[64] -_("""ANSWER:""") +_("""ANSWER:"""), + # GETTOR_TEXT[65] +_("""Sorry, but the package you requested (%s) is too large for your +provider to accept as an attachment. Try using another provider that allows +for larger email attachments. Or try one of the following mirrors: + + https://www.oignon.net/dist/torbrowser/ + https://tor.beme-it.de/dist/torbrowser/ + https://www.torservers.net/mirrors/torproject.org/dist/torbrowser/""") ] diff --git a/lib/gettor/requests.py b/lib/gettor/requests.py index 0a2741e..4383813 100644 --- a/lib/gettor/requests.py +++ b/lib/gettor/requests.py @@ -24,13 +24,15 @@ class requestMail: self.request['user'] = self.parsedMessage["Return-Path"] # Normalize address before hashing normalized_addr = gettor.utils.normalizeAddress(self.request['user']) + max_attach = gettor.utils.getMaxAttSize(normalized_addr, config) self.request['hashed_user'] = gettor.utils.getHash(normalized_addr) self.request['ouraddr'] = self.getRealTo(self.parsedMessage["to"]) self.request['locale'] = self.getLocaleInTo(self.request['ouraddr']) self.request['package'] = None self.request['split'] = False self.request['forward'] = None - self.request['valid'] = False # This will get set by gettor.filters + self.request['valid'] = False # This will get set by gettor.filters + self.request['max_attach'] = max_attach def getRealTo(self, toField): """If someone wrote to `gettor+zh_CN(a)torproject.org', the `From:' field diff --git a/lib/gettor/responses.py b/lib/gettor/responses.py index 6a5adf7..6448f37 100644 --- a/lib/gettor/responses.py +++ b/lib/gettor/responses.py @@ -165,6 +165,11 @@ def getDelayAlertMsg(t, packageInfo): + t.gettext(i18n.GETTOR_TEXT[39]) + "\n\n" \ + getSupportText(t) +def getSorrySizeMsg(t, packageInfo): + return getGreetingText(t) \ + + t.gettext(i18n.GETTOR_TEXT[65] % packageInfo) + "\n\n" \ + + getSupportText(t) + def getNoSplitAvailable(t): return getGreetingText(t) \ + t.gettext(i18n.GETTOR_TEXT[1]) + "\n\n" \ @@ -210,7 +215,27 @@ class Response: if self.reqInfo['split']: return self.sendSplitPackage() else: - return self.sendPackage() + # Check if the user's allowed attachment size is okay. + if self.attachmentSizeOk(self.reqInfo['package'], self.reqInfo['max_attach']): + return self.sendPackage() + else: + return self.sendSorrySize() + + def attachmentSizeOk(self, package, max_attach): + """Check if the user is allowed to receive a certain attachment size-wise. + """ + if max_attach == 0: + return True + + try: + package_path = os.path.join(self.config.BASEDIR, "packages", package + ".z") + package_size = os.path.getsize(package_path) + if package_size <= max_attach: + return True + except OSError: + log.error("Ugh, this is bad. package %s isnt available!" % package_path) + + return False def isAllowed(self): """Do all checks necessary to decide whether the reply-to user is @@ -365,7 +390,19 @@ class Response: logging.info("Sending delay alert to %s" % self.reqInfo['hashed_user']) return self.sendTextEmail(getDelayAlertMsg(self.t, packageInfo)) - + + + def sendSorrySize(self): + """Send a polite note that the user's provider doesn't support the + attachment size necessary for a given package. + """ + if self.isBlacklistedForMessageType("sendSorrySize"): + # Don't send anything + return False + + logging.info("Sending sorry size email to %s" % self.reqInfo['hashed_user']) + return self.sendTextEmail(getSorrySizeMsg(self.t, self.reqInfo['package'])) + def sendHelp(self): """Send a help mail. This happens when a user sent us a request we didn't really understand diff --git a/lib/gettor/utils.py b/lib/gettor/utils.py index c06e40f..edcd945 100644 --- a/lib/gettor/utils.py +++ b/lib/gettor/utils.py @@ -298,6 +298,25 @@ def removeFromListByRegex(l, string): return l +def getBase64Size(unencoded_size): + """Return the number of bytes a given byte sequence will expand to if it + is base64 (MIME) encoded. + + Source for the formula: Wikipedia + """ + return (unencoded_size + 814) * 1.37 + +def getMaxAttSize(addr, config): + """Return the maximum attachment size allowed for a certain email + provider. If the provider isn't known by us, return 0, indicating + an unlimited attachment size. + """ + (_, domain) = emailGetLocalAndDomainPart(addr) + if domain in config.PROVIDER_ATTACHMENT_SIZES: + return config.PROVIDER_ATTACHMENT_SIZES[domain] * 1024 * 1024 + else: + return 0 + # The following code is more or less taken from BridgeDB class BadEmail(Exception): @@ -355,10 +374,10 @@ def extractAddrSpec(addr): localpart, domain = m.groups() return localpart, domain -def normalizeEmail(addr): - """Given the contents of a from line, and a map of supported email - domains (in lowercase), raise BadEmail or return a normalized - email address. +def emailGetLocalAndDomainPart(addr): + """For a given email address, return a touple of localpart, domainpart. + Example: + bla(a)foo.org -> bla, foo.org """ addr = addr.lower() localpart, domain = extractAddrSpec(addr) @@ -369,5 +388,10 @@ def normalizeEmail(addr): localpart = localpart[:idx] localpart = localpart.replace(".", "") - return "%s@%s"%(localpart, domain) + return localpart, domain + +def normalizeEmail(addr): + """Return normalized email address. + """ + return "%s@%s" % emailGetLocalAndDomainPart(addr)

1 0

[gettor/master] Merge remote branch 'kaner/bug3920'
by kaner＠torproject.org 24 Oct '11

24 Oct '11

commit 734da4b28746bbcd34710ea59e83ba480281d2fe Merge: 4ce8743 1ebe00e Author: Christian Fromme <kaner(a)strace.org> Date: Mon Oct 24 17:39:54 2011 +0200 Merge remote branch 'kaner/bug3920' gettor.conf | 5 +++++ lib/gettor/i18n.py | 10 +++++++++- lib/gettor/requests.py | 4 +++- lib/gettor/responses.py | 41 +++++++++++++++++++++++++++++++++++++++-- lib/gettor/utils.py | 34 +++++++++++++++++++++++++++++----- 5 files changed, 85 insertions(+), 9 deletions(-)

1 0

[gettor/master] Send out the short user manual together with GetTor packages.
by kaner＠torproject.org 24 Oct '11

24 Oct '11

commit 96948a01265142e39022a704dfb228ab3dbb6696 Author: Christian Fromme <kaner(a)strace.org> Date: Wed Oct 19 21:43:24 2011 +0200 Send out the short user manual together with GetTor packages. Fixes #4163. --- lib/gettor/packages.py | 12 ++++++++++++ lib/gettor/responses.py | 26 ++++++++++++++++++++++++++ lib/gettor/utils.py | 3 +++ 3 files changed, 41 insertions(+), 0 deletions(-) diff --git a/lib/gettor/packages.py b/lib/gettor/packages.py index cbfddb4..0f205c1 100644 --- a/lib/gettor/packages.py +++ b/lib/gettor/packages.py @@ -11,6 +11,7 @@ import gettor.config import gettor.utils import re import glob +import shutil # Stolen from Mike's TorCtl: class RouterVersion: @@ -60,6 +61,7 @@ class Packages: self.packageList = {} self.distDir = os.path.join(config.BASEDIR, "dist") self.packDir = os.path.join(config.BASEDIR, "packages") + self.docDir = os.path.join(config.BASEDIR, "doc") self.initRsync(config.RSYNC_MIRROR, silent) self.packageList = config.PACKAGES @@ -194,6 +196,16 @@ class Packages: logging.debug("All split files for package %s created." % pack) return True + def copyManuals(self): + """Copy the short user manuals to their destination directory + """ + manualDir = os.path.join(self.distDir, "manual") + gettor.utils.createDir(self.docDir) + for f in glob.glob(os.path.join(manualDir, "*.xhtml")): + copyTo = os.path.join(self.docDir, os.path.basename(f)) + shutil.copyfile(f, copyTo) + logging.debug("%s copied." % f) + def getPart(self, fileName): """Helper function: Extract the `partXX' part of the file name. """ diff --git a/lib/gettor/responses.py b/lib/gettor/responses.py index 6a5adf7..94d8400 100644 --- a/lib/gettor/responses.py +++ b/lib/gettor/responses.py @@ -260,6 +260,7 @@ class Response: f = os.path.join(self.config.BASEDIR, "packages", pack + ".z") txt = getPackageMsg(self.t) msg = self.makeMsg(txt, to, fileName=f) + msg = self.addUserManual(msg, self.reqInfo['locale']) try: status = self.sendEmail(to, msg) except: @@ -431,6 +432,31 @@ class Response: return message + def addUserManual(self, message, lang="en"): + """Add the short user manual to an existing message. + """ + docDir = os.path.join(self.config.BASEDIR, "doc") + mName = "short-user-manual_" + lang + ".xhtml" + docName = os.path.join(docDir, mName) + if not os.access(docName, os.R_OK): + # Fall back to english if a certain locale isn't + # available + mName = "short-user-manual_en.xhtml" + docName = os.path.join(docDir, mName) + if os.access(docName, os.R_OK): + filePart = MIMEBase("application", "xhtml") + fp = open(docName, 'rb') + filePart.set_payload(fp.read()) + fp.close() + encoders.encode_base64(filePart) + # Add file part + filePart.add_header('Content-Disposition', 'attachment', filename=mName) + message.attach(filePart) + else: + logging.error("Could not open manual file %d" % docName) + + return message + def sendEmail(self, sendTo, message, smtpserver="localhost:25"): """Send out message via STMP. If an error happens, be verbose about the reason diff --git a/lib/gettor/utils.py b/lib/gettor/utils.py index c06e40f..6ac754b 100644 --- a/lib/gettor/utils.py +++ b/lib/gettor/utils.py @@ -85,6 +85,9 @@ def prepPackages(conf): if not packs.buildPackages(): return False + # Copy the short user manual + packs.copyManuals() + logging.debug("Building packages done.") return True

1 0

[gettor/master] Merge branch 'bug4163'
by kaner＠torproject.org 24 Oct '11

24 Oct '11

commit 635bcc5f011a851673cca2e3a2445314055ce390 Merge: 734da4b 96948a0 Author: Christian Fromme <kaner(a)strace.org> Date: Mon Oct 24 17:43:12 2011 +0200 Merge branch 'bug4163' lib/gettor/packages.py | 12 ++++++++++++ lib/gettor/responses.py | 26 ++++++++++++++++++++++++++ lib/gettor/utils.py | 3 +++ 3 files changed, 41 insertions(+), 0 deletions(-)

1 0

[tor/master] Don't initialize desc stats for non-bridgedirauth nodes
by nickm＠torproject.org 24 Oct '11

24 Oct '11

commit f885c605013bd72970159aad92ad9d9f64395a0c Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Mon Oct 24 12:51:00 2011 +0200 Don't initialize desc stats for non-bridgedirauth nodes Also make sure that calling rep_hist_note_desc_served() while stats aren't initialized just returns. Bug spotted by SwissTorHelp. Thanks! --- src/or/config.c | 3 ++- src/or/rephist.c | 2 ++ 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 627e1ac..40ce258 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1578,7 +1578,8 @@ options_act(const or_options_t *old_options) options->ConnDirectionStatistics) { rep_hist_conn_stats_init(now); } - if (!old_options || !old_options->BridgeAuthoritativeDir) { + if ((!old_options || !old_options->BridgeAuthoritativeDir) && + options->BridgeAuthoritativeDir) { rep_hist_desc_stats_init(now); print_notice = 1; } diff --git a/src/or/rephist.c b/src/or/rephist.c index 1aa0aeb..f8ebe64 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -2712,6 +2712,8 @@ rep_hist_desc_stats_write(time_t now) void rep_hist_note_desc_served(const char * desc) { + if (!served_descs) + return; // We're not collecting stats digestmap_set(served_descs, desc, (void *)1); total_descriptor_downloads++; }

1 0

[tor/master] Merge remote-tracking branch 'sebastian/bug4293'
by nickm＠torproject.org 24 Oct '11

24 Oct '11

commit ea0518f209959250dd07272d739a6d9aa9531444 Merge: d5bb0d7 f885c60 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 24 10:21:09 2011 -0400 Merge remote-tracking branch 'sebastian/bug4293' src/or/config.c | 3 ++- src/or/rephist.c | 2 ++ 2 files changed, 4 insertions(+), 1 deletions(-)

1 0