[or-cvs] r21357: {} Remove everything in bridgedb but README_BRIDGEDB_HAS_MOVED (bridgedb/trunk)
nickm at seul.org
nickm at seul.org
Wed Dec 30 02:30:40 UTC 2009
Author: nickm
Date: 2009-12-29 21:30:39 -0500 (Tue, 29 Dec 2009)
New Revision: 21357
Removed:
bridgedb/trunk/LICENSE
bridgedb/trunk/MANIFEST.in
bridgedb/trunk/README
bridgedb/trunk/TODO
bridgedb/trunk/bridgedb.conf
bridgedb/trunk/lib/
bridgedb/trunk/setup.py
Log:
Remove everything in bridgedb but README_BRIDGEDB_HAS_MOVED
Deleted: bridgedb/trunk/LICENSE
===================================================================
--- bridgedb/trunk/LICENSE 2009-12-29 22:53:18 UTC (rev 21356)
+++ bridgedb/trunk/LICENSE 2009-12-30 02:30:39 UTC (rev 21357)
@@ -1,31 +0,0 @@
-BridgeDB is distributed under this license:
-
-Copyright (c) 2007, 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: bridgedb/trunk/MANIFEST.in
===================================================================
--- bridgedb/trunk/MANIFEST.in 2009-12-29 22:53:18 UTC (rev 21356)
+++ bridgedb/trunk/MANIFEST.in 2009-12-30 02:30:39 UTC (rev 21357)
@@ -1 +0,0 @@
-include README TODO
Deleted: bridgedb/trunk/README
===================================================================
--- bridgedb/trunk/README 2009-12-29 22:53:18 UTC (rev 21356)
+++ bridgedb/trunk/README 2009-12-30 02:30:39 UTC (rev 21357)
@@ -1,28 +0,0 @@
-
-To set up:
- - Install Python 2.4 or later.
- - Install Twisted-Web, Twisted-Mail, PyOpenSSL, and all their dependencies.
- - To run unit tests, "python setup.py test"
- - python setup.py install --prefix=$HOME
- - Edit bridgedb.conf; put it somewhere good.
- - Make sure that the input files referred to in bridgedb.conf exist.
- - You can make a self-signed certificate with
- openssl req -x509 -new -nodes > cert
- - Set up PYTHONPATH to include "~/lib/python2.4/site-packages/".
-
-To run:
- - Run "python -m TorBridgeDB bridgedb.conf"
-
- - When you have new lists of bridges, replace the old files and send the
- process a sighup.
-
-To use with HTTPS:
- - Just connect to the appropriate port.
-
-To use with email:
- - Any mail sent to the email port with a subject or a single line _exactly_
- equal to "get bridges" will get answered, assuming the domain is okay.
-
-Support
- - Send your questions to nickm.
-
Deleted: bridgedb/trunk/TODO
===================================================================
--- bridgedb/trunk/TODO 2009-12-29 22:53:18 UTC (rev 21356)
+++ bridgedb/trunk/TODO 2009-12-30 02:30:39 UTC (rev 21357)
@@ -1,41 +0,0 @@
-
-Soon:
-* It keeps corrupting its database, causing Roger to delete the old
- database and undermine this whole give-the-same-answer-each-time
- design:
- https://bugs.torproject.org/flyspray/index.php?do=details&id=1098
-o Send back an email even if there are no bridges
-o Check dkim headers for sanity.
-- Make the 'magic word' for the email configurable, case-tolerant,
- html-tolerant, and punctuation-tolerant
- - for bonus points, make it base64-tolerant
-- make all the rest of the email options configurable.
-- bug: the email handler gets really upset when the email doesn't have
- a message-id header in it.
-- When we hit the end of a period, forget email address history.
-- When sending bridges to an email address in the history, check for
- liveness.
-. Make bounces go to the right address.
- o Make address sent in "mail from" command configurable.
- - Actually configure it.
-- make the bridge list you get back include at least one *non*443
- bridge. turns out sometimes 443 isn't all it's cracked up to be.
-- write the ip addresses of the unallocated bridges to a local file,
- so we can give them out manually as needed
-
-Not now:
-- check that incoming IP of email is sane.
-- check more email headers for sanity
-
-Later:
-- document stuff better
-- better area division logic
-- make all proxies get stuck in their own area.
-o implement slightly nicer logging
-- add captchas
-o decent template for web interface
-o decent template for mail interface
-- implement 'help' command
-- Reload configuration on sighup; not just bridges.
-- Reply with locale support.
-- Check host option in http
Deleted: bridgedb/trunk/bridgedb.conf
===================================================================
--- bridgedb/trunk/bridgedb.conf 2009-12-29 22:53:18 UTC (rev 21356)
+++ bridgedb/trunk/bridgedb.conf 2009-12-30 02:30:39 UTC (rev 21357)
@@ -1,134 +0,0 @@
-
-#==========
-# General-purpose options.
-
-# We chdir to this directory when we start; all files with relative
-# pathnames are created under this directory
-RUN_IN_DIR = "~/run/"
-
-# Either a file in which to write our pid, or None
-PIDFILE = "bridgedb.pid"
-
-# Either a file to log to, or None if we should log to the console.
-LOGFILE = "bridgedb.log"
-# One of "DEBUG", "INFO", "WARNING", "ERROR"...
-LOGLEVEL = "INFO"
-
-# Files from which we read bridge descriptors, on start and on SIGHUP.
-BRIDGE_FILES = [ "./bridge-descriptors" ]
-
-# File from which we read routerstatus entries, for learning which
-# current bridges are Running.
-STATUS_FILE = "networkstatus-bridges"
-
-# Only consider routers whose purpose matches this string.
-BRIDGE_PURPOSE = "bridge"
-# File to store persistent info in.
-DB_FILE = "./bridgedist.db"
-# File to log changes to persistent info in. For debugging and bugfixing.
-DB_LOG_FILE = "./bridgedist.log"
-# File in which we store our secret HMAC root key.
-MASTER_KEY_FILE = "./secret_key"
-
-# How many clusters do we group IPs in when distributing bridges based on IP?
-# Note that if PROXY_LIST_FILES is set (below), what we actually do here
-# is use one higher than the number here, and the extra cluster is used
-# for answering requests made by IP addresses in the PROXY_LIST_FILES file.
-N_IP_CLUSTERS = 4
-
-# If possible, always give a certain number of answers with a given ORPort.
-# This is a list of (port,minimum) tuples.
-FORCE_PORTS = [ (443, 1) ]
-
-# If possible, always give a certain number of answers with a given flag.
-# Only "stable" is now supported. This is a list of (flag,minimum) tuples.
-FORCE_FLAGS = [ ("Stable", 1) ]
-
-# A list of filenames that contain IP addresses (one per line) of proxies.
-# All IP-based distributors that see an incoming connection from a proxy
-# will treat them specially.
-PROXY_LIST_FILES = [ ]
-
-#==========
-# Options related to HTTPS
-
-# True if we are enabling distribution via HTTP or HTTPS; False otherwise.
-HTTPS_DIST = True
-# What proportion of bridges do we allocate to HTTP distribution? See
-# EMAIL_SHARE and RESERVED_SHARE.
-HTTPS_SHARE=10
-# An IP address (form "1.2.3.4") where we listen for HTTPS connections.
-# "None" to listen on the default interface.
-HTTPS_BIND_IP=None
-# Port to listen on for incoming HTTPS connections
-HTTPS_PORT=3443
-# Certificate file
-HTTPS_CERT_FILE="cert"
-# Private key file.
-HTTPS_KEY_FILE="privkey.pem"
-# If true, there is a trusted proxy relaying incoming messages to us: take
-# the *last* entry from its X-Forwarded-For header as the client's IP.
-HTTPS_USE_IP_FROM_FORWARDED_HEADER = False
-
-# IP and port to listen on for unencrypted HTTP connections.
-HTTP_UNENCRYPTED_BIND_IP=None
-HTTP_UNENCRYPTED_PORT=None
-# As HTTPS_USE_IP_FROM_FORWARDED_HEADER, but for unencrypted connections.
-HTTP_USE_IP_FROM_FORWARDED_HEADER = False
-# How many bridges do we give back in an answer?
-HTTPS_N_BRIDGES_PER_ANSWER=3
-
-#==========
-# Options related to Email
-
-# True if we are enabling distribution via Email; false otherwise.
-EMAIL_DIST = True
-# What proportion of bridges do we allocate to Email distribution? See
-# HTTPS_SHARE and RESERVED_SHARE.
-EMAIL_SHARE=10
-
-# What email addresses do we use for outgoing email? EMAIL_FROM_ADDR goes
-# in the From: line in outgoing headers, and EMAIL_SMTP_FROM_ADDR goes in
-# the MAIL FROM header in outgoing SMTP.
-EMAIL_FROM_ADDR = "bridges at torproject.org"
-EMAIL_SMTP_FROM_ADDR = "bridges at torproject.org"
-
-# Reject any RCPT TO lines that aren't to this user.
-EMAIL_USERNAME = "bridges"
-
-# Canonical versions of domains that we will reply to.
-EMAIL_DOMAINS = [ "gmail.com", "yahoo.com" ]
-# Map from unofficial domain to canonical domain.
-EMAIL_DOMAIN_MAP = { "mail.google.com" : "gmail.com",
- "googlemail.com" : "gmail.com",
- }
-# Map from canonical domain to list of options for that domain. Recognized
-# options are:
-# "ignore_dots" -- the service ignores "." characters in email addresses.
-# "dkim" -- if there is not a X-DKIM-Authentication-Result header
-# with the value "pass", then drop the message.
-#
-# Note that unrecognized options are ignored; be sure to spell them right!
-EMAIL_DOMAIN_RULES = { 'gmail.com' : ["ignore_dots", "dkim"],
- 'yahoo.com' : ["dkim"]
- }
-# If there are any IPs in this list, only allow incoming connections from
-# those IPs.
-EMAIL_RESTRICT_IPS=[]
-# IP and port to listen on for email connections. Debugging only.
-EMAIL_BIND_IP="127.0.0.1"
-EMAIL_PORT=6725
-# How many bridges do we give back in an answer?
-EMAIL_N_BRIDGES_PER_ANSWER=3
-
-#==========
-# Options related to unallocated bridges.
-
-# We split bridges into a group accessible by HTTPS queries; a group
-# accessible by email queries; and a group that we don't assign to any
-# query mechanism. Once a bridge is assigned to either of the first
-# two groups, it stays there persistently. The bridges are allocated
-# to these groups in a proportion of
-# HTTPS_SHARE : EMAIL_SHARE : RESERVED_SHARE
-RESERVED_SHARE=2
-
Deleted: bridgedb/trunk/setup.py
===================================================================
--- bridgedb/trunk/setup.py 2009-12-29 22:53:18 UTC (rev 21356)
+++ bridgedb/trunk/setup.py 2009-12-30 02:30:39 UTC (rev 21357)
@@ -1,48 +0,0 @@
-#!/usr/bin/python
-# BridgeDB by Nick Mathewson.
-# Copyright (c) 2007, The Tor Project, Inc.
-# See LICENSE for licensing information
-
-import distutils
-import sys
-
-from distutils.core import setup, Command
-
-class runTests(Command):
- # Based on setup.py from mixminion, which is based on setup.py
- # from Zooko's pyutil package, which is in turn based on
- # http://mail.python.org/pipermail/distutils-sig/2002-January/002714.html
- description = "Run unit tests"
- user_options = []
-
- def initialize_options(self):
- pass
-
- def finalize_options(self):
- build = self.get_finalized_command('build')
- self.build_purelib = build.build_purelib
- self.build_platlib = build.build_platlib
-
- def run(self):
- self.run_command('build')
- old_path = sys.path[:]
- sys.path[0:0] = [ self.build_purelib, self.build_platlib ]
- try:
- testmod = __import__("bridgedb.Tests", globals(), "", [])
- testmod.Tests.main()
- finally:
- sys.path = old_path
-
-setup(name='BridgeDB',
- version='0.1',
- description='Bridge disbursal tool for use with Tor anonymity network',
- author='Nick Mathewson',
- author_email='nickm at torproject dot org',
- url='https://www.torproject.org',
- package_dir= {'' : 'lib'},
- packages=['bridgedb'],
- py_modules=['TorBridgeDB'],
- cmdclass={'test' : runTests}
- )
-
-
More information about the tor-commits
mailing list