- tor-commits - lists.torproject.org

r24261: {website} Revise the GeoIP project idea slightly (website/trunk/getinvolved/en)
by Robert Ransom 23 Feb '11

23 Feb '11

Author: rransom Date: 2011-02-23 13:16:10 +0000 (Wed, 23 Feb 2011) New Revision: 24261 Modified: website/trunk/getinvolved/en/volunteer.wml Log: Revise the GeoIP project idea slightly Modified: website/trunk/getinvolved/en/volunteer.wml =================================================================== --- website/trunk/getinvolved/en/volunteer.wml 2011-02-23 13:15:41 UTC (rev 24260) +++ website/trunk/getinvolved/en/volunteer.wml 2011-02-23 13:16:10 UTC (rev 24261) @@ -759,7 +759,8 @@ Currently, Tor bridges and relays read an entire IP->country database into memory from a text file during startup. We would like to distribute this database and store it on disk in a much more compact - form if possible. + form, and perform IP->country lookups on it in its on-disk format if + possible. We have <a href='https://trac.torproject.org/projects/tor/ticket/2506'>a sketch of a design</a> for a moderately optimized format for IPv4 GeoIP data; this project will involve both implementing the IPv4 format and

1 0

r24262: {website} switch the suggested signature to erinn's. (website/trunk/docs/en)
by Andrew Lewman 23 Feb '11

23 Feb '11

Author: phobos Date: 2011-02-23 13:16:10 +0000 (Wed, 23 Feb 2011) New Revision: 24262 Modified: website/trunk/docs/en/verifying-signatures.wml Log: switch the suggested signature to erinn's. Modified: website/trunk/docs/en/verifying-signatures.wml =================================================================== --- website/trunk/docs/en/verifying-signatures.wml 2011-02-23 13:16:10 UTC (rev 24261) +++ website/trunk/docs/en/verifying-signatures.wml 2011-02-23 13:16:10 UTC (rev 24262) @@ -54,7 +54,7 @@ <hr> The next step is to import the key. This can be done directly from GnuPG. Make sure you import the correct key. For example, if you - downloaded a Windows package, you will need to import Andrew's key. + downloaded a Windows package, you will need to import Erinn's key. Windows: GnuPG for Windows is a command line tool, and you will need to use

1 0

r24260: {website} Add two more project ideas to the volunteer page (website/trunk/getinvolved/en)
by Robert Ransom 23 Feb '11

23 Feb '11

Author: rransom Date: 2011-02-23 13:15:41 +0000 (Wed, 23 Feb 2011) New Revision: 24260 Modified: website/trunk/getinvolved/en/volunteer.wml Log: Add two more project ideas to the volunteer page Modified: website/trunk/getinvolved/en/volunteer.wml =================================================================== --- website/trunk/getinvolved/en/volunteer.wml 2011-02-23 11:55:04 UTC (rev 24259) +++ website/trunk/getinvolved/en/volunteer.wml 2011-02-23 13:15:41 UTC (rev 24260) @@ -614,6 +614,36 @@ TBB, please contact Erinn. </li> + <a id="firewallProbeTool"></a> + <li> + Develop a fully automatic firewall-probing system + + Priority: High + + Effort Level: Medium to High + + Skill Level: High + + Likely Mentors: Robert Ransom, Nick, Jacob + We would like to have a fully automatic firewall-probing system for + blocking systems with no long-term state (i.e. firewalls that can + examine each connection, but do not change their behaviour for future + connections based on the traffic they have seen). + Ideally, volunteers would only need to set up one or more test servers, + and run the probe client program on a publicly accessible computer + behind the firewall. + The test tool should: + <ul> + <li>generate packet captures on both ends (and send them out to the + extent possible),</li> + <li>cycle through all the SSL configurations we might want to test + through a censorship device, and</li> + <li>also test some other protocols to see whether they are allowed + through the firewall (IMAP and other mail protocols, BitTorrent, + DTLS, etc.).</li> + </ul> + </li> + <a id="tailsStartMenu"></a> <li> Custom GDM3 startup menu, aka. tails-greeter @@ -715,6 +745,27 @@ robustness. </li> + <a id="geoIPUpgrade"></a> + <li> + Improve our GeoIP file format + + Priority: Medium + + Effort Level: Medium + + Skill Level: Medium to High + + Likely Mentors: Robert Ransom + Currently, Tor bridges and relays read an entire IP->country database + into memory from a text file during startup. We would like to + distribute this database and store it on disk in a much more compact + form if possible. + We have <a href='https://trac.torproject.org/projects/tor/ticket/2506'>a + sketch of a design</a> for a moderately optimized format for IPv4 GeoIP + data; this project will involve both implementing the IPv4 format and + designing and implementing a format for IPv6 GeoIP data. + </li> + <a id="armClientMode"></a> <li> Client Mode Use Cases for Arm

1 0

[metrics-db/master] Import GetTor stats directly into the database.
by karsten＠torproject.org 23 Feb '11

23 Feb '11

commit d217212943b2d1c8690c54a50021ee085acbf6c3 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Feb 23 13:24:30 2011 +0100 Import GetTor stats directly into the database. --- src/org/torproject/ernie/db/Configuration.java | 5 ++++ src/org/torproject/ernie/db/GetTorProcessor.java | 24 ---------------------- 2 files changed, 5 insertions(+), 24 deletions(-) diff --git a/src/org/torproject/ernie/db/Configuration.java b/src/org/torproject/ernie/db/Configuration.java index 37676ec..8b0fc1f 100644 --- a/src/org/torproject/ernie/db/Configuration.java +++ b/src/org/torproject/ernie/db/Configuration.java @@ -252,6 +252,11 @@ public class Configuration { + "least one data sink, but we don't have a single data source " + "containing bridge descriptors."); } + if (this.downloadProcessGetTorStats && + !this.writeAggregateStatsDatabase) { + logger.warning("We are configured to download GetTor statistics, " + + "but not to import them into the database."); + } } public boolean getWriteConsensusStats() { return this.writeConsensusStats; diff --git a/src/org/torproject/ernie/db/GetTorProcessor.java b/src/org/torproject/ernie/db/GetTorProcessor.java index ed1b7ff..8c5687c 100644 --- a/src/org/torproject/ernie/db/GetTorProcessor.java +++ b/src/org/torproject/ernie/db/GetTorProcessor.java @@ -65,30 +65,6 @@ public class GetTorProcessor { return; } - File statsFile = new File("stats/gettor-stats"); - logger.fine("Writing file " + statsFile.getAbsolutePath() + "..."); - try { - statsFile.getParentFile().mkdirs(); - BufferedWriter bw = new BufferedWriter(new FileWriter(statsFile)); - bw.write("date"); - for (String column : columns) { - bw.write("," + column); - } - bw.write("\n"); - for (String date : data.keySet()) { - bw.write(date); - for (String column : columns) { - Integer value = data.get(date).get(column); - bw.write("," + (value == null ? "NA" : value)); - } - bw.write("\n"); - } - bw.close(); - } catch (IOException e) { - logger.log(Level.WARNING, "Failed writing " - + statsFile.getAbsolutePath() + "!", e); - } - /* Write results to database. */ if (connectionURL != null) { try {

1 0

r4520: Fixes messagelog drawing problem, wrt ticket #2093 (vidalia/trunk/src/vidalia/log)
by vidalia-svn＠svn.torproject.org 23 Feb '11

23 Feb '11

Author: chiiph Date: 2011-02-23 12:20:10 +0000 (Wed, 23 Feb 2011) New Revision: 4520 Modified: vidalia/trunk/src/vidalia/log/MessageLog.cpp Log: Fixes messagelog drawing problem, wrt ticket #2093 Modified: vidalia/trunk/src/vidalia/log/MessageLog.cpp =================================================================== --- vidalia/trunk/src/vidalia/log/MessageLog.cpp 2011-02-17 20:28:26 UTC (rev 4519) +++ vidalia/trunk/src/vidalia/log/MessageLog.cpp 2011-02-23 12:20:10 UTC (rev 4520) @@ -454,6 +454,7 @@ void MessageLog::log(tc::Severity type, const QString &message) { + setUpdatesEnabled(false); /* Only add the message if it's not being filtered out */ if (_filter & (uint)type) { /* Add the message to the list and scroll to it if necessary. */ @@ -472,6 +473,7 @@ _logFile << item->toString() << "\n"; } } + setUpdatesEnabled(true); } /** Displays help information about the message log. */

1 0

r24259: {} gettor moved to git (projects/gettor)
by Sebastian Hahn 23 Feb '11

23 Feb '11

Author: sebastian Date: 2011-02-23 11:55:04 +0000 (Wed, 23 Feb 2011) New Revision: 24259 Added: projects/gettor/README-THIS-REPO-HAS-MOVED-TO-GIT.TXT Removed: projects/gettor/GetTor.py projects/gettor/LICENSE projects/gettor/MANIFEST.in projects/gettor/MakeStat.py projects/gettor/README projects/gettor/README.USER-HOWTO projects/gettor/README.locale-spec-draft projects/gettor/TODO projects/gettor/lib/ projects/gettor/po/ projects/gettor/sample-emails/ projects/gettor/sample-gettorrc projects/gettor/setup.cfg projects/gettor/setup.py Log: gettor moved to git Deleted: projects/gettor/GetTor.py =================================================================== --- projects/gettor/GetTor.py 2011-02-23 00:21:44 UTC (rev 24258) +++ projects/gettor/GetTor.py 2011-02-23 11:55:04 UTC (rev 24259) @@ -1,129 +0,0 @@ -#!/usr/bin/python2.5 -# -*- coding: utf-8 -*- - -__program__ = 'GetTor.py' -__url__ = 'https://svn.torproject.org/svn/projects/gettor' -__author__ = 'Jacob Appelbaum <jacob(a)appelbaum.net>, Christian Fromme <kaner(a)strace.org>' -__copyright__ = 'Copyright (c) 2008, 2009, The Tor Project' -__license__ = 'See LICENSE for licensing information' - -try: - from future import antigravity -except ImportError: - antigravity = None - -import sys - -import gettor.gtlog -import gettor.opt -import gettor.config -import gettor.requests -import gettor.responses -import gettor.utils - -log = gettor.gtlog.getLogger() - -def processFail(conf, rawMessage, reqval, failedAction, e=None): - """This routine gets called when something went wrong with the processing - """ - log.error("Failing to " + failedAction) - if e is not None: - log.error("Here is the exception I saw: %s" % sys.exc_info()[0]) - log.error("Detail: %s" %e) - # Keep a copy of the failed email for later reference - log.info("We'll keep a record of this mail.") - gettor.utils.dumpMessage(conf, rawMessage) - # Send out notification to user, if possible - #if reqval.toField != "" or reqval.sendTo != "": - # if not gettor.responses.sendNotification(conf, reqval.toField, reqval.sendTo): - # log.error("Also failed to send the user a proper notification. :-/") - # else: - # log.info("Failure notification sent to user %s" % reqval.sendTo) - -def dumpInfo(reqval): - """Dump some info to the logfile - """ - log.info("Request From: %s To: %s Package: %s Lang: %s Split: %s Signature: %s Cmdaddr: %s" % (reqval.replyTo, reqval.toField, reqval.pack, reqval.lang, reqval.split, reqval.sign, reqval.cmdAddr)) - -def processMail(conf): - """All mail processing happens here. Processing goes as follows: - - Parse request. This means: Find out everything we need to reply in - an appropriate manner. Reply address, language, package name. - Also try to find out if the user wants split packages and if he has - a valid signature on his mail. - - Send reply. Use all information gathered from the request and pass - it on to the reply class/method to decide what to do. - """ - rawMessage = "" - reqval = None - log.info("Processing mail..") - # Retrieve request from stdin and parse it - try: - request = gettor.requests.requestMail(conf) - rawMessage = request.getRawMessage() - # reqval contains all important information we need from the request - reqval = request.parseMail() - dumpInfo(reqval) - except Exception, e: - processFail(conf, rawMessage, reqval, "process request", e) - return False - - # Ok, request information aquired. Initiate reply sequence - try: - reply = gettor.responses.Response(conf, reqval) - if not reply.sendReply(): - processFail(conf, rawMessage, reqval, "send reply") - return False - return True - except Exception, e: - processFail(conf, rawMessage, reqval, "send reply (got exception)", e) - return False - -def processOptions(options, conf): - """Do everything that's not part of parsing a mail. Prepare GetTor usage, - install files, fetch packages, do some black/whitelist voodoo and so on - """ - # Order matters! - if options.insttrans: - m = gettor.utils.installTranslations(conf, options.i18ndir) - if options.fetchpackages: - gettor.utils.fetchPackages(conf, options.mirror) - if options.preppackages: - gettor.utils.prepPackages(conf) - if options.installcron: - gettor.utils.installCron() - if options.whitelist: - gettor.utils.addWhitelistEntry(conf, options.whitelist) - if options.blacklist: - gettor.utils.addBlacklistEntry(conf, options.blacklist) - if options.lookup: - gettor.utils.lookupAddress(conf, options.lookup) - if options.clearwl: - gettor.utils.clearWhitelist(conf) - if options.days: - gettor.utils.clearBlacklist(conf, options.days) - if options.cmdpass: - gettor.utils.setCmdPassword(conf, options.cmdpass) - -def main(): - """Parse command line, setup config and logging - """ - options, arguments = gettor.opt.parseOpts() - config = gettor.config.Config(options.configfile) - gettor.gtlog.initialize() - - if sys.stdin.isatty(): - # We separate this because we need a way to know how we reply to the - # caller: Send mail or just dump to stdout/stderr. - processOptions(options, config) - else: - # We've got mail - if processMail(config): - log.info("Processing mail finished") - else: - log.error("Processing mail failed") - - log.info("Done.") - -if __name__ == "__main__": - main() Deleted: projects/gettor/LICENSE =================================================================== --- projects/gettor/LICENSE 2011-02-23 00:21:44 UTC (rev 24258) +++ projects/gettor/LICENSE 2011-02-23 11:55:04 UTC (rev 24259) @@ -1,31 +0,0 @@ -gettor is distributed under this license: - -Copyright (c) 2008, The Tor Project, Inc. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - - * Redistributions of source code must retain the above copyright -notice, this list of conditions and the following disclaimer. - - * Redistributions in binary form must reproduce the above -copyright notice, this list of conditions and the following disclaimer -in the documentation and/or other materials provided with the -distribution. - - * Neither the names of the copyright owners nor the names of its -contributors may be used to endorse or promote products derived from -this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Deleted: projects/gettor/MANIFEST.in =================================================================== --- projects/gettor/MANIFEST.in 2011-02-23 00:21:44 UTC (rev 24258) +++ projects/gettor/MANIFEST.in 2011-02-23 11:55:04 UTC (rev 24259) @@ -1,2 +0,0 @@ -include README TODO README.USER-HOWTO README.locale-spec-draft -recursive-include po * Deleted: projects/gettor/MakeStat.py =================================================================== --- projects/gettor/MakeStat.py 2011-02-23 00:21:44 UTC (rev 24258) +++ projects/gettor/MakeStat.py 2011-02-23 11:55:04 UTC (rev 24259) @@ -1,130 +0,0 @@ -#!/usr/bin/python - - -import sys -import os -import re -import string - -def emptyPacks(packs): - for k, v in packs.iteritems(): - packs[k] = 0 - return packs - -def makestats(filename, days): - day = None - pack = None - lang = None - packages = {"None": 0, - "tor-browser-bundle": 0, - "tor-im-browser-bundle": 0, - "tor-browser-bundle_en": 0, - "tor-im-browser-bundle_en": 0, - "tor-browser-bundle_de": 0, - "tor-im-browser-bundle_de": 0, - "tor-browser-bundle_ar": 0, - "tor-im-browser-bundle_ar": 0, - "tor-browser-bundle_es": 0, - "tor-im-browser-bundle_es": 0, - "tor-browser-bundle_fa": 0, - "tor-im-browser-bundle_fa": 0, - "tor-browser-bundle_fr": 0, - "tor-im-browser-bundle_fr": 0, - "tor-browser-bundle_it": 0, - "tor-im-browser-bundle_it": 0, - "tor-browser-bundle_nl": 0, - "tor-im-browser-bundle_nl": 0, - "tor-browser-bundle_pl": 0, - "tor-im-browser-bundle_pl": 0, - "tor-browser-bundle_pt": 0, - "tor-im-browser-bundle_pt": 0, - "tor-browser-bundle_ru": 0, - "tor-im-browser-bundle_ru": 0, - "tor-browser-bundle_zh_CN": 0, - "tor-im-browser-bundle_zh_CN": 0, - "source-bundle": 0, - "macosx-ppc-bundle": 0, - "macosx-i386-bundle": 0} - - try: - logFile = open(filename, 'r') - except: - print "Couldn't open logfile %s" % filename - sys.exit(1) - readData = logFile.read().split('\n') - for line in readData: - match = re.match(".*Request from.*cmdaddr None.*", line, re.DOTALL) - if match: - splitline = string.split(line) - if len(splitline) > 12: - day = splitline[0] - pack = splitline[7] - lang = splitline[9] - if not re.match("[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]", day): - continue - pack = pack.strip(',') - lang = lang.strip(',') - if day in days: - packs = days[day] - else: - packs = emptyPacks(packages).copy() - if pack is not None: - if pack in packs: - packs[pack] += 1 - days[day] = packs - else: - match = re.match(".*Request From.*Cmdaddr: None.*", line, re.DOTALL) - if match: - splitline = string.split(line) - if len(splitline) > 12: - day = splitline[0] - pack = splitline[9] - lang = splitline[11] - if not re.match("[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]", day): - continue - pack = pack.strip(',') - lang = lang.strip(',') - if day in days: - packs = days[day] - else: - packs = emptyPacks(packages).copy() - if pack is not None: - if pack in packs: - packs[pack] += 1 - days[day] = packs - -def printStatsStdout(days): - for day in sorted(days.iterkeys()): - packs = days[day] - daystr = "%s -" % day - print daystr, - for pack in sorted(packs.iterkeys()): - packstr = "%s:%s" % (pack, packs[pack]) - print packstr, - print "" - -def printStatsGNUPlot(days): - for day in sorted(days.iterkeys()): - packs = days[day] - print day, - for pack in sorted(packs.iterkeys()): - print packs[pack], - print "" - -def main(): - days = {} - - if len(sys.argv) < 2: - print >> sys.stderr, "Usage: %s LOGDIR" % sys.argv[0] - sys.exit(1) - for arg in sys.argv: - if not os.path.isfile(arg): - print >> sys.stderr, "Not a file: %s" % arg - sys.exit(1) - makestats(arg, days) - - printStatsStdout(days) - #printStatsGNUPlot(days) - -if __name__ == "__main__": - main() Deleted: projects/gettor/README =================================================================== --- projects/gettor/README 2011-02-23 00:21:44 UTC (rev 24258) +++ projects/gettor/README 2011-02-23 11:55:04 UTC (rev 24259) @@ -1,262 +0,0 @@ -OVERVIEW --------- -GetTor is a program for serving Tor and related files over SMTP. Users interact -with GetTor by sending it email. - -The following document explains how to setup GetTor for a server admin. - -PREREQUISITES -------------- - -To deploy GetTor, you'll want a machine that invokes .forward files -for users. You'll also want to have python (>= 2.5) and rsync installed. - -There are some limits with smtp software for outgoing email sizes. You should -check your software to ensure that you can send files that are as large -as the largest files Tor distributes. For postfix, you may want to have a line -that looks like the following in /etc/postfix/main.cf: - - message_size_limit = 50360000 - -In Exim, the default message size is now 50MB, which should be sufficient. The -value is also adaptable through the config file parameter 'message_size_limit' -in case you need to. - -SETUP ------ - -This setup descripton presumes that you have access to the latest gettor svn -trunk somewhere in your local file system. - - gettor@moria:~/tmp$ svn co https://freehaven.net/svn/projects/gettor gettor - -After checking out the GetTor source code, you will need to install everything -as follows: - - gettor@moria:~/tmp$ cd gettor/ - gettor@moria:~/tmp/gettor$ python setup.py install - -This will copy necessary files to ~/opt/gettor. - -Next, configure your ~/.gettorrc file (see "Configuration", below). - -After that, you will want to ensure that you have a properly configured set -of mo files for each translation. Generate and install mo files as follows: - - gettor@moria:~/tmp/gettor$ cd ~/opt/gettor - gettor@moria:~/opt/gettor$ ./GetTor.py -r - -You'll see something like this upon success: - - 2009-06-21 20:06:01,324 (6136) Installing translation files done. - -Once you have everything installed, you'll want to initialize the file store: - - gettor@moria:~/opt/gettor$ ./GetTor.py -fp - -You should see an rsync and finally something like: - - sent 1637 bytes received 415792532 bytes 9558486.64 bytes/sec - total size is 415735925 speedup is 1.00 - 2009-01-05 16:49:29,226 (9222) Syncing Tor packages done. - 2009-01-05 16:49:30,155 (9222) Building packages done. - -Now you'll install the cronjob. This clears the blacklist and updates packages -daily: - - gettor@moria:~/opt/gettor$ ./GetTor.py -i - 2009-01-05 17:34:53,911 (16646) Installing cron donee - -Set up a password for package forwarding commands if you wish to use that -feature: - - gettor@moria:~/opt/gettor$ ./GetTor.py -s seCreTpAssworD - -Finally, you need to setup email forwarding to the GetTor bot like so: - - gettor@moria:~$ echo "|/home/gettor/opt/gettor/GetTor.py" > ~/.forward - -Now GetTor.py is installed, prepared and ready to serve files. Send it email! - -TRANSLATION FILES ------------------ -Provided there is a working locale environment, GetTor will compile and setup -locale files for you as follows: - - gettor@moria:~/opt/gettor$ ./GetTor.py -r - 2009-01-08 12:18:09,041 (19287) Installing translation files done. - -You can also configure the .mo files to live in another place by telling GetTor -so in the config file, for example: - - localeDir = /home/gettor/gettor/po - -This will result in GetTor expecting the English .mo file in the directory - - /home/gettor/gettor/po/en/gettor.mo - -Also, in case your .po files for some reason live in a different directory -than po/ (relative to GetTor.py, as provided by GetTor), you can tell this -to GetTor as follows: - - gettor@moria:~/opt/gettor$ ./GetTor.py -r -d /path/to/my/pofiles/directory - -Note that GetTor will expect the same directory structure as provided under -po/ in the GetTor source package, e.g. 'po/en/gettor.po', -'po/de/gettor.po', and so on. - -To add a new language to GetTor, one must create a new .po file in subversion -in the proper directory. For Korean, one would create po/ko/ and add the -untranslated file (called gettor.po) to that directory. This file should be -translated but partial translations are allowed. Once this file has been -created, the GetTor program does not need to be modified. - -However, if a user wished to add support in responses to users, they will need -to modiy the 'requests.py' file like so: - - defaultLang = "en" - supportedLangs = { "en": "English",· - "ko": "Korean",· - "de": "Deutsch" } - -CONFIGURATION -------------- -A proper GetTor configuration file is expected in the user's home directory -and should look like this: - - gettor@moria:~$ cat .gettorrc - [global] - stateDir = /home/gettor/gettor/state/ - blStateDir = /home/gettor/gettor/bl/ - wlStateDir = /home/gettor/gettor/wl/ - distDir = /home/gettor/gettor/distdir/ - packDir = /home/gettor/gettor/packdir/ - locale = en - logSubSystem = stdout - logFile = /home/gettor/gettor/logs/logfile - localeDir = /home/gettor/gettor/po/ - cmdPassFile = /home/gettor/gettor/pass - dumpFile = /home/gettor/gettor/failedmails - -You can leave any of these lines out, and it will choose a suitable -default. - -Here is what each of them is used for individually: - -blStateDir: Blacklisted (hashed) email addresses go here -wlStateDir: Whitelisted (hashed) email addresses go here -distDir: Pristine Tor packages as downloaded by rsync will be found here -packDir: Processed Tor packages ready to be handed out to the user will - be found here -srcEmail: The email containing the Tor package will use this as 'From:' -locale: Choose your default mail locale -logFile: If 'file' logging is chosen, log to this file -logSubSystem: This has to be one of the following strings: - 'nothing': Nothing is logged anywhere (Recommended) - 'stdout': Log to stdout - 'syslog': Log messages will be written to syslog - 'file': Log messages will be written to a file (Not that - this needs the 'logFile' option in the config file - also set to something useful -localeDir: This is where the 'en/LC_MESSAGES/gettor.mo' or - 'whateverlang/LC_MESSAGES/gettor.mo' should go -cmdPassFile: The file containing the hashed command password -dumpFile: All failed mails are recorded here - -WHAT'S DKIM / WHY DKIM? ------------------------ - -People who send mail to gettor need to either use a mail provider that -signs outgoing mail with DKIM, or have their email address or domain -added to the whitelist. - -"DomainKeys Identified Mail", aka DKIM, is a mechanism that lets the mail -provider prove that the mail is really coming from the domain and sender -it claims to be from. - -Currently GMail and Yahoo both support DKIM, along with other more -esoteric domains like paypal, AOL, earthlink, linkedin, etc. You can -check if your mail provider uses DKIM by examining the headers of emails -you send. If there's a "DomainKey-Signature:" header, then you're in -good shape. - -If we didn't check the DKIM signature, people could abuse gettor into -mailbombing innocent email addresses -- one short email resulting in a -15MB attachment sent to an address of their choice is quite an attack -multiplier. - -There are a few other alternative options (for example, Microsoft uses its -own proprietary design called 'Sender ID'), but since GMail is already -very common for users in blocked countries, we figured DKIM was a good -starting point. - -And last, be aware that the set of domains that technically support -DKIM is probably not exactly the same set that we should recommend for -our users, due to other properties of each mail provider like their -privacy policies. - -VALIDATION OF REQUESTED FILES ------------------------------ - -When a user submits a successful request, GetTor will respond with an email -that has one attachment. This attachment is a zip file with a .z file -extension. The compressed file currently consists of two files: the requested -tool and a gpg signature from the packager of the respective file. - -FILE SIZE ISSUES ----------------- - -Some email providers may not be happy with the files GetTor sends. -Gmail provides documentation of their incoming and outgoing file sizes. It is -currently 20MB (though we have sent around 21MB without issue): - - http://mail.google.com/support/bin/answer.py?hl=en&answer=8770 - -Other providers are not as transparent and this may cause failures. - -SPAM / ABUSE PREVENTION ------------------------------- - -GetTor does some spam/abuse prevention. This is primarily because we don't want -to hammer innocent inboxes with huge amounts of tor packages. - -First of all, there is a DKIM checker (see "WHAT'S DKIM / WHY DKIM" above) that -prevents GetTor from answering useless spam emails. On top of that, there are -some hard-coded checks being performed on the sender address. Only mails coming -from yahoo.com.cn, yahoo.com and gmail.com are allowed. However, DKIM checking -and hard-coded domain checks are currently disabled in GetTor. Mails from all -addresses are being passed to GetTor processing. - -On top of that, there is a blacklisting mechanism. It works as follows: Each -unique email address is allowed to mail GetTor the same type of mail once each -7 days. Mail types are sendDelayAlert, sendPackage, sendPackageHelp, -sendSplitPackage. Blacklists are stored in the form of hashed email files under -directories. In reality, that looks as follows: - - gettor@moria:~/opt/gettor$ ls -d /home/gettor/gettor/bl/* - /home/gettor/gettor/bl/general - /home/gettor/gettor/bl/sendPackage - /home/gettor/gettor/bl/sendSplitPackage - /home/gettor/gettor/bl/sendDelayAlert - /home/gettor/gettor/bl/sendPackageHelp - - gettor@moria:~/opt/gettor$ ls /home/gettor/gettor/bl/sendDelayAlert \ - | head -n 2 - 0154d8584c0afa6290e21098e7ab4cc635b7d50a - 02a33e16feece8671f1274de62de32068a67cf20 - -In addition to this automatic whitelisting, there is the possibility to add -blacklist entries by hand as follows: - - gettor@moria:~/opt/gettor$ ./GetTor.py -b someone(a)evil.org - -Email addresses that are added this way, go to the general/ directory in the -blacklist directory. - -Besides the blacklisting mechanism, there is a whitelisting mechanism. It works -analogous to the manual blacklisting mechanism: - - gettor@moria:~/opt/gettor$ ./GetTor.py -w someone(a)evil.org - -Whitelisting wins over blacklisting. If a user if blacklisted for X, but also -whitelisted, he will be allowed to do X. Added: projects/gettor/README-THIS-REPO-HAS-MOVED-TO-GIT.TXT =================================================================== --- projects/gettor/README-THIS-REPO-HAS-MOVED-TO-GIT.TXT (rev 0) +++ projects/gettor/README-THIS-REPO-HAS-MOVED-TO-GIT.TXT 2011-02-23 11:55:04 UTC (rev 24259) @@ -0,0 +1,5 @@ +This repo is now in git. You may view it either via the web: +https://gitweb.torproject.org/gettor + +Or clone it: +git://git.torproject.org/gettor.git Deleted: projects/gettor/README.USER-HOWTO =================================================================== --- projects/gettor/README.USER-HOWTO 2011-02-23 00:21:44 UTC (rev 24258) +++ projects/gettor/README.USER-HOWTO 2011-02-23 11:55:04 UTC (rev 24259) @@ -1,90 +0,0 @@ - -This document explains how a user may request Tor or Tor-related -software via email with the GetTor program. - -FINDING GETTOR --------------- - -It is assumed that a user has a method of finding a valid GetTor email robot. -Currently the best known GetTor email is gettor @ torproject.org. This should -be the most current stable GetTor robot as it is operated by the Tor Project. - - -REQUIREMENTS FOR USING GETTOR ------------------------------ - -Users communicate with the GetTor robot by sending messages via email. The -messages are currently English keywords. The user must use an email provider -that signs their email with DKIM. A user will be alerted if their email -provider is unsupported. - -USING GETTOR ------------- - -Currently, users have a limited set of options. It is best to send an email -with a message body (the subject line can be blank) that consists of only the -word 'help' to receive instructions. This will send the most current set of -choices. An example reply to a request for help follows: - - Hello, This is the "gettor" robot. - - I am sorry, but your request was not understood. Please select one of the - following package names: - - panther-bundle - source-bundle - windows-bundle - tiger-bundle - tor-browser-bundle - tor-im-browser-bundle - - Please send me another email. It only needs a single package name anywhere - in the body of your email. - -For example, it is possible to fetch the most current Windows bundle. A user may -send a request with only the word 'windows-bundle' in the body of the email. An -example reply would look something like the following: - - Hello! This is the "gettor" robot. - - Here's your requested software as a zip file. Please unzip the - package and verify the signature. - - Hint: If your computer has GnuPG installed, use the gpg - commandline tool as follows after unpacking the zip file: - - gpg --verify <packagename>.asc <packagename> - - The output should look somewhat like this: - - gpg: Good signature from "Roger Dingledine <arma(a)mit.edu>" - - If you're not familiar with commandline tools, try looking for - a graphical user interface for GnuPG on this website: - - http://www.gnupg.org/related_software/frontends.html - - Have fun. - -The email should also include an attachment with the name 'windows-bundle.z' -that can be downloaded by the user. The user must now unpack the zip file and -if they wish, they may verify that the file is from the Tor Project. - -UNPACKING AND VERIFYING THE REQUESTED FILES -------------------------------------------- - -A user should have software for decompressing .zip files. It will contain at -least two files, the requested bundle and its digital signature. Before a user -installs the bundle, they should verify the signature. - -Users should follow the most current instructions for signature verification -as detailed by the Tor Project website: - https://www.torproject.org/verifying-signatures.html - -INSTALLING THE REQUESTED FILES ------------------------------- - -After verifying that the file is valid, a user should simply run the program. -If a user requested the source code to Tor, we assume that they're able to -follow the build instructions contained within the source itself. - Deleted: projects/gettor/README.locale-spec-draft =================================================================== --- projects/gettor/README.locale-spec-draft 2011-02-23 00:21:44 UTC (rev 24258) +++ projects/gettor/README.locale-spec-draft 2011-02-23 11:55:04 UTC (rev 24259) @@ -1,61 +0,0 @@ -OVERVIEW --------- - -This document explains how GetTor handles locale parsing for both the operator -and the end of user of GetTor. This allows non-English speaking users to -operate GetTor in their language and to serve users in all other supported -languages. It is currently a draft and will be reformatted, rewritten and -changed until further notice. - -LOCALES FOR END USERS ---------------------- - -Users should be able to send an indicator that they wish to have a localized -response. All responses will be localized and localized binaries will be sent. - -SUPPORTED LOCALES ------------------ - -All supported locales will be advertised by gettor in all emails. - -LOW TECH LOCALE PARSING ------------------------ - -If no locale is specified, GetTor will default to English in the locale 'en-US' -for all output. - -If a user wishes, they may set the locale for all responses. The locale must be -passed by the end user as a single line. The start of the line must begin with -'Lang: ' and be followed by the desired locale. The locale must be at the end -of the line. An example follows on the following line: - - Lang: de - -The first valid Locale line found in the message will designate the response -locale. - -AUTOMATED LOCALE PARSING ------------------------- - -If possible and supported by the server, GetTor will attempt to automatically -parse the desired locale by using plus addressing. The user should append the -desired locale to the email address of the GetTor robot. An example for setting -all responses into German (Locale: de) follows below: - - gettor+de(a)torproject.org - -This will allow the user to interact without any knowledge of locales. - -GENERATING .po/.pot FILES -------------------------- - -In the top level directory of the gettor source, run the following command: - - xgettext lib/gettor/constants.py -d gettor -o po/templates/gettor.pot - -Commit your pot file. Then log into the pootle server, commit any -outstanding changes in ~/gettor/, and do an svn update. Then log into the -pootle web interface, choose gettor, choose 'admin', click each check box -(ugh), click 'update languages' at the bottom. Then log into the pootle -server and do an svn commit of all the new po files. - Deleted: projects/gettor/TODO =================================================================== --- projects/gettor/TODO 2011-02-23 00:21:44 UTC (rev 24258) +++ projects/gettor/TODO 2011-02-23 11:55:04 UTC (rev 24259) @@ -1,26 +0,0 @@ -These are planned changes to the gettor system. - -- Split (at least) tiger bundle into several smaller archives to avoid ~20MB -- React in some way if the user requested a split download but no split - downloads are available for that specific package (maybe send out the non- - split version of the package?) -- Update https://www.torproject.org/gettor/ -- Write instructions on the website on how to use GetTor. Put that site into - pootle for translation so for example chinese and iranian users have a - reference for help -- Package names that are sent out to the user are currently hard-coded. Return - to a more dynamic approach, also: Add a nice little note about the size of - the files users may request -- Remove 'localhost:25' to send mail and use '/usr/bin/sendmail' instead - (suggested by weasel) -- Implement test (-t switch) functionality -- Add torbutton (Mike, please sign torbutton and populate a proper .asc) -- Add GetTor to GetTor and it will be able to distribute itself -- Merge checkInternalEarlyBlacklist() in requests.py with the real blacklist - mechanism of GetTor - Related: - - Make blacklists learn wildcards: Something like "*(a)torproject.org" as a - reply-to address should really be blacklisted, for instance. -- Come up with something more elegant than torSpecialPackageExpansion() in - requests.py. Hardcoding package names in other places than packages.py is - inviting bugs. Deleted: projects/gettor/sample-gettorrc =================================================================== --- projects/gettor/sample-gettorrc 2011-02-23 00:21:44 UTC (rev 24258) +++ projects/gettor/sample-gettorrc 2011-02-23 11:55:04 UTC (rev 24259) @@ -1,16 +0,0 @@ -# Put this into the home directory of the user who runs gettor.py: -# ~/.gettorrc -# -[global] -stateDir = /tmp/gettor -blstatedir = /tmp/gettor/bl/ -wlstatedir = /tmp/gettor/wl/ -distdir = /tmp/gettor/distdir/ -packdir = /tmp/gettor/packdir/ -locale = en -delayalert = True -logSubSystem = stdout -logFile = /tmp/gettor/logfile -localDir = /tmp/gettor/po/ -cmdPassFile = /tmp/gettor/pass -dumpFile = /tmp/gettor/dumpfile Deleted: projects/gettor/setup.cfg =================================================================== --- projects/gettor/setup.cfg 2011-02-23 00:21:44 UTC (rev 24258) +++ projects/gettor/setup.cfg 2011-02-23 11:55:04 UTC (rev 24259) @@ -1,4 +0,0 @@ -[install] -install-purelib=$HOME/opt/gettor -install-scripts=$HOME/opt/gettor -install-data=$HOME/opt/gettor Deleted: projects/gettor/setup.py =================================================================== --- projects/gettor/setup.py 2011-02-23 00:21:44 UTC (rev 24258) +++ projects/gettor/setup.py 2011-02-23 11:55:04 UTC (rev 24259) @@ -1,36 +0,0 @@ -#!/usr/bin/python2.5 -# (c) 2009 The Tor project -# GetTor installer & packer - -import glob -import os -import sys - -from distutils.core import setup - -TRANSLATION_DIR='po' -data_files = dict() -for filename in os.listdir(TRANSLATION_DIR): - if filename.endswith('.svn'): - continue - dir = os.path.join(TRANSLATION_DIR, filename) - if dir.endswith('templates'): - file = "gettor.pot" - else: - file = "gettor.po" - pofile = os.path.join(dir, file) - data_files[dir] = [pofile] - -setup(name='GetTor', - version='0.1', - description='GetTor enables users to obtain Tor via email', - author='Jacob Appelbaum, Christian Fromme', - author_email='jacob at appelbaum dot net, kaner at strace dot org', - url='https://www.torproject.org/gettor/', - package_dir={'': 'lib'}, - packages=['gettor'], - data_files = data_files.items(), - scripts = ["GetTor.py", "MakeStat.py"], - py_modules=['GetTor'], - long_description = """Really long text here.""" - )

1 0

[tor/release-0.2.1] a blurb for 0.2.1.30
by arma＠torproject.org 23 Feb '11

23 Feb '11

commit 1855b4ebfdd63c0c3beeeed5eefb9b0c3f50a8bd Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Feb 23 03:24:32 2011 -0500 a blurb for 0.2.1.30 --- ChangeLog | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6c8af1c..beb2dff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,10 @@ Changes in version 0.2.1.30 - 2011-02-23 + Tor 0.2.1.30 fixes a variety of less critical bugs. The main other + change is a slight tweak to Tor's TLS handshake that makes relays + and bridges that run this new version reachable from Iran again. + We don't expect this tweak will win the arms race long-term, but it + buys us time until we roll out a better solution. + o Major bugfixes: - Stop sending a CLOCK_SKEW controller status event whenever we fetch directory information from a relay that has a wrong clock.

1 0

[tor/release-0.2.1] fold in last two changes files
by arma＠torproject.org 23 Feb '11

23 Feb '11

commit feabf2eb6c79dca34bc9972d696020904da79ecd Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Feb 22 22:56:57 2011 -0500 fold in last two changes files --- ChangeLog | 13 ++++++++++++- changes/bug1859 | 9 --------- changes/bug2402 | 4 ---- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index 869365c..6c8af1c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -Changes in version 0.2.1.30 - 2011-02-?? +Changes in version 0.2.1.30 - 2011-02-23 o Major bugfixes: - Stop sending a CLOCK_SKEW controller status event whenever we fetch directory information from a relay that has a wrong clock. @@ -25,11 +25,22 @@ Changes in version 0.2.1.30 - 2011-02-?? - Check for and reject overly long directory certificates and directory tokens before they have a chance to hit any assertions. Bugfix on 0.2.1.28. Found by "doorss". + - Bring the logic that gathers routerinfos and assesses the + acceptability of circuits into line. This prevents a Tor OP from + getting locked in a cycle of choosing its local OR as an exit for a + path (due to a .exit request) and then rejecting the circuit because + its OR is not listed yet. It also prevents Tor clients from using an + OR running in the same instance as an exit (due to a .exit request) + if the OR does not meet the same requirements expected of an OR + running elsewhere. Fixes bug 1859; bugfix on 0.1.0.1-rc. o Packaging changes: - Stop shipping the Tor specs files and development proposal documents in the tarball. They are now in a separate git repository at git://git.torproject.org/torspec.git + - Do not include Git version tags as though they are SVN tags when + generating a tarball from inside a repository that has switched + between branches. Bugfix on 0.2.1.15-rc; fixes bug 2402. Changes in version 0.2.1.29 - 2011-01-15 diff --git a/changes/bug1859 b/changes/bug1859 deleted file mode 100644 index 5b139f3..0000000 --- a/changes/bug1859 +++ /dev/null @@ -1,9 +0,0 @@ - o Minor bugfixes: - - Bring the logic that gathers routerinfos and assesses the - acceptability of circuits into line. This prevents a Tor OP from getting - locked in a cycle of choosing its local OR as an exit for a path (due to - a .exit request) and then rejecting the circuit because its OR is not - listed yet. Also prevent Tor clients from using an OR running in the same - instance as an exit (due to a .exit request) if the OR does not meet the - same requirements expected of an OR running elsewhere. - Fixes bug 1859; bugfix on 0.2.0-alpha. diff --git a/changes/bug2402 b/changes/bug2402 deleted file mode 100644 index f16f677..0000000 --- a/changes/bug2402 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes (build) - - Do not include Git version tags as though they were SVN tags when - generating a tarball from inside a repository that has switched between - branches. Bugfix on 0.2.1.15-rc; fixes bug 2402.

1 0

[tor/release-0.2.1] bump to 0.2.1.30
by arma＠torproject.org 23 Feb '11

23 Feb '11

commit 62d660b1da601c264c4e653a427c653ff87b26e7 Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Feb 22 22:59:30 2011 -0500 bump to 0.2.1.30 --- configure.in | 2 +- contrib/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.in b/configure.in index c91bce0..4ab7908 100644 --- a/configure.in +++ b/configure.in @@ -5,7 +5,7 @@ dnl Copyright (c) 2007-2008, The Tor Project, Inc. dnl See LICENSE for licensing information AC_INIT -AM_INIT_AUTOMAKE(tor, 0.2.1.29) +AM_INIT_AUTOMAKE(tor, 0.2.1.30) AM_CONFIG_HEADER(orconfig.h) AC_CANONICAL_HOST diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in index 6da39d1..0aae2c7 100644 --- a/contrib/tor-mingw.nsi.in +++ b/contrib/tor-mingw.nsi.in @@ -9,7 +9,7 @@ !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.1.29" +!define VERSION "0.2.1.30" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index df34bd1..5468eaa 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -226,6 +226,6 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.1.29" +#define VERSION "0.2.1.30"

1 0

[tor/release-0.2.1] Merge remote branch 'public/bug1859_021' into maint-0.2.1
by arma＠torproject.org 23 Feb '11

23 Feb '11

commit 491abbc65e535b5308d6c57ab9ab3900ac2dd2d2 Merge: 7605985 2392290 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 22 17:19:41 2011 -0500 Merge remote branch 'public/bug1859_021' into maint-0.2.1 changes/bug1859 | 9 +++++++++ src/or/connection_edge.c | 2 +- src/or/rendclient.c | 5 ++++- src/or/routerlist.c | 3 --- 4 files changed, 14 insertions(+), 5 deletions(-) diff --combined src/or/connection_edge.c index 052aa37,f72aa94..5609c1d --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@@ -1,7 -1,7 +1,7 @@@ /* Copyright (c) 2001 Matej Pfajfar. * Copyright (c) 2001-2004, Roger Dingledine. * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. - * Copyright (c) 2007-2010, The Tor Project, Inc. */ + * Copyright (c) 2007-2011, The Tor Project, Inc. */ /* See LICENSE for licensing information */ /** @@@ -571,7 -571,7 +571,7 @@@ circuit_discard_optional_exit_enclaves( !edge_conn->chosen_exit_retries) continue; r1 = router_get_by_nickname(edge_conn->chosen_exit_name, 0); - r2 = router_get_by_nickname(info->nickname, 0); + r2 = router_get_by_digest(info->identity_digest); if (!r1 || !r2 || r1 != r2) continue; tor_assert(edge_conn->socks_request); @@@ -1139,23 -1139,9 +1139,23 @@@ address_is_in_virtual_range(const char return 0; } +/** Increment the value of next_virtual_addr; reset it to the start of the + * virtual address range if it wraps around. + */ +static INLINE void +increment_virtual_addr(void) +{ + ++next_virtual_addr; + if (addr_mask_cmp_bits(next_virtual_addr, virtual_addr_network, + virtual_addr_netmask_bits)) + next_virtual_addr = virtual_addr_network; +} + /** Return a newly allocated string holding an address of type * (one of RESOLVED_TYPE_{IPV4|HOSTNAME}) that has not yet been mapped, * and that is very unlikely to be the address of any real host. + * + * May return NULL if we have run out of virtual addresses. */ static char * addressmap_get_virtual_address(int type) @@@ -1180,26 -1166,25 +1180,26 @@@ /* Don't hand out any .0 or .255 address. */ while ((next_virtual_addr & 0xff) == 0 || (next_virtual_addr & 0xff) == 0xff) { - ++next_virtual_addr; + increment_virtual_addr(); + if (! --available) { + log_warn(LD_CONFIG, "Ran out of virtual addresses!"); + return NULL; + } } in.s_addr = htonl(next_virtual_addr); tor_inet_ntoa(&in, buf, sizeof(buf)); if (!strmap_get(addressmap, buf)) { - ++next_virtual_addr; + increment_virtual_addr(); break; } - ++next_virtual_addr; + increment_virtual_addr(); --available; - log_info(LD_CONFIG, "%d addrs available", (int)available); - if (! --available) { + // log_info(LD_CONFIG, "%d addrs available", (int)available); + if (! available) { log_warn(LD_CONFIG, "Ran out of virtual addresses!"); return NULL; } - if (addr_mask_cmp_bits(next_virtual_addr, virtual_addr_network, - virtual_addr_netmask_bits)) - next_virtual_addr = virtual_addr_network; } return tor_strdup(buf); } else { @@@ -1214,15 -1199,14 +1214,15 @@@ * allocated string. If another address of the same type is already * mapped to new_address, try to return a copy of that address. * - * The string in new_address may be freed, or inserted into a map - * as appropriate. + * The string in new_address may be freed or inserted into a map + * as appropriate. May return NULL if are out of virtual addresses. **/ const char * addressmap_register_virtual_address(int type, char *new_address) { char **addrp; virtaddress_entry_t *vent; + int vent_needs_to_be_added = 0; tor_assert(new_address); tor_assert(addressmap); @@@ -1231,7 -1215,7 +1231,7 @@@ vent = strmap_get(virtaddress_reversemap, new_address); if (!vent) { vent = tor_malloc_zero(sizeof(virtaddress_entry_t)); - strmap_set(virtaddress_reversemap, new_address, vent); + vent_needs_to_be_added = 1; } addrp = (type == RESOLVED_TYPE_IPV4) ? @@@ -1241,7 -1225,6 +1241,7 @@@ if (ent && ent->new_address && !strcasecmp(new_address, ent->new_address)) { tor_free(new_address); + tor_assert(!vent_needs_to_be_added); return tor_strdup(*addrp); } else log_warn(LD_BUG, @@@ -1253,14 -1236,7 +1253,14 @@@ tor_free(*addrp); *addrp = addressmap_get_virtual_address(type); + if (!*addrp) { + tor_free(vent); + tor_free(new_address); + return NULL; + } log_info(LD_APP, "Registering map from %s to %s", *addrp, new_address); + if (vent_needs_to_be_added) + strmap_set(virtaddress_reversemap, new_address, vent); addressmap_register(*addrp, new_address, 2, ADDRMAPSRC_CONTROLLER); #if 0 @@@ -1439,12 -1415,7 +1439,12 @@@ connection_ap_handshake_rewrite_and_att const char *new_addr; new_addr = addressmap_register_virtual_address( RESOLVED_TYPE_IPV4, tor_strdup(socks->address)); - tor_assert(new_addr); + if (! new_addr) { + log_warn(LD_APP, "Unable to automap address %s", + escaped_safe_str(socks->address)); + connection_mark_unattached_ap(conn, END_STREAM_REASON_INTERNAL); + return -1; + } log_info(LD_APP, "Automapping %s to %s", escaped_safe_str(socks->address), safe_str(new_addr)); strlcpy(socks->address, new_addr, sizeof(socks->address)); @@@ -1459,8 -1430,7 +1459,8 @@@ tor_snprintf(socks->address, sizeof(socks->address), "REVERSE[%s]", orig_address); connection_ap_handshake_socks_resolved(conn, RESOLVED_TYPE_HOSTNAME, - strlen(result), result, -1, + strlen(result), (uint8_t*)result, + -1, map_expires); connection_mark_unattached_ap(conn, END_STREAM_REASON_DONE | @@@ -1592,8 -1562,7 +1592,8 @@@ /* remember _what_ is supposed to have been resolved. */ strlcpy(socks->address, orig_address, sizeof(socks->address)); connection_ap_handshake_socks_resolved(conn,RESOLVED_TYPE_IPV4,4, - (char*)&answer,-1,map_expires); + (uint8_t*)&answer, + -1,map_expires); connection_mark_unattached_ap(conn, END_STREAM_REASON_DONE | END_STREAM_REASON_FLAG_ALREADY_SOCKS_REPLIED); @@@ -2342,7 -2311,7 +2342,7 @@@ voi connection_ap_handshake_socks_resolved(edge_connection_t *conn, int answer_type, size_t answer_len, - const char *answer, + const uint8_t *answer, int ttl, time_t expires) { @@@ -2356,7 -2325,7 +2356,7 @@@ client_dns_set_addressmap(conn->socks_request->address, a, conn->chosen_exit_name, ttl); } else if (answer_type == RESOLVED_TYPE_HOSTNAME && answer_len < 256) { - char *cp = tor_strndup(answer, answer_len); + char *cp = tor_strndup((char*)answer, answer_len); client_dns_set_reverse_addressmap(conn->socks_request->address, cp, conn->chosen_exit_name, ttl); @@@ -2367,14 -2336,14 +2367,14 @@@ if (conn->is_dns_request) { if (conn->dns_server_request) { /* We had a request on our DNS port: answer it. */ - dnsserv_resolved(conn, answer_type, answer_len, answer, ttl); + dnsserv_resolved(conn, answer_type, answer_len, (char*)answer, ttl); conn->socks_request->has_finished = 1; return; } else { /* This must be a request from the controller. We already sent * a mapaddress if there's a ttl. */ tell_controller_about_resolved_result(conn, answer_type, answer_len, - answer, ttl, expires); + (char*)answer, ttl, expires); conn->socks_request->has_finished = 1; return; } @@@ -2518,8 -2487,6 +2518,8 @@@ connection_exit_begin_conn(cell_t *cell or_circ = TO_OR_CIRCUIT(circ); relay_header_unpack(&rh, cell->payload); + if (rh.length > RELAY_PAYLOAD_SIZE) + return -1; /* Note: we have to use relay_send_command_from_edge here, not * connection_edge_end or connection_edge_send_command, since those require @@@ -2543,8 -2510,7 +2543,8 @@@ END_STREAM_REASON_TORPROTOCOL, NULL); return 0; } - if (parse_addr_port(LOG_PROTOCOL_WARN, cell->payload+RELAY_HEADER_SIZE, + if (parse_addr_port(LOG_PROTOCOL_WARN, + (char*)(cell->payload+RELAY_HEADER_SIZE), &address,NULL,&port)<0) { log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL, "Unable to parse addr:port in relay begin cell. Closing."); @@@ -2695,8 -2661,6 +2695,8 @@@ connection_exit_begin_resolve(cell_t *c assert_circuit_ok(TO_CIRCUIT(circ)); relay_header_unpack(&rh, cell->payload); + if (rh.length > RELAY_PAYLOAD_SIZE) + return -1; /* This 'dummy_conn' only exists to remember the stream ID * associated with the resolve request; and to make the @@@ -2707,9 -2671,8 +2707,9 @@@ */ dummy_conn = edge_connection_new(CONN_TYPE_EXIT, AF_INET); dummy_conn->stream_id = rh.stream_id; - dummy_conn->_base.address = tor_strndup(cell->payload+RELAY_HEADER_SIZE, - rh.length); + dummy_conn->_base.address = tor_strndup( + (char*)cell->payload+RELAY_HEADER_SIZE, + rh.length); dummy_conn->_base.port = 0; dummy_conn->_base.state = EXIT_CONN_STATE_RESOLVEFAILED; dummy_conn->_base.purpose = EXIT_PURPOSE_RESOLVE; diff --combined src/or/rendclient.c index 783a661,1f253c1..af91099 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@@ -1,5 -1,5 +1,5 @@@ /* Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. - * Copyright (c) 2007-2010, The Tor Project, Inc. */ + * Copyright (c) 2007-2011, The Tor Project, Inc. */ /* See LICENSE for licensing information */ /** @@@ -130,7 -130,7 +130,7 @@@ rend_client_send_introduction(origin_ci cpath = rendcirc->build_state->pending_final_cpath = tor_malloc_zero(sizeof(crypt_path_t)); cpath->magic = CRYPT_PATH_MAGIC; - if (!(cpath->dh_handshake_state = crypto_dh_new())) { + if (!(cpath->dh_handshake_state = crypto_dh_new(DH_TYPE_REND))) { log_warn(LD_BUG, "Internal error: couldn't allocate DH."); goto err; } @@@ -193,7 -193,6 +193,7 @@@ /*XXX maybe give crypto_pk_public_hybrid_encrypt a max_len arg, * to avoid buffer overflows? */ r = crypto_pk_public_hybrid_encrypt(intro_key, payload+DIGEST_LEN, + sizeof(payload)-DIGEST_LEN, tmp, (int)(dh_offset+DH_KEY_LEN), PK_PKCS1_OAEP_PADDING, 0); @@@ -244,7 -243,7 +244,7 @@@ rend_client_rendcirc_has_opened(origin_ */ int rend_client_introduction_acked(origin_circuit_t *circ, - const char *request, size_t request_len) + const uint8_t *request, size_t request_len) { origin_circuit_t *rendcirc; (void) request; // XXXX Use this. @@@ -629,7 -628,7 +629,7 @@@ rend_client_remove_intro_point(extend_i * the circuit to C_REND_READY. */ int -rend_client_rendezvous_acked(origin_circuit_t *circ, const char *request, +rend_client_rendezvous_acked(origin_circuit_t *circ, const uint8_t *request, size_t request_len) { (void) request; @@@ -655,7 -654,7 +655,7 @@@ /** Bob sent us a rendezvous cell; join the circuits. */ int -rend_client_receive_rendezvous(origin_circuit_t *circ, const char *request, +rend_client_receive_rendezvous(origin_circuit_t *circ, const uint8_t *request, size_t request_len) { crypt_path_t *hop; @@@ -683,8 -682,7 +683,8 @@@ tor_assert(circ->build_state->pending_final_cpath); hop = circ->build_state->pending_final_cpath; tor_assert(hop->dh_handshake_state); - if (crypto_dh_compute_secret(hop->dh_handshake_state, request, DH_KEY_LEN, + if (crypto_dh_compute_secret(hop->dh_handshake_state, (char*)request, + DH_KEY_LEN, keys, DIGEST_LEN+CPATH_KEY_MATERIAL_LEN)<0) { log_warn(LD_GENERAL, "Couldn't complete DH handshake."); goto err; @@@ -717,10 -715,8 +717,10 @@@ * attach only the connections that are waiting on this circuit, rather * than trying to attach them all. See comments bug 743. */ connection_ap_attach_pending(); + memset(keys, 0, sizeof(keys)); return 0; err: + memset(keys, 0, sizeof(keys)); circuit_mark_for_close(TO_CIRCUIT(circ), END_CIRC_REASON_TORPROTOCOL); return -1; } @@@ -814,7 -810,10 +814,10 @@@ rend_client_get_random_intro(const rend intro = smartlist_get(entry->parsed->intro_nodes, i); /* Do we need to look up the router or is the extend info complete? */ if (!intro->extend_info->onion_key) { - router = router_get_by_nickname(intro->extend_info->nickname, 0); + if (tor_digest_is_zero(intro->extend_info->identity_digest)) + router = router_get_by_hexdigest(intro->extend_info->nickname); + else + router = router_get_by_digest(intro->extend_info->identity_digest); if (!router) { log_info(LD_REND, "Unknown router with nickname '%s'; trying another.", intro->extend_info->nickname); diff --combined src/or/routerlist.c index 7c8e36e,9622406..fb8fb88 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@@ -1,7 -1,7 +1,7 @@@ /* Copyright (c) 2001 Matej Pfajfar. * Copyright (c) 2001-2004, Roger Dingledine. * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. - * Copyright (c) 2007-2010, The Tor Project, Inc. */ + * Copyright (c) 2007-2011, The Tor Project, Inc. */ /* See LICENSE for licensing information */ /** @@@ -1989,9 -1989,6 +1989,6 @@@ router_get_by_nickname(const char *nick return router_get_by_hexdigest(nickname); if (!strcasecmp(nickname, UNNAMED_ROUTER_NICKNAME)) return NULL; - if (server_mode(get_options()) && - !strcasecmp(nickname, get_options()->Nickname)) - return router_get_my_routerinfo(); maybedigest = (strlen(nickname) >= HEX_DIGEST_LEN) && (base16_decode(digest,DIGEST_LEN,nickname,HEX_DIGEST_LEN) == 0); @@@ -4676,8 -4673,7 +4673,8 @@@ routerinfo_incompatible_with_extrainfo( if (ei->pending_sig) { char signed_digest[128]; - if (crypto_pk_public_checksig(ri->identity_pkey, signed_digest, + if (crypto_pk_public_checksig(ri->identity_pkey, + signed_digest, sizeof(signed_digest), ei->pending_sig, ei->pending_sig_len) != DIGEST_LEN || memcmp(signed_digest, ei->cache_info.signed_descriptor_digest, DIGEST_LEN)) {

1 0