- tor-commits - lists.torproject.org

[tor/master] start preparing the 0.2.3.5-alpha changelog
by arma＠torproject.org 28 Sep '11

28 Sep '11

commit 458cc9d351f27092b245853fa72c5941389a3577 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Sep 28 15:12:16 2011 -0400 start preparing the 0.2.3.5-alpha changelog --- ChangeLog | 30 ++++++++++++++++++++++++++++++ changes/4027-diagnose | 4 ---- changes/bug4059 | 5 ----- changes/bug4118 | 5 ----- changes/feature3630 | 8 -------- changes/ticket-4063 | 6 ------ 6 files changed, 30 insertions(+), 28 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5381cf8..6890d2d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,33 @@ +Changes in version 0.2.3.5-alpha - 2011-09-28 + o Major bugfixes: + - Fix a crash bug that could occur when the same microdescriptor was + referenced by two node_t objects at once. Fix for bug 4118; bugfix + on Tor 0.2.3.1-alpha. + + o Major features (networking): + - Add a new TokenBucketRefillInterval option to refill token buckets + more frequently than once per second. This should improve network + performance, alleviate queueing problems, and make traffic less + bursty. Implements proposal 183; closes ticket 3630. Design by + Florian Tschorsch and Björn Scheuermann; implementation by + Florian Tschorsch. + + o Minor bugfixes: + - Change an integer overflow check in the OpenBSD_Malloc code so + that GCC is less likely to eliminate it as impossible. Patch + from Mansour Moufid. Fixes bug 4059. + + o Minor bugfixes (usability): + - Downgrade log messages about circuit timeout calibration from + "notice" to "info": they don't require or suggest any human + intervention. Patch from Tom Lowenthal. Fixes bug 4063; + bugfix on 0.2.2.14-alpha. + + o Minor features (diagnostics): + - When the system call to create a listener socket fails, log the + error message explaining why. This may help diagnose bug 4027. + + Changes in version 0.2.3.4-alpha - 2011-09-13 Tor 0.2.3.4-alpha includes the fixes from 0.2.2.33, including a slight tweak to Tor's TLS handshake that makes relays and bridges that run diff --git a/changes/4027-diagnose b/changes/4027-diagnose deleted file mode 100644 index 3fb6bd0..0000000 --- a/changes/4027-diagnose +++ /dev/null @@ -1,4 +0,0 @@ - o Minor features (diagnostics): - - When the system call to create a listener socket fails, log the - error message explaining why. This may help diagnose bug 4027. - diff --git a/changes/bug4059 b/changes/bug4059 deleted file mode 100644 index 82a4b1a..0000000 --- a/changes/bug4059 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes: - - Change an integer overflow check in the OpenBSD_Malloc code so - that GCC is less likely to eliminate it as impossible. Patch - from Mansour Moufid. Fixes bug 4059. - diff --git a/changes/bug4118 b/changes/bug4118 deleted file mode 100644 index e56ea70..0000000 --- a/changes/bug4118 +++ /dev/null @@ -1,5 +0,0 @@ - o Major bugfixes: - - Fix a crash bug that could occur when the same microdescriptor was - referenced by two node_t objects at once. Fix for bug 4118; bugfix - on Tor 0.2.3.1-alpha. - diff --git a/changes/feature3630 b/changes/feature3630 deleted file mode 100644 index dab46c8..0000000 --- a/changes/feature3630 +++ /dev/null @@ -1,8 +0,0 @@ - o Major features (networking): - - Add a new TokenBucketRefillInterval option to refill token buckets - more frequently than once per second. This should improve network - performance, alleviate queueing problems, and make traffic less - bursty. Implements proposal 183; closes ticket 3630. Design by - Florian Tschorsch and Björn Scheuermann; implementation by - Florian Tschorsch. - diff --git a/changes/ticket-4063 b/changes/ticket-4063 deleted file mode 100644 index 6a985b8..0000000 --- a/changes/ticket-4063 +++ /dev/null @@ -1,6 +0,0 @@ - o Minor bugfixes (usability): - - Downgrade log messages about circuit timeout calibration from - "notice" to "info": they don't require or suggest any human - intervention. Patch from Tom Lowenthal. Fixes bug 4063; - bugfix on 0.2.2.14-alpha. -

1 0

[tor/master] Fix a crash bug in tor_assert(md->held_by_node)
by nickm＠torproject.org 28 Sep '11

28 Sep '11

commit a4b7525c3ce596d4221575806d44652aaa9047a9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 28 13:29:01 2011 -0400 Fix a crash bug in tor_assert(md->held_by_node) The fix is to turn held_by_node into a reference count. Fixes bug 4118; bugfix on 0.2.3.1-alpha. --- changes/bug4118 | 5 +++++ src/or/microdesc.c | 8 ++++---- src/or/nodelist.c | 16 ++++++++-------- src/or/or.h | 4 ++-- 4 files changed, 19 insertions(+), 14 deletions(-) diff --git a/changes/bug4118 b/changes/bug4118 new file mode 100644 index 0000000..e56ea70 --- /dev/null +++ b/changes/bug4118 @@ -0,0 +1,5 @@ + o Major bugfixes: + - Fix a crash bug that could occur when the same microdescriptor was + referenced by two node_t objects at once. Fix for bug 4118; bugfix + on Tor 0.2.3.1-alpha. + diff --git a/src/or/microdesc.c b/src/or/microdesc.c index 510b2f4..0517e47 100644 --- a/src/or/microdesc.c +++ b/src/or/microdesc.c @@ -522,7 +522,7 @@ microdesc_free(microdesc_t *md) } tor_fragile_assert(); } - if (md->held_by_node) { + if (md->held_by_nodes) { int found=0; const smartlist_t *nodes = nodelist_get_list(); SMARTLIST_FOREACH(nodes, node_t *, node, { @@ -533,15 +533,15 @@ microdesc_free(microdesc_t *md) }); if (found) { log_warn(LD_BUG, "microdesc_free() called, but md was still referenced " - "%d node(s)", found); + "%d node(s); held_by_nodes == %u", found, md->held_by_nodes); } else { - log_warn(LD_BUG, "microdesc_free() called with held_by_node set, but " + log_warn(LD_BUG, "microdesc_free() called with held_by_nodes set, but " "md was not refrenced by any nodes"); } tor_fragile_assert(); } //tor_assert(md->held_in_map == 0); - //tor_assert(md->held_by_node == 0); + //tor_assert(md->held_by_nodes == 0); if (md->onion_pkey) crypto_free_pk_env(md->onion_pkey); diff --git a/src/or/nodelist.c b/src/or/nodelist.c index 308aaa8..39bc082 100644 --- a/src/or/nodelist.c +++ b/src/or/nodelist.c @@ -160,9 +160,9 @@ nodelist_add_microdesc(microdesc_t *md) node = node_get_mutable_by_id(rs->identity_digest); if (node) { if (node->md) - node->md->held_by_node = 0; + node->md->held_by_nodes--; node->md = md; - md->held_by_node = 1; + md->held_by_nodes++; } return node; } @@ -189,11 +189,11 @@ nodelist_set_consensus(networkstatus_t *ns) if (node->md == NULL || tor_memneq(node->md->digest,rs->descriptor_digest,DIGEST256_LEN)) { if (node->md) - node->md->held_by_node = 0; + node->md->held_by_nodes--; node->md = microdesc_cache_lookup_by_digest256(NULL, rs->descriptor_digest); if (node->md) - node->md->held_by_node = 1; + node->md->held_by_nodes++; } } @@ -250,7 +250,7 @@ nodelist_remove_microdesc(const char *identity_digest, microdesc_t *md) node_t *node = node_get_mutable_by_id(identity_digest); if (node && node->md == md) { node->md = NULL; - md->held_by_node = 0; + md->held_by_nodes--; } } @@ -299,7 +299,7 @@ node_free(node_t *node) if (!node) return; if (node->md) - node->md->held_by_node = 0; + node->md->held_by_nodes--; tor_assert(node->nodelist_idx == -1); tor_free(node); } @@ -319,7 +319,7 @@ nodelist_purge(void) if (node->md && !node->rs) { /* An md is only useful if there is an rs. */ - node->md->held_by_node = 0; + node->md->held_by_nodes--; node->md = NULL; } @@ -394,7 +394,7 @@ nodelist_assert_ok(void) microdesc_cache_lookup_by_digest256(NULL, rs->descriptor_digest); tor_assert(md == node->md); if (md) - tor_assert(md->held_by_node == 1); + tor_assert(md->held_by_nodes >= 1); } } SMARTLIST_FOREACH_END(rs); } diff --git a/src/or/or.h b/src/or/or.h index b05c767..a1a0790 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -1830,10 +1830,10 @@ typedef struct microdesc_t { saved_location_t saved_location : 3; /** If true, do not attempt to cache this microdescriptor on disk. */ unsigned int no_save : 1; - /** If true, this microdesc is attached to a node_t. */ - unsigned int held_by_node : 1; /** If true, this microdesc has an entry in the microdesc_map */ unsigned int held_in_map : 1; + /** Reference count: how many node_ts have a reference to this microdesc? */ + unsigned int held_by_nodes; /** If saved_location == SAVED_IN_CACHE, this field holds the offset of the * microdescriptor in the cache. */

1 0

[tor/master] Add some debugging code to microdesc.[ch]
by nickm＠torproject.org 28 Sep '11

28 Sep '11

commit 4a10845075d14df285e52ea4bdd72ff12c10c959 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 28 14:13:49 2011 -0400 Add some debugging code to microdesc.[ch] --- src/or/microdesc.c | 26 ++++++++++++++++++++++++-- src/or/microdesc.h | 2 ++ 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/src/or/microdesc.c b/src/or/microdesc.c index 0517e47..92f5c03 100644 --- a/src/or/microdesc.c +++ b/src/or/microdesc.c @@ -499,6 +499,28 @@ microdesc_cache_rebuild(microdesc_cache_t *cache, int force) return 0; } +/** Make sure that the reference count of every microdescriptor in cache is + * accurate. */ +void +microdesc_check_counts(void) +{ + microdesc_t **mdp; + if (!the_microdesc_cache) + return; + + HT_FOREACH(mdp, microdesc_map, &the_microdesc_cache->map) { + microdesc_t *md = *mdp; + unsigned int found=0; + const smartlist_t *nodes = nodelist_get_list(); + SMARTLIST_FOREACH(nodes, node_t *, node, { + if (node->md == md) { + ++found; + } + }); + tor_assert(found == md->held_by_nodes); + } +} + /** Deallocate a single microdescriptor. Note: the microdescriptor MUST have * previously been removed from the cache if it had ever been inserted. */ void @@ -535,8 +557,8 @@ microdesc_free(microdesc_t *md) log_warn(LD_BUG, "microdesc_free() called, but md was still referenced " "%d node(s); held_by_nodes == %u", found, md->held_by_nodes); } else { - log_warn(LD_BUG, "microdesc_free() called with held_by_nodes set, but " - "md was not refrenced by any nodes"); + log_warn(LD_BUG, "microdesc_free() called with held_by_nodes set to %u, " + "but md was not referenced by any nodes", md->held_by_nodes); } tor_fragile_assert(); } diff --git a/src/or/microdesc.h b/src/or/microdesc.h index 72e4572..4564132 100644 --- a/src/or/microdesc.h +++ b/src/or/microdesc.h @@ -14,6 +14,8 @@ microdesc_cache_t *get_microdesc_cache(void); +void microdesc_check_counts(void); + smartlist_t *microdescs_add_to_cache(microdesc_cache_t *cache, const char *s, const char *eos, saved_location_t where, int no_save, time_t listed_at,

1 0

[tor/master] Make sure the microdesc cache is loaded before setting a v3 md consensus
by nickm＠torproject.org 28 Sep '11

28 Sep '11

commit 6201b8b361fb56d9d488cea4ed47d5e0819d94b8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 28 14:14:31 2011 -0400 Make sure the microdesc cache is loaded before setting a v3 md consensus Otherwise, we can wind up munging our reference counts if we set it in the middle of loading the nodes. This happens because nodelist_set_consensus() and microdesc_reload_cache() are both in the business of adjusting microdescriptors' references. --- src/or/nodelist.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/src/or/nodelist.c b/src/or/nodelist.c index 39bc082..b93b919 100644 --- a/src/or/nodelist.c +++ b/src/or/nodelist.c @@ -177,7 +177,10 @@ nodelist_set_consensus(networkstatus_t *ns) { const or_options_t *options = get_options(); int authdir = authdir_mode_v2(options) || authdir_mode_v3(options); + init_nodelist(); + if (ns->flavor == FLAV_MICRODESC) + (void) get_microdesc_cache(); /* Make sure it exists first. */ SMARTLIST_FOREACH(the_nodelist->nodes, node_t *, node, node->rs = NULL);

1 0

[arm/master] fix: forcing redraw on ctrl+L reguardless of need
by atagar＠torproject.org 28 Sep '11

28 Sep '11

commit ad8741d5f43b0ba441d094bc1dea9aa9a4354254 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Sep 28 10:12:27 2011 -0700 fix: forcing redraw on ctrl+L reguardless of need The ctrl+L keybinding is suppose to perform a redraw but this was only making a 'request' rather than forcing it, so unchanged portions of the interface weren't actually redrawn. Caught by np. https://trac.torproject.org/projects/tor/ticket/2830 --- src/cli/controller.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/cli/controller.py b/src/cli/controller.py index 4e6dc82..762f955 100644 --- a/src/cli/controller.py +++ b/src/cli/controller.py @@ -778,7 +778,7 @@ def drawTorMonitor(stdscr, startTime): cli.wizard.showWizard() elif key == ord('l') - 96: # force redraw when ctrl+l is pressed - control.redraw() + control.redraw(True) else: for panelImpl in displayPanels: isKeystrokeConsumed = panelImpl.handleKey(key)

1 0

[metrics-web/master] Make a few improvements to ExoneraTor.
by karsten＠torproject.org 28 Sep '11

28 Sep '11

commit 10eb958d33de920cfbedb2cb9bfebf14f0334a0e Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Sep 28 10:08:24 2011 +0200 Make a few improvements to ExoneraTor. - Include exit lists in results along with network status entries. Implements part of #3567. - Relax the requirement to specify an exact timestamps by also accepting a full day to search relays for. - Use a new database schema that allows us to remove raw descriptors from the Metrics database in the future. - Prepare the ExoneraTor database for IPv6 addresses (not supported by Tor or the ExoneraTor database importer or web interface yet). - Use a single database connection per HTTP request. --- build.xml | 9 + config.template | 7 + db/exonerator.sql | 328 +++++++ etc/context.xml.template | 10 + etc/web.xml | 11 + src/org/torproject/ernie/cron/Configuration.java | 14 + .../ernie/cron/ExoneraTorDatabaseImporter.java | 528 +++++++++++ .../ernie/web/ExoneraTorBetaServlet.java | 991 ++++++++++++++++++++ 8 files changed, 1898 insertions(+), 0 deletions(-) diff --git a/build.xml b/build.xml index 4b4a7e9..9194ccd 100644 --- a/build.xml +++ b/build.xml @@ -51,6 +51,15 @@ </java> </target> +  + <target name="exonerator" depends="compile"> + <java fork="true" + maxmemory="2048m" + classname="org.torproject.ernie.cron.ExoneraTorDatabaseImporter"> + <classpath refid="classpath"/> + </java> + </target> +  <target name="run" depends="compile"> <java fork="true" diff --git a/config.template b/config.template index 7936420..e0fa743 100644 --- a/config.template +++ b/config.template @@ -58,4 +58,11 @@ # ## Relative path to directory where to find GetTor stats #GetTorDirectory gettor/ +# +## JDBC string for ExoneraTor database +#ExoneraTorDatabaseJdbc jdbc:postgresql://localhost/exonerator?user=metrics&password=password +# +## Relative path to directory where to find descriptors to import into the +## ExoneraTor database +#ExoneraTorImportDirectory exonerator-import/ diff --git a/db/exonerator.sql b/db/exonerator.sql new file mode 100755 index 0000000..b3c7c62 --- /dev/null +++ b/db/exonerator.sql @@ -0,0 +1,328 @@ +-- Copyright 2011 The Tor Project +-- See LICENSE for licensing information + +-- The descriptor table holds server descriptors that we use for display +-- purposes and to parse exit policies. +CREATE TABLE descriptor ( + + -- The 40-character lower-case hex string identifies a descriptor + -- uniquely and is used to join statusentry and this table. + descriptor CHARACTER(40) NOT NULL PRIMARY KEY, + + -- The raw descriptor string is used for display purposes and to check + -- whether the relay allowed exiting to a given target or not. + rawdescriptor BYTEA NOT NULL +); + +-- The consensus table stores network status consensuses to be looked up +-- by valid-after time and displayed upon request. A second purpose is +-- to learn quickly whether the database contains status entries for a +-- given day or not. +CREATE TABLE consensus ( + + -- The unique valid-after time of the consensus. + validafter TIMESTAMP WITHOUT TIME ZONE NOT NULL PRIMARY KEY, + + -- The raw consensus string for display purposes only. + rawconsensus BYTEA NOT NULL +); + +-- The statusentry table stores network status consensus entries listing +-- a relay as running at a certain point in time. Only relays with the +-- Running flag shall be inserted into this table. If a relay advertises +-- more than one IP address, there is a distinct entry for each address in +-- this table. +CREATE TABLE statusentry ( + + -- The valid-after time of the consensus that contains this entry. + validafter TIMESTAMP WITHOUT TIME ZONE NOT NULL, + + -- The 40-character lower-case hex string uniquely identifying the + -- relay. + fingerprint CHARACTER(40) NOT NULL, + + -- The 40-character lower-case hex string that identifies the server + -- descriptor published by the relay. + descriptor CHARACTER(40) NOT NULL, + + -- The most significant 3 bytes of the relay's onion routing address in + -- hex notation. This column contains the /24 network of the IPv4 or + -- IPv6 address. The purpose is to quickly reduce query results which + -- works surprisingly well. + oraddress24 CHARACTER(6) NOT NULL, + + -- The relay's onion routing address. Can be an IPv4 or an IPv6 + -- address. If a relay advertises more than one address, there are + -- multiple entries in this table for the same status entry. + oraddress INET NOT NULL, + + -- The raw status entry string as contained in the network status + -- consensus for display purposes only. + rawstatusentry BYTEA NOT NULL, + + -- A status entry is uniquely identified by its valid-after time, relay + -- fingerprint, and onion routing address. + CONSTRAINT statusentry_pkey + PRIMARY KEY (validafter, fingerprint, oraddress) +); + +-- The index on the exact onion routing address and on the valid-after +-- date is used to speed up ExoneraTor's query for status entries. +CREATE INDEX statusentry_oraddress_validafterdate + ON statusentry (oraddress, DATE(validafter)); + +-- The index on the most significant 3 bytes of the relay's onion routing +-- address and on the valid-after date is used to speed up queries for +-- other relays in the same /24 network. +CREATE INDEX statusentry_oraddress24_validafterdate + ON statusentry (oraddress24, DATE(validafter)); + +-- The exitlistentry table stores the results of the active testing, +-- DNS-based exit list for exit nodes. An entry in this table means that +-- a relay was scanned at a given time and found to be exiting to the +-- Internet from a given IP address. This IP address can be different +-- from the relay's onion routing address if the relay uses more than one +-- IP addresses. +CREATE TABLE exitlistentry ( + + -- The 40-character lower-case hex string identifying the relay. + fingerprint CHARACTER(40) NOT NULL, + + -- The most significant 3 bytes of the relay's exit address in hex + -- notation. This column contains the /24 network of the IPv4 or IPv6 + -- address. The purpose is to quickly reduce query results. + exitaddress24 CHARACTER(6) NOT NULL, + + -- The IP address that the relay uses for exiting to the Internet. If + -- the relay uses more than one IP address, there are multiple entries + -- in this table. + exitaddress INET NOT NULL, + + -- The time when the relay was scanned to find out its exit IP + -- address(es). + scanned TIMESTAMP WITHOUT TIME ZONE NOT NULL, + + -- The raw exit list entry containing all scan results for a given relay + -- for display purposes. + rawexitlistentry BYTEA NOT NULL, + + -- An exit list entry is uniquely identified by its scan time, relay + -- fingerprint, and exit address. + CONSTRAINT exitlistentry_pkey + PRIMARY KEY (scanned, fingerprint, exitaddress) +); + +-- The index on the exact exit address and on the valid-after date is used +-- to speed up ExoneraTor's query for status entries referencing exit list +-- entries. +CREATE INDEX exitlistentry_exitaddress_scanneddate + ON exitlistentry (exitaddress, DATE(scanned)); + +-- The index on the most significant 3 bytes of the relay's exit address +-- and on the valid-after date is used to speed up queries for other +-- relays in the same /24 network. +CREATE INDEX exitlistentry_exitaddress24_scanneddate + ON exitlistentry (exitaddress24, DATE(scanned)); + +-- Create the plpgsql language, so that we can use it below. +CREATE LANGUAGE plpgsql; + +-- Insert a server descriptor into the descriptor table. Before doing so, +-- check that there is no descriptor with the same descriptor identifier +-- in the table yet. Return 1 if the descriptor was inserted, 0 +-- otherwise. +CREATE OR REPLACE FUNCTION insert_descriptor ( + insert_descriptor CHARACTER(40), + insert_rawdescriptor BYTEA) + RETURNS INTEGER AS $$ + BEGIN + -- Look up if the descriptor is already contained in the descriptor + -- table. + IF (SELECT COUNT(*) + FROM descriptor + WHERE descriptor = insert_descriptor) = 0 THEN + -- Insert the descriptor and remember the new descriptorid to update + -- the foreign key in statusentry. + INSERT INTO descriptor (descriptor, rawdescriptor) + VALUES (insert_descriptor, insert_rawdescriptor); + -- Return 1 for a successfully inserted descriptor. + RETURN 1; + ELSE + -- Return 0 because we didn't change anything. + RETURN 0; + END IF; + END; +$$ LANGUAGE 'plpgsql'; + +-- Insert a status entry into the statusentry table. First check that +-- this status entry isn't contained in the table yet. It's okay to +-- insert the same status entry multiple times for different IP addresses +-- though. Return 1 if it was inserted, 0 otherwise. +CREATE OR REPLACE FUNCTION insert_statusentry ( + insert_validafter TIMESTAMP WITHOUT TIME ZONE, + insert_fingerprint CHARACTER(40), + insert_descriptor CHARACTER(40), + insert_oraddress24 CHARACTER(6), + insert_oraddress TEXT, + insert_rawstatusentry BYTEA) + RETURNS INTEGER AS $$ + BEGIN + -- Look up if the status entry is already contained in the statusentry + -- table. + IF (SELECT COUNT(*) + FROM statusentry + WHERE validafter = insert_validafter + AND fingerprint = insert_fingerprint + AND oraddress = insert_oraddress::INET) = 0 THEN + -- Insert the status entry. + INSERT INTO statusentry (validafter, fingerprint, descriptor, + oraddress24, oraddress, rawstatusentry) + VALUES (insert_validafter, insert_fingerprint, + insert_descriptor, insert_oraddress24, insert_oraddress::INET, + insert_rawstatusentry); + -- Return 1 for a successfully inserted status entry. + RETURN 1; + ELSE + -- Return 0 because we already had this status entry. + RETURN 0; + END IF; + END; +$$ LANGUAGE 'plpgsql'; + +-- Insert a consensus into the consensus table. Check that the same +-- consensus has not been imported before. Return 1 if it was inserted, 0 +-- otherwise. +CREATE OR REPLACE FUNCTION insert_consensus ( + insert_validafter TIMESTAMP WITHOUT TIME ZONE, + insert_rawconsensus BYTEA) + RETURNS INTEGER AS $$ + BEGIN + -- Look up if the consensus is already contained in the consensus + -- table. + IF (SELECT COUNT(*) + FROM consensus + WHERE validafter = insert_validafter) = 0 THEN + -- Insert the consensus. + INSERT INTO consensus (validafter, rawconsensus) + VALUES (insert_validafter, insert_rawconsensus); + -- Return 1 for a successful insert operation. + RETURN 1; + ELSE + -- Return 0 for not inserting the consensus. + RETURN 0; + END IF; + END; +$$ LANGUAGE 'plpgsql'; + +-- Insert an exit list entry into the exitlistentry table. Check that +-- this entry hasn't been inserted before. It's okay to insert the same +-- exit list entry multiple times for different exit addresses. Return 1 +-- if the entry was inserted, 0 otherwise. +CREATE OR REPLACE FUNCTION insert_exitlistentry ( + insert_fingerprint CHARACTER(40), + insert_exitaddress24 CHARACTER(6), + insert_exitaddress TEXT, + insert_scanned TIMESTAMP WITHOUT TIME ZONE, + insert_rawexitlistentry BYTEA) + RETURNS INTEGER AS $$ + BEGIN + IF (SELECT COUNT(*) + FROM exitlistentry + WHERE fingerprint = insert_fingerprint + AND exitaddress = insert_exitaddress::INET + AND scanned = insert_scanned) = 0 THEN + -- This exit list entry is not in the database yet. Add it. + INSERT INTO exitlistentry (fingerprint, exitaddress24, exitaddress, + scanned, rawexitlistentry) + VALUES (insert_fingerprint, insert_exitaddress24, + insert_exitaddress::INET, insert_scanned, + insert_rawexitlistentry); + -- Return 1 for a successfully inserted exit list entry. + RETURN 1; + ELSE + -- Return 0 to show that we didn't add anything. + RETURN 0; + END IF; + END; +$$ LANGUAGE 'plpgsql'; + +-- Search for status entries with the given IP address as onion routing +-- address, plus status entries of relays having an exit list entry with +-- the given IP address as exit address. +CREATE OR REPLACE FUNCTION search_statusentries_by_address_date ( + select_address TEXT, + select_date DATE) + RETURNS TABLE(rawstatusentry BYTEA, + descriptor CHARACTER(40), + validafter TIMESTAMP WITHOUT TIME ZONE, + fingerprint CHARACTER(40), + oraddress TEXT, + exitaddress TEXT, + scanned TIMESTAMP WITHOUT TIME ZONE) AS $$ + -- The first select finds all status entries of relays with the given + -- IP address as onion routing address. + SELECT rawstatusentry, + descriptor, + validafter, + fingerprint, + HOST(oraddress), + NULL, + NULL + FROM statusentry + WHERE oraddress = $1::INET + AND DATE(validafter) >= $2 - 1 + AND DATE(validafter) <= $2 + 1 + UNION + -- The second select finds status entries of relays having an exit list + -- entry with the provided IP address as the exit address. + SELECT statusentry.rawstatusentry, + statusentry.descriptor, + statusentry.validafter, + statusentry.fingerprint, + HOST(statusentry.oraddress), + HOST(exitlistentry.exitaddress), + -- Pick only the last scan result that took place in the 24 hours + -- before the valid-after time. + MAX(exitlistentry.scanned) + FROM statusentry + JOIN exitlistentry + ON statusentry.fingerprint = exitlistentry.fingerprint + WHERE exitlistentry.exitaddress = $1::INET + -- Focus on a time period from 1 day before and 1 day after the + -- given date. Also include a second day before the given date + -- for exit lists, because it can take up to 24 hours to scan a + -- relay again. We shouldn't miss exit list entries here. + AND DATE(exitlistentry.scanned) >= $2 - 2 + AND DATE(exitlistentry.scanned) <= $2 + 1 + AND DATE(statusentry.validafter) >= $2 - 1 + AND DATE(statusentry.validafter) <= $2 + 1 + -- Consider only exit list scans that took place in the 24 hours + -- before the relay was listed in a consensus. + AND statusentry.validafter >= exitlistentry.scanned + AND statusentry.validafter - exitlistentry.scanned <= + '1 day'::INTERVAL + GROUP BY 1, 2, 3, 4, 5, 6 + ORDER BY 3, 4, 6; +$$ LANGUAGE SQL; + +-- Look up all IP adddresses in the /24 network of a given address to +-- suggest other addresses the user may be looking for. +-- TODO Revisit this function when enabling IPv6. +CREATE OR REPLACE FUNCTION search_addresses_in_same_24 ( + select_address24 CHARACTER(6), + select_date DATE) + RETURNS TABLE(address TEXT) AS $$ + SELECT HOST(oraddress) + FROM statusentry + WHERE oraddress24 = $1 + AND DATE(validafter) >= $2 - 1 + AND DATE(validafter) <= $2 + 1 + UNION + SELECT HOST(exitaddress) + FROM exitlistentry + WHERE exitaddress24 = $1 + AND DATE(scanned) >= $2 - 2 + AND DATE(scanned) <= $2 + 1 + ORDER BY 1; +$$ LANGUAGE SQL; + diff --git a/etc/context.xml.template b/etc/context.xml.template index 00f14fe..152f1de 100644 --- a/etc/context.xml.template +++ b/etc/context.xml.template @@ -1,4 +1,14 @@ <Context cookies="false"> + <Resource name="jdbc/exonerator" + type="javax.sql.DataSource" + auth="Container" + username="metrics" + password="password" + driverClassName="org.postgresql.Driver" + url="jdbc:postgresql://localhost/exonerator" + maxActive="8" + maxIdle="4" + maxWait="15000"/> <Resource name="jdbc/tordir" type="javax.sql.DataSource" auth="Container" diff --git a/etc/web.xml b/etc/web.xml index 5c48bc0..2c6752b 100644 --- a/etc/web.xml +++ b/etc/web.xml @@ -266,6 +266,17 @@ </servlet-mapping> <servlet> + <servlet-name>ExoneraTorBeta</servlet-name> + <servlet-class> + org.torproject.ernie.web.ExoneraTorBetaServlet + </servlet-class> + </servlet> + <servlet-mapping> + <servlet-name>ExoneraTorBeta</servlet-name> + <url-pattern>/exonerator-beta.html</url-pattern> + </servlet-mapping> + + <servlet> <servlet-name>ServerDescriptor</servlet-name> <servlet-class> org.torproject.ernie.web.ServerDescriptorServlet diff --git a/src/org/torproject/ernie/cron/Configuration.java b/src/org/torproject/ernie/cron/Configuration.java index 4192f55..1c57392 100644 --- a/src/org/torproject/ernie/cron/Configuration.java +++ b/src/org/torproject/ernie/cron/Configuration.java @@ -31,6 +31,10 @@ public class Configuration { private String torperfDirectory = "torperf/"; private boolean processGetTorStats = false; private String getTorDirectory = "gettor/"; + private String exoneraTorDatabaseJdbc = "jdbc:postgresql:" + + "//localhost/exonerator?user=metrics&password=password"; + private String exoneraTorImportDirectory = "exonerator-import/"; + public Configuration() { /* Initialize logger. */ @@ -93,6 +97,10 @@ public class Configuration { line.split(" ")[1]) != 0; } else if (line.startsWith("GetTorDirectory")) { this.getTorDirectory = line.split(" ")[1]; + } else if (line.startsWith("ExoneraTorDatabaseJdbc")) { + this.exoneraTorDatabaseJdbc = line.split(" ")[1]; + } else if (line.startsWith("ExoneraTorImportDirectory")) { + this.exoneraTorImportDirectory = line.split(" ")[1]; } else { logger.severe("Configuration file contains unrecognized " + "configuration key in line '" + line + "'! Exiting!"); @@ -169,5 +177,11 @@ public class Configuration { public String getGetTorDirectory() { return this.getTorDirectory; } + public String getExoneraTorDatabaseJdbc() { + return this.exoneraTorDatabaseJdbc; + } + public String getExoneraTorImportDirectory() { + return this.exoneraTorImportDirectory; + } } diff --git a/src/org/torproject/ernie/cron/ExoneraTorDatabaseImporter.java b/src/org/torproject/ernie/cron/ExoneraTorDatabaseImporter.java new file mode 100755 index 0000000..95d894b --- /dev/null +++ b/src/org/torproject/ernie/cron/ExoneraTorDatabaseImporter.java @@ -0,0 +1,528 @@ +/* Copyright 2011 The Tor Project + * See LICENSE for licensing information */ +package org.torproject.ernie.cron; + +import java.io.*; +import java.sql.*; +import java.text.*; +import java.util.*; +import org.apache.commons.codec.binary.*; +import org.apache.commons.codec.digest.*; + +/* Import Tor descriptors into the ExoneraTor database. */ +public class ExoneraTorDatabaseImporter { + + /* Main function controlling the parsing process. */ + public static void main(String[] args) { + readConfiguration(); + openDatabaseConnection(); + prepareDatabaseStatements(); + createLockFile(); + readImportHistoryToMemory(); + parseDescriptors(); + writeImportHistoryToDisk(); + closeDatabaseConnection(); + deleteLockFile(); + } + + /* JDBC string of the ExoneraTor database. */ + private static String jdbcString; + + /* Directory from which to import descriptors. */ + private static String importDirString; + + /* Learn JDBC string and directory to parse descriptors from. */ + private static void readConfiguration() { + Configuration config = new Configuration(); + jdbcString = config.getExoneraTorDatabaseJdbc(); + importDirString = config.getExoneraTorImportDirectory(); + } + + /* Database connection. */ + private static Connection connection; + + /* Open a database connection using the JDBC string in the config. */ + private static void openDatabaseConnection() { + try { + connection = DriverManager.getConnection(jdbcString); + } catch (SQLException e) { + System.out.println("Could not connect to database. Exiting."); + System.exit(1); + } + } + + /* Callable statements to import data into the database. */ + private static CallableStatement insertDescriptorStatement; + private static CallableStatement insertStatusentryStatement; + private static CallableStatement insertConsensusStatement; + private static CallableStatement insertExitlistentryStatement; + + /* Prepare statements for importing data into the database. */ + private static void prepareDatabaseStatements() { + try { + insertDescriptorStatement = connection.prepareCall( + "{call insert_descriptor(?, ?)}"); + insertStatusentryStatement = connection.prepareCall( + "{call insert_statusentry(?, ?, ?, ?, ?, ?)}"); + insertConsensusStatement = connection.prepareCall( + "{call insert_consensus(?, ?)}"); + insertExitlistentryStatement = connection.prepareCall( + "{call insert_exitlistentry(?, ?, ?, ?, ?)}"); + } catch (SQLException e) { + System.out.println("Could not prepare callable statements to " + + "import data into the database. Exiting."); + System.exit(1); + } + } + + /* Create a local lock file to prevent other instances of this import + * tool to run concurrently. */ + private static void createLockFile() { + File lockFile = new File("exonerator-lock"); + try { + if (lockFile.exists()) { + BufferedReader br = new BufferedReader(new FileReader(lockFile)); + long runStarted = Long.parseLong(br.readLine()); + br.close(); + if (System.currentTimeMillis() - runStarted + < 6L * 60L * 60L * 1000L) { + System.out.println("File 'exonerator-lock' is less than 6 " + + "hours old. Exiting."); + System.exit(1); + } else { + System.out.println("File 'exonerator-lock' is at least 6 hours " + + "old. Overwriting and executing anyway."); + } + } + BufferedWriter bw = new BufferedWriter(new FileWriter( + "exonerator-lock")); + bw.append(String.valueOf(System.currentTimeMillis()) + "\n"); + bw.close(); + } catch (IOException e) { + System.out.println("Could not create 'exonerator-lock' file. " + + "Exiting."); + System.exit(1); + } + } + + /* Last and next parse histories containing paths of parsed files and + * last modified times. */ + private static Map<String, Long> + lastImportHistory = new HashMap<String, Long>(), + nextImportHistory = new HashMap<String, Long>(); + + /* Read stats/exonerator-import-history file from disk and remember + * locally when files were last parsed. */ + private static void readImportHistoryToMemory() { + File parseHistoryFile = new File("stats", + "exonerator-import-history"); + if (parseHistoryFile.exists()) { + try { + BufferedReader br = new BufferedReader(new FileReader( + parseHistoryFile)); + String line = null; + int lineNumber = 0; + while ((line = br.readLine()) != null) { + lineNumber++; + String[] parts = line.split(","); + if (parts.length != 2) { + System.out.println("File 'stats/exonerator-import-history' " + + "contains a corrupt entry in line " + lineNumber + + ". Ignoring parse history file entirely."); + lastImportHistory.clear(); + return; + } + long lastModified = Long.parseLong(parts[0]); + String filename = parts[1]; + lastImportHistory.put(filename, lastModified); + } + br.close(); + } catch (IOException e) { + System.out.println("Could not read import history. Ignoring."); + lastImportHistory.clear(); + } + } + } + + /* Parse descriptors in the import directory and its subdirectories. */ + private static void parseDescriptors() { + File file = new File(importDirString); + if (!file.exists()) { + System.out.println("File or directory " + importDirString + " does " + + "not exist. Exiting."); + return; + } + Stack<File> files = new Stack<File>(); + files.add(file); + while (!files.isEmpty()) { + file = files.pop(); + if (file.isDirectory()) { + for (File f : file.listFiles()) { + files.add(f); + } + } else { + parseFile(file); + } + } + } + + /* Import a file if it wasn't imported before, and add it to the import + * history for the next execution. */ + private static void parseFile(File file) { + long lastModified = file.lastModified(); + String filename = file.getName(); + nextImportHistory.put(filename, lastModified); + if (!lastImportHistory.containsKey(filename) || + lastImportHistory.get(filename) < lastModified) { + try { + FileInputStream fis = new FileInputStream(file); + BufferedInputStream bis = new BufferedInputStream(fis); + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + int len; + byte[] bytes = new byte[1024]; + while ((len = bis.read(bytes, 0, 1024)) >= 0) { + baos.write(bytes, 0, len); + } + bis.close(); + byte[] allBytes = baos.toByteArray(); + splitFile(file, allBytes); + } catch (IOException e) { + System.out.println("Could not read '" + file + "' to memory. " + + "Skipping."); + nextImportHistory.remove(filename); + } + } + } + + /* Detect what descriptor type is contained in a file and split it to + * parse the single descriptors. */ + private static void splitFile(File file, byte[] bytes) { + try { + String asciiString = new String(bytes, "US-ASCII"); + BufferedReader br = new BufferedReader(new StringReader( + asciiString)); + String line = br.readLine(); + while (line != null && line.startsWith("@")) { + line = br.readLine(); + } + if (line == null) { + return; + } + br.close(); + String startToken = null; + if (line.startsWith("router ")) { + startToken = "router "; + } else if (line.equals("network-status-version 3")) { + startToken = "network-status-version 3"; + } else if (line.startsWith("ExitNode ")) { + startToken = "ExitNode "; + } else { + System.out.println("Unknown descriptor type in file '" + file + + "'. Ignoring."); + return; + } + String splitToken = "\n" + startToken; + int length = bytes.length, start = asciiString.indexOf(startToken); + while (start < length) { + int end = asciiString.indexOf(splitToken, start); + if (end < 0) { + end = length; + } else { + end += 1; + } + byte[] descBytes = new byte[end - start]; + System.arraycopy(bytes, start, descBytes, 0, end - start); + if (startToken.equals("router ")) { + parseServerDescriptor(file, descBytes); + } else if (startToken.equals("network-status-version 3")) { + parseConsensus(file, descBytes); + } else if (startToken.equals("ExitNode ")) { + parseExitList(file, descBytes); + } + start = end; + } + } catch (IOException e) { + System.out.println("Could not parse descriptor '" + file + "'. " + + "Skipping."); + } + } + + /* Date format to parse UTC timestamps. */ + private static SimpleDateFormat parseFormat; + static { + parseFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + parseFormat.setTimeZone(TimeZone.getTimeZone("UTC")); + } + + /* Parse a single server descriptor. */ + private static void parseServerDescriptor(File file, byte[] bytes) { + String ascii = ""; + try { + ascii = new String(bytes, "US-ASCII"); + } catch (UnsupportedEncodingException e) { + /* We know that US-ASCII is a supported encoding. */ + } + String startToken = "router "; + String sigToken = "\nrouter-signature\n"; + int start = ascii.indexOf(startToken); + int sig = ascii.indexOf(sigToken) + sigToken.length(); + String descriptor = null; + if (start >= 0 || sig >= 0 || sig > start) { + byte[] forDigest = new byte[sig - start]; + System.arraycopy(bytes, start, forDigest, 0, sig - start); + descriptor = DigestUtils.shaHex(forDigest); + } + if (descriptor == null) { + System.out.println("Could not calculate descriptor digest. " + + "Skipping."); + return; + } + importDescriptor(descriptor, bytes); + } + + /* Import a single server descriptor into the database. */ + private static void importDescriptor(String descriptor, + byte[] rawDescriptor) { + try { + insertDescriptorStatement.clearParameters(); + insertDescriptorStatement.setString(1, descriptor); + insertDescriptorStatement.setBytes(2, rawDescriptor); + insertDescriptorStatement.execute(); + } catch (SQLException e) { + System.out.println("Could not import descriptor into the " + + "database. Exiting."); + System.exit(1); + } + } + + /* Parse a consensus. */ + private static void parseConsensus(File file, byte[] bytes) { + try { + BufferedReader br = new BufferedReader(new StringReader(new String( + bytes, "US-ASCII"))); + String line, fingerprint = null, descriptor = null, + orAddress24 = null, orAddress = null; + long validAfterMillis = -1L; + StringBuilder rawStatusentryBuilder = null; + boolean isRunning = false; + while ((line = br.readLine()) != null) { + if (line.startsWith("vote-status ") && + !line.equals("vote-status consensus")) { + System.out.println("File '" + file + "' contains network status " + + "*votes*, not network status *consensuses*. Skipping."); + return; + } else if (line.startsWith("valid-after ")) { + String validAfterTime = line.substring("valid-after ".length()); + try { + validAfterMillis = parseFormat.parse(validAfterTime). + getTime(); + } catch (ParseException e) { + System.out.println("Could not parse valid-after timestamp in " + + "'" + file + "'. Skipping."); + return; + } + importConsensus(validAfterMillis, bytes); + } else if (line.startsWith("r ") || + line.equals("directory-footer")) { + if (isRunning) { + byte[] rawStatusentry = rawStatusentryBuilder.toString(). + getBytes(); + importStatusentry(validAfterMillis, fingerprint, descriptor, + orAddress24, orAddress, rawStatusentry); + } + if (line.equals("directory-footer")) { + return; + } + rawStatusentryBuilder = new StringBuilder(line + "\n"); + String[] parts = line.split(" "); + if (parts.length < 9) { + System.out.println("Could not parse r line '" + line + + "'. Skipping."); + return; + } + fingerprint = Hex.encodeHexString(Base64.decodeBase64(parts[2] + + "=")).toLowerCase(); + descriptor = Hex.encodeHexString(Base64.decodeBase64(parts[3] + + "=")).toLowerCase(); + orAddress = parts[6]; + /* TODO Extend the following code for IPv6 once Tor supports + * it. */ + String[] orAddressParts = orAddress.split("\\."); + byte[] orAddress24Bytes = new byte[3]; + orAddress24Bytes[0] = (byte) Integer.parseInt( + orAddressParts[0]); + orAddress24Bytes[1] = (byte) Integer.parseInt( + orAddressParts[1]); + orAddress24Bytes[2] = (byte) Integer.parseInt( + orAddressParts[2]); + orAddress24 = Hex.encodeHexString(orAddress24Bytes); + } else if (line.startsWith("s ") || line.equals("s")) { + rawStatusentryBuilder.append(line + "\n"); + isRunning = line.contains(" Running"); + } else if (rawStatusentryBuilder != null) { + rawStatusentryBuilder.append(line + "\n"); + } + /* TODO Extend this code to parse additional addresses once that's + * implemented in Tor. */ + } + } catch (IOException e) { + System.out.println("Could not parse consensus. Skipping."); + return; + } + } + + /* UTC calendar for importing timestamps into the database. */ + private static Calendar calendarUTC = Calendar.getInstance( + TimeZone.getTimeZone("UTC")); + + /* Import a single status entry into the database. */ + private static void importStatusentry(long validAfterMillis, + String fingerprint, String descriptor, String orAddress24, + String orAddress, byte[] rawStatusentry) { + try { + insertStatusentryStatement.clearParameters(); + insertStatusentryStatement.setTimestamp(1, + new Timestamp(validAfterMillis), calendarUTC); + insertStatusentryStatement.setString(2, fingerprint); + insertStatusentryStatement.setString(3, descriptor); + insertStatusentryStatement.setString(4, orAddress24); + insertStatusentryStatement.setString(5, orAddress); + insertStatusentryStatement.setBytes(6, rawStatusentry); + insertStatusentryStatement.execute(); + } catch (SQLException e) { + System.out.println("Could not import status entry. Exiting."); + System.exit(1); + } + } + + /* Import a consensus into the database. */ + private static void importConsensus(long validAfterMillis, + byte[] rawConsensus) { + try { + insertConsensusStatement.clearParameters(); + insertConsensusStatement.setTimestamp(1, + new Timestamp(validAfterMillis), calendarUTC); + insertConsensusStatement.setBytes(2, rawConsensus); + insertConsensusStatement.execute(); + } catch (SQLException e) { + System.out.println("Could not import consensus. Exiting."); + System.exit(1); + } + } + + /* Parse an exit list. */ + private static void parseExitList(File file, byte[] bytes) { + try { + BufferedReader br = new BufferedReader(new StringReader(new String( + bytes, "US-ASCII"))); + String fingerprint = null; + Set<String> exitAddressLines = new HashSet<String>(); + StringBuilder rawExitlistentryBuilder = new StringBuilder(); + while (true) { + String line = br.readLine(); + if ((line == null || line.startsWith("ExitNode ")) && + fingerprint != null) { + for (String exitAddressLine : exitAddressLines) { + String[] parts = exitAddressLine.split(" "); + String exitAddress = parts[1]; + /* TODO Extend the following code for IPv6 once the exit list + * format supports it. */ + String[] exitAddressParts = exitAddress.split("\\."); + byte[] exitAddress24Bytes = new byte[3]; + exitAddress24Bytes[0] = (byte) Integer.parseInt( + exitAddressParts[0]); + exitAddress24Bytes[1] = (byte) Integer.parseInt( + exitAddressParts[1]); + exitAddress24Bytes[2] = (byte) Integer.parseInt( + exitAddressParts[2]); + String exitAddress24 = Hex.encodeHexString( + exitAddress24Bytes); + String scannedTime = parts[2] + " " + parts[3]; + long scannedMillis = -1L, publishedMillis = -1L; + try { + scannedMillis = parseFormat.parse(scannedTime).getTime(); + } catch (ParseException e) { + System.out.println("Could not parse timestamp in " + + "'" + file + "'. Skipping."); + return; + } + byte[] rawExitlistentry = rawExitlistentryBuilder.toString(). + getBytes(); + importExitlistentry(fingerprint, exitAddress24, exitAddress, + scannedMillis, rawExitlistentry); + } + exitAddressLines.clear(); + rawExitlistentryBuilder = new StringBuilder(); + } + if (line == null) { + break; + } + rawExitlistentryBuilder.append(line + "\n"); + if (line.startsWith("ExitNode ")) { + fingerprint = line.substring("ExitNode ".length()). + toLowerCase(); + } else if (line.startsWith("ExitAddress ")) { + exitAddressLines.add(line); + } + } + br.close(); + } catch (IOException e) { + System.out.println("Could not parse exit list. Skipping."); + return; + } + } + + /* Import an exit list entry into the database. */ + private static void importExitlistentry(String fingerprint, + String exitAddress24, String exitAddress, long scannedMillis, + byte[] rawExitlistentry) { + try { + insertExitlistentryStatement.clearParameters(); + insertExitlistentryStatement.setString(1, fingerprint); + insertExitlistentryStatement.setString(2, exitAddress24); + insertExitlistentryStatement.setString(3, exitAddress); + insertExitlistentryStatement.setTimestamp(4, + new Timestamp(scannedMillis), calendarUTC); + insertExitlistentryStatement.setBytes(5, rawExitlistentry); + insertExitlistentryStatement.execute(); + } catch (SQLException e) { + System.out.println("Could not import exit list entry. Exiting."); + System.exit(1); + } + } + + /* Write parse history from memory to disk for the next execution. */ + private static void writeImportHistoryToDisk() { + File parseHistoryFile = new File("stats/exonerator-import-history"); + try { + BufferedWriter bw = new BufferedWriter(new FileWriter( + parseHistoryFile)); + for (Map.Entry<String, Long> historyEntry : + nextImportHistory.entrySet()) { + bw.write(String.valueOf(historyEntry.getValue()) + "," + + historyEntry.getKey() + "\n"); + } + bw.close(); + } catch (IOException e) { + System.out.println("File 'stats/exonerator-import-history' could " + + "not be written. Ignoring."); + } + } + + /* Close the database connection. */ + private static void closeDatabaseConnection() { + try { + connection.close(); + } catch (SQLException e) { + System.out.println("Could not close database connection. " + + "Ignoring."); + } + } + + /* Delete the exonerator-lock file to allow the next executing of this + * tool. */ + private static void deleteLockFile() { + new File("exonerator-lock").delete(); + } +} + diff --git a/src/org/torproject/ernie/web/ExoneraTorBetaServlet.java b/src/org/torproject/ernie/web/ExoneraTorBetaServlet.java new file mode 100644 index 0000000..c2e7b96 --- /dev/null +++ b/src/org/torproject/ernie/web/ExoneraTorBetaServlet.java @@ -0,0 +1,991 @@ +package org.torproject.ernie.web; + +import java.io.*; +import java.math.*; +import java.sql.*; +import java.text.*; +import java.util.*; +import java.util.logging.*; +import java.util.regex.*; + +import javax.naming.*; +import javax.servlet.*; +import javax.servlet.http.*; +import javax.sql.*; + +import org.apache.commons.codec.binary.*; +import org.apache.commons.lang.*; + +public class ExoneraTorBetaServlet extends HttpServlet { + + private DataSource ds; + + private Logger logger; + + public void init() { + + /* Initialize logger. */ + this.logger = Logger.getLogger( + ExoneraTorBetaServlet.class.toString()); + + /* Look up data source. */ + try { + Context cxt = new InitialContext(); + this.ds = (DataSource) cxt.lookup("java:comp/env/jdbc/exonerator"); + this.logger.info("Successfully looked up data source."); + } catch (NamingException e) { + this.logger.log(Level.WARNING, "Could not look up data source", e); + } + } + + private void writeHeader(PrintWriter out) throws IOException { + out.println("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 " + + "Transitional//EN\">\n" + + "<html>\n" + + " <head>\n" + + " <title>Tor Metrics Portal: ExoneraTor</title>\n" + + " <meta http-equiv=\"content-type\" content=\"text/html; " + + "charset=ISO-8859-1\">\n" + + " <link href=\"/css/stylesheet-ltr.css\" type=\"text/css\" " + + "rel=\"stylesheet\">\n" + + " <link href=\"/images/favicon.ico\" " + + "type=\"image/x-icon\" rel=\"shortcut icon\">\n" + + " </head>\n" + + " <body>\n" + + " <div class=\"center\">\n" + + " <table class=\"banner\" border=\"0\" cellpadding=\"0\" " + + "cellspacing=\"0\" summary=\"\">\n" + + " <tr>\n" + + " <td class=\"banner-left\"><a " + + "href=\"/index.html\"><img src=\"/images/top-left.png\" " + + "alt=\"Click to go to home page\" width=\"193\" " + + "height=\"79\"></a></td>\n" + + " <td class=\"banner-middle\">\n" + + " <a href=\"/\">Home</a>\n" + + " <a href=\"graphs.html\">Graphs</a>\n" + + " <a href=\"research.html\">Research</a>\n" + + " <a href=\"status.html\">Status</a>\n" + + " <br>\n" + + " <font size=\"2\">\n" + + " <a href=\"networkstatus.html\">Network Status</a>\n" + + " <a class=\"current\">ExoneraTor</a>\n" + + " <a href=\"relay-search.html\">Relay Search</a>\n" + + " <a href=\"consensus-health.html\">Consensus " + + "Health</a>\n" + + " </font>\n" + + " </td>\n" + + " <td class=\"banner-right\"></td>\n" + + " </tr>\n" + + " </table>\n" + + " <div class=\"main-column\" style=\"margin:5; " + + "Padding:0;\">\n" + + " <h2>ExoneraTor</h2>\n" + + " <h3>or: a website that tells you whether some IP " + + "address was a Tor relay</h3>\n" + + " <p>ExoneraTor tells you whether there was a Tor relay " + + "running on a given IP address at a given time. ExoneraTor " + + "can further find out whether this relay permitted exiting " + + "to a given server and/or TCP port. ExoneraTor learns about " + + "these facts from parsing the public relay lists and relay " + + "descriptors that are collected from the Tor directory " + + "authorities and the exit lists collected by TorDNSEL.</p>\n" + + " <br>\n" + + " <p>This is a <b>BETA</b> version of ExoneraTor. " + + "Beware of bugs. The stable version of ExoneraTor is still " + + "available <a href=\"exonerator.html\">here</a>. The " + + "visible changes in this BETA version are:</p>\n" + + " <ul>\n" + + " <li>Results now include IP addresses from exit " + + "lists, too.</li>\n" + + " <li>It's not required anymore to specify an exact " + + "timestamp, but now a date is enough.</li>\n" + + " </ul><br>\n" + + " <p><font color=\"red\"><b>Notice:</b> Note that the " + + "information you are providing below may be leaked to anyone " + + "who can read the network traffic between you and this web " + + "server or who has access to this web server. If you need to " + + "keep the IP addresses and incident times confidential, you " + + "should download the <a href=\"tools.html#exonerator\">Java " + + "or Python version of ExoneraTor</a> and run it on your " + + "local machine.</font></p>\n" + + " <br>\n"); + } + + private void writeFooter(PrintWriter out) throws IOException { + out.println(" <br>\n" + + " </div>\n" + + " </div>\n" + + " <div class=\"bottom\" id=\"bottom\">\n" + + " <p>This material is supported in part by the National " + + "Science Foundation under Grant No. CNS-0959138. Any " + + "opinions, finding, and conclusions or recommendations " + + "expressed in this material are those of the author(s) and " + + "do not necessarily reflect the views of the National " + + "Science Foundation.</p>\n" + + " <p>\"Tor\" and the \"Onion Logo\" are <a " + + "href=\"https://www.torproject.org/docs/trademark-faq.html.en" + + "\">registered trademarks</a> of The Tor Project, Inc.</p>\n" + + " <p>Data on this site is freely available under a <a " + + "href=\"http://creativecommons.org/publicdomain/zero/1.0/\">" + + "CC0 no copyright declaration</a>: To the extent possible " + + "under law, the Tor Project has waived all copyright and " + + "related or neighboring rights in the data. Graphs are " + + "licensed under a <a " + + "href=\"http://creativecommons.org/licenses/by/3.0/us/\">" + + "Creative Commons Attribution 3.0 United States " + + "License</a>.</p>\n" + + " </div>\n" + + " </body>\n" + + "</html>"); + out.close(); + } + + public void doGet(HttpServletRequest request, + HttpServletResponse response) throws IOException, + ServletException { + + /* Start writing response. */ + PrintWriter out = response.getWriter(); + writeHeader(out); + + /* Open a database connection that we'll use to handle the whole + * request. */ + Connection conn = null; + try { + conn = this.ds.getConnection(); + } catch (SQLException e) { + out.println("<p><font color=\"red\"><b>Warning: </b></font>Unable " + + "to connect to the database. If this problem persists, " + + "please <a href=\"mailto:tor-assistants@torproject.org\">let " + + "us know</a>!</p>\n"); + writeFooter(out); + return; + } + + /* Look up first and last consensus in the database. */ + long firstValidAfter = -1L, lastValidAfter = -1L; + try { + Statement statement = conn.createStatement(); + String query = "SELECT MIN(validafter) AS first, " + + "MAX(validafter) AS last FROM consensus"; + ResultSet rs = statement.executeQuery(query); + if (rs.next()) { + firstValidAfter = rs.getTimestamp(1).getTime(); + lastValidAfter = rs.getTimestamp(2).getTime(); + } + rs.close(); + statement.close(); + } catch (SQLException e) { + /* Looks like we don't have any consensuses. */ + } + if (firstValidAfter < 0L || lastValidAfter < 0L) { + out.println("<p><font color=\"red\"><b>Warning: </b></font>This " + + "server doesn't have any relay lists available. If this " + + "problem persists, please " + + "<a href=\"mailto:tor-assistants@torproject.org\">let us " + + "know</a>!</p>\n"); + writeFooter(out); + try { + conn.close(); + } catch (SQLException e) { + } + return; + } + + out.println("<a name=\"relay\"></a><h3>Was there a Tor relay running " + + "on this IP address?</h3>"); + + /* Parse IP parameter. */ + /* TODO Extend the parsing code to accept IPv6 addresses, too. */ + Pattern ipAddressPattern = Pattern.compile( + "^([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\." + + "([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\." + + "([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\." + + "([01]?\\d\\d?|2[0-4]\\d|25[0-5])$"); + String ipParameter = request.getParameter("ip"); + String relayIP = "", ipWarning = ""; + if (ipParameter != null && ipParameter.length() > 0) { + Matcher ipParameterMatcher = ipAddressPattern.matcher(ipParameter); + if (ipParameterMatcher.matches()) { + String[] ipParts = ipParameter.split("\\."); + relayIP = Integer.parseInt(ipParts[0]) + "." + + Integer.parseInt(ipParts[1]) + "." + + Integer.parseInt(ipParts[2]) + "." + + Integer.parseInt(ipParts[3]); + } else { + ipWarning = "\"" + (ipParameter.length() > 20 ? + StringEscapeUtils.escapeHtml(ipParameter.substring(0, 20)) + + "[...]" : StringEscapeUtils.escapeHtml(ipParameter)) + + "\" is not a valid IP address."; + } + } + + /* Parse timestamp parameter. */ + String timestampParameter = request.getParameter("timestamp"); + long timestamp = 0L; + boolean timestampIsDate = false; + String timestampStr = "", timestampWarning = ""; + SimpleDateFormat shortDateTimeFormat = new SimpleDateFormat( + "yyyy-MM-dd HH:mm"); + shortDateTimeFormat.setTimeZone(TimeZone.getTimeZone("UTC")); + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); + dateFormat.setTimeZone(TimeZone.getTimeZone("UTC")); + if (timestampParameter != null && timestampParameter.length() > 0) { + try { + if (timestampParameter.split(" ").length == 1) { + timestamp = dateFormat.parse(timestampParameter).getTime(); + timestampStr = dateFormat.format(timestamp); + timestampIsDate = true; + } else { + timestamp = shortDateTimeFormat.parse(timestampParameter). + getTime(); + timestampStr = shortDateTimeFormat.format(timestamp); + } + if (timestamp < firstValidAfter || timestamp > lastValidAfter) { + timestampWarning = "Please pick a date or timestamp between \"" + + shortDateTimeFormat.format(firstValidAfter) + "\" and \"" + + shortDateTimeFormat.format(lastValidAfter) + "\"."; + timestamp = 0L; + } + } catch (ParseException e) { + /* We have no way to handle this exception, other than leaving + timestampStr at "". */ + timestampWarning = "\"" + (timestampParameter.length() > 20 ? + StringEscapeUtils.escapeHtml(timestampParameter. + substring(0, 20)) + "[...]" : + StringEscapeUtils.escapeHtml(timestampParameter)) + + "\" is not a valid date or timestamp."; + } + } + + /* If either IP address or timestamp is provided, the other one must + * be provided, too. */ + if (relayIP.length() < 1 && timestampStr.length() > 0 && + ipWarning.length() < 1) { + ipWarning = "Please provide an IP address."; + } + if (relayIP.length() > 0 && timestamp < 1 && + timestampWarning.length() < 1) { + timestampWarning = "Please provide a date or timestamp."; + } + + /* Parse target IP parameter. */ + String targetIP = "", targetPort = "", target = ""; + String[] targetIPParts = null; + String targetAddrParameter = request.getParameter("targetaddr"); + String targetAddrWarning = ""; + if (targetAddrParameter != null && targetAddrParameter.length() > 0) { + Matcher targetAddrParameterMatcher = + ipAddressPattern.matcher(targetAddrParameter); + if (targetAddrParameterMatcher.matches()) { + String[] targetAddrParts = targetAddrParameter.split("\\."); + targetIP = Integer.parseInt(targetAddrParts[0]) + "." + + Integer.parseInt(targetAddrParts[1]) + "." + + Integer.parseInt(targetAddrParts[2]) + "." + + Integer.parseInt(targetAddrParts[3]); + target = targetIP; + targetIPParts = targetIP.split("\\."); + } else { + targetAddrWarning = "\"" + (targetAddrParameter.length() > 20 ? + StringEscapeUtils.escapeHtml(targetAddrParameter.substring( + 0, 20)) + "[...]" : StringEscapeUtils.escapeHtml( + targetAddrParameter)) + "\" is not a valid IP address."; + } + } + + /* Parse target port parameter. */ + String targetPortParameter = request.getParameter("targetport"); + String targetPortWarning = ""; + if (targetPortParameter != null && targetPortParameter.length() > 0) { + Pattern targetPortPattern = Pattern.compile("\\d+"); + if (targetPortParameter.length() < 5 && + targetPortPattern.matcher(targetPortParameter).matches() && + !targetPortParameter.equals("0") && + Integer.parseInt(targetPortParameter) < 65536) { + targetPort = targetPortParameter; + if (target != null) { + target += ":" + targetPort; + } else { + target = targetPort; + } + } else { + targetPortWarning = "\"" + (targetPortParameter.length() > 8 ? + StringEscapeUtils.escapeHtml(targetPortParameter. + substring(0, 8)) + "[...]" : + StringEscapeUtils.escapeHtml(targetPortParameter)) + + "\" is not a valid TCP port."; + } + } + + /* If target port is provided, a target address must be provided, + * too. */ + /* TODO Relax this requirement. */ + if (targetPort.length() > 0 && targetIP.length() < 1 && + targetAddrWarning.length() < 1) { + targetAddrWarning = "Please provide an IP address."; + } + + /* Write form with IP address and timestamp. */ + out.println(" <form action=\"#relay\">\n" + + " <input type=\"hidden\" name=\"targetaddr\" " + + (targetIP.length() > 0 ? " value=\"" + targetIP + "\"" : "") + + ">\n" + + " <input type=\"hidden\" name=\"targetPort\"" + + (targetPort.length() > 0 ? " value=\"" + targetPort + "\"" : "") + + ">\n" + + " <table>\n" + + " <tr>\n" + + " <td align=\"right\">IP address in question:" + + "</td>\n" + + " <td><input type=\"text\" name=\"ip\"" + + (relayIP.length() > 0 ? " value=\"" + relayIP + "\"" + : "") + + ">" + + (ipWarning.length() > 0 ? "<br><font color=\"red\">" + + ipWarning + "</font>" : "") + + "</td>\n" + + " <td><i>(Ex.: 1.2.3.4)</i></td>\n" + + " </tr>\n" + + " <tr>\n" + + " <td align=\"right\">Date or timestamp, in " + + "UTC:</td>\n" + + " <td><input type=\"text\" name=\"timestamp\"" + + (timestampStr.length() > 0 ? " value=\"" + timestampStr + "\"" + : "") + + ">" + + (timestampWarning.length() > 0 ? "<br><font color=\"red\">" + + timestampWarning + "</font>" : "") + + "</td>\n" + + " <td><i>(Ex.: 2010-01-01 or 2010-01-01 12:00)" + + "</i></td>\n" + + " </tr>\n" + + " <tr>\n" + + " <td></td>\n" + + " <td>\n" + + " <input type=\"submit\">\n" + + " <input type=\"reset\">\n" + + " </td>\n" + + " <td></td>\n" + + " </tr>\n" + + " </table>\n" + + " </form>\n"); + + if (relayIP.length() < 1 || timestamp < 1) { + writeFooter(out); + try { + conn.close(); + } catch (SQLException e) { + } + return; + } + + out.printf("<p>Looking up IP address %s in the relay lists " + + "published ", relayIP); + long timestampFrom, timestampTo; + if (timestampIsDate) { + /* If we only have a date, consider all consensuses published on the + * given date, plus the ones published 3 hours before the given date + * and until 23:59:59. */ + timestampFrom = timestamp - 3L * 60L * 60L * 1000L; + timestampTo = timestamp + (24L * 60L * 60L - 1L) * 1000L; + out.printf("on %s", timestampStr); + } else { + /* If we have an exact timestamp, consider the consensuses published + * in the 3 hours preceding the UTC timestamp. */ + timestampFrom = timestamp - 3L * 60L * 60L * 1000L; + timestampTo = timestamp; + out.printf("between %s and %s UTC", + shortDateTimeFormat.format(timestampFrom), + shortDateTimeFormat.format(timestampTo)); + } + /* If we don't find any relays in the given time interval, also look + * at consensuses published 12 hours before and 12 hours after the + * interval, in case the user got the "UTC" bit wrong. */ + long timestampTooOld = timestampFrom - 12L * 60L * 60L * 1000L; + long timestampTooNew = timestampTo + 12L * 60L * 60L * 1000L; + out.print(" as well as in the relevant exit lists. Clients could " + + "have selected any of these relays to build circuits. " + + "You may follow the links to relay lists and relay descriptors " + + "to grep for the lines printed below and confirm that results " + + "are correct.<br>"); + SimpleDateFormat validAfterTimeFormat = new SimpleDateFormat( + "yyyy-MM-dd HH:mm:ss"); + validAfterTimeFormat.setTimeZone(TimeZone.getTimeZone("UTC")); + String fromValidAfter = validAfterTimeFormat.format(timestampTooOld); + String toValidAfter = validAfterTimeFormat.format(timestampTooNew); + SortedSet<Long> tooOldConsensuses = new TreeSet<Long>(); + SortedSet<Long> relevantConsensuses = new TreeSet<Long>(); + SortedSet<Long> tooNewConsensuses = new TreeSet<Long>(); + try { + Statement statement = conn.createStatement(); + String query = "SELECT validafter FROM consensus " + + "WHERE validafter >= '" + fromValidAfter + + "' AND validafter <= '" + toValidAfter + "'"; + ResultSet rs = statement.executeQuery(query); + while (rs.next()) { + long consensusTime = rs.getTimestamp(1).getTime(); + if (consensusTime < timestampFrom) { + tooOldConsensuses.add(consensusTime); + } else if (consensusTime > timestampTo) { + tooNewConsensuses.add(consensusTime); + } else { + relevantConsensuses.add(consensusTime); + } + } + rs.close(); + statement.close(); + } catch (SQLException e) { + /* Looks like we don't have any consensuses in the requested + * interval. */ + } + SortedSet<Long> allConsensuses = new TreeSet<Long>(); + allConsensuses.addAll(tooOldConsensuses); + allConsensuses.addAll(relevantConsensuses); + allConsensuses.addAll(tooNewConsensuses); + if (allConsensuses.isEmpty()) { + out.println(" <p>No relay lists found!</p>\n" + + " <p>Result is INDECISIVE!</p>\n" + + " <p>We cannot make any statement whether there was " + + "a Tor relay running on IP address " + relayIP + + (timestampIsDate ? " on " : " at ") + timestampStr + "! We " + + "did not find any relevant relay lists at the given time. If " + + "you think this is an error on our side, please " + + "<a href=\"mailto:tor-assistants@torproject.org\">contact " + + "us</a>!</p>\n"); + writeFooter(out); + try { + conn.close(); + } catch (SQLException e) { + } + return; + } + + /* Search for status entries with the given IP address as onion + * routing address, plus status entries of relays having an exit list + * entry with the given IP address as exit address. */ + SortedMap<Long, SortedMap<String, String>> statusEntries = + new TreeMap<Long, SortedMap<String, String>>(); + SortedSet<Long> positiveConsensusesNoTarget = new TreeSet<Long>(); + SortedMap<String, Set<Long>> relevantDescriptors = + new TreeMap<String, Set<Long>>(); + try { + CallableStatement cs = conn.prepareCall( + "{call search_statusentries_by_address_date(?, ?)}"); + cs.setString(1, relayIP); + cs.setDate(2, new java.sql.Date(timestamp)); + ResultSet rs = cs.executeQuery(); + while (rs.next()) { + byte[] rawstatusentry = rs.getBytes(1); + String descriptor = rs.getString(2); + long validafter = rs.getTimestamp(3).getTime(); + positiveConsensusesNoTarget.add(validafter); + if (!relevantDescriptors.containsKey(descriptor)) { + relevantDescriptors.put(descriptor, new HashSet<Long>()); + } + relevantDescriptors.get(descriptor).add(validafter); + String fingerprint = rs.getString(4); + boolean orAddressMatches = rs.getString(5).equals(relayIP); + String exitaddress = rs.getString(6); + String rLine = new String(rawstatusentry); + rLine = rLine.substring(0, rLine.indexOf("\n")); + String[] parts = rLine.split(" "); + String htmlString = "r " + parts[1] + " " + parts[2] + " " + + "<a href=\"serverdesc?desc-id=" + descriptor + "\" " + + "target=\"_blank\">" + parts[3] + "</a> " + parts[4] + + " " + parts[5] + " " + (orAddressMatches ? "<b>" : "") + + parts[6] + (orAddressMatches ? "</b>" : "") + " " + parts[7] + + " " + parts[8] + "\n"; + if (exitaddress != null && exitaddress.length() > 0) { + long scanned = rs.getTimestamp(7).getTime(); + htmlString += " [ExitAddress <b>" + exitaddress + + "</b> " + validAfterTimeFormat.format(scanned) + + "]\n"; + } + if (!statusEntries.containsKey(validafter)) { + statusEntries.put(validafter, new TreeMap<String, String>()); + } + statusEntries.get(validafter).put(fingerprint, htmlString); + } + rs.close(); + cs.close(); + } catch (SQLException e) { + /* Nothing found. */ + } + + /* Print out what we found. */ + SimpleDateFormat validAfterUrlFormat = new SimpleDateFormat( + "yyyy-MM-dd-HH-mm-ss"); + validAfterUrlFormat.setTimeZone(TimeZone.getTimeZone("UTC")); + out.print("<pre><code>"); + for (long consensus : allConsensuses) { + if (relevantConsensuses.contains(consensus)) { + String validAfterDatetime = validAfterTimeFormat.format( + consensus); + String validAfterString = validAfterUrlFormat.format(consensus); + out.print("valid-after <b>" + + "<a href=\"consensus?valid-after=" + + validAfterString + "\" target=\"_blank\">" + + validAfterDatetime + "</b></a>\n"); + if (statusEntries.containsKey(consensus)) { + for (String htmlString : + statusEntries.get(consensus).values()) { + out.print(htmlString); + } + } + out.print("\n"); + } + } + out.print("</code></pre>"); + if (relevantDescriptors.isEmpty()) { + out.printf(" <p>None found!</p>\n" + + " <p>Result is NEGATIVE with high certainty!</p>\n" + + " <p>We did not find IP " + + "address " + relayIP + " in any of the relay or exit lists " + + "that were published between %s and %s.</p>\n", + dateFormat.format(timestampTooOld), + dateFormat.format(timestampTooNew)); + /* Run another query to find out if there are relays running on + * other IP addresses in the same /24 network and tell the user + * about it. */ + SortedSet<String> addressesInSameNetwork = new TreeSet<String>(); + String[] relayIPParts = relayIP.split("\\."); + byte[] address24Bytes = new byte[3]; + address24Bytes[0] = (byte) Integer.parseInt(relayIPParts[0]); + address24Bytes[1] = (byte) Integer.parseInt(relayIPParts[1]); + address24Bytes[2] = (byte) Integer.parseInt(relayIPParts[2]); + String address24 = Hex.encodeHexString(address24Bytes); + try { + CallableStatement cs = conn.prepareCall( + "{call search_addresses_in_same_24 (?, ?)}"); + cs.setString(1, address24); + cs.setDate(2, new java.sql.Date(timestamp)); + ResultSet rs = cs.executeQuery(); + while (rs.next()) { + Map<String, String> resultEntry = new HashMap<String, String>(); + String address = rs.getString(1); + addressesInSameNetwork.add(address); + } + rs.close(); + cs.close(); + } catch (SQLException e) { + /* No other addresses in the same /24 found. */ + } + if (!addressesInSameNetwork.isEmpty()) { + out.print(" <p>The following other IP addresses of Tor " + + "relays in the same /24 network were found in relay and/or " + + "exit lists around the time that could be related to IP " + + "address " + relayIP + ":</p>\n"); + out.print(" <ul>\n"); + for (String s : addressesInSameNetwork) { + out.print(" <li>" + s + "</li>\n"); + } + out.print(" </ul>\n"); + } + writeFooter(out); + try { + conn.close(); + } catch (SQLException e) { + } + return; + } + + /* Print out result. */ + boolean inMostRelevantConsensuses = false, + inOtherRelevantConsensus = false, + inTooOldConsensuses = false, + inTooNewConsensuses = false; + for (long match : positiveConsensusesNoTarget) { + if (timestampIsDate && + dateFormat.format(match).equals(timestampStr)) { + inMostRelevantConsensuses = true; + } else if (!timestampIsDate && + match == relevantConsensuses.last()) { + inMostRelevantConsensuses = true; + } else if (relevantConsensuses.contains(match)) { + inOtherRelevantConsensus = true; + } else if (tooOldConsensuses.contains(match)) { + inTooOldConsensuses = true; + } else if (tooNewConsensuses.contains(match)) { + inTooNewConsensuses = true; + } + } + if (inMostRelevantConsensuses) { + out.print(" <p>Result is POSITIVE with high certainty!" + + "</p>\n" + + " <p>We found one or more relays on IP address " + + relayIP + " in "); + if (timestampIsDate) { + out.print("relay list published on " + timestampStr); + } else { + out.print("the most recent relay list preceding " + timestampStr); + } + out.print(" that clients were likely to know.</p>\n"); + } else { + if (inOtherRelevantConsensus) { + out.println(" <p>Result is POSITIVE " + + "with moderate certainty!</p>\n"); + out.println("<p>We found one or more relays on IP address " + + relayIP + ", but not in "); + if (timestampIsDate) { + out.print("a relay list published on " + timestampStr); + } else { + out.print("the most recent relay list preceding " + timestampStr); + } + out.print(". A possible reason for the relay being missing in a " + + "relay list might be that some of the directory " + + "authorities had difficulties connecting to the relay. " + + "However, clients might still have used the relay.</p>\n"); + } else { + out.println(" <p>Result is NEGATIVE " + + "with high certainty!</p>\n"); + out.println(" <p>We did not find any relay on IP address " + + relayIP + + " in the relay lists 3 hours preceding " + timestampStr + + ".</p>\n"); + if (inTooOldConsensuses || inTooNewConsensuses) { + if (inTooOldConsensuses && !inTooNewConsensuses) { + out.println(" <p>Note that we found a matching relay " + + "in relay lists that were published between 15 and 3 " + + "hours before " + timestampStr + ".</p>\n"); + } else if (!inTooOldConsensuses && inTooNewConsensuses) { + out.println(" <p>Note that we found a matching relay " + + "in relay lists that were published up to 12 hours " + + "after " + timestampStr + ".</p>\n"); + } else { + out.println(" <p>Note that we found a matching relay " + + "in relay lists that were published between 15 and 3 " + + "hours before and in relay lists that were published " + + "up to 12 hours after " + timestampStr + ".</p>\n"); + } + if (timestampIsDate) { + out.println("<p>Be sure to try out the previous/next day or " + + "provide an exact timestamp in UTC.</p>"); + } else { + out.println("<p>Make sure that the timestamp you " + + "provided is correctly converted to the UTC " + + "timezone.</p>"); + } + } + /* We didn't find any descriptor. No need to look up targets. */ + writeFooter(out); + try { + conn.close(); + } catch (SQLException e) { + } + return; + } + } + + /* Second part: target */ + out.println("<br><a name=\"exit\"></a><h3>Was this relay configured " + + "to permit exiting to a given target?</h3>"); + + out.println(" <form action=\"#exit\">\n" + + " <input type=\"hidden\" name=\"timestamp\"\n" + + " value=\"" + timestampStr + "\">\n" + + " <input type=\"hidden\" name=\"ip\" " + + "value=\"" + relayIP + "\">\n" + + " <table>\n" + + " <tr>\n" + + " <td align=\"right\">Target address:</td>\n" + + " <td><input type=\"text\" name=\"targetaddr\"" + + (targetIP.length() > 0 ? " value=\"" + targetIP + "\"" : "") + + "\">" + + (targetAddrWarning.length() > 0 ? "<br><font color=\"red\">" + + targetAddrWarning + "</font>" : "") + + "</td>\n" + + " <td><i>(Ex.: 4.3.2.1)</i></td>\n" + + " </tr>\n" + + " <tr>\n" + + " <td align=\"right\">Target port:</td>\n" + + " <td><input type=\"text\" name=\"targetport\"" + + (targetPort.length() > 0 ? " value=\"" + targetPort + "\"" + : "") + + ">" + + (targetPortWarning.length() > 0 ? "<br><font color=\"red\">" + + targetPortWarning + "</font>" : "") + + "</td>\n" + + " <td><i>(Ex.: 80)</i></td>\n" + + " </tr>\n" + + " <tr>\n" + + " <td></td>\n" + + " <td>\n" + + " <input type=\"submit\">\n" + + " <input type=\"reset\">\n" + + " </td>\n" + + " <td></td>\n" + + " </tr>\n" + + " </table>\n" + + " </form>\n"); + + if (targetIP.length() < 1) { + writeFooter(out); + try { + conn.close(); + } catch (SQLException e) { + } + return; + } + + /* Parse router descriptors to check exit policies. */ + out.println("<p>Searching the relay descriptors published by the " + + "relay on IP address " + relayIP + " to find out whether this " + + "relay permitted exiting to " + target + ". You may follow the " + + "links above to the relay descriptors and grep them for the " + + "lines printed below to confirm that results are correct.</p>"); + SortedSet<Long> positiveConsensuses = new TreeSet<Long>(); + Set<String> missingDescriptors = new HashSet<String>(); + Set<String> descriptors = relevantDescriptors.keySet(); + for (String descriptor : descriptors) { + byte[] rawDescriptor = null; + try { + String query = "SELECT rawdescriptor FROM descriptor " + + "WHERE descriptor = '" + descriptor + "'"; + Statement statement = conn.createStatement(); + ResultSet rs = statement.executeQuery(query); + if (rs.next()) { + rawDescriptor = rs.getBytes(1); + } + rs.close(); + statement.close(); + } catch (SQLException e) { + /* Consider this descriptors as 'missing'. */ + continue; + } + if (rawDescriptor != null && rawDescriptor.length > 0) { + missingDescriptors.remove(descriptor); + String rawDescriptorString = new String(rawDescriptor, + "US-ASCII"); + try { + BufferedReader br = new BufferedReader( + new StringReader(rawDescriptorString)); + String line = null, routerLine = null, publishedLine = null; + StringBuilder acceptRejectLines = new StringBuilder(); + boolean foundMatch = false; + while ((line = br.readLine()) != null) { + if (line.startsWith("router ")) { + routerLine = line; + } else if (line.startsWith("published ")) { + publishedLine = line; + } else if (line.startsWith("reject ") || + line.startsWith("accept ")) { + if (foundMatch) { + out.println(line); + continue; + } + boolean ruleAccept = line.split(" ")[0].equals("accept"); + String ruleAddress = line.split(" ")[1].split(":")[0]; + if (!ruleAddress.equals("*")) { + if (!ruleAddress.contains("/") && + !ruleAddress.equals(targetIP)) { + /* IP address does not match. */ + acceptRejectLines.append(line + "\n"); + continue; + } + String[] ruleIPParts = ruleAddress.split("/")[0]. + split("\\."); + int ruleNetwork = ruleAddress.contains("/") ? + Integer.parseInt(ruleAddress.split("/")[1]) : 32; + for (int i = 0; i < 4; i++) { + if (ruleNetwork == 0) { + break; + } else if (ruleNetwork >= 8) { + if (ruleIPParts[i].equals(targetIPParts[i])) { + ruleNetwork -= 8; + } else { + break; + } + } else { + int mask = 255 ^ 255 >>> ruleNetwork; + if ((Integer.parseInt(ruleIPParts[i]) & mask) == + (Integer.parseInt(targetIPParts[i]) & mask)) { + ruleNetwork = 0; + } + break; + } + } + if (ruleNetwork > 0) { + /* IP address does not match. */ + acceptRejectLines.append(line + "\n"); + continue; + } + } + String rulePort = line.split(" ")[1].split(":")[1]; + if (targetPort.length() < 1 && !ruleAccept && + !rulePort.equals("*")) { + /* With no port given, we only consider reject :* rules as + matching. */ + acceptRejectLines.append(line + "\n"); + continue; + } + if (targetPort.length() > 0 && !rulePort.equals("*") && + rulePort.contains("-")) { + int fromPort = Integer.parseInt(rulePort.split("-")[0]); + int toPort = Integer.parseInt(rulePort.split("-")[1]); + int targetPortInt = Integer.parseInt(targetPort); + if (targetPortInt < fromPort || + targetPortInt > toPort) { + /* Port not contained in interval. */ + continue; + } + } + if (targetPort.length() > 0) { + if (!rulePort.equals("*") && + !rulePort.contains("-") && + !targetPort.equals(rulePort)) { + /* Ports do not match. */ + acceptRejectLines.append(line + "\n"); + continue; + } + } + boolean relevantMatch = false; + for (long match : relevantDescriptors.get(descriptor)) { + if (relevantConsensuses.contains(match)) { + relevantMatch = true; + } + } + if (relevantMatch) { + String[] routerParts = routerLine.split(" "); + out.println("<pre><code>" + routerParts[0] + " " + + routerParts[1] + " <b>" + routerParts[2] + "</b> " + + routerParts[3] + " " + routerParts[4] + " " + + routerParts[5]); + String[] publishedParts = publishedLine.split(" "); + out.println(publishedParts[0] + " <b>" + + publishedParts[1] + " " + publishedParts[2] + + "</b>"); + out.print(acceptRejectLines.toString()); + out.println("<b>" + line + "</b>"); + foundMatch = true; + } + if (ruleAccept) { + positiveConsensuses.addAll( + relevantDescriptors.get(descriptor)); + } + } + } + br.close(); + if (foundMatch) { + out.println("</code></pre>"); + } + } catch (IOException e) { + /* Could not read descriptor string. */ + continue; + } + } + } + + /* Print out result. */ + inMostRelevantConsensuses = false; + inOtherRelevantConsensus = false; + inTooOldConsensuses = false; + inTooNewConsensuses = false; + for (long match : positiveConsensuses) { + if (timestampIsDate && + dateFormat.format(match).equals(timestampStr)) { + inMostRelevantConsensuses = true; + } else if (!timestampIsDate && match == relevantConsensuses.last()) { + inMostRelevantConsensuses = true; + } else if (relevantConsensuses.contains(match)) { + inOtherRelevantConsensus = true; + } else if (tooOldConsensuses.contains(match)) { + inTooOldConsensuses = true; + } else if (tooNewConsensuses.contains(match)) { + inTooNewConsensuses = true; + } + } + if (inMostRelevantConsensuses) { + out.print(" <p>Result is POSITIVE with high certainty!" + + "</p>\n" + + " <p>We found one or more relays on IP address " + + relayIP + " permitting exit to " + target + " in "); + if (timestampIsDate) { + out.print("relay list published on " + timestampStr); + } else { + out.print("the most recent relay list preceding " + timestampStr); + } + out.print(" that clients were likely to know.</p>\n"); + writeFooter(out); + try { + conn.close(); + } catch (SQLException e) { + } + return; + } + boolean resultIndecisive = target.length() > 0 + && !missingDescriptors.isEmpty(); + if (resultIndecisive) { + out.println(" <p>Result is INDECISIVE!</p>\n" + + " <p>At least one referenced descriptor could not be " + + "found. This is a rare case, but one that (apparently) " + + "happens. We cannot make any good statement about exit " + + "relays without these descriptors. The following descriptors " + + "are missing:</p>"); + for (String desc : missingDescriptors) + out.println(" <p>" + desc + "</p>\n"); + } + if (inOtherRelevantConsensus) { + if (!resultIndecisive) { + out.println(" <p>Result is POSITIVE " + + "with moderate certainty!</p>\n"); + } + out.println("<p>We found one or more relays on IP address " + + relayIP + " permitting exit to " + target + ", but not in "); + if (timestampIsDate) { + out.print("a relay list published on " + timestampStr); + } else { + out.print("the most recent relay list preceding " + timestampStr); + } + out.print(". A possible reason for the relay being missing in a " + + "relay list might be that some of the directory authorities " + + "had difficulties connecting to the relay. However, clients " + + "might still have used the relay.</p>\n"); + } else { + if (!resultIndecisive) { + out.println(" <p>Result is NEGATIVE " + + "with high certainty!</p>\n"); + } + out.println(" <p>We did not find any relay on IP address " + + relayIP + " permitting exit to " + target + + " in the relay list 3 hours preceding " + timestampStr + + ".</p>\n"); + if (inTooOldConsensuses || inTooNewConsensuses) { + if (inTooOldConsensuses && !inTooNewConsensuses) { + out.println(" <p>Note that we found a matching relay in " + + "relay lists that were published between 15 and 3 " + + "hours before " + timestampStr + ".</p>\n"); + } else if (!inTooOldConsensuses && inTooNewConsensuses) { + out.println(" <p>Note that we found a matching relay in " + + "relay lists that were published up to 12 hours after " + + timestampStr + ".</p>\n"); + } else { + out.println(" <p>Note that we found a matching relay in " + + "relay lists that were published between 15 and 3 " + + "hours before and in relay lists that were published up " + + "to 12 hours after " + timestampStr + ".</p>\n"); + } + if (timestampIsDate) { + out.println("<p>Be sure to try out the previous/next day or " + + "provide an exact timestamp in UTC.</p>"); + } else { + out.println("<p>Make sure that the timestamp you provided is " + + "correctly converted to the UTC timezone.</p>"); + } + } + } + if (target != null) { + if (positiveConsensuses.isEmpty() && + !positiveConsensusesNoTarget.isEmpty()) { + out.println(" <p>Note that although the found relay(s) did " + + "not permit exiting to " + target + ", there have been one " + + "or more relays running at the given time.</p>"); + } + } + try { + conn.close(); + } catch (SQLException e) { + } + writeFooter(out); + } +} +

1 0

[arm/master] fix: crash from esc in interpretor panel prompt
by atagar＠torproject.org 28 Sep '11

28 Sep '11

commit ed4bee53a3dd4258ced3168819656bff7d8f211f Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Sep 28 07:31:43 2011 -0700 fix: crash from esc in interpretor panel prompt When the user presses 'esc' in the interpretor panel prompt the getstr result is None. I didn't account for this, causing a stacktrace. Caught by Sebastian. https://trac.torproject.org/projects/tor/ticket/4098 --- src/cli/interpretorPanel.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/cli/interpretorPanel.py b/src/cli/interpretorPanel.py index 37b9e58..246636c 100644 --- a/src/cli/interpretorPanel.py +++ b/src/cli/interpretorPanel.py @@ -70,6 +70,7 @@ class InterpretorPanel(panel.Panel): inputLine = min(self.maxY - 1, displayLength) inputFormat = getFormat(torInterpretor.INPUT_FORMAT) input = self.getstr(inputLine, xOffset, "", inputFormat, validator = validator) + if input == None: input = "" input, isDone = input.strip(), False if not input:

1 0

r25133: {website} remove webersiedlung mirror and update the table. (in website/trunk: . include)
by Andrew Lewman 28 Sep '11

28 Sep '11

Author: phobos Date: 2011-09-28 13:12:45 +0000 (Wed, 28 Sep 2011) New Revision: 25133 Modified: website/trunk/include/mirrors-table.wmi website/trunk/update-mirrors.pl Log: remove webersiedlung mirror and update the table. Modified: website/trunk/include/mirrors-table.wmi =================================================================== --- website/trunk/include/mirrors-table.wmi 2011-09-28 12:51:22 UTC (rev 25132) +++ website/trunk/include/mirrors-table.wmi 2011-09-28 13:12:45 UTC (rev 25133) @@ -1,15 +1,15 @@ <tr> - <td>NL</td> + <td>IS</td> - <td>CCC</td> + <td>torproject.is</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.ccc.de/dist/">http</a></td> - <td><a href="http://tor.ccc.de/">http</a></td> + <td><a href="http://torproject.is/dist">http</a></td> + <td><a href="http://torproject.is/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -18,49 +18,83 @@ <tr> - <td>DK</td> + <td>AT</td> - <td>Zentrum der Gesundheit</td> + <td>FoDT.IT</td> <td>Up to date</td> + <td><a href="ftp://ftp.fodt.it/pub/mirror/tor/">ftp</a></td> + <td><a href="http://tor.fodt.it/dist/">http</a></td> + <td><a href="http://tor.fodt.it/">http</a></td> + <td><a href="https://tor.fodt.it/dist/">https</a></td> + <td><a href="https://tor.fodt.it/">https</a></td> <td> - </td> - <td><a href="http://tor.idnr.ws/dist/">http</a></td> - <td><a href="http://tor.idnr.ws/">http</a></td> <td> - </td> +</tr> + +<tr> + + <td>US</td> + + <td>searchprivate</td> + + <td>Up to date</td> + <td> - </td> + <td><a href="http://tor.searchprivate.com/dist">http</a></td> + <td><a href="http://tor.searchprivate.com">http</a></td> <td> - </td> <td> - </td> + <td> - </td> + <td> - </td> </tr> <tr> - <td>EE</td> + <td>DE</td> - <td>CyberSIDE</td> + <td>beme it</td> <td>Up to date</td> <td> - </td> - <td><a href="http://cyberside.net.ee/tor/">http</a></td> - <td><a href="http://cyberside.planet.ee/tor/">http</a></td> + <td><a href="http://tor.beme-it.de/dist/">http</a></td> + <td><a href="http://tor.beme-it.de/">http</a></td> + <td><a href="https://tor.beme-it.de/dist/">https</a></td> + <td><a href="https://tor.beme-it.de/">https</a></td> <td> - </td> + <td><a href="rsync://tor.beme-it.de/tor">rsync</a></td> +</tr> + +<tr> + + <td>US</td> + + <td>NW Linux</td> + + <td>Up to date</td> + <td> - </td> + <td><a href="http://torproject.nwlinux.us/dist">http</a></td> + <td><a href="http://torproject.nwlinux.us">http</a></td> <td> - </td> <td> - </td> + <td> - </td> + <td><a href="rsync://nwlinux.us/tor-web">rsync</a></td> </tr> <tr> <td>IS</td> - <td>torproject.is</td> + <td>TheOnionRouter</td> <td>Up to date</td> <td> - </td> - <td><a href="http://torproject.is/dist">http</a></td> - <td><a href="http://torproject.is/">http</a></td> + <td><a href="http://theonionrouter.com/dist/">http</a></td> + <td><a href="http://theonionrouter.com/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -69,19 +103,19 @@ <tr> - <td>US</td> + <td>NL</td> - <td>BarkerJr</td> + <td>CCC</td> <td>Up to date</td> <td> - </td> - <td><a href="http://www.torproject.us/dist/">http</a></td> - <td><a href="http://www.torproject.us/">http</a></td> - <td><a href="https://www.torproject.us/dist/">https</a></td> - <td><a href="https://www.torproject.us/">https</a></td> + <td><a href="http://tor.ccc.de/dist/">http</a></td> + <td><a href="http://tor.ccc.de/">http</a></td> <td> - </td> - <td><a href="rsync://rsync.torproject.us/tor">rsync</a></td> + <td> - </td> + <td> - </td> + <td> - </td> </tr> <tr> @@ -120,83 +154,83 @@ <tr> - <td>AT</td> + <td>DE</td> - <td></td> + <td>CCC-Hanau</td> <td>Up to date</td> + <td><a href="ftp://key-server.org/tor">ftp</a></td> + <td><a href="http://tor.key-server.org/dist">http</a></td> + <td><a href="http://tor.key-server.org">http</a></td> + <td><a href="https://tor.key-server.org/dist">https</a></td> + <td><a href="https://tor.key-server.org">https</a></td> <td> - </td> - <td><a href="http://tor.webersiedlung.at/dist/">http</a></td> - <td><a href="http://tor.webersiedlung.at/">http</a></td> <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> </tr> <tr> - <td>DE</td> + <td>FR</td> - <td>CCC-Hanau</td> + <td>BarkerJr</td> <td>Up to date</td> - <td><a href="ftp://key-server.org/tor">ftp</a></td> - <td><a href="http://tor.key-server.org/dist">http</a></td> - <td><a href="http://tor.key-server.org">http</a></td> - <td><a href="https://tor.key-server.org/dist">https</a></td> - <td><a href="https://tor.key-server.org">https</a></td> <td> - </td> + <td><a href="http://www.oignon.net/dist/">http</a></td> + <td><a href="http://www.oignon.net/">http</a></td> + <td><a href="https://www.oignon.net/dist/">https</a></td> + <td><a href="https://www.oignon.net/">https</a></td> <td> - </td> + <td> - </td> </tr> <tr> - <td>AT</td> + <td>NL</td> - <td>FoDT.IT</td> + <td>Amorphis</td> <td>Up to date</td> - <td><a href="ftp://ftp.fodt.it/pub/mirror/tor/">ftp</a></td> - <td><a href="http://tor.fodt.it/dist/">http</a></td> - <td><a href="http://tor.fodt.it/">http</a></td> - <td><a href="https://tor.fodt.it/dist/">https</a></td> - <td><a href="https://tor.fodt.it/">https</a></td> <td> - </td> + <td><a href="http://tor.amorphis.eu/dist/">http</a></td> + <td><a href="http://tor.amorphis.eu/">http</a></td> <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> </tr> <tr> - <td>FR</td> + <td>DK</td> - <td>BarkerJr</td> + <td>Zentrum der Gesundheit</td> <td>Up to date</td> <td> - </td> - <td><a href="http://www.oignon.net/dist/">http</a></td> - <td><a href="http://www.oignon.net/">http</a></td> - <td><a href="https://www.oignon.net/dist/">https</a></td> - <td><a href="https://www.oignon.net/">https</a></td> + <td><a href="http://tor.idnr.ws/dist/">http</a></td> + <td><a href="http://tor.idnr.ws/">http</a></td> <td> - </td> <td> - </td> + <td> - </td> + <td> - </td> </tr> <tr> - <td>AT</td> + <td>EE</td> - <td>cyberarmy</td> + <td>CyberSIDE</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.cyberarmy.at/dist">http</a></td> - <td><a href="http://tor.cyberarmy.at">http</a></td> + <td><a href="http://cyberside.net.ee/tor/">http</a></td> + <td><a href="http://cyberside.planet.ee/tor/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -207,17 +241,17 @@ <td>US</td> - <td>searchprivate</td> + <td>BarkerJr</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.searchprivate.com/dist">http</a></td> - <td><a href="http://tor.searchprivate.com">http</a></td> + <td><a href="http://www.torproject.us/dist/">http</a></td> + <td><a href="http://www.torproject.us/">http</a></td> + <td><a href="https://www.torproject.us/dist/">https</a></td> + <td><a href="https://www.torproject.us/">https</a></td> <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> + <td><a href="rsync://rsync.torproject.us/tor">rsync</a></td> </tr> <tr> @@ -273,42 +307,8 @@ <tr> - <td>DE</td> - - <td>beme it</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://tor.beme-it.de/dist/">http</a></td> - <td><a href="http://tor.beme-it.de/">http</a></td> - <td><a href="https://tor.beme-it.de/dist/">https</a></td> - <td><a href="https://tor.beme-it.de/">https</a></td> - <td> - </td> - <td><a href="rsync://tor.beme-it.de/tor">rsync</a></td> -</tr> - -<tr> - <td>US</td> - <td>NW Linux</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://torproject.nwlinux.us/dist">http</a></td> - <td><a href="http://torproject.nwlinux.us">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td><a href="rsync://nwlinux.us/tor-web">rsync</a></td> -</tr> - -<tr> - - <td>US</td> - <td>Xpdm</td> <td>Up to date</td> @@ -341,15 +341,15 @@ <tr> - <td>FR</td> + <td>US</td> - <td>LazyTiger</td> + <td>AskApache</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.taiga-san.net/dist">http</a></td> - <td><a href="http://tor.taiga-san.net/">http</a></td> + <td><a href="http://tor.askapache.com/dist/">http</a></td> + <td><a href="http://tor.askapache.com/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -358,15 +358,15 @@ <tr> - <td>IS</td> + <td>FR</td> - <td>TheOnionRouter</td> + <td>LazyTiger</td> <td>Up to date</td> <td> - </td> - <td><a href="http://theonionrouter.com/dist/">http</a></td> - <td><a href="http://theonionrouter.com/">http</a></td> + <td><a href="http://tor.taiga-san.net/dist">http</a></td> + <td><a href="http://tor.taiga-san.net/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -375,91 +375,40 @@ <tr> - <td>DE</td> + <td>SE</td> - <td>[[:bbs:]]</td> + <td>homosu</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.blingblingsquad.net/dist">http</a></td> - <td><a href="http://tor.blingblingsquad.net/">http</a></td> - <td><a href="https://tor.blingblingsquad.net/dist">https</a></td> - <td><a href="https://tor.blingblingsquad.net/">https</a></td> + <td><a href="http://tor.homosu.net/dist">http</a></td> + <td><a href="http://tor.homosu.net/">http</a></td> <td> - </td> <td> - </td> -</tr> - -<tr> - - <td>INT</td> - - <td>CoralCDN</td> - - <td>Up to date</td> - <td> - </td> - <td><a href="http://www.torproject.org.nyud.net/dist/">http</a></td> - <td><a href="http://www.torproject.org.nyud.net/">http</a></td> <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> </tr> <tr> - <td>NL</td> + <td>DE</td> - <td>Amorphis</td> + <td>[[:bbs:]]</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.amorphis.eu/dist/">http</a></td> - <td><a href="http://tor.amorphis.eu/">http</a></td> + <td><a href="http://tor.blingblingsquad.net/dist">http</a></td> + <td><a href="http://tor.blingblingsquad.net/">http</a></td> + <td><a href="https://tor.blingblingsquad.net/dist">https</a></td> + <td><a href="https://tor.blingblingsquad.net/">https</a></td> <td> - </td> <td> - </td> - <td> - </td> - <td> - </td> </tr> <tr> - <td>US</td> - - <td>AskApache</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://tor.askapache.com/dist/">http</a></td> - <td><a href="http://tor.askapache.com/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - - <td>SE</td> - - <td>homosu</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://tor.homosu.net/dist">http</a></td> - <td><a href="http://tor.homosu.net/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>DE</td> <td></td> @@ -545,6 +494,23 @@ <tr> + <td>AT</td> + + <td>cyberarmy</td> + + <td>Unknown</td> + + <td> - </td> + <td><a href="http://tor.cyberarmy.at/dist">http</a></td> + <td><a href="http://tor.cyberarmy.at">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>NL</td> <td></td> @@ -562,6 +528,23 @@ <tr> + <td>INT</td> + + <td>CoralCDN</td> + + <td>Unknown</td> + + <td> - </td> + <td><a href="http://www.torproject.org.nyud.net/dist/">http</a></td> + <td><a href="http://www.torproject.org.nyud.net/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>IS</td> <td>crypto.is</td> Modified: website/trunk/update-mirrors.pl =================================================================== --- website/trunk/update-mirrors.pl 2011-09-28 12:51:22 UTC (rev 25132) +++ website/trunk/update-mirrors.pl 2011-09-28 13:12:45 UTC (rev 25133) @@ -553,24 +553,6 @@ rsyncDistMirror => "", hiddenServiceMirror => "http://hbpvnydyyjbmhx6b.onion/mirrors/torproject.org/", }, - mirror034 => { - adminContact => "", - orgName => "", - isoCC => "AT", - subRegion => "", - region => "AT", - ipv4 => "True", - ipv6 => "False", - loadBalanced => "No", - httpWebsiteMirror => "http://tor.webersiedlung.at/", - httpsWebsiteMirror => "", - rsyncWebsiteMirror => "", - ftpWebsiteMirror => "", - httpDistMirror => "http://tor.webersiedlung.at/dist/", - httpsDistMirror => "", - rsyncDistMirror => "", - hiddenServiceMirror => "", - }, mirror036 => { adminContact => "", orgName => "",

1 0

r25132: {} add the images for svn commit 25131. (website/trunk/images)
by Andrew Lewman 28 Sep '11

28 Sep '11

Author: phobos Date: 2011-09-28 12:51:22 +0000 (Wed, 28 Sep 2011) New Revision: 25132 Added: website/trunk/images/easy-bg.png website/trunk/images/easy-tbb.png website/trunk/images/table-title-hover.jpg Log: add the images for svn commit 25131. Added: website/trunk/images/easy-bg.png =================================================================== (Binary files differ) Property changes on: website/trunk/images/easy-bg.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: website/trunk/images/easy-tbb.png =================================================================== (Binary files differ) Property changes on: website/trunk/images/easy-tbb.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: website/trunk/images/table-title-hover.jpg =================================================================== (Binary files differ) Property changes on: website/trunk/images/table-title-hover.jpg ___________________________________________________________________ Added: svn:mime-type + image/jpeg

1 0

r25131: {website} and we have a new download-easy page from ticket 3926. (in website/trunk: css download/en include js)
by Andrew Lewman 28 Sep '11

28 Sep '11

Author: phobos Date: 2011-09-28 12:48:57 +0000 (Wed, 28 Sep 2011) New Revision: 25131 Modified: website/trunk/css/layout-rtl.css website/trunk/css/layout.css website/trunk/css/typography.css website/trunk/download/en/download-easy.wml website/trunk/download/en/download.wml website/trunk/include/dlhead.wmi website/trunk/js/dlpage01.js website/trunk/js/jquery.accordion.min.js Log: and we have a new download-easy page from ticket 3926. Modified: website/trunk/css/layout-rtl.css =================================================================== --- website/trunk/css/layout-rtl.css 2011-09-28 10:14:02 UTC (rev 25130) +++ website/trunk/css/layout-rtl.css 2011-09-28 12:48:57 UTC (rev 25131) @@ -269,6 +269,29 @@ /* END DL PAGE ------------*/ +/* DOWNLOAD-EASY ----------*/ + +.easy .package p { + padding-right: 0px; + } + +.easy .package p.alt-dl { + padding-right: 0px; + } + +.easy .downloads { + margin-left: 0px; + margin-right: 30px; + } + +.lang-alt { + float: left; + margin-right: 0px; + margin-left: 10px; +} + +/* END DOWNLOAD-EASY ----------*/ + .title { background: url(../images/table-title-arrow-rtl.jpg) right top no-repeat; padding: 10px 10px 0 25px; Modified: website/trunk/css/layout.css =================================================================== --- website/trunk/css/layout.css 2011-09-28 10:14:02 UTC (rev 25130) +++ website/trunk/css/layout.css 2011-09-28 12:48:57 UTC (rev 25131) @@ -518,6 +518,7 @@ } .accordionButton:hover { + background: url("../images/table-title-hover.jpg") repeat-x left bottom #885CA4; text-shadow: 1px 1px 0px rgba(17, 17, 17, 1); } @@ -636,7 +637,102 @@ margin: 3px 0px 20px 0px; } +/* DOWNLOAD-EASY ---*/ +.easy { + width: 710px; + height: 241px; + background: url(../images/easy-bg.png) repeat-x scroll left 85px; + margin-bottom: 10px; + } + +.easy .package h2, +.easy .package em { + display: block; + width: 100%; + text-align: center; + } + +.easy .package h2 { + font-size: 30px; + font-weight: normal; + padding-top: 10px; + padding-bottom: 5px; + } + +.easy .package em { + font-size: 12px; + padding-bottom: 30px; + } + +.easy .package p { + padding-left: 0px; + font-size: 15px; + text-align: justify; + } + +.easy .package p.alt-dl { + text-align: center; + text-indent: 0px; + padding-left: 0px; + margin-top: 32px; + } + +.all-dl { + display: block; + text-align: center; + width: 100%; + font-size: 15px; +} + +.all-dl a{ + text-decoration: none; + font-weight: bold; +} + +.all-dl a:hover{ + text-decoration: underline; +} + +.easy .package { + float: none; + padding-left: 30px; + padding-right: 30px; + width: 651px; + } + +.easy .downloads { + margin-left: 30px; + padding-top: 125px; + background: url(../images/easy-tbb.png) no-repeat scroll center 10px; + } + +.easy.windows, +.easy.linux, +.easy.mac { + border: 1px solid #885CA4; + border-radius: 10px; + } + +.open { + display: block; + } + +.lang-alt { + line-height: 15px; + font-size: 10px; + float: right; + margin-right: 10px; +} + +.expander { + text-align: right; + float: right; + padding: 10px 20px 0 0px; + font-size: 15px; + display: none; +} + /* MISC ------------*/ .title { Modified: website/trunk/css/typography.css =================================================================== --- website/trunk/css/typography.css 2011-09-28 10:14:02 UTC (rev 25130) +++ website/trunk/css/typography.css 2011-09-28 12:48:57 UTC (rev 25131) @@ -250,7 +250,7 @@ } .package p { - text-indent: 5px; + text-indent: 0px; line-height: 18px; } Modified: website/trunk/download/en/download-easy.wml =================================================================== --- website/trunk/download/en/download-easy.wml 2011-09-28 10:14:02 UTC (rev 25130) +++ website/trunk/download/en/download-easy.wml 2011-09-28 12:48:57 UTC (rev 25131) @@ -1,196 +1,265 @@ ## translation metadata # Revision: $Revision$ -# Translation-Priority: 1-high +# Translation-Priority: 3-low -#include "head.wmi" TITLE="Tor: Easy Download Selector" CHARSET="UTF-8" ANNOUNCE_RSS="yes" +# +# +# +# +<define-tag lang>en-US</define-tag> + +# +<define-tag button-win-tbb32>Tor Browser Bundle</define-tag> +<define-tag button-win-tbb64>Currently Unused</define-tag> +<define-tag button-osx-tbb32>Tor Browser Bundle (Beta)</define-tag> +<define-tag button-osx-tbb64>64-bit (Beta)</define-tag> +<define-tag button-lin-tbb32>Tor Browser Bundle (Beta)</define-tag> +<define-tag button-lin-tbb64>64-bit (Beta)</define-tag> + +#include "dlhead.wmi" TITLE="Download Tor" CHARSET="UTF-8" ANNOUNCE_RSS="yes" + <div id="content" class="clearfix"> -<div id="breadcrumbs"><a href="<page index>">Home » </a><a href="<page download/download-easy>">Easy Download Selector</a></div> -<div id="maincol-left"> + <div id="breadcrumbs"><a href="<page index>">Home » </a><a href="<page download/download>">Download</a></div> + <div id="maincol-left">  + <div class="warning-top"> + <h2>Want Tor to really work?</h2> + <p>...then please don't just install it and go on. You need to change some of your habits, and reconfigure your software! Tor by itself is <em>NOT</em> all you need to maintain your anonymity. Read the <a href="#warning">full list of warnings</a>. + </p> + </div> + + + + + <div class="easy windows"> + <div class="package" style="padding-top: 13px; border-top: 0px;"> + <form class="downloads"> + <a class="button win-tbb" href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_<lang>.exe"><span class="strong">Download</span><span class="normal"><button-win-tbb32></span></a> + <select name="language" id="win-tbb" class="lang"> +#include <lang.wmi> + </select> + <div class="sig" style="margin-bottom: 5px;"> + <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundle">Other Languages</a> + (<a class="win-tbb-sig" href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_<lang>.exe.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> + </div> + </form> + <h2>Tor Browser Bundle for Windows</h2> + <em>Version <version-torbrowserbundle> - Windows 7, Vista, and XP</em> + <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run. <a href="<page projects/torbrowser>">Learn more »</a></p> + <p class="alt-dl">Not Using Windows? Download for <a class="mac-alt" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-<lang>.zip">Mac</a> or <a class="lin-alt" href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-<lang>.tar.gz">Linux</a></p> + </div> + </div> + + <div class="easy mac"> + <div class="package" style="padding-top: 13px; border-top: 0px;"> + <form class="downloads"> + <a class="button mac-tbb" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-<lang>.zip"><span class="strong">Download</span><span class="normal"><button-osx-tbb32></span></a> + <select name="language" id="mac-tbb" class="lang"> +#include <lang.wmi> + </select> + <div class="sig" style="margin-bottom: 5px;"> + <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundleosx">Other Languages</a> + (<a class="mac-tbb-sig" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-<lang>.zip.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> + </div> + </form> + <h2>Tor Browser Bundle for Mac</h2> + <em>Version <version-torbrowserbundleosx> - OS X</em> + <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run. <a href="<page projects/torbrowser>">Learn more »</a></p> + <p class="alt-dl">Not Using Mac? Download for <a class="win-alt" href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_<lang>.exe">Windows</a> or <a class="lin-alt" href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-<lang>.tar.gz">Linux</a></p> + </div> + </div> + + <div class="easy linux"> + <div class="package" style="padding-top: 13px; border-top: 0px;"> + <form class="downloads"> + <a class="button lin-tbb32" href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-<lang>.tar.gz"><span class="strong">Download</span><span class="normal"><button-lin-tbb32></span></a> + <select name="language" id="lin-tbb32" class="lang"> +#include <lang.wmi> + </select> + <div class="sig" style="margin-bottom: 5px;"> + <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundlelinux">Other Languages</a> + (<a class="lin-tbb32-sig" href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-<lang>.tar.gz.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> + </div> + </form> + <h2>Tor Browser Bundle for Linux</h2> + <em>Version <version-torbrowserbundlelinux32> - Linux, Unix, BSD</em> + <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run. <a href="<page projects/torbrowser>">Learn more »</a></p> + <p class="alt-dl">Not Using Linux? Download for <a class="mac-alt" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-<lang>.zip">Mac</a> or <a class="win-alt" href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_<lang>.exe">Windows</a></p> + </div> + </div> + <p class="all-dl">Looking For Something Else? <a href="<page download/download>">View All Downloads</a></p> +<br> + <div class="warning"> -<h2>Want Tor to really work?</h2> -<p>...then please don't just install it and go on. You need to change some of -your habits, and reconfigure your software! Tor by itself is <em>NOT</em> all -you need to maintain your anonymity. Read the <a -href="<page download/download>#warning">full list of warnings</a>. +<a name="warning"></a> +<a name="Warning"></a> +<h2><a class="anchor" href="#warning">Want Tor to really work?</a></h2> +<p>...then please don't just install it and go on. You need to change some of your habits, and reconfigure your software! Tor by itself is <em>NOT</em> all you need to maintain your anonymity. There are several major pitfalls to watch out for: </p> -</div> - -<br> -<table class="toppad" summary=""> -<tbody> -<tr style="vertical-align:top;"> -<td class="nopad" height="1" style="vertical-align:top;"> -<h2>Tor Browser Bundle</h2> +<ol> +<li> +Tor only protects Internet applications that are configured to +send their traffic through Tor — it doesn't magically anonymize +all your traffic just because you install it. We recommend you +use <a href="http://www.mozilla.com/en-US/firefox/all-older.html">Firefox</a> with the <a +href="<page torbutton/index>">Torbutton</a> extension. +</li> -</td> +<li> +Torbutton blocks browser plugins such as Java, Flash, ActiveX, RealPlayer, +Quicktime, Adobe's PDF plugin, and others: they can be manipulated +into revealing your IP address. For example, that means Youtube is +disabled. If you really need your Youtube, you can <a href="<page +torbutton/torbutton-faq>#noflash">reconfigure Torbutton</a> to allow it; but +be aware that you're opening yourself up to potential attack. Also, +extensions like Google toolbar look up more information about the +websites you type in: they may bypass Tor and/or broadcast sensitive +information. Some people prefer using two browsers (one for Tor, one +for non-Tor browsing). +</li> -  -<script type="text/javascript" src="$(DOCROOT)/jquery.min.js"></script> -<script type="text/javascript"> -function displayVals() { - var t3 = jQuery("#t3").val(); - var amount = jQuery("#amount").val(); - if(t3 != 0){ - jQuery('#a3').val(amount); - jQuery('#p3').val(1); - jQuery('#cmd').val('_xclick-subscriptions'); - jQuery('#item_name').val('Tor Project Membership'); - jQuery('#ppinfo').replaceWith('<h6 id="ppinfo"><small>(Requires a PayPal Account)</small></h6>'); - }else{ - jQuery('#a3').val(0); - jQuery('#p3').val(0); - jQuery('#cmd').val('_donations'); - jQuery('#item_name').val('Donation to the Tor Project'); - jQuery('#ppinfo').replaceWith('<h6 id="ppinfo" style="height:0px;"></h6>'); - } - if( !t3 ) { - jQuery('#cmd').val('_donations'); - jQuery('#item_name').val('Donation to the Tor Project'); - jQuery('#ppinfo').replaceWith('<h6 id="ppinfo" style="height:0px;"></h6>'); - } -} +<li> +Beware of cookies: if you ever browse without Tor and a site gives +you a cookie, that cookie could identify you even when you start +using Tor again. Torbutton tries to handle your cookies safely. <a +href="https://addons.mozilla.org/firefox/82/">CookieCuller</a> can help +protect any cookies you do not want to lose. +</li> -jQuery(function(){ - jQuery("#amount").change(displayVals); - jQuery("#t3").change(displayVals); - displayVals(); -}); +<li> +Tor anonymizes the origin of your traffic, and it encrypts everything +between you and the Tor network and everything inside the Tor network, +but <a href="<wikifaq>#SoImtotallyanonymousifIuseTor">it +can't encrypt your traffic between the Tor network and its final +destination.</a> If you are communicating sensitive information, you +should use as much care as you would on the normal scary Internet — +use HTTPS or other end-to-end encryption and authentication. <a +href="https://www.eff.org/https-everywhere">HTTPS Everywhere</a> is a +Firefox extension produced as a collaboration between The Tor Project +and the Electronic Frontier Foundation. It encrypts your communications +with a number of major websites. +</li> -</script> -<td class="nopad" rowspan="8" style="width:220px;vertical-align:top;"> - <form class="dbox" action="https://www.paypal.com/cgi-bin/webscr" method="post"> - <h2>Donate to Tor</h2> - <p> - <select name="currency_code" class="cur"> - <option value="USD" selected="selected">$</option> - <option value="EUR">€</option> - <option value="GBP">£</option> - <option value="YEN">¥</option> - </select> - <input type="text" id="amount" class="amount" name="amount" value="5" size="10"> - </p> - <p> - <input type="hidden" id="a3" name="a3" value="0"> - <select id="t3" name="t3"> - <option value="0">One-time Donation</option> - <option value="M">Monthly Subscription</option> - </select> - </p> - <p> - <input type="hidden" id="p3" name="p3" value="1"> - <input type="hidden" name="sra" value="1"> - <input type="hidden" name="src" value="1"> - <input type="hidden" name="no_shipping" value="1"> - <input type="hidden" name="no_note" value="1"> - <input type="hidden" id="cmd" name="cmd" value="_donations"> - <input type="hidden" name="business" value="donations(a)torproject.org"> - <input type="hidden" id="item_name" name="item_name" value="Donation to the Tor Project"> - <input type="hidden" name="return" value="https://www.torproject.org/donate/thankyou"> - <input type="hidden" name="cancel_return" value="https://www.torproject.org/download-easy"> - </p> - <h6 id="ppinfo" style="height:0px;"></h6> - <p> - <input class="donate-btn" type="submit" name="donate" value="Donate"> - </p> - <p> - <a href="<page donate/donate>">Other donation options...</a> - </p> - </form> -</td> -  +<li> +While Tor blocks attackers on your local network from discovering +or influencing your destination, it opens new risks: malicious or +misconfigured Tor exit nodes can send you the wrong page, or even send +you embedded Java applets disguised as domains you trust. Be careful +opening documents or applications you download through Tor, unless you've +verified their integrity. +</li> -</tr> -<tr> -<td>The <strong>Tor Browser Bundle</strong> contains everything you need -to safely browse the Internet. This package requires no installation. -Just extract it and run. <a href="<page projects/torbrowser>">Learn more -& other languages »</a></td> +<li> +Tor tries to prevent attackers from learning what destinations you connect +to. It doesn't prevent somebody watching your traffic from learning that +you're using Tor. You can mitigate (but not fully resolve) the risk +by using a <a href="<page docs/bridges>">Tor bridge relay</a> rather than +connecting directly to the public Tor network, but ultimately the best +protection here is a social approach: the more Tor users there are near +you and the more <a href="<page about/torusers>">diverse</a> their interests, +the less dangerous it will be that you are one of them. +</li> -</tr> -<tr class="gray"> -<td><span class="windows"> -# Translators: please point to the version of TBB in your language, if there is one. -<a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_en-US.exe">Windows 7, Vista, XP</a>  -(<a href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_en-US.exe.asc">sig</a>) -</span> -</td> -</tr> -<tr> -<td><span class="mac"> -# Translators: please point to the version of TBB in your language, if there is one. -<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-en-US.zip">Apple OS X Intel</a>  -(<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-en-US.zip.asc">sig</a>) -</span> -</td> -</tr> -<tr class="gray"> -<td><span class="linux"> -# Translators: please point to the version of TBB in your language, if there is one. -<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-en-US.tar.gz">GNU/Linux i686</a>  -(<a href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-en-US.tar.gz.asc">sig</a>) -</span> -</td> -</tr> -<tr> -<td> -<p>Looking for something else? <a href="<page download/download>">View All Downloads</a>.</p> -</td> -</tr> -<tr class="gray"> -<td colspan="2"> -<p>To keep informed of security advisories and new stable releases, subscribe to the <a -href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-announce">tor-announce -mailing list</a>. You can also <a -href="http://rss.gmane.org/gmane.network.onion-routing.announce">watch -the list's RSS feed</a>.</p> -<p>Interested in <a href="<page about/overview>">learning more about Tor in general</a>?</p> -</td> -</tr> -</tbody> -</table> +<li> Do not use <a +href="https://blog.torproject.org/blog/bittorrent-over-tor-isnt-good-idea">BitTorrent +and Tor</a> together. +</li> +</ol> +<br> +<p> +Be smart and learn more. Understand what Tor does and does not offer. +This list of pitfalls isn't complete, and we need your +help <a href="<page getinvolved/volunteer>#Documentation">identifying and documenting +all the issues</a>. +</p> </div> + +</div>  + <div id="sidecol-right"> + + <script async type="text/javascript"> + function displayVals() { + var t3 = $("#t3").val(); + var amount = $("#amount").val(); + if(t3 != 0){ + $('#a3').val(amount); + $('#p3').val(1); + $('#cmd').val('_xclick-subscriptions'); + $('#item_name').val('Tor Project Membership'); + $('#ppinfo').replaceWith('<h6 id="ppinfo"><small>(Requires a PayPal Account)</small></h6>'); + }else{ + $('#a3').val(0); + $('#p3').val(0); + $('#cmd').val('_donations'); + $('#item_name').val('Donation to the Tor Project'); + $('#ppinfo').replaceWith('<h6 id="ppinfo" style="height:0px;"></h6>'); + } + if( !t3 ) { + $('#cmd').val('_donations'); + $('#item_name').val('Donation to the Tor Project'); + $('#ppinfo').replaceWith('<h6 id="ppinfo" style="height:0px;"></h6>'); + } + } + $(function(){ + $("#amount").change(displayVals); + $("#t3").change(displayVals); + displayVals(); + }); + </script> +<form class="dbox dl" action="https://www.paypal.com/cgi-bin/webscr" method="post"> + <h2>Donate to Tor</h2> + <p> + <select name="currency_code" class="cur"> + <option value="USD" selected="selected">$</option> + <option value="EUR">€</option> + <option value="GBP">£</option> + <option value="YEN">¥</option> + </select> + <input type="text" id="amount" class="amount" name="amount" value="5" size="10"> + </p> + <p> + <input type="hidden" id="a3" name="a3" value="0"> + <select id="t3" name="t3"> + <option value="0">One-time Donation</option> + <option value="M">Monthly Subscription</option> + </select> + </p> + <p> + <input type="hidden" id="p3" name="p3" value="1"> + <input type="hidden" name="sra" value="1"> + <input type="hidden" name="src" value="1"> + <input type="hidden" name="no_shipping" value="1"> + <input type="hidden" name="no_note" value="1"> + <input type="hidden" id="cmd" name="cmd" value="_donations"> + <input type="hidden" name="business" value="donations(a)torproject.org"> + <input type="hidden" id="item_name" name="item_name" value="Donation to the Tor Project"> + <input type="hidden" name="return" value="https://www.torproject.org/donate/thankyou.html"> + <input type="hidden" name="cancel_return" value="https://www.torproject.org/download/download.html"> + </p> + <h6 id="ppinfo" style="height:0px;"></h6> + <p> + <input class="donate-btn" type="submit" name="donate" value="Donate"> + </p> + <p><a href="<page donate/donate>">Other donation options...</a></p> +</form> + + <div class="img-shadow"> <div class="sidenav-sub"> -<h2>Advanced Choices:</h2> -<ul> -<li class="dropdown"><a href="<page download/download>#Windows">Microsoft Windows</a></li> -<li class="dropdown"><a href="<page download/download>#mac">Apple OS X</a></li> -<li class="dropdown"><a href="<page download/download>#linux">Linux/Unix</a></li> -<li class="dropdown"><a href="<page download/download>#smartphones">Smartphones</a></li> -<li class="dropdown"><a href="<page download/download>#source">Source Code</a></li> -</ul> -</div> -</div> - -<div class="img-shadow"> -<div class="infoblock"> -<h2>What is the (sig) link?</h2> -<p>These are GPG signatures to allow you to verify that -your downloaded file is really from The Tor Project and not -an imposter.</p> -<a href="<page docs/verifying-signatures>">Learn more »</a> -</div> -</div> - -<div class="img-shadow"> -<div class="sidenav-sub"> <h2>Having Trouble?</h2> <ul> <li class="dropdown"><a href="<page docs/documentation>">Read the fine manuals</a></li> </ul> </div> </div> - + </div> -</div> -<div class=""> -<p><small>All trademarks are the property of their respective owners.</small></p> + </div> + #include <foot.wmi> - Modified: website/trunk/download/en/download.wml =================================================================== --- website/trunk/download/en/download.wml 2011-09-28 10:14:02 UTC (rev 25130) +++ website/trunk/download/en/download.wml 2011-09-28 12:48:57 UTC (rev 25131) @@ -45,6 +45,7 @@ #include <lang.wmi> </select> <div class="sig"> + <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundle">Other Languages</a> (<a class="win-tbb-sig" href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_<lang>.exe.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> </div> <a class="additional" href="<page projects/torbrowser-details>#build">Source Code</a> @@ -140,6 +141,7 @@ #include <lang.wmi> </select> <div class="sig"> + <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundleosx">Other Languages</a> (<a class="osx-tbb-sig" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-<lang>.zip.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> </div> <a class="button osx-tbb64" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-<lang>.zip"><span class="strong">Download</span><span class="normal"><button-osx-tbb64></span></a> @@ -147,6 +149,7 @@ #include <lang.wmi> </select> <div class="sig"> + <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundleosx">Other Languages</a> (<a class="osx-tbb64-sig" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-<lang>.zip.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> </div> <a href="<page projects/torbrowser-details>#build">Source Code</a> @@ -190,6 +193,7 @@ #include <lang.wmi> </select> <div class="sig"> + <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundlelinux">Other Languages</a> (<a class="lin-tbb32-sig" href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-<lang>.tar.gz.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> </div> @@ -198,6 +202,7 @@ #include <lang.wmi> </select> <div class="sig"> + <a class="lang-alt" href="<page projects/torbrowser>#Download-torbrowserbundlelinux">Other Languages</a> (<a class="lin-tbb64-sig" href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-<lang>.tar.gz.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> </div> <a class="additional" href="<page projects/torbrowser-details>#build">Source Code</a> @@ -267,6 +272,7 @@ <p>The current unstable/alpha version of Tor is <version-alpha>. Its <a href="https://gitweb.torproject.org/tor.git/blob/HEAD:/ChangeLog">Changelog</a> is available.</p> </div> </div> + <div class="expander"><a href="javascript:void(0)" class="switch">Expand All</a></div>   <br> @@ -360,6 +366,18 @@   <div id="sidecol-right"> +<div class="img-shadow sidenav"> +<div class="sidenav-sub"> +<h2>Jump To:</h2> +<ul> +<li class="dropdown"><a href="<page download/download>#windows">Microsoft Windows</a></li> +<li class="dropdown"><a href="<page download/download>#apple">Apple OS X</a></li> +<li class="dropdown"><a href="<page download/download>#linux">Linux/Unix</a></li> +<li class="dropdown"><a href="<page download/download>#smartphone">Smartphones</a></li> +<li class="dropdown"><a href="<page download/download>#source">Source Code</a></li> +</ul> +</div> +</div>  <script async type="text/javascript"> function displayVals() { @@ -390,7 +408,7 @@ displayVals(); }); </script> -<form class="dbox dl" action="https://www.paypal.com/cgi-bin/webscr" method="post"> +<form class="dbox dl" action="https://www.paypal.com/cgi-bin/webscr" method="post" style="float:left; margin-bottom:10px;"> <h2>Donate to Tor</h2> <p> <select name="currency_code" class="cur"> Modified: website/trunk/include/dlhead.wmi =================================================================== --- website/trunk/include/dlhead.wmi 2011-09-28 10:14:02 UTC (rev 25130) +++ website/trunk/include/dlhead.wmi 2011-09-28 12:48:57 UTC (rev 25131) @@ -67,15 +67,21 @@ if(pkg == 'win-tbb'){ $('.'+pkg).replaceWith('<a class="button win-tbb" href="'+wintbb+'"><span class="strong">Download</span><span class="normal"><button-win-tbb32></span></a>'); $('.'+pkg+'-sig').replaceWith('<a class="win-tbb-sig" href="'+wintbb+'.asc">sig</a>'); + $('.mac-alt').replaceWith('<a class="mac-alt" href="'+osxtbb+'">Mac</a>'); + $('.lin-alt').replaceWith('<a class="lin-alt" href="'+lintbb32+'">Linux</a>'); }else if(pkg == 'osx-tbb'){ $('.'+pkg).replaceWith('<a class="button osx-tbb" href="'+osxtbb+'"><span class="strong">Download</span><span class="normal"><button-osx-tbb32></span></a>'); $('.'+pkg+'-sig').replaceWith('<a class="osx-tbb-sig" href="'+osxtbb+'.asc">sig</a>'); + $('.win-alt').replaceWith('<a class="lin-win" href="'+wintbb+'">Windows</a>'); + $('.lin-alt').replaceWith('<a class="lin-alt" href="'+lintbb32+'">Linux</a>'); }else if(pkg == 'osx-tbb64'){ $('.'+pkg).replaceWith('<a class="button osx-tbb64" href="'+osxtbb64+'"><span class="strong">Download</span><span class="normal"><button-osx-tbb64></span></a>'); $('.'+pkg+'-sig').replaceWith('<a class="osx-tbb64-sig" href="'+osxtbb64+'.asc">sig</a>'); }else if(pkg == 'lin-tbb32'){ $('.'+pkg).replaceWith('<a class="button lin-tbb32" href="'+lintbb32+'"><span class="strong">Download</span><span class="normal"><button-lin-tbb32></span></a>'); $('.'+pkg+'-sig').replaceWith('<a class="lin-tbb32-sig" href="'+lintbb32+'.asc">sig</a>'); + $('.mac-alt').replaceWith('<a class="lin-mac" href="'+osxtbb+'">Mac</a>'); + $('.win-alt').replaceWith('<a class="lin-win" href="'+wintbb+'">Windows</a>'); }else if(pkg == 'lin-tbb64'){ $('.'+pkg).replaceWith('<a class="button lin-tbb64" href="'+lintbb64+'"><span class="strong">Download</span><span class="normal"><button-lin-tbb64></span></a>'); $('.'+pkg+'-sig').replaceWith('<a class="lin-tbb64-sig" href="'+lintbb64+'.asc">sig</a>'); Modified: website/trunk/js/dlpage01.js =================================================================== (Binary files differ) Modified: website/trunk/js/jquery.accordion.min.js =================================================================== (Binary files differ)

1 0