- tor-commits - lists.torproject.org

[bridgedb/master] 4056-add smart defaults for recaptcha settings
by arma＠torproject.org 01 Oct '11

01 Oct '11

commit e892917afee9e419daa7cf02a8c265a5fb809b39 Author: aagbsn <aagbsn(a)extc.org> Date: Mon Sep 19 16:12:11 2011 -0700 4056-add smart defaults for recaptcha settings If RECAPTCHA_* configuration options are not present in bridgedb.conf, bridgedb disables recaptcha support. --- lib/bridgedb/Main.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/lib/bridgedb/Main.py b/lib/bridgedb/Main.py index 3e06936..55f2956 100644 --- a/lib/bridgedb/Main.py +++ b/lib/bridgedb/Main.py @@ -37,6 +37,9 @@ class Conf: CONFIG_DEFAULTS = { 'HTTPS_INCLUDE_FINGERPRINTS' : False, 'EMAIL_INCLUDE_FINGERPRINTS' : False, + 'RECAPTCHA_ENABLED' : False, + 'RECAPTCHA_PUB_KEY' : "", + 'RECAPTCHA_PRIV_KEY' : "" } # An example configuration. Used for testing. See sample

1 0

[torflow/master] Submodule...
by mikeperry＠torproject.org 01 Oct '11

01 Oct '11

commit 87ac7f972a4dc603046538b6ada6456e64057a65 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Fri Sep 30 17:23:48 2011 -0700 Submodule... --- TorCtl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/TorCtl b/TorCtl index e99394c..520722b 160000 --- a/TorCtl +++ b/TorCtl @@ -1 +1 @@ -Subproject commit e99394c46b30ed73ffbf02d5c6a39bf9b04416a2 +Subproject commit 520722b8e3a7bb72bf9b5063f3c1649b53110225

1 0

[pytorctl/master] 4024 - get_git_version does not work for submodule
by mikeperry＠torproject.org 01 Oct '11

01 Oct '11

commit 520722b8e3a7bb72bf9b5063f3c1649b53110225 Author: aagbsn <aagbsn(a)extc.org> Date: Wed Sep 14 16:56:16 2011 -0700 4024 - get_git_version does not work for submodule Added support for detached heads --- TorUtil.py | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/TorUtil.py b/TorUtil.py index 73ea2a8..fee4407 100644 --- a/TorUtil.py +++ b/TorUtil.py @@ -429,9 +429,13 @@ def get_git_version(path_to_repo): plog('NOTICE', 'Git Repo at %s Not Found' % path_to_repo) return ('unknown','unknown') try: - f = open(path_to_repo+ref[1]) - branch = ref[1].strip().split('/')[-1] - head = f.readline().strip() + if len(ref) > 1: + f = open(path_to_repo+ref[1]) + branch = ref[1].strip().split('/')[-1] + head = f.readline().strip() + else: + branch = 'detached' + head = ref[0] f.close() return (branch, head) except IOError, e:

1 0

[torflow/master] 4077 remove UseMicrodescriptors from torrc
by mikeperry＠torproject.org 01 Oct '11

01 Oct '11

commit 599a74baf7886ae6008583059de6f9018f5d2cfc Author: aagbsn <aagbsn(a)extc.org> Date: Wed Sep 21 14:06:55 2011 -0700 4077 remove UseMicrodescriptors from torrc "Tor 0.2.3.4-alpha makes 'FetchUselessDescriptors' cause all descriptor types and all consensus types (including microdescriptors) to get fetched. Fixes bug 3851; bugfix on 0.2.3.1-alpha." --- NetworkScanners/BwAuthority/data/tor/torrc | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/NetworkScanners/BwAuthority/data/tor/torrc b/NetworkScanners/BwAuthority/data/tor/torrc index 2f15c38..53c0a63 100644 --- a/NetworkScanners/BwAuthority/data/tor/torrc +++ b/NetworkScanners/BwAuthority/data/tor/torrc @@ -8,6 +8,5 @@ PidFile ./data/tor/tor.pid CookieAuthentication 1 FetchUselessDescriptors 1 __LeaveStreamsUnattached 1 -UseMicrodescriptors 0 FetchDirInfoExtraEarly 1 FetchDirInfoEarly 1

1 0

[torflow/master] Suggest add_torctl.sh if torctl is missing.
by mikeperry＠torproject.org 01 Oct '11

01 Oct '11

commit 3558511832cb68f8b8cf1202a2879785e045a866 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Fri Sep 30 17:19:40 2011 -0700 Suggest add_torctl.sh if torctl is missing. --- NetworkScanners/ExitAuthority/libsoat.py | 2 +- NetworkScanners/ExitAuthority/snakeinspector.py | 2 +- NetworkScanners/ExitAuthority/soat.py | 2 +- NetworkScanners/ExitAuthority/soat_config.py | 2 +- NetworkScanners/ExitAuthority/soatstats.py | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/NetworkScanners/ExitAuthority/libsoat.py b/NetworkScanners/ExitAuthority/libsoat.py index 153d80f..8a62383 100644 --- a/NetworkScanners/ExitAuthority/libsoat.py +++ b/NetworkScanners/ExitAuthority/libsoat.py @@ -28,7 +28,7 @@ try: from TorCtl.TorUtil import * except ImportError: from os import getcwd, path - print "TorCtl not found in %s" % path.abspath(getcwd()+'../..') + print "TorCtl not found in %s. Did you run torflow.git/add_torctl.sh?" % path.abspath(getcwd()+'../..') print "Exiting..." exit() diff --git a/NetworkScanners/ExitAuthority/snakeinspector.py b/NetworkScanners/ExitAuthority/snakeinspector.py index 45250b6..f34826e 100755 --- a/NetworkScanners/ExitAuthority/snakeinspector.py +++ b/NetworkScanners/ExitAuthority/snakeinspector.py @@ -26,7 +26,7 @@ try: import TorCtl.TorUtil except ImportError: from os import getcwd, path - print "TorCtl not found in %s" % path.abspath(getcwd()+'../..') + print "TorCtl not found in %s. Did you run torflow.git/add_torctl.sh?" % path.abspath(getcwd()+'../..') print "Exiting..." exit() diff --git a/NetworkScanners/ExitAuthority/soat.py b/NetworkScanners/ExitAuthority/soat.py index 2355dea..bafe43f 100755 --- a/NetworkScanners/ExitAuthority/soat.py +++ b/NetworkScanners/ExitAuthority/soat.py @@ -83,7 +83,7 @@ try: from TorCtl.TorUtil import plog except ImportError: from os import getcwd, path - print "TorCtl not found in %s" % path.abspath(getcwd()+'../..') + print "TorCtl not found in %s. Did you run torflow.git/add_torctl.sh?" % path.abspath(getcwd()+'../..') print "Exiting..." exit() diff --git a/NetworkScanners/ExitAuthority/soat_config.py b/NetworkScanners/ExitAuthority/soat_config.py index fa36658..f7a1fc8 100644 --- a/NetworkScanners/ExitAuthority/soat_config.py +++ b/NetworkScanners/ExitAuthority/soat_config.py @@ -12,7 +12,7 @@ try: from TorCtl.PathSupport import * except ImportError: from os import getcwd, path - print "TorCtl not found in %s" % path.abspath(getcwd()+'../..') + print "TorCtl not found in %s. Did you run torflow.git/add_torctl.sh?" % path.abspath(getcwd()+'../..') print "Exiting..." exit() diff --git a/NetworkScanners/ExitAuthority/soatstats.py b/NetworkScanners/ExitAuthority/soatstats.py index ab790e5..a4b42cb 100755 --- a/NetworkScanners/ExitAuthority/soatstats.py +++ b/NetworkScanners/ExitAuthority/soatstats.py @@ -20,7 +20,7 @@ try: from TorCtl.TorUtil import * except ImportError: from os import getcwd, path - print "TorCtl not found in %s" % path.abspath(getcwd()+'../..') + print "TorCtl not found in %s. Did you run torflow.git/add_torctl.sh?" % path.abspath(getcwd()+'../..') print "Exiting..." exit()

1 0

[torflow/master] Merge branch 'fixes_rebased_2018_4066_4067_4077'
by mikeperry＠torproject.org 01 Oct '11

01 Oct '11

commit c1871065ca2b110b74f96dfbc2dd6367815a1d8e Merge: 8e56ac3 599a74b Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Fri Sep 30 17:18:12 2011 -0700 Merge branch 'fixes_rebased_2018_4066_4067_4077' NetworkScanners/BwAuthority/README.BwAuthorities | 38 ++++++++++++++++--- .../BwAuthority/data/scanner.2/bwauthority.cfg | 4 +- .../BwAuthority/data/scanner.3/bwauthority.cfg | 4 +- .../BwAuthority/data/scanner.4/bwauthority.cfg | 4 +- NetworkScanners/ExitAuthority/libsoat.py | 8 ++++- NetworkScanners/ExitAuthority/snakeinspector.py | 8 ++++- NetworkScanners/ExitAuthority/soat.py | 10 ++++- NetworkScanners/ExitAuthority/soat_config.py | 8 ++++- NetworkScanners/ExitAuthority/soatstats.py | 10 ++++- 9 files changed, 75 insertions(+), 19 deletions(-)

1 0

[torflow/master] 4067 update BwAuthority README
by mikeperry＠torproject.org 01 Oct '11

01 Oct '11

commit 5c91b733f88a15b9163f2f4c6f71cf711b42efc6 Author: aagbsn <aagbsn(a)extc.org> Date: Wed Sep 21 02:28:51 2011 -0700 4067 update BwAuthority README Add Appendix B: for postgres configuration Explain how to get a postgres backend working with BwAuthority --- NetworkScanners/BwAuthority/README.BwAuthorities | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/NetworkScanners/BwAuthority/README.BwAuthorities b/NetworkScanners/BwAuthority/README.BwAuthorities index 395f9d8..516465b 100644 --- a/NetworkScanners/BwAuthority/README.BwAuthorities +++ b/NetworkScanners/BwAuthority/README.BwAuthorities @@ -160,4 +160,26 @@ for i in 512 256 128 64 32 16; do done +Appendix B: Configuring PostgreSQL backend +To use postgres instead of sqlite: + +1. Install postgresql: +sudo apt-get install postgresql postgresql-common postgresql-client-common + +2. Create role: +sudo -u postgres psql + CREATE USER bwscanner WITH PASSWORD 'password'; + +3. Create databases: +sudo -u postgres createdb BwScan1 -O bwscanner +sudo -u postgres createdb BwScan2 -O bwscanner +sudo -u postgres createdb BwScan3 -O bwscanner +sudo -u postgres createdb BwScan4 -O bwscanner + +4. Update bwauthority.cfg files +comment out the lines beginning with db_url= +uncomment the line: +#db_url = postgresql://bwscanner:password@127.0.0.1/BwScan1 + +5. ./run_scan.sh

1 0

[torflow/master] 4067 - update BwAuthority README
by mikeperry＠torproject.org 01 Oct '11

01 Oct '11

commit 1097e68e04ddf47c0e9687f862f52a76c34cab67 Author: aagbsn <aagbsn(a)extc.org> Date: Wed Sep 21 03:13:21 2011 -0700 4067 - update BwAuthority README update README to bump library versions recommend using newer versions of SQLAlchemy and Elixir in the README. direct postgresql users to install python-psycopg2. --- NetworkScanners/BwAuthority/README.BwAuthorities | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/NetworkScanners/BwAuthority/README.BwAuthorities b/NetworkScanners/BwAuthority/README.BwAuthorities index 516465b..2653404 100644 --- a/NetworkScanners/BwAuthority/README.BwAuthorities +++ b/NetworkScanners/BwAuthority/README.BwAuthorities @@ -34,9 +34,12 @@ need to be running the master branch from tor git. 4. Download SQLAlchemy 0.5.x-latest and Elixir 0.6.x-latest -While TorFlow is written to be compatible with both 0.4.x and 0.5.x of -SQLAlchemy, 0.4.8 seems to exhibit odd object persistence bugs. If your -distribution does not provide 0.5.4 or newer, you will likely want to +The latest version of SQLAlchemy is 0.7.2 and the latest version of Elixir +is 0.7.1 at the time of writing. While TorFlow is written to be compatible +with 0.4.x and 0.5.x and 0.6.x of SQLAlchemy, 0.5.5 was noted for +problems parsing postgres database URLS, 0.4.8 seems to exhibit odd object persistence bugs. + +If your distribution does not provide 0.7.x or newer, you will likely want to download that tarball from: http://pypi.python.org/pypi/SQLAlchemy/ @@ -45,7 +48,7 @@ Untar it in the same directory that contains the TorFlow checkout and your git checkout (for peace of mind, you will want all three in the same place). -If your distribution does not provide Elixir 0.6.1 or above, do the +If your distribution does not provide Elixir 0.7.x or above, do the same with Elixir: http://pypi.python.org/pypi/Elixir/ @@ -53,12 +56,13 @@ http://pypi.python.org/pypi/Elixir/ So for example, an ls in ~/code/tor/ should look like this: # ls ~/code/tor/ -Elixir-0.6.1 SQLAlchemy-0.5.5 tor.git -Elixir-0.6.1.tar.gz SQLAlchemy-0.5.5.tar.gz torflow-trunk +Elixir-0.7.1 SQLAlchemy-0.7.2 tor.git +Elixir-0.7.1.tar.gz SQLAlchemy-0.7.2.tar.gz torflow-trunk Both these libraries also depend upon python-pysqlite2, which should be a package for your distribution (you want 2.3.x for SQLite 3.x). +If you want to use postgres support, you should also install python-psycopg2. 5. Enable voting on bandwidths in your authority torrc

1 0

[torflow/master] 2018 - better error messages
by mikeperry＠torproject.org 01 Oct '11

01 Oct '11

commit 085bdd31cb9e916d0d86edccd7bf4199da173870 Author: aagbsn <aagbsn(a)extc.org> Date: Fri Sep 16 15:49:07 2011 -0700 2018 - better error messages Wraps custom library imports in try/except, and adds error messages in format: """ TorCtl not found in os.path.abspath($cwd/../..) Exiting... """ --- NetworkScanners/ExitAuthority/libsoat.py | 8 +++++++- NetworkScanners/ExitAuthority/snakeinspector.py | 8 +++++++- NetworkScanners/ExitAuthority/soat.py | 10 ++++++++-- NetworkScanners/ExitAuthority/soat_config.py | 8 +++++++- NetworkScanners/ExitAuthority/soatstats.py | 10 ++++++++-- 5 files changed, 37 insertions(+), 7 deletions(-) diff --git a/NetworkScanners/ExitAuthority/libsoat.py b/NetworkScanners/ExitAuthority/libsoat.py index c4be677..153d80f 100644 --- a/NetworkScanners/ExitAuthority/libsoat.py +++ b/NetworkScanners/ExitAuthority/libsoat.py @@ -24,7 +24,13 @@ from soat import Tag, SoupStrainer from soat_config import * sys.path.append("../../") -from TorCtl.TorUtil import * +try: + from TorCtl.TorUtil import * +except ImportError: + from os import getcwd, path + print "TorCtl not found in %s" % path.abspath(getcwd()+'../..') + print "Exiting..." + exit() # Antlr stuff sys.path.append("../libs/jsparser/") diff --git a/NetworkScanners/ExitAuthority/snakeinspector.py b/NetworkScanners/ExitAuthority/snakeinspector.py index cf1edfe..45250b6 100755 --- a/NetworkScanners/ExitAuthority/snakeinspector.py +++ b/NetworkScanners/ExitAuthority/snakeinspector.py @@ -22,7 +22,13 @@ from libsoat import * from soat_config import * sys.path.append("../../") -import TorCtl.TorUtil +try: + import TorCtl.TorUtil +except ImportError: + from os import getcwd, path + print "TorCtl not found in %s" % path.abspath(getcwd()+'../..') + print "Exiting..." + exit() TorCtl.TorUtil.loglevel="INFO" diff --git a/NetworkScanners/ExitAuthority/soat.py b/NetworkScanners/ExitAuthority/soat.py index 4db34a2..2355dea 100755 --- a/NetworkScanners/ExitAuthority/soat.py +++ b/NetworkScanners/ExitAuthority/soat.py @@ -78,8 +78,14 @@ from libsoat import * from soat_config import * sys.path.append("../../") -from TorCtl import TorUtil, TorCtl, PathSupport, ScanSupport -from TorCtl.TorUtil import plog +try: + from TorCtl import TorUtil, TorCtl, PathSupport, ScanSupport + from TorCtl.TorUtil import plog +except ImportError: + from os import getcwd, path + print "TorCtl not found in %s" % path.abspath(getcwd()+'../..') + print "Exiting..." + exit() sys.path.insert(0,"../libs") # Make our SocksiPy use our socket diff --git a/NetworkScanners/ExitAuthority/soat_config.py b/NetworkScanners/ExitAuthority/soat_config.py index 6beba50..fa36658 100644 --- a/NetworkScanners/ExitAuthority/soat_config.py +++ b/NetworkScanners/ExitAuthority/soat_config.py @@ -8,7 +8,13 @@ import sys sys.path.append("../../") -from TorCtl.PathSupport import * +try: + from TorCtl.PathSupport import * +except ImportError: + from os import getcwd, path + print "TorCtl not found in %s" % path.abspath(getcwd()+'../..') + print "Exiting..." + exit() from soat import BeautifulSoup diff --git a/NetworkScanners/ExitAuthority/soatstats.py b/NetworkScanners/ExitAuthority/soatstats.py index db12c48..ab790e5 100755 --- a/NetworkScanners/ExitAuthority/soatstats.py +++ b/NetworkScanners/ExitAuthority/soatstats.py @@ -15,8 +15,14 @@ if sys.version_info < (2, 5): import libsoat from libsoat import * -sys.path.append("../") -from TorCtl.TorUtil import * +sys.path.append("../../") +try: + from TorCtl.TorUtil import * +except ImportError: + from os import getcwd, path + print "TorCtl not found in %s" % path.abspath(getcwd()+'../..') + print "Exiting..." + exit() class ResultCount: def __init__(self, type):

1 0

[torflow/master] 4066 example db_url should refer to unique db
by mikeperry＠torproject.org 01 Oct '11

01 Oct '11

commit 98b1475e73afbd7e72c2ce9c26e046ba0de5c668 Author: aagbsn <aagbsn(a)extc.org> Date: Wed Sep 21 01:46:10 2011 -0700 4066 example db_url should refer to unique db BwAuthority sample db_url should refer to distinct databases. --- .../BwAuthority/data/scanner.2/bwauthority.cfg | 4 ++-- .../BwAuthority/data/scanner.3/bwauthority.cfg | 4 ++-- .../BwAuthority/data/scanner.4/bwauthority.cfg | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/NetworkScanners/BwAuthority/data/scanner.2/bwauthority.cfg b/NetworkScanners/BwAuthority/data/scanner.2/bwauthority.cfg index 42a6a5d..04c7a9f 100644 --- a/NetworkScanners/BwAuthority/data/scanner.2/bwauthority.cfg +++ b/NetworkScanners/BwAuthority/data/scanner.2/bwauthority.cfg @@ -14,8 +14,8 @@ out_dir = ./data/scanner.2/scan-data pid_file = ./data/scanner.2/bwauthority.pid # if db_url is unset bwauthority will default to sqlite db_url = -#db_url = mysql+mysqldb://bwscanner:password@127.0.0.1/BwScan1 -#db_url = postgresql://bwscanner:password@127.0.0.1/BwScan1 +#db_url = mysql+mysqldb://bwscanner:password@127.0.0.1/BwScan2 +#db_url = postgresql://bwscanner:password@127.0.0.1/BwScan2 tor_dir = ./data/tor start_pct = 12 stop_pct = 35 diff --git a/NetworkScanners/BwAuthority/data/scanner.3/bwauthority.cfg b/NetworkScanners/BwAuthority/data/scanner.3/bwauthority.cfg index a2ea7ac..a662c8c 100644 --- a/NetworkScanners/BwAuthority/data/scanner.3/bwauthority.cfg +++ b/NetworkScanners/BwAuthority/data/scanner.3/bwauthority.cfg @@ -14,8 +14,8 @@ out_dir = ./data/scanner.3/scan-data pid_file = ./data/scanner.3/bwauthority.pid # if db_url is unset bwauthority will default to sqlite db_url = -#db_url = mysql+mysqldb://bwscanner:password@127.0.0.1/BwScan1 -#db_url = postgresql://bwscanner:password@127.0.0.1/BwScan1 +#db_url = mysql+mysqldb://bwscanner:password@127.0.0.1/BwScan3 +#db_url = postgresql://bwscanner:password@127.0.0.1/BwScan3 tor_dir = ./data/tor start_pct =35 stop_pct = 60 diff --git a/NetworkScanners/BwAuthority/data/scanner.4/bwauthority.cfg b/NetworkScanners/BwAuthority/data/scanner.4/bwauthority.cfg index 20ebe5a..fa3f50f 100644 --- a/NetworkScanners/BwAuthority/data/scanner.4/bwauthority.cfg +++ b/NetworkScanners/BwAuthority/data/scanner.4/bwauthority.cfg @@ -14,8 +14,8 @@ out_dir = ./data/scanner.4/scan-data pid_file = ./data/scanner.4/bwauthority.pid # if db_url is unset bwauthority will default to sqlite db_url = -#db_url = mysql+mysqldb://bwscanner:password@127.0.0.1/BwScan1 -#db_url = postgresql://bwscanner:password@127.0.0.1/BwScan1 +#db_url = mysql+mysqldb://bwscanner:password@127.0.0.1/BwScan4 +#db_url = postgresql://bwscanner:password@127.0.0.1/BwScan4 tor_dir = ./data/tor start_pct =60 stop_pct = 100

1 0