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

[torflow/master] Fix an exception ordering issue.
by mikeperry＠torproject.org 23 Feb '11

23 Feb '11

commit 293214df5a0cff14e6c626fa7be37cda1edd6350 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Wed Feb 23 11:17:48 2011 -0800 Fix an exception ordering issue. --- NetworkScanners/statsplitter.py | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/NetworkScanners/statsplitter.py b/NetworkScanners/statsplitter.py index 2b088d1..f2d8f91 100755 --- a/NetworkScanners/statsplitter.py +++ b/NetworkScanners/statsplitter.py @@ -433,17 +433,17 @@ def check_port_bytes(sorted_rlist, top_n): try: extra_info = c.sendAndRecv("GETINFO extra-info/digest/" + r.extra_info_digest + "\r\n")[0][2] + if "exit-kibibytes-written" in extra_info: + displayed += 1 + g = re.search("exit-kibibytes-read (\S+)", extra_info).group(1) + (tot, port_list) = split_port_list(g) + display_port_list(r, "read", tot, port_list) + g = re.search("exit-kibibytes-written (\S+)", extra_info).group(1) + (tot, port_list) = split_port_list(g) + display_port_list(r, "wrote", tot, port_list) + print except TorCtl.ErrorReply: print "Not all extra info docs present. Missing one for router "+r.idhex+"="+r.nickname - if "exit-kibibytes-written" in extra_info: - displayed += 1 - g = re.search("exit-kibibytes-read (\S+)", extra_info).group(1) - (tot, port_list) = split_port_list(g) - display_port_list(r, "read", tot, port_list) - g = re.search("exit-kibibytes-written (\S+)", extra_info).group(1) - (tot, port_list) = split_port_list(g) - display_port_list(r, "wrote", tot, port_list) - print check_slices()

1 0

[torflow/master] Update submodule.
by mikeperry＠torproject.org 23 Feb '11

23 Feb '11

commit 6aeff66befd239eef576db7b47657608a1290260 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Wed Feb 23 11:18:04 2011 -0800 Update submodule. --- TorCtl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/TorCtl b/TorCtl index 7329ceb..62e4705 160000 --- a/TorCtl +++ b/TorCtl @@ -1 +1 @@ -Subproject commit 7329ceb4fe44c3557742ea596aeca7ea5f9e76f7 +Subproject commit 62e470554c12e3fa0edd948d8f2c7c7a02217635

1 0

[pytorctl/master] Add a body field to all events.
by mikeperry＠torproject.org 23 Feb '11

23 Feb '11

commit 62e470554c12e3fa0edd948d8f2c7c7a02217635 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Wed Feb 23 11:10:27 2011 -0800 Add a body field to all events. Useful to grab the original raw event for debugging/logging. --- TorCtl.py | 78 ++++++++++++++++++++++++++++++++----------------------------- 1 files changed, 41 insertions(+), 37 deletions(-) diff --git a/TorCtl.py b/TorCtl.py index d2cb2a9..96e17a3 100755 --- a/TorCtl.py +++ b/TorCtl.py @@ -180,32 +180,33 @@ class NetworkStatus: self.updated = datetime.datetime(*map(int, m.groups())) class Event: - def __init__(self, event_name): + def __init__(self, event_name, body=None): + self.body = body self.event_name = event_name self.arrived_at = 0 self.state = EVENT_STATE.PRISTINE class TimerEvent(Event): - def __init__(self, event_name, type): - Event.__init__(self, event_name) - self.type = type + def __init__(self, event_name, body): + Event.__init__(self, event_name, body) + self.type = body class NetworkStatusEvent(Event): - def __init__(self, event_name, nslist): - Event.__init__(self, event_name) + def __init__(self, event_name, nslist, body): + Event.__init__(self, event_name, body) self.nslist = nslist # List of NetworkStatus objects class NewConsensusEvent(NetworkStatusEvent): pass class NewDescEvent(Event): - def __init__(self, event_name, idlist): - Event.__init__(self, event_name) + def __init__(self, event_name, idlist, body): + Event.__init__(self, event_name, body) self.idlist = idlist class GuardEvent(Event): - def __init__(self, event_name, ev_type, guard, status): - Event.__init__(self, event_name) + def __init__(self, event_name, ev_type, guard, status, body): + Event.__init__(self, event_name, body) if "~" in guard: (self.idhex, self.nick) = guard[1:].split("~") elif "=" in guard: @@ -216,8 +217,8 @@ class GuardEvent(Event): class BuildTimeoutSetEvent(Event): def __init__(self, event_name, set_type, total_times, timeout_ms, xm, alpha, - quantile): - Event.__init__(self, event_name) + quantile, body): + Event.__init__(self, event_name, body) self.set_type = set_type self.total_times = total_times self.timeout_ms = timeout_ms @@ -227,8 +228,8 @@ class BuildTimeoutSetEvent(Event): class CircuitEvent(Event): def __init__(self, event_name, circ_id, status, path, purpose, - reason, remote_reason): - Event.__init__(self, event_name) + reason, remote_reason, body): + Event.__init__(self, event_name, body) self.circ_id = circ_id self.status = status self.path = path @@ -238,8 +239,9 @@ class CircuitEvent(Event): class StreamEvent(Event): def __init__(self, event_name, strm_id, status, circ_id, target_host, - target_port, reason, remote_reason, source, source_addr, purpose): - Event.__init__(self, event_name) + target_port, reason, remote_reason, source, source_addr, purpose, + body): + Event.__init__(self, event_name, body) self.strm_id = strm_id self.status = status self.circ_id = circ_id @@ -253,8 +255,8 @@ class StreamEvent(Event): class ORConnEvent(Event): def __init__(self, event_name, status, endpoint, age, read_bytes, - wrote_bytes, reason, ncircs): - Event.__init__(self, event_name) + wrote_bytes, reason, ncircs, body): + Event.__init__(self, event_name, body) self.status = status self.endpoint = endpoint self.age = age @@ -264,21 +266,21 @@ class ORConnEvent(Event): self.ncircs = ncircs class StreamBwEvent(Event): - def __init__(self, event_name, strm_id, written, read): - Event.__init__(self, event_name) + def __init__(self, event_name, strm_id, written, read, body): + Event.__init__(self, event_name, body) self.strm_id = int(strm_id) self.bytes_read = int(read) self.bytes_written = int(written) class LogEvent(Event): def __init__(self, level, msg): - Event.__init__(self, level) + Event.__init__(self, level, msg) self.level = level self.msg = msg class AddrMapEvent(Event): - def __init__(self, event_name, from_addr, to_addr, when): - Event.__init__(self, event_name) + def __init__(self, event_name, from_addr, to_addr, when, body): + Event.__init__(self, event_name, body) self.from_addr = from_addr self.to_addr = to_addr self.when = when @@ -290,14 +292,14 @@ class AddrMap: self.when = when class BWEvent(Event): - def __init__(self, event_name, read, written): - Event.__init__(self, event_name) + def __init__(self, event_name, read, written, body): + Event.__init__(self, event_name, body) self.read = read self.written = written class UnknownEvent(Event): def __init__(self, event_name, event_string): - Event.__init__(self, event_name) + Event.__init__(self, event_name, event_string) self.event_string = event_string ipaddress_re = re.compile(r"(\d{1,3}\.){3}\d{1,3}$") @@ -1386,7 +1388,8 @@ class EventHandler(EventSink): if purpose: purpose = purpose[9:] if reason: reason = reason[8:] if remote: remote = remote[15:] - event = CircuitEvent(evtype, ident, status, path, purpose, reason, remote) + event = CircuitEvent(evtype, ident, status, path, purpose, reason, + remote, body) elif evtype == "STREAM": #plog("DEBUG", "STREAM: "+body) m = re.match(r"(\S+)\s+(\S+)\s+(\S+)\s+(\S+)?:(\d+)(\sREASON=\S+)?(\sREMOTE_REASON=\S+)?(\sSOURCE=\S+)?(\sSOURCE_ADDR=\S+)?(\s+PURPOSE=\S+)?", body) @@ -1404,7 +1407,8 @@ class EventHandler(EventSink): purpose = purpose.lstrip() purpose = purpose[8:] event = StreamEvent(evtype, ident, status, circ, target_host, - int(target_port), reason, remote, source, source_addr, purpose) + int(target_port), reason, remote, source, source_addr, + purpose, body) elif evtype == "ORCONN": m = re.match(r"(\S+)\s+(\S+)(\sAGE=\S+)?(\sREAD=\S+)?(\sWRITTEN=\S+)?(\sREASON=\S+)?(\sNCIRCS=\S+)?", body) if not m: @@ -1422,18 +1426,18 @@ class EventHandler(EventSink): if wrote: wrote = int(wrote[9:]) else: wrote = 0 event = ORConnEvent(evtype, status, target, age, read, wrote, - reason, ncircs) + reason, ncircs, body) elif evtype == "STREAM_BW": m = re.match(r"(\d+)\s+(\d+)\s+(\d+)", body) if not m: raise ProtocolError("STREAM_BW event misformatted.") - event = StreamBwEvent(evtype, *m.groups()) + event = StreamBwEvent(evtype, *m.groups(), body=body) elif evtype == "BW": m = re.match(r"(\d+)\s+(\d+)", body) if not m: raise ProtocolError("BANDWIDTH event misformatted.") read, written = map(long, m.groups()) - event = BWEvent(evtype, read, written) + event = BWEvent(evtype, read, written, body) elif evtype in ("DEBUG", "INFO", "NOTICE", "WARN", "ERR"): event = LogEvent(evtype, body) elif evtype == "NEWDESC": @@ -1441,7 +1445,7 @@ class EventHandler(EventSink): ids = [] for i in ids_verb: ids.append(i.replace("~", "=").split("=")[0].replace("$","")) - event = NewDescEvent(evtype, ids) + event = NewDescEvent(evtype, ids, body) elif evtype == "ADDRMAP": # TODO: Also parse errors and GMTExpiry m = re.match(r'(\S+)\s+(\S+)\s+(\"[^"]+\"|\w+)', body) @@ -1452,11 +1456,11 @@ class EventHandler(EventSink): when = None else: when = time.strptime(when[1:-1], "%Y-%m-%d %H:%M:%S") - event = AddrMapEvent(evtype, fromaddr, toaddr, when) + event = AddrMapEvent(evtype, fromaddr, toaddr, when, body) elif evtype == "NS": - event = NetworkStatusEvent(evtype, parse_ns_body(data)) + event = NetworkStatusEvent(evtype, parse_ns_body(data), data) elif evtype == "NEWCONSENSUS": - event = NewConsensusEvent(evtype, parse_ns_body(data)) + event = NewConsensusEvent(evtype, parse_ns_body(data), data) elif evtype == "BUILDTIMEOUT_SET": m = re.match( r"(\S+)\sTOTAL_TIMES=(\d+)\sTIMEOUT_MS=(\d+)\sXM=(\d+)\sALPHA=(\S+)\sCUTOFF_QUANTILE=(\S+)", @@ -1464,11 +1468,11 @@ class EventHandler(EventSink): set_type, total_times, timeout_ms, xm, alpha, quantile = m.groups() event = BuildTimeoutSetEvent(evtype, set_type, int(total_times), int(timeout_ms), int(xm), float(alpha), - float(quantile)) + float(quantile), body) elif evtype == "GUARD": m = re.match(r"(\S+)\s(\S+)\s(\S+)", body) entry, guard, status = m.groups() - event = GuardEvent(evtype, entry, guard, status) + event = GuardEvent(evtype, entry, guard, status, body) elif evtype == "TORCTL_TIMER": event = TimerEvent(evtype, data) else:

1 0

r24263: {website} Write a not-for-GSoC indicator for the GeoIP project, but le (website/trunk/getinvolved/en)
by Robert Ransom 23 Feb '11

23 Feb '11

Author: rransom Date: 2011-02-23 13:27:20 +0000 (Wed, 23 Feb 2011) New Revision: 24263 Modified: website/trunk/getinvolved/en/volunteer.wml Log: Write a not-for-GSoC indicator for the GeoIP project, but leave it commented out for now Modified: website/trunk/getinvolved/en/volunteer.wml =================================================================== --- website/trunk/getinvolved/en/volunteer.wml 2011-02-23 13:16:10 UTC (rev 24262) +++ website/trunk/getinvolved/en/volunteer.wml 2011-02-23 13:27:20 UTC (rev 24263) @@ -765,6 +765,9 @@ 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>

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

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

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