- tor-commits - lists.torproject.org

[bridgedb/master] 1860 - email rate limiting support
by arma＠torproject.org 19 Sep '11

19 Sep '11

commit 6081a27dfc38634eb1f47c462d2bf9c6aab599d8 Author: aagbsn <aagbsn(a)extc.org> Date: Mon Jul 25 17:04:14 2011 -0700 1860 - email rate limiting support This set of changes implements email rate-limiting for the EmailBasedDistributor. Abusers are warned, and then temporarily blacklisted. --- lib/bridgedb/Dist.py | 20 +++++++++++++++++++- lib/bridgedb/I18n.py | 9 ++++++++- lib/bridgedb/Server.py | 37 +++++++++++++++++++++++++++++++++++++ lib/bridgedb/Storage.py | 37 +++++++++++++++++++++++++++++++++++++ lib/bridgedb/Tests.py | 47 ++++++++++++++++++++++++++++++++++++++++++++++- 5 files changed, 147 insertions(+), 3 deletions(-) diff --git a/lib/bridgedb/Dist.py b/lib/bridgedb/Dist.py index 5394cfa..030c7fa 100644 --- a/lib/bridgedb/Dist.py +++ b/lib/bridgedb/Dist.py @@ -146,6 +146,10 @@ class TooSoonEmail(BadEmail): """Raised when we got a request from this address too recently.""" pass +class IgnoreEmail(BadEmail): + """Raised when we get requests from this address after rate warning.""" + pass + def extractAddrSpec(addr): """Given an email From line, try to extract and parse the addrspec portion. Returns localpart,domain on success; raises BadEmail @@ -257,14 +261,27 @@ class EmailBasedDistributor(bridgedb.Bridges.BridgeHolder): return [] #XXXX raise an exception. db = bridgedb.Storage.getDB() + wasWarned = db.getWarnedEmail(emailaddress) lastSaw = db.getEmailTime(emailaddress) if lastSaw is not None and lastSaw + MAX_EMAIL_RATE >= now: + if wasWarned: + logging.warn("Got a request for bridges from %r; we already " + "sent a warning. Ignoring.", emailaddress) + raise IgnoreEmail("Client was warned", emailaddress) + else: + db.setWarnedEmail(emailaddress, True, now) + db.commit() + logging.warn("Got a request for bridges from %r; we already " - "answered one within the last %d seconds. Ignoring.", + "answered one within the last %d seconds. Warning.", emailaddress, MAX_EMAIL_RATE) raise TooSoonEmail("Too many emails; wait till later", emailaddress) + # warning period is over + elif wasWarned: + db.setWarnedEmail(emailaddress, False) + pos = self.emailHmac("<%s>%s" % (epoch, emailaddress)) result = self.ring.getBridges(pos, N, countryCode) @@ -279,6 +296,7 @@ class EmailBasedDistributor(bridgedb.Bridges.BridgeHolder): db = bridgedb.Storage.getDB() try: db.cleanEmailedBridges(time.time()-MAX_EMAIL_RATE) + db.cleanWarnedBridges(time.time()-MAX_EMAIL_RATE) except: db.rollback() raise diff --git a/lib/bridgedb/I18n.py b/lib/bridgedb/I18n.py index 44adb8c..750ca4a 100644 --- a/lib/bridgedb/I18n.py +++ b/lib/bridgedb/I18n.py @@ -51,5 +51,12 @@ bridge addresses."""), # BRIDGEDB_TEXT[8] _("""(e-mail requests not currently supported)"""), # BRIDGEDB_TEXT[9] - _("""(Might be blocked)""") + _("""To receive your bridge relays, please prove you are human"""), + # BRIDGEDB_TEXT[10] + _("""You have exceeded the rate limit. Please slow down, the minimum time between +emails is: """), + # BRIDGEDB_TEXT[11] + _("""hours"""), + # BRIDGEDB_TEXT[12] + _("""All further emails will be ignored.""") ] diff --git a/lib/bridgedb/Server.py b/lib/bridgedb/Server.py index 8ec659e..9cbeb15 100644 --- a/lib/bridgedb/Server.py +++ b/lib/bridgedb/Server.py @@ -274,6 +274,35 @@ def getMailResponse(lines, ctx): clientAddr, e) return None, None + # Handle rate limited email + except bridgedb.Dist.TooSoonEmail, e: + logging.info("Got a mail too frequently; warning %r: %s.", + clientAddr, e) + + # Compose a warning email + f = StringIO() + w = MimeWriter.MimeWriter(f) + w.addheader("From", ctx.fromAddr) + w.addheader("To", clientAddr) + w.addheader("Message-ID", twisted.mail.smtp.messageid()) + if not subject.startswith("Re:"): subject = "Re: %s"%subject + w.addheader("Subject", subject) + if msgID: + w.addheader("In-Reply-To", msgID) + w.addheader("Date", twisted.mail.smtp.rfc822date()) + body = w.startbody("text/plain") + + # MAX_EMAIL_RATE is in seconds, convert to hours + EMAIL_MESSAGE_RATELIMIT = buildSpamWarningTemplate(t) + body.write(EMAIL_MESSAGE_RATELIMIT % (bridgedb.Dist.MAX_EMAIL_RATE / 3600)) + f.seek(0) + return clientAddr, f + + except bridgedb.Dist.IgnoreEmail, e: + logging.info("Got a mail too frequently; ignoring %r: %s.", + clientAddr, e) + return None, None + # Generate the message. f = StringIO() w = MimeWriter.MimeWriter(f) @@ -311,6 +340,14 @@ def buildMessageTemplate(t): return msg_template +def buildSpamWarningTemplate(t): + msg_template = t.gettext(I18n.BRIDGEDB_TEXT[5]) + "\n\n" \ + + t.gettext(I18n.BRIDGEDB_TEXT[10]) + "\n\n" \ + + "%s " \ + + t.gettext(I18n.BRIDGEDB_TEXT[11]) + "\n\n" \ + + t.gettext(I18n.BRIDGEDB_TEXT[12]) + "\n\n" + return msg_template + def replyToMail(lines, ctx): """Given a list of lines from an incoming email message, and a MailContext object, possibly send a reply. diff --git a/lib/bridgedb/Storage.py b/lib/bridgedb/Storage.py index 5d42930..da64a30 100644 --- a/lib/bridgedb/Storage.py +++ b/lib/bridgedb/Storage.py @@ -8,6 +8,7 @@ import logging import binascii import sqlite3 import time +import sha toHex = binascii.b2a_hex fromHex = binascii.a2b_hex @@ -144,6 +145,13 @@ SCHEMA2_SCRIPT = """ CREATE INDEX BlockedBridgesBlockingCountry on BlockedBridges(hex_key); + CREATE TABLE WarnedEmails ( + email PRIMARY KEY NOT NULL, + when_warned + ); + + CREATE INDEX WarnedEmailsWasWarned on WarnedEmails ( email ); + INSERT INTO Config VALUES ( 'schema-version', 2 ); """ @@ -227,6 +235,7 @@ class Database: cur.execute("DELETE FROM EmailedBridges WHERE when_mailed < ?", (t,)) def getEmailTime(self, addr): + addr = sha.new(addr).hexdigest() cur = self._cur cur.execute("SELECT when_mailed FROM EmailedBridges WHERE " "email = ?", (addr,)) @@ -236,6 +245,7 @@ class Database: return strToTime(v[0]) def setEmailTime(self, addr, whenMailed): + addr = sha.new(addr).hexdigest() cur = self._cur t = timeToStr(whenMailed) cur.execute("INSERT OR REPLACE INTO EmailedBridges " @@ -321,6 +331,33 @@ class Database: return False return True + def getWarnedEmail(self, addr): + addr = sha.new(addr).hexdigest() + cur = self._cur + cur.execute("SELECT * FROM WarnedEmails WHERE " + " email = ?", (addr,)) + v = cur.fetchone() + if v is None: + return False + return True + + def setWarnedEmail(self, addr, warned=True, whenWarned=time.time()): + addr = sha.new(addr).hexdigest() + t = timeToStr(whenWarned) + cur = self._cur + if warned == True: + cur.execute("INSERT INTO WarnedEmails" + "(email,when_warned) VALUES (?,?)", (addr, t,)) + elif warned == False: + cur.execute("DELETE FROM WarnedEmails WHERE " + "email = ?", (addr,)) + + def cleanWarnedEmails(self, expireBefore): + cur = self._cur + t = timeToStr(expireBefore) + + cur.execute("DELETE FROM WarnedEmails WHERE when_warned < ?", (t,)) + def openDatabase(sqlite_file): conn = sqlite3.Connection(sqlite_file) cur = conn.cursor() diff --git a/lib/bridgedb/Tests.py b/lib/bridgedb/Tests.py index 558fedf..9648f86 100644 --- a/lib/bridgedb/Tests.py +++ b/lib/bridgedb/Tests.py @@ -45,6 +45,41 @@ class RhymesWith255Category: def contains(self, ip): return ip.endswith(".255") +class EmailBridgeDistTests(unittest.TestCase): + def setUp(self): + self.fd, self.fname = tempfile.mkstemp() + self.db = bridgedb.Storage.Database(self.fname) + bridgedb.Storage.setGlobalDB(self.db) + self.cur = self.db._conn.cursor() + + def tearDown(self): + self.db.close() + os.close(self.fd) + os.unlink(self.fname) + + def testEmailRateLimit(self): + db = self.db + EMAIL_DOMAIN_MAP = {'example.com':'example.com'} + d = bridgedb.Dist.EmailBasedDistributor( + "Foo", + {'example.com': 'example.com', + 'dkim.example.com': 'dkim.example.com'}, + {'example.com': [], 'dkim.example.com': ['dkim']}) + for _ in xrange(256): + d.insert(fakeBridge()) + d.getBridgesForEmail('abc(a)example.com', 1, 3) + self.assertRaises(bridgedb.Dist.TooSoonEmail, + d.getBridgesForEmail, 'abc(a)example.com', 1, 3) + self.assertRaises(bridgedb.Dist.IgnoreEmail, + d.getBridgesForEmail, 'abc(a)example.com', 1, 3) + + def testUnsupportedDomain(self): + db = self.db + self.assertRaises(bridgedb.Dist.UnsupportedDomain, + bridgedb.Dist.normalizeEmail, 'bad(a)email.com', + {'example.com':'example.com'}, + {'example.com':[]}) + class IPBridgeDistTests(unittest.TestCase): def dumbAreaMapper(self, ip): return ip @@ -250,12 +285,22 @@ class SQLStorageTests(unittest.TestCase): self.assertEquals(set(db.getBlockingCountries(b2.fingerprint)), set(['uk', 'cn', 'de', 'jp', 'se', 'kr'])) + self.assertEquals(db.getWarnedEmail("def(a)example.com"), False) + db.setWarnedEmail("def(a)example.com") + self.assertEquals(db.getWarnedEmail("def(a)example.com"), True) + db.setWarnedEmail("def(a)example.com", False) + self.assertEquals(db.getWarnedEmail("def(a)example.com"), False) + + db.setWarnedEmail("def(a)example.com") + self.assertEquals(db.getWarnedEmail("def(a)example.com"), True) + db.cleanWarnedEmails(t+200) + self.assertEquals(db.getWarnedEmail("def(a)example.com"), False) def testSuite(): suite = unittest.TestSuite() loader = unittest.TestLoader() - for klass in [ IPBridgeDistTests, DictStorageTests, SQLStorageTests ]: + for klass in [ IPBridgeDistTests, DictStorageTests, SQLStorageTests, EmailBridgeDistTests ]: suite.addTest(loader.loadTestsFromTestCase(klass)) for module in [ bridgedb.Bridges,

1 0

[bridgedb/master] 1836 - recaptcha support
by arma＠torproject.org 19 Sep '11

19 Sep '11

commit 2d670fe64c04b632c9bbc8f0d2ccddd6e2b0baaa Author: aagbsn <aagbsn(a)extc.org> Date: Mon Jul 25 17:18:20 2011 -0700 1836 - recaptcha support This set of changes adds recaptcha support to bridgedb. The implementation proxies responses from clients to preserve their privacy. --- README | 3 + bridgedb.conf | 7 +++ lib/bridgedb/I18n.py | 10 ++++- lib/bridgedb/Main.py | 5 ++- lib/bridgedb/Raptcha.py | 40 +++++++++++++++ lib/bridgedb/Server.py | 122 +++++++++++++++++++++++++++++++++++++++++++++- 6 files changed, 182 insertions(+), 5 deletions(-) diff --git a/README b/README index c05317a..a21e273 100644 --- a/README +++ b/README @@ -14,6 +14,9 @@ To set up: - To install Maxmind GeoIP - Debian: apt-get install python-geoip - Others: http://www.maxmind.com/app/python + - To enable recaptcha support, set the options RECAPTCHA_ENABLED, + RECAPTCHA_PUB_KEY, and RECAPTCHA_PRIV_KEY in bridgedb.conf. + A recaptcha.net account is required. To re-generate and update the i18n files (in case translated strings have changed in BridgeDB): diff --git a/bridgedb.conf b/bridgedb.conf index 11afc02..e5d7314 100644 --- a/bridgedb.conf +++ b/bridgedb.conf @@ -147,3 +147,10 @@ EMAIL_INCLUDE_FINGERPRINTS=False RESERVED_SHARE=2 FILE_BUCKETS = {} + +# Options related to recaptcha support. +# Enable/Disable recaptcha +RECAPTCHA_ENABLED = False +# Recaptcha API keys +RECAPTCHA_PUB_KEY = '' +RECAPTCHA_PRIV_KEY = '' diff --git a/lib/bridgedb/I18n.py b/lib/bridgedb/I18n.py index 750ca4a..24629f1 100644 --- a/lib/bridgedb/I18n.py +++ b/lib/bridgedb/I18n.py @@ -58,5 +58,13 @@ emails is: """), # BRIDGEDB_TEXT[11] _("""hours"""), # BRIDGEDB_TEXT[12] - _("""All further emails will be ignored.""") + _("""All further emails will be ignored."""), + # BRIDGEDB_TEXT[13] + _("""Type the two words"""), + # BRIDGEDB_TEXT[14] + _("""I am human"""), + # BRIDGEDB_TEXT[15] + _("""Upgrade your browser to Firefox"""), + # BRIDGEDB_TEXT[16] + _("""(Might be blocked)""") ] diff --git a/lib/bridgedb/Main.py b/lib/bridgedb/Main.py index 42f78c3..2ef56bf 100644 --- a/lib/bridgedb/Main.py +++ b/lib/bridgedb/Main.py @@ -95,7 +95,10 @@ CONFIG = Conf( RESERVED_SHARE=2, - FILE_BUCKETS = {} + FILE_BUCKETS = {}, + RECAPTCHA_ENABLED = False, + RECAPTCHA_PUB_KEY = '', + RECAPTCHA_PRIV_KEY = '', ) def configureLogging(cfg): diff --git a/lib/bridgedb/Raptcha.py b/lib/bridgedb/Raptcha.py new file mode 100644 index 0000000..1af8dd6 --- /dev/null +++ b/lib/bridgedb/Raptcha.py @@ -0,0 +1,40 @@ +# Raptcha +# Copyright (c) 2010, The Tor Project, Inc. +# See LICENSE for licensing information + +""" +This module wraps the recaptcha api and proxies requests to protect privacy. +""" +import recaptcha.client.captcha as captcha +from BeautifulSoup import BeautifulSoup +import urllib2 + +class Raptcha(): + """ A recaptcha captcha and method to request them """ + + def __init__(self, pubkey=None, privkey=None): + self.pubkey = pubkey + self.privkey = privkey + self.image = None + self.challenge = None + + def get(self): + """ gets a fresh captcha """ + + if (self.pubkey == '') or (self.privkey == ''): + raise RaptchaKeyError + urlbase = captcha.API_SERVER + form = "/noscript?k=%s" % self.pubkey + + # extract and store image from captcha + html = urllib2.urlopen(urlbase+form).read() + soup = BeautifulSoup(html) + imgurl = urlbase+"/"+ soup.find('img')['src'] + self.challenge = str(soup.find('input', {'name' : 'recaptcha_challenge_field'})['value']) + self.image = urllib2.urlopen(imgurl).read() + +class RaptchaKeyError(Exception): + """ Exception raised when recaptcha API keys are not supplied""" + def __init__(self): + msg = 'You must supply recaptcha API keys' + Exception.__init__(self, msg) diff --git a/lib/bridgedb/Server.py b/lib/bridgedb/Server.py index 9cbeb15..1089598 100644 --- a/lib/bridgedb/Server.py +++ b/lib/bridgedb/Server.py @@ -26,6 +26,12 @@ import twisted.mail.smtp import bridgedb.Dist import bridgedb.I18n as I18n +import recaptcha.client.captcha as captcha +from random import randint +from bridgedb.Raptcha import Raptcha +import base64 +import textwrap + try: import GeoIP # GeoIP data object: choose database here @@ -42,7 +48,9 @@ class WebResource(twisted.web.resource.Resource): isLeaf = True def __init__(self, distributor, schedule, N=1, useForwardedHeader=False, - includeFingerprints=True, domains=[]): + includeFingerprints=True, + useRecaptcha=False,recaptchaPrivKey='', recaptchaPubKey='', + domains=[]): """Create a new WebResource. distributor -- an IPBasedDistributor object schedule -- an IntervalSchedule object @@ -57,7 +65,57 @@ class WebResource(twisted.web.resource.Resource): self.includeFingerprints = includeFingerprints self.domains = domains + # recaptcha options + self.useRecaptcha = useRecaptcha + self.recaptchaPrivKey = recaptchaPrivKey + self.recaptchaPubKey = recaptchaPubKey + def render_GET(self, request): + if self.useRecaptcha: + # get a captcha + c = Raptcha(self.recaptchaPubKey, self.recaptchaPrivKey) + c.get() + + # TODO: this does not work for versions of IE < 8.0 + imgstr = 'data:image/jpeg;base64,%s' % base64.b64encode(c.image) + HTML_CAPTCHA_TEMPLATE = self.buildHTMLMessageTemplateWithCaptcha( + getLocaleFromRequest(request), c.challenge, imgstr) + return HTML_CAPTCHA_TEMPLATE + else: + return self.getBridgeRequestAnswer(request) + + + def render_POST(self, request): + + # check captcha if recaptcha support is enabled + if self.useRecaptcha: + try: + challenge = request.args['recaptcha_challenge_field'][0] + response = request.args['recaptcha_response_field'][0] + + except: + return self.render_GET(request) + + # generate a random IP for the captcha submission + remote_ip = '%d.%d.%d.%d' % (randint(1,255),randint(1,255), + randint(1,255),randint(1,255)) + + recaptcha_response = captcha.submit(challenge, response, + self.recaptchaPrivKey, remote_ip) + if recaptcha_response.is_valid: + logging.info("Valid recaptcha from %s. Parameters were %r", + remote_ip, request.args) + else: + logging.info("Invalid recaptcha from %s. Parameters were %r", + remote_ip, request.args) + logging.info("Recaptcha error code: %s", recaptcha_response.error_code) + return self.render_GET(request) # redirect back to captcha + + return self.getBridgeRequestAnswer(request) + + def getBridgeRequestAnswer(self, request): + """ returns a response to a bridge request """ + interval = self.schedule.getInterval(time.time()) bridges = ( ) ip = None @@ -131,6 +189,44 @@ class WebResource(twisted.web.resource.Resource): return html_msg + def buildHTMLMessageTemplateWithCaptcha(self, t, challenge, img): + """Builds a translated html response with recaptcha""" + + recaptchaTemplate = textwrap.dedent("""\ + <form action="" method="POST"> + <input type="hidden" name="recaptcha_challenge_field" + id="recaptcha_challenge_field"\ + value="{recaptchaChallengeField}"> + <img width="300" height="57" alt="{bridgeDBText14}"\ + src="{recaptchaImgSrc}"> + <div class="recaptcha_input_area"> + <label for="recaptcha_response_field">{bridgeDBText12}</label> + </div> + <div> + <input name="recaptcha_response_field"\ + id="recaptcha_response_field" + type="text" autocomplete="off"> + </div> + <div> + <input type="submit" name="submit" value="{bridgeDBText13}"> + </div> + </form> + """).strip() + + recaptchaTemplate = recaptchaTemplate.format( + recaptchaChallengeField=challenge, + recaptchaImgSrc=img, + bridgeDBText12=t.gettext(I18n.BRIDGEDB_TEXT[13]), + bridgeDBText13=t.gettext(I18n.BRIDGEDB_TEXT[14]), + bridgeDBText14=t.gettext(I18n.BRIDGEDB_TEXT[15])) + + html_msg = "<html><body>" \ + + "<p>" + t.gettext(I18n.BRIDGEDB_TEXT[1]) + "</p>" \ + + "<p>" + t.gettext(I18n.BRIDGEDB_TEXT[9]) + "</p>" \ + + "<p>" + recaptchaTemplate + "</p>" \ + + "<p>" + t.gettext(I18n.BRIDGEDB_TEXT[4]) + "</p>" \ + + "</body></html>" + return html_msg def addWebServer(cfg, dist, sched): """Set up a web server. @@ -142,6 +238,9 @@ def addWebServer(cfg, dist, sched): HTTPS_PORT HTTPS_BIND_IP HTTPS_USE_IP_FROM_FORWARDED_HEADER + RECAPTCHA_ENABLED + RECAPTCHA_PUB_KEY + RECAPTCHA_PRIV_KEY dist -- an IPBasedDistributor object. sched -- an IntervalSchedule object. """ @@ -152,7 +251,10 @@ def addWebServer(cfg, dist, sched): resource = WebResource(dist, sched, cfg.HTTPS_N_BRIDGES_PER_ANSWER, cfg.HTTP_USE_IP_FROM_FORWARDED_HEADER, includeFingerprints=cfg.HTTPS_INCLUDE_FINGERPRINTS, - domains=cfg.EMAIL_DOMAINS) + useRecaptcha=cfg.RECAPTCHA_ENABLED, + domains=cfg.EMAIL_DOMAINS, + recaptchaPrivKey=cfg.RECAPTCHA_PRIV_KEY, + recaptchaPubKey=cfg.RECAPTCHA_PUB_KEY) site = Site(resource) reactor.listenTCP(cfg.HTTP_UNENCRYPTED_PORT, site, interface=ip) if cfg.HTTPS_PORT: @@ -164,7 +266,10 @@ def addWebServer(cfg, dist, sched): resource = WebResource(dist, sched, cfg.HTTPS_N_BRIDGES_PER_ANSWER, cfg.HTTPS_USE_IP_FROM_FORWARDED_HEADER, includeFingerprints=cfg.HTTPS_INCLUDE_FINGERPRINTS, - domains=cfg.EMAIL_DOMAINS) + domains=cfg.EMAIL_DOMAINS, + useRecaptcha=cfg.RECAPTCHA_ENABLED, + recaptchaPrivKey=cfg.RECAPTCHA_PRIV_KEY, + recaptchaPubKey=cfg.RECAPTCHA_PUB_KEY) site = Site(resource) reactor.listenSSL(cfg.HTTPS_PORT, site, factory, interface=ip) return site @@ -381,6 +486,17 @@ def getLocaleFromPlusAddr(address): return replyLocale +def getLocaleFromRequest(request): + # See if we did get a request for a certain locale, otherwise fall back + # to 'en': + # Try evaluating the path /foo first, then check if we got a ?lang=foo + default_lang = lang = "en" + if len(request.path) > 1: + lang = request.path[1:] + if lang == default_lang: + lang = request.args.get("lang", [default_lang]) + lang = lang[0] + return I18n.getLang(lang) class MailContext: """Helper object that holds information used by email subsystem."""

1 0

[gettor/master] Insert a dirty hack into MakeStat.py as long as we must keep
by kaner＠torproject.org 18 Sep '11

18 Sep '11

commit 56176f0babfb3623279b3dc0732e78e23a3e6e41 Author: Christian Fromme <kaner(a)strace.org> Date: Mon Sep 12 20:07:17 2011 +0200 Insert a dirty hack into MakeStat.py as long as we must keep log files with old packages names around.. --- MakeStat.py | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/MakeStat.py b/MakeStat.py index f124370..24ceeaf 100644 --- a/MakeStat.py +++ b/MakeStat.py @@ -12,6 +12,7 @@ def makestats(filename, configPackages): # Initialize package counter packageCounter = { 'None': 0} + dateInfo = "" for k in configPackages.keys(): packageCounter[k] = 0 @@ -30,6 +31,21 @@ def makestats(filename, configPackages): reqInfo = ast.literal_eval(match.group(2)) package = reqInfo['package'] if package is not None: + match = re.match("tor-browser-bundle(_.*)", package) + if match: + package = "windows" + match.group(1) + match = re.match("linux-browser-bundle(-.*)", package) + if match: + package = "linux" + match.group(1) + match = re.match("(macosx-i386)(.*)", package) + if match: + package = "macosx-i386" + match = re.match("(macosx-ppc)(.*)", package) + if match: + package = "macosx-ppc" + match = re.match("windows-bundle", package) + if match: + continue packageCounter[package] += 1 else: packageCounter['None'] += 1

1 0

[gettor/master] Configuration file correction: s/macosx/macos/
by kaner＠torproject.org 18 Sep '11

18 Sep '11

commit ea20c37577818f64f00e37f056bcdb936a058457 Author: Christian Fromme <kaner(a)strace.org> Date: Sun Sep 18 21:27:41 2011 +0200 Configuration file correction: s/macosx/macos/ --- gettor.conf | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/gettor.conf b/gettor.conf index 29a2494..56f8c35 100644 --- a/gettor.conf +++ b/gettor.conf @@ -95,46 +95,46 @@ PACKAGES = { "source": ("tor-*.tar.gz", "unavailable"), - "macosx-ppc": + "macos-ppc": ("vidalia-bundles/vidalia-bundle-*-ppc.dmg", "unavailable"), - "macosx-i386": + "macos-i386": ("torbrowser/osx/TorBrowser-*-dev-osx-i386-en-US.zip", "unavailable"), - "macosx-i386_en": + "macos-i386_en": ("torbrowser/osx/TorBrowser-*-dev-osx-i386-en-US.zip", "unavailable"), - "macosx-i386_ar": + "macos-i386_ar": ("torbrowser/osx/TorBrowser-*-dev-osx-i386-ar.zip", "unavailable"), - "macosx-i386_de": + "macos-i386_de": ("torbrowser/osx/TorBrowser-*-dev-osx-i386-de.zip", "unavailable"), - "macosx-i386_es-ES": + "macos-i386_es-ES": ("torbrowser/osx/TorBrowser-*-dev-osx-i386-es-ES.zip", "unavailable"), - "macosx-i386_fa": + "macos-i386_fa": ("torbrowser/osx/TorBrowser-*-dev-osx-i386-fa.zip", "unavailable"), - "macosx-i386_fr": + "macos-i386_fr": ("torbrowser/osx/TorBrowser-*-dev-osx-i386-fr.zip", "unavailable"), - "macosx-i386_it": + "macos-i386_it": ("torbrowser/osx/TorBrowser-*-dev-osx-i386-it.zip", "unavailable"), - "macosx-i386_nl": + "macos-i386_nl": ("torbrowser/osx/TorBrowser-*-dev-osx-i386-nl.zip", "unavailable"), - "macosx-i386_pl": + "macos-i386_pl": ("torbrowser/osx/TorBrowser-*-dev-osx-i386-pl.zip", "unavailable"), - "macosx-i386_pt": + "macos-i386_pt": ("torbrowser/osx/TorBrowser-*-dev-osx-i386-pt-PT.zip", "unavailable"), - "macosx-i386_ru": + "macos-i386_ru": ("torbrowser/osx/TorBrowser-*-dev-osx-i386-ru.zip", "unavailable"), - "macosx-i386_zh_CN": + "macos-i386_zh_CN": ("torbrowser/osx/TorBrowser-*-dev-osx-i386-zh-CN.zip", "unavailable"), "linux-i386":

1 0

r25086: {website} actually really truly link to the vidalia foo bundle correct (website/trunk/include)
by Roger Dingledine 18 Sep '11

18 Sep '11

Author: arma Date: 2011-09-18 15:50:03 +0000 (Sun, 18 Sep 2011) New Revision: 25086 Modified: website/trunk/include/versions.wmi Log: actually really truly link to the vidalia foo bundle correctly this time for sure! Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2011-09-18 15:37:57 UTC (rev 25085) +++ website/trunk/include/versions.wmi 2011-09-18 15:50:03 UTC (rev 25086) @@ -67,19 +67,19 @@ <define-tag file-win32-bundle-alpha whitespace=delete>vidalia-bundle-<version-win32-bundle-alpha>-0.2.14.exe</define-tag> <define-tag package-win32-bundle-alpha whitespace=delete>/dist/vidalia-bundles/<file-win32-bundle-alpha></define-tag> -<define-tag file-win32-bridge-bundle-stable whitespace=delete>vidalia-bundle-<version-win32-bundle-stable>-0.2.14.exe</define-tag> +<define-tag file-win32-bridge-bundle-stable whitespace=delete>vidalia-bridge-bundle-<version-win32-bundle-stable>-0.2.14.exe</define-tag> <define-tag package-win32-bridge-bundle-stable whitespace=delete>/dist/vidalia-bundles/<file-win32-bridge-bundle-stable></define-tag> -<define-tag file-win32-bridge-bundle-alpha whitespace=delete>vidalia-bundle-<version-win32-bundle-alpha>-0.2.14.exe</define-tag> +<define-tag file-win32-bridge-bundle-alpha whitespace=delete>vidalia-bridge-bundle-<version-win32-bundle-alpha>-0.2.14.exe</define-tag> <define-tag package-win32-bridge-bundle-alpha whitespace=delete>/dist/vidalia-bundles/<file-win32-bridge-bundle-alpha></define-tag> -<define-tag file-win32-relay-bundle-stable whitespace=delete>vidalia-bundle-<version-win32-bundle-stable>-0.2.14.exe</define-tag> +<define-tag file-win32-relay-bundle-stable whitespace=delete>vidalia-relay-bundle-<version-win32-bundle-stable>-0.2.14.exe</define-tag> <define-tag package-win32-relay-bundle-stable whitespace=delete>/dist/vidalia-bundles/<file-win32-relay-bundle-stable></define-tag> -<define-tag file-win32-relay-bundle-alpha whitespace=delete>vidalia-bundle-<version-win32-bundle-alpha>-0.2.14.exe</define-tag> +<define-tag file-win32-relay-bundle-alpha whitespace=delete>vidalia-relay-bundle-<version-win32-bundle-alpha>-0.2.14.exe</define-tag> <define-tag package-win32-relay-bundle-alpha whitespace=delete>/dist/vidalia-bundles/<file-win32-relay-bundle-alpha></define-tag> -<define-tag file-win32-exit-bundle-stable whitespace=delete>vidalia-bundle-<version-win32-bundle-stable>-0.2.14.exe</define-tag> +<define-tag file-win32-exit-bundle-stable whitespace=delete>vidalia-exit-bundle-<version-win32-bundle-stable>-0.2.14.exe</define-tag> <define-tag package-win32-exit-bundle-stable whitespace=delete>/dist/vidalia-bundles/<file-win32-exit-bundle-stable></define-tag> -<define-tag file-win32-exit-bundle-alpha whitespace=delete>vidalia-bundle-<version-win32-bundle-alpha>-0.2.14.exe</define-tag> +<define-tag file-win32-exit-bundle-alpha whitespace=delete>vidalia-exit-bundle-<version-win32-bundle-alpha>-0.2.14.exe</define-tag> <define-tag package-win32-exit-bundle-alpha whitespace=delete>/dist/vidalia-bundles/<file-win32-exit-bundle-alpha></define-tag> <define-tag file-osx-x86-bundle-stable whitespace=delete>vidalia-bundle-<version-osx-x86-bundle-stable>-0.2.14-i386.dmg</define-tag>

1 0

r25085: {website} the windows bridge/exit/relay bundles were all pointing to h (website/trunk/download/en)
by Roger Dingledine 18 Sep '11

18 Sep '11

Author: arma Date: 2011-09-18 15:37:57 +0000 (Sun, 18 Sep 2011) New Revision: 25085 Modified: website/trunk/download/en/download.wml Log: the windows bridge/exit/relay bundles were all pointing to https://www.torproject.org/dist/vidalia-bundles/vidalia-bundle-0.2.2.33-0.2… Modified: website/trunk/download/en/download.wml =================================================================== --- website/trunk/download/en/download.wml 2011-09-18 15:36:21 UTC (rev 25084) +++ website/trunk/download/en/download.wml 2011-09-18 15:37:57 UTC (rev 25085) @@ -85,7 +85,7 @@  <div class="package"> <div class="downloads"> - <a class="button" href="<package-win32-relay-bundle-stable>.exe"><span class="strong">Download</span><span class="normal">Vidalia Relay Bundle (Beta)</span></a> + <a class="button" href="<package-win32-relay-bundle-stable>"><span class="strong">Download</span><span class="normal">Vidalia Relay Bundle (Beta)</span></a> <div class="sig"> (<a href="<package-win32-relay-bundle-stable>.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> </div> @@ -99,7 +99,7 @@  <div class="package"> <div class="downloads"> - <a class="button" href="<package-win32-exit-bundle-stable>.exe"><span class="strong">Download</span><span class="normal">Vidalia Exit Bundle (Beta)</span></a> + <a class="button" href="<package-win32-exit-bundle-stable>"><span class="strong">Download</span><span class="normal">Vidalia Exit Bundle (Beta)</span></a> <div class="sig"> (<a href="<package-win32-exit-bundle-stable>.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> </div>

1 0

r25084: {website} the windows bridge/relay/exit bundle links were pointing at (website/trunk/include)
by Roger Dingledine 18 Sep '11

18 Sep '11

Author: arma Date: 2011-09-18 15:36:21 +0000 (Sun, 18 Sep 2011) New Revision: 25084 Modified: website/trunk/include/versions.wmi Log: the windows bridge/relay/exit bundle links were pointing at the main bundle only Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2011-09-17 00:59:13 UTC (rev 25083) +++ website/trunk/include/versions.wmi 2011-09-18 15:36:21 UTC (rev 25084) @@ -68,19 +68,19 @@ <define-tag package-win32-bundle-alpha whitespace=delete>/dist/vidalia-bundles/<file-win32-bundle-alpha></define-tag> <define-tag file-win32-bridge-bundle-stable whitespace=delete>vidalia-bundle-<version-win32-bundle-stable>-0.2.14.exe</define-tag> -<define-tag package-win32-bridge-bundle-stable whitespace=delete>/dist/vidalia-bundles/<file-win32-bundle-stable></define-tag> +<define-tag package-win32-bridge-bundle-stable whitespace=delete>/dist/vidalia-bundles/<file-win32-bridge-bundle-stable></define-tag> <define-tag file-win32-bridge-bundle-alpha whitespace=delete>vidalia-bundle-<version-win32-bundle-alpha>-0.2.14.exe</define-tag> -<define-tag package-win32-bridge-bundle-alpha whitespace=delete>/dist/vidalia-bundles/<file-win32-bundle-alpha></define-tag> +<define-tag package-win32-bridge-bundle-alpha whitespace=delete>/dist/vidalia-bundles/<file-win32-bridge-bundle-alpha></define-tag> <define-tag file-win32-relay-bundle-stable whitespace=delete>vidalia-bundle-<version-win32-bundle-stable>-0.2.14.exe</define-tag> -<define-tag package-win32-relay-bundle-stable whitespace=delete>/dist/vidalia-bundles/<file-win32-bundle-stable></define-tag> +<define-tag package-win32-relay-bundle-stable whitespace=delete>/dist/vidalia-bundles/<file-win32-relay-bundle-stable></define-tag> <define-tag file-win32-relay-bundle-alpha whitespace=delete>vidalia-bundle-<version-win32-bundle-alpha>-0.2.14.exe</define-tag> -<define-tag package-win32-relay-bundle-alpha whitespace=delete>/dist/vidalia-bundles/<file-win32-bundle-alpha></define-tag> +<define-tag package-win32-relay-bundle-alpha whitespace=delete>/dist/vidalia-bundles/<file-win32-relay-bundle-alpha></define-tag> <define-tag file-win32-exit-bundle-stable whitespace=delete>vidalia-bundle-<version-win32-bundle-stable>-0.2.14.exe</define-tag> -<define-tag package-win32-exit-bundle-stable whitespace=delete>/dist/vidalia-bundles/<file-win32-bundle-stable></define-tag> +<define-tag package-win32-exit-bundle-stable whitespace=delete>/dist/vidalia-bundles/<file-win32-exit-bundle-stable></define-tag> <define-tag file-win32-exit-bundle-alpha whitespace=delete>vidalia-bundle-<version-win32-bundle-alpha>-0.2.14.exe</define-tag> -<define-tag package-win32-exit-bundle-alpha whitespace=delete>/dist/vidalia-bundles/<file-win32-bundle-alpha></define-tag> +<define-tag package-win32-exit-bundle-alpha whitespace=delete>/dist/vidalia-bundles/<file-win32-exit-bundle-alpha></define-tag> <define-tag file-osx-x86-bundle-stable whitespace=delete>vidalia-bundle-<version-osx-x86-bundle-stable>-0.2.14-i386.dmg</define-tag> <define-tag package-osx-x86-bundle-stable whitespace=delete>/dist/vidalia-bundles/<file-osx-x86-bundle-stable></define-tag>

1 0

[metrics-web/master] Fix a typo.
by karsten＠torproject.org 17 Sep '11

17 Sep '11

commit d1a9d14a45c15c054e083ef57d50ab5d1deadfa6 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sat Sep 17 20:22:22 2011 +0200 Fix a typo. --- web/WEB-INF/formats.jsp | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/WEB-INF/formats.jsp b/web/WEB-INF/formats.jsp index 0326d5b..31078c0 100644 --- a/web/WEB-INF/formats.jsp +++ b/web/WEB-INF/formats.jsp @@ -817,7 +817,7 @@ Tor Check makes the list of known exits and corresponding exit IP addresses available in a specific format. The document below shows an entry of the exit list written on December 28, 2010 at 15:21:44 UTC. -This entry means that the relay with fingerprint <tt>63Ba..</tt> which +This entry means that the relay with fingerprint <tt>63BA..</tt> which published a descriptor at 07:35:55 and was contained in a version 2 network status from 08:10:11 uses two different IP addresses for exiting. The first address <tt>91.102.152.236</tt> was found in a test performed at

1 0

r25083: {website} 2010 financial results are now available. Maybe someone will (in website/trunk/about: en findoc)
by Andrew Lewman 17 Sep '11

17 Sep '11

Author: phobos Date: 2011-09-17 00:59:13 +0000 (Sat, 17 Sep 2011) New Revision: 25083 Added: website/trunk/about/findoc/2010-TorProject-combined-Form990_PC_Audit_Results.pdf website/trunk/about/findoc/2010-TorProject-combined-Form990_PC_Audit_Results.pdf.asc Modified: website/trunk/about/en/financials.wml Log: 2010 financial results are now available. Maybe someone will leak these public documents again. Modified: website/trunk/about/en/financials.wml =================================================================== --- website/trunk/about/en/financials.wml 2011-09-16 02:32:04 UTC (rev 25082) +++ website/trunk/about/en/financials.wml 2011-09-17 00:59:13 UTC (rev 25083) @@ -13,6 +13,8 @@ <div id="maincol"> <h1>Tor: Financial Reports</h1> <dl> + <dt>Fiscal Year 2010</dt> + <dd><a href="findoc/2010-TorProject-combined-Form990_PC_Audit_Results.pdf">2010 IRS Form 990, State of MA Form PC, and Independent Audit Results</a></dd> <dt>Fiscal Year 2009</dt> <dd><a href="findoc/2009-TorProject-Annual-Report.pdf">2009 Annual Report</a></dd> <dd><a href="findoc/2009-TorProject-Form990andPC.pdf">2009 IRS Form 990 and State of MA Form PC</a></dd> Added: website/trunk/about/findoc/2010-TorProject-combined-Form990_PC_Audit_Results.pdf =================================================================== (Binary files differ) Property changes on: website/trunk/about/findoc/2010-TorProject-combined-Form990_PC_Audit_Results.pdf ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: website/trunk/about/findoc/2010-TorProject-combined-Form990_PC_Audit_Results.pdf.asc =================================================================== --- website/trunk/about/findoc/2010-TorProject-combined-Form990_PC_Audit_Results.pdf.asc (rev 0) +++ website/trunk/about/findoc/2010-TorProject-combined-Form990_PC_Audit_Results.pdf.asc 2011-09-17 00:59:13 UTC (rev 25083) @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIcBAABCAAGBQJOc+/xAAoJEM3X9rV07TNrlHcQAMBB1WLDi+uQwTGqcA/j68QB +uaF2ncd+IHKb1WCgvZi1FravA55yTZmTjXhE95iY1SZqLIzGabY3H1F+3d12lNLx +iPepQhXuBvumk0/+Ioc30W1ZOJxzimcuGCQ5hbqhyGAOZoFO7LHvp/tl1bZn6w8N +5D5kJedWGACoLCJIzSIM8xUUksaq5n3H8ERd/Z8qcnNAluCl5QDsdrnKj78q5fqp +l17sK8ZUi54fp0iccewSSme8Qfoe6uBtqEZDuBW+obd/283A8JKs9Q7qSLIdit9/ +KJOHbmwy6IrDnfd5aUpKWAr+ajAVhrt/p4Tr5wxqlBaFxvOGmCOWZppqnD7v38At +T40sX0jIsaXTLX90R7luZuNWdHkoBbN4Wpj8RfH6DXE/gsOb88Tb4m/D4Sr0XxTO +Di1KQG65ZUmFb9hpihJcE+xwh9SpzPHF3Yq1+NIem+iwHrNG5f3Ugon1rSzYHLmU +iKAETw+xiRExUwqFoVZgPb0iDLplcI9bKgzm8hAkUzctyTQaUkpovixgleqIkrHI +Ft2Q6TAXpi/pw4mCPiNnzzOgHcvwAUIoAR2iMrMthkZ61OSwHIFqDTTUfuNkRf67 +RTwi+8lVVmXXquJFjs30FDiWzISydfQZFiqFbO2cEdMi0xiGVsMK/zSZQwuqvqMh +PTQE1Q4mNB6AVQWwrTff +=O/R2 +-----END PGP SIGNATURE----- Property changes on: website/trunk/about/findoc/2010-TorProject-combined-Form990_PC_Audit_Results.pdf.asc ___________________________________________________________________ Added: svn:mime-type + text/plain

1 0

r25082: {website} fix the odd character encodings. (website/trunk/eff/en)
by Andrew Lewman 16 Sep '11

16 Sep '11

Author: phobos Date: 2011-09-16 02:32:04 +0000 (Fri, 16 Sep 2011) New Revision: 25082 Modified: website/trunk/eff/en/tor-dmca-response.wml Log: fix the odd character encodings. Modified: website/trunk/eff/en/tor-dmca-response.wml =================================================================== --- website/trunk/eff/en/tor-dmca-response.wml 2011-09-16 02:26:27 UTC (rev 25081) +++ website/trunk/eff/en/tor-dmca-response.wml 2011-09-16 02:32:04 UTC (rev 25082) @@ -14,7 +14,7 @@ <p>Note to Tor relay operators: In this litigious era, anyone providing routing services may face copyright complaints for transmitted content. Fortunately, the Digital Millennium Copyright Act safe harbors should -provide protections from many of them�both to you and to your upstream +provide protections from many of them both to you and to your upstream provider. If your Internet host forwards a DMCA copyright complaint to you, you can use this template to write a response, though you will need to customize it to your situation. Please also ensure all the statements @@ -56,7 +56,7 @@ run.</p> <p>As you know, the DMCA creates four "safe harbors" for service providers to protect them from copyright liability for the acts of their -users, when the ISPs fulfill certain requirements. (17 U.S.C. � 512) The +users, when the ISPs fulfill certain requirements. (17 U.S.C. § 512) The DMCA's requirements vary depending on the ISP's role. You may be familiar with the "notice and takedown" provisions of section 512(c) of the DMCA; however, those do not apply when an ISP merely acts as a @@ -80,7 +80,7 @@ terminates subscribers who are repeat infringers. The notification you received is certainly not proof of the "repeat infringement" that is required under the law before you need to terminate my account. In fact, -it�s not even proof of any copyright infringement; a notice claiming +it's not even proof of any copyright infringement; a notice claiming infringement is not the same as a determination of infringement. I have not infringed any copyrights and do not intend to do so. Therefore, you should continue to be protected under the DMCA 512(a) safe harbor

1 0