November 2013 - tor-commits - lists.torproject.org

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 26 Nov '13

26 Nov '13

commit 25fba8013ba8eb9f0edbc5643becbde7bf7e454a Author: Translation commit bot <translation(a)torproject.org> Date: Tue Nov 26 07:15:54 2013 +0000 Update translations for https_everywhere --- uk/https-everywhere.dtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/uk/https-everywhere.dtd b/uk/https-everywhere.dtd index 3a2f66f..b572e60 100644 --- a/uk/https-everywhere.dtd +++ b/uk/https-everywhere.dtd @@ -40,8 +40,8 @@ <!ENTITY https-everywhere.… [View More]

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 26 Nov '13

26 Nov '13

commit 8f3c6a8490dcca8fce9001df8cf39592c2a7636c Author: Translation commit bot <translation(a)torproject.org> Date: Tue Nov 26 07:15:46 2013 +0000 Update translations for torcheck --- uk/torcheck.po | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/uk/torcheck.po b/uk/torcheck.po index 2e70eab..8a7280f 100644 --- a/uk/torcheck.po +++ b/uk/torcheck.po @@ -2,12 +2,13 @@ # Copyright (C) 2008-2012 The Tor Project, Inc # # Translators: +# AVATOR <… [View More]

1 0

[tor/master] Merge branch 'bug4677'
by nickm＠torproject.org 25 Nov '13

25 Nov '13

commit c64d5227401a44e8a1fcd85a67356a53b83cff82 Merge: acd8c4f 8f9c847 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 25 10:56:52 2013 -0500 Merge branch 'bug4677' changes/bug4677 | 4 ++ src/common/tortls.c | 114 +++++++++++++++++++++++++-------------------------- 2 files changed, 61 insertions(+), 57 deletions(-)

1 0

[tor/master] Restore ability to build with V2_HANDSHAKE_SERVER
by nickm＠torproject.org 25 Nov '13

25 Nov '13

commit 2d9adcd2049ae24cfa8fda90491ce2bc81267464 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 25 10:45:20 2013 -0500 Restore ability to build with V2_HANDSHAKE_SERVER Fixes bug 4677; bugfix on 0.2.3.2-alpha. Fix by "piet". --- changes/bug4677 | 4 ++ src/common/tortls.c | 114 +++++++++++++++++++++++++-------------------------- 2 files changed, 61 insertions(+), 57 deletions(-) diff --git a/changes/bug4677 b/changes/bug4677 new file mode 100644 … [View More]index 0000000..9a62bdb --- /dev/null +++ b/changes/bug4677 @@ -0,0 +1,4 @@ + o Minor bugfixes (build): + - Restore the ability to compile Tor with V2_HANDSHAKE_SERVER + turned off. Fixes bug 4677; bugfix on 0.2.3.2-alpha. Patch + from "piet". diff --git a/src/common/tortls.c b/src/common/tortls.c index 5aee664..1fc440f 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -1390,6 +1390,21 @@ tor_tls_context_new(crypto_pk_t *identity, unsigned int key_lifetime, return NULL; } +/** Invoked when a TLS state changes: log the change at severity 'debug' */ +static void +tor_tls_debug_state_callback(const SSL *ssl, int type, int val) +{ + log_debug(LD_HANDSHAKE, "SSL %p is now in state %s [type=%d,val=%d].", + ssl, SSL_state_string_long(ssl), type, val); +} + +/* Return the name of the negotiated ciphersuite in use on tls */ +const char * +tor_tls_get_ciphersuite_name(tor_tls_t *tls) +{ + return SSL_get_cipher(tls->ssl); +} + #ifdef V2_HANDSHAKE_SERVER /* Here's the old V2 cipher list we sent from 0.2.1.1-alpha up to @@ -1458,13 +1473,6 @@ prune_v2_cipher_list(void) v2_cipher_list_pruned = 1; } -/* Return the name of the negotiated ciphersuite in use on tls */ -const char * -tor_tls_get_ciphersuite_name(tor_tls_t *tls) -{ - return SSL_get_cipher(tls->ssl); -} - /** Examine the client cipher list in ssl, and determine what kind of * client it is. Return one of CIPHERS_ERR, CIPHERS_V1, CIPHERS_V2, * CIPHERS_UNRESTRICTED. @@ -1563,56 +1571,6 @@ tor_tls_client_is_using_v2_ciphers(const SSL *ssl) return tor_tls_classify_client_ciphers(ssl, session->ciphers) >= CIPHERS_V2; } -#if OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,0,0) -/** Callback to get invoked on a server after we've read the list of ciphers - * the client supports, but before we pick our own ciphersuite. - * - * We can't abuse an info_cb for this, since by the time one of the - * client_hello info_cbs is called, we've already picked which ciphersuite to - * use. - * - * Technically, this function is an abuse of this callback, since the point of - * a session_secret_cb is to try to set up and/or verify a shared-secret for - * authentication on the fly. But as long as we return 0, we won't actually be - * setting up a shared secret, and all will be fine. - */ -static int -tor_tls_session_secret_cb(SSL *ssl, void *secret, int *secret_len, - STACK_OF(SSL_CIPHER) *peer_ciphers, - SSL_CIPHER **cipher, void *arg) -{ - (void) secret; - (void) secret_len; - (void) peer_ciphers; - (void) cipher; - (void) arg; - - if (tor_tls_classify_client_ciphers(ssl, peer_ciphers) == - CIPHERS_UNRESTRICTED) { - SSL_set_cipher_list(ssl, UNRESTRICTED_SERVER_CIPHER_LIST); - } - - SSL_set_session_secret_cb(ssl, NULL, NULL); - - return 0; -} -static void -tor_tls_setup_session_secret_cb(tor_tls_t *tls) -{ - SSL_set_session_secret_cb(tls->ssl, tor_tls_session_secret_cb, NULL); -} -#else -#define tor_tls_setup_session_secret_cb(tls) STMT_NIL -#endif - -/** Invoked when a TLS state changes: log the change at severity 'debug' */ -static void -tor_tls_debug_state_callback(const SSL *ssl, int type, int val) -{ - log_debug(LD_HANDSHAKE, "SSL %p is now in state %s [type=%d,val=%d].", - ssl, SSL_state_string_long(ssl), type, val); -} - /** Invoked when we're accepting a connection on ssl, and the connection * changes state. We use this: * <ul><li>To alter the state of the handshake partway through, so we @@ -1672,6 +1630,48 @@ tor_tls_server_info_callback(const SSL *ssl, int type, int val) } #endif +#if OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,0,0) && defined(V2_HANDSHAKE_SERVER) +/** Callback to get invoked on a server after we've read the list of ciphers + * the client supports, but before we pick our own ciphersuite. + * + * We can't abuse an info_cb for this, since by the time one of the + * client_hello info_cbs is called, we've already picked which ciphersuite to + * use. + * + * Technically, this function is an abuse of this callback, since the point of + * a session_secret_cb is to try to set up and/or verify a shared-secret for + * authentication on the fly. But as long as we return 0, we won't actually be + * setting up a shared secret, and all will be fine. + */ +static int +tor_tls_session_secret_cb(SSL *ssl, void *secret, int *secret_len, + STACK_OF(SSL_CIPHER) *peer_ciphers, + SSL_CIPHER **cipher, void *arg) +{ + (void) secret; + (void) secret_len; + (void) peer_ciphers; + (void) cipher; + (void) arg; + + if (tor_tls_classify_client_ciphers(ssl, peer_ciphers) == + CIPHERS_UNRESTRICTED) { + SSL_set_cipher_list(ssl, UNRESTRICTED_SERVER_CIPHER_LIST); + } + + SSL_set_session_secret_cb(ssl, NULL, NULL); + + return 0; +} +static void +tor_tls_setup_session_secret_cb(tor_tls_t *tls) +{ + SSL_set_session_secret_cb(tls->ssl, tor_tls_session_secret_cb, NULL); +} +#else +#define tor_tls_setup_session_secret_cb(tls) STMT_NIL +#endif + /** Explain which ciphers we're missing. */ static void log_unsupported_ciphers(smartlist_t *unsupported) [View Less]

1 0

[tor/master] Restore prop198 behavior from 4677 patch
by nickm＠torproject.org 25 Nov '13

25 Nov '13

commit 8f9c847fbf4032a8db4802708f7e2d69a26cd3d2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 25 10:53:37 2013 -0500 Restore prop198 behavior from 4677 patch The previous commit from piet would have backed out some of proposal 198 and made servers built without the V2 handshake not use the unrestricted cipher list from prop198. Bug not in any released Tor. --- src/common/tortls.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) … [View More]

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 25 Nov '13

25 Nov '13

commit a654dc9496d6e309513e920e2d0ff74a1fb563a8 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 25 13:15:58 2013 +0000 Update translations for https_everywhere_completed --- nl/https-everywhere.dtd | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nl/https-everywhere.dtd b/nl/https-everywhere.dtd index 2626b64..ccd729f 100644 --- a/nl/https-everywhere.dtd +++ b/nl/https-everywhere.dtd @@ -40,3 +40,7 @@ <!ENTITY https-everywhere.popup.… [View More]

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 25 Nov '13

25 Nov '13

commit c861f99b269c2d03601bb5c63c065aca6a4cbae0 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 25 13:15:52 2013 +0000 Update translations for https_everywhere --- nl/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nl/https-everywhere.dtd b/nl/https-everywhere.dtd index 740cb81..ccd729f 100644 --- a/nl/https-everywhere.dtd +++ b/nl/https-everywhere.dtd @@ -41,6 +41,6 @@ <!ENTITY https-everywhere.popup.keep … [View More]

1 0

[check/master] Keep all the addresses we've seen per relay.
by arlo＠torproject.org 24 Nov '13

24 Nov '13

commit 026e43b08656d78398b15742ddf510f6b17f859e Author: Arlo Breault <arlolra(a)gmail.com> Date: Sun Nov 24 15:16:16 2013 -0800 Keep all the addresses we've seen per relay. Stored as an address list. Will result in more false positives but probably better than false negatives. See discussion in #21. Also, trac #7342. --- datastore.go | 93 +++++++++++++++++++++++++++++++++++++--------------- datastore_test.go | 30 ++++++++--------- handlers.go … [View More] | 4 +-- scripts/exitips.py | 12 ++++--- 4 files changed, 90 insertions(+), 49 deletions(-) diff --git a/datastore.go b/datastore.go index 17aab92..34106a6 100644 --- a/datastore.go +++ b/datastore.go @@ -50,27 +50,51 @@ type AddressPort struct { Port int } +type CanExitCache struct { + ap AddressPort + can bool +} + type Policy struct { Fingerprint string - Address string + Address []string Rules []Rule IsAllowedDefault bool Tminus int + CacheLast CanExitCache } -func (p Policy) CanExit(ap AddressPort) bool { +func (p Policy) CanExit(ap AddressPort) (can bool) { + if p.CacheLast.ap == ap { + can = p.CacheLast.can + return + } + + // update the cache *after* we return + defer func() { + p.CacheLast = CanExitCache{ap, can} + }() + addr := net.ParseIP(ap.Address) if addr != nil && ValidPort(ap.Port) { for _, rule := range p.Rules { if rule.IsMatch(addr, ap.Port) { - return rule.IsAccept + can = rule.IsAccept + return } } } - return p.IsAllowedDefault + + can = p.IsAllowedDefault + return +} + +type PolicyAddress struct { + Policy Policy + Address string } -type PolicyList []Policy +type PolicyList []PolicyAddress func (p PolicyList) Less(i, j int) bool { return p[i].Address < p[j].Address @@ -127,8 +151,8 @@ func (e *Exits) DumpJSON(w io.Writer, tminus int, ip string, port int) { func (e *Exits) GetAllExits(ap AddressPort, tminus int, fn func(string, string, int)) { ind := 0 for _, val := range e.List { - if val.Tminus <= tminus && val.CanExit(ap) { - fn(val.Address, val.Fingerprint, ind) + if val.Policy.Tminus <= tminus && val.Policy.CanExit(ap) { + fn(val.Address, val.Policy.Fingerprint, ind) ind += 1 } } @@ -149,29 +173,53 @@ func (e *Exits) IsTor(remoteAddr string) (fingerprint string, ok bool) { return } -func (e *Exits) Update(exits PolicyList) PolicyList { +func InsertUnique(arr *[]string, a string) { + for _, b := range *arr { + if a == b { + return + } + } + *arr = append(*arr, a) +} + +func (e *Exits) Update(exits []Policy, update bool) { m := make(map[string]Policy) - for _, p := range e.List { - p.Tminus = p.Tminus + 1 - m[p.Fingerprint] = p + // bump entries by an hour that aren't in the new exit list + if update { + for _, p := range e.List { + if _, ok := m[p.Policy.Fingerprint]; !ok { + p.Policy.Tminus = p.Policy.Tminus + 1 + m[p.Policy.Fingerprint] = p.Policy + } + } } + // keep all unique ips we've seen for _, p := range exits { + if q, ok := m[p.Fingerprint]; ok { + for _, a := range q.Address { + InsertUnique(&p.Address, a) + } + } m[p.Fingerprint] = p } - i := 0 - exits = make(PolicyList, len(m)) + var pl PolicyList for _, p := range m { - exits[i] = p - i = i + 1 + for _, a := range p.Address { + pl = append(pl, PolicyAddress{p, a}) + } } - return exits + + // sort -n + sort.Sort(pl) + + e.List = pl } func (e *Exits) Load(source io.Reader, update bool) error { - var exits PolicyList + var exits []Policy dec := json.NewDecoder(source) for { @@ -195,18 +243,9 @@ func (e *Exits) Load(source io.Reader, update bool) error { exits = append(exits, p) } - // bump entries by an hour that aren't in this list - if update { - exits = e.Update(exits) - } - - // sort -n - sort.Sort(exits) - - e.List = exits + e.Update(exits, update) e.UpdateTime = time.Now() e.PreComputeTorList() - return nil } diff --git a/datastore_test.go b/datastore_test.go index ccde0a5..07afc8a 100644 --- a/datastore_test.go +++ b/datastore_test.go @@ -65,8 +65,8 @@ func setupExitList(t *testing.T, testData string) (e *Exits) { } func TestExitListLoading(t *testing.T) { - testData := `{"Rules": [{"IsAccept": true, "MinPort": 706, "MaxPort": 706, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 993, "MaxPort": 993, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 995, "MaxPort": 995, "Address": null, "IsAddressWildcard": true}], "IsAllowedDefault": false, "Address": "83.227.52.198"} - {"Rules": [{"IsAccept": true, "MinPort": 20, "MaxPort": 23, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 43, "MaxPort": 43, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 53, "MaxPort": 53, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 79, "MaxPort": 81, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 88, "MaxPort": 88, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 110, "MaxPort": 110, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 143, "MaxPort": 143, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 194, "MaxPort": 194, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 220, "MaxPort": 220, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 443, "MaxPort": 443, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 4 64, "MaxPort": 465, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 543, "MaxPort": 544, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 563, "MaxPort": 563, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 587, "MaxPort": 587, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 706, "MaxPort": 706, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 749, "MaxPort": 749, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 873, "MaxPort": 873, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 902, "MaxPort": 904, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 981, "MaxPort": 981, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 989, "MaxPort": 995, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 1194, "MaxPort": 1194, "Address": null , "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 1220, "MaxPort": 1220, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 1293, "MaxPort": 1293, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 1500, "MaxPort": 1500, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 1723, "MaxPort": 1723, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 1863, "MaxPort": 1863, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 2082, "MaxPort": 2083, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 2086, "MaxPort": 2087, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 2095, "MaxPort": 2096, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 3128, "MaxPort": 3128, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 3389, "MaxPort": 3389, "Address": null, "IsAddressWildc ard": true}, {"IsAccept": true, "MinPort": 3690, "MaxPort": 3690, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 4321, "MaxPort": 4321, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 4643, "MaxPort": 4643, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 5050, "MaxPort": 5050, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 5190, "MaxPort": 5190, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 5222, "MaxPort": 5223, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 5228, "MaxPort": 5228, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 5900, "MaxPort": 5900, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 6666, "MaxPort": 6667, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 6679, "MaxPort": 6679, "Address": null, "IsAddressWildcard": true}, {"Is Accept": true, "MinPort": 6697, "MaxPort": 6697, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 8000, "MaxPort": 8000, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 8008, "MaxPort": 8008, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 8080, "MaxPort": 8080, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 8087, "MaxPort": 8088, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 8443, "MaxPort": 8443, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 8888, "MaxPort": 8888, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 9418, "MaxPort": 9418, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 9999, "MaxPort": 10000, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 19294, "MaxPort": 19294, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 19638, "MaxPort": 19638, "Address": null, "IsAddressWildcard": true}], "IsAllowedDefault": false, "Address": "91.121.43.80"}` + testData := `{"Rules": [{"IsAccept": true, "MinPort": 706, "MaxPort": 706, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 993, "MaxPort": 993, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 995, "MaxPort": 995, "Address": null, "IsAddressWildcard": true}], "IsAllowedDefault": false, "Address": ["83.227.52.198"], "Fingerprint": "1"} + {"Rules": [{"IsAccept": true, "MinPort": 20, "MaxPort": 23, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 43, "MaxPort": 43, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 53, "MaxPort": 53, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 79, "MaxPort": 81, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 88, "MaxPort": 88, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 110, "MaxPort": 110, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 143, "MaxPort": 143, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 194, "MaxPort": 194, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 220, "MaxPort": 220, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 443, "MaxPort": 443, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 4 64, "MaxPort": 465, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 543, "MaxPort": 544, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 563, "MaxPort": 563, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 587, "MaxPort": 587, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 706, "MaxPort": 706, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 749, "MaxPort": 749, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 873, "MaxPort": 873, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 902, "MaxPort": 904, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 981, "MaxPort": 981, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 989, "MaxPort": 995, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 1194, "MaxPort": 1194, "Address": null , "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 1220, "MaxPort": 1220, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 1293, "MaxPort": 1293, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 1500, "MaxPort": 1500, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 1723, "MaxPort": 1723, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 1863, "MaxPort": 1863, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 2082, "MaxPort": 2083, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 2086, "MaxPort": 2087, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 2095, "MaxPort": 2096, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 3128, "MaxPort": 3128, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 3389, "MaxPort": 3389, "Address": null, "IsAddressWildc ard": true}, {"IsAccept": true, "MinPort": 3690, "MaxPort": 3690, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 4321, "MaxPort": 4321, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 4643, "MaxPort": 4643, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 5050, "MaxPort": 5050, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 5190, "MaxPort": 5190, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 5222, "MaxPort": 5223, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 5228, "MaxPort": 5228, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 5900, "MaxPort": 5900, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 6666, "MaxPort": 6667, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 6679, "MaxPort": 6679, "Address": null, "IsAddressWildcard": true}, {"Is Accept": true, "MinPort": 6697, "MaxPort": 6697, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 8000, "MaxPort": 8000, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 8008, "MaxPort": 8008, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 8080, "MaxPort": 8080, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 8087, "MaxPort": 8088, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 8443, "MaxPort": 8443, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 8888, "MaxPort": 8888, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 9418, "MaxPort": 9418, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 9999, "MaxPort": 10000, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 19294, "MaxPort": 19294, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 19638, "MaxPort": 19638, "Address": null, "IsAddressWildcard": true}], "IsAllowedDefault": false, "Address": ["91.121.43.80"], "Fingerprint": "2"}` exits := setupExitList(t, testData) // Valid tor exit @@ -87,8 +87,8 @@ func expectDump(t *testing.T, e *Exits, ip string, port int, expected ...string) } func TestIsAcceptRules(t *testing.T) { - testData := `{"Rules": [{"IsAccept": false, "MinPort": 706, "MaxPort": 706, "Address": null, "IsAddressWildcard": true}, {"IsAccept": false, "MinPort": 5000, "MaxPort": 55000, "Address": null, "IsAddressWildcard": true}], "IsAllowedDefault": false, "Address": "111.111.111.111"} - {"Rules": [{"IsAccept": true, "MinPort": 706, "MaxPort": 706, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 5000, "MaxPort": 55000, "Address": null, "IsAddressWildcard": true}], "IsAllowedDefault": false, "Address": "222.222.222.222"}` + testData := `{"Rules": [{"IsAccept": false, "MinPort": 706, "MaxPort": 706, "Address": null, "IsAddressWildcard": true}, {"IsAccept": false, "MinPort": 5000, "MaxPort": 55000, "Address": null, "IsAddressWildcard": true}], "IsAllowedDefault": false, "Address": ["111.111.111.111"], "Fingerprint": "1"} + {"Rules": [{"IsAccept": true, "MinPort": 706, "MaxPort": 706, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 5000, "MaxPort": 55000, "Address": null, "IsAddressWildcard": true}], "IsAllowedDefault": false, "Address": ["222.222.222.222"], "Fingerprint": "2"}` exits := setupExitList(t, testData) // one should fail, the other should be OK @@ -98,8 +98,8 @@ func TestIsAcceptRules(t *testing.T) { } func TestIsDefaultAllowedPolicy(t *testing.T) { - testData := `{"Rules": [{"IsAccept": false, "MinPort": 706, "MaxPort": 706, "Address": null, "IsAddressWildcard": true}, {"IsAccept": false, "MinPort": 5000, "MaxPort": 55000, "Address": null, "IsAddressWildcard": true}], "IsAllowedDefault": true, "Address": "111.111.111.111"} - {"Rules": [{"IsAccept": true, "MinPort": 706, "MaxPort": 706, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 5000, "MaxPort": 55000, "Address": null, "IsAddressWildcard": true}], "IsAllowedDefault": false, "Address": "222.222.222.222"}` + testData := `{"Rules": [{"IsAccept": false, "MinPort": 706, "MaxPort": 706, "Address": null, "IsAddressWildcard": true}, {"IsAccept": false, "MinPort": 5000, "MaxPort": 55000, "Address": null, "IsAddressWildcard": true}], "IsAllowedDefault": true, "Address": ["111.111.111.111"], "Fingerprint": "1"} + {"Rules": [{"IsAccept": true, "MinPort": 706, "MaxPort": 706, "Address": null, "IsAddressWildcard": true}, {"IsAccept": true, "MinPort": 5000, "MaxPort": 55000, "Address": null, "IsAddressWildcard": true}], "IsAllowedDefault": false, "Address": ["222.222.222.222"], "Fingerprint": "2"}` exits := setupExitList(t, testData) // first one should be allowing everything but his blocked port, @@ -112,8 +112,8 @@ func TestIsDefaultAllowedPolicy(t *testing.T) { func TestRulesNonWildcard(t *testing.T) { // Testing load - testData := `{"Rules": [{"IsAccept": false, "MinPort": 706, "MaxPort": 706, "Address": "38.229.70.31"}, {"IsAccept": false, "MinPort": 5000, "MaxPort": 55000, "Address": "38.229.70.31"}], "IsAllowedDefault": true, "Address": "111.111.111.111"} - {"Rules": [{"IsAccept": true, "MinPort": 706, "MaxPort": 706, "Address": "38.229.70.31"}, {"IsAccept": true, "MinPort": 5000, "MaxPort": 55000, "Address": "38.229.70.31"}], "IsAllowedDefault": false, "Address": "222.222.222.222"}` + testData := `{"Rules": [{"IsAccept": false, "MinPort": 706, "MaxPort": 706, "Address": "38.229.70.31"}, {"IsAccept": false, "MinPort": 5000, "MaxPort": 55000, "Address": "38.229.70.31"}], "IsAllowedDefault": true, "Address": ["111.111.111.111"], "Fingerprint": "1"} + {"Rules": [{"IsAccept": true, "MinPort": 706, "MaxPort": 706, "Address": "38.229.70.31"}, {"IsAccept": true, "MinPort": 5000, "MaxPort": 55000, "Address": "38.229.70.31"}], "IsAllowedDefault": false, "Address": ["222.222.222.222"], "Fingerprint": "2"}` exits := setupExitList(t, testData) // first one should reject due to ip @@ -132,7 +132,7 @@ func TestRulesNonWildcard(t *testing.T) { } func TestMaskedIP(t *testing.T) { - testData := `{"Rules": [{"MaxPort": 65535, "IsAddressWildcard": false, "Mask": "255.0.0.0", "Address": "0.0.0.0", "IsAccept": false, "MinPort": 1}, {"MaxPort": 65535, "IsAddressWildcard": false, "Mask": "255.255.0.0", "Address": "169.254.0.0", "IsAccept": false, "MinPort": 1}], "IsAllowedDefault": true, "Address": "111.111.111.111"}` + testData := `{"Rules": [{"MaxPort": 65535, "IsAddressWildcard": false, "Mask": "255.0.0.0", "Address": "0.0.0.0", "IsAccept": false, "MinPort": 1}, {"MaxPort": 65535, "IsAddressWildcard": false, "Mask": "255.255.0.0", "Address": "169.254.0.0", "IsAccept": false, "MinPort": 1}], "IsAllowedDefault": true, "Address": ["111.111.111.111"], "Fingerprint": "1"}` exits := setupExitList(t, testData) expectDump(t, exits, "0.1.2.3", 123) expectDump(t, exits, "169.254.111.111", 345) @@ -140,13 +140,13 @@ func TestMaskedIP(t *testing.T) { } func TestDoubleReject(t *testing.T) { - testData := `{"Rules": [{"IsAccept": false, "MinPort": 80, "MaxPort": 80, "Address": "222.222.222.222"}, {"IsAccept": false, "MinPort": 80, "MaxPort": 80, "Address": "123.123.123.123"}], "IsAllowedDefault": true, "Address": "111.111.111.111"}` + testData := `{"Rules": [{"IsAccept": false, "MinPort": 80, "MaxPort": 80, "Address": "222.222.222.222"}, {"IsAccept": false, "MinPort": 80, "MaxPort": 80, "Address": "123.123.123.123"}], "IsAllowedDefault": true, "Address": ["111.111.111.111"], "Fingerprint": "1"}` exits := setupExitList(t, testData) expectDump(t, exits, "222.222.222.222", 80) } func TestRejectWithDefaultReject(t *testing.T) { - testData := `{"Rules": [{"IsAccept": false, "MinPort": 80, "MaxPort": 80, "Address": "222.222.222.222"}, {"IsAccept": true, "MinPort": 80, "MaxPort": 80, "Address": "", "IsAddressWildcard": true}], "IsAllowedDefault": false, "Address": "111.111.111.111"}` + testData := `{"Rules": [{"IsAccept": false, "MinPort": 80, "MaxPort": 80, "Address": "222.222.222.222"}, {"IsAccept": true, "MinPort": 80, "MaxPort": 80, "Address": "", "IsAddressWildcard": true}], "IsAllowedDefault": false, "Address": ["111.111.111.111"], "Fingerprint": "1"}` exits := setupExitList(t, testData) // Should reject expectDump(t, exits, "222.222.222.222", 80) @@ -162,20 +162,20 @@ func TestMatchedRuleOrdering(t *testing.T) { such entry. The rules are considered in order; if no rule matches, the address will be accepted. For clarity, the last such entry SHOULD be accept : or reject :. */ - testData := `{"Rules": [{"IsAccept": false, "MinPort": 80, "MaxPort": 80, "Address": "222.222.222.222"}, {"IsAccept": true, "MinPort": 80, "MaxPort": 80, "Address": "222.222.222.222"}], "IsAllowedDefault": false, "Address": "111.111.111.111"}` + testData := `{"Rules": [{"IsAccept": false, "MinPort": 80, "MaxPort": 80, "Address": "222.222.222.222"}, {"IsAccept": true, "MinPort": 80, "MaxPort": 80, "Address": "222.222.222.222"}], "IsAllowedDefault": false, "Address": ["111.111.111.111"], "Fingerprint": "1"}` exits := setupExitList(t, testData) // Should match the reject rule first expectDump(t, exits, "222.222.222.222", 80) - testData = `{"Rules": [{"IsAccept": true, "MinPort": 80, "MaxPort": 80, "Address": "222.222.222.222"}, {"IsAccept": false, "MinPort": 80, "MaxPort": 80, "Address": "222.222.222.222"}], "IsAllowedDefault": false, "Address": "111.111.111.111"}` + testData = `{"Rules": [{"IsAccept": true, "MinPort": 80, "MaxPort": 80, "Address": "222.222.222.222"}, {"IsAccept": false, "MinPort": 80, "MaxPort": 80, "Address": "222.222.222.222"}], "IsAllowedDefault": false, "Address": ["111.111.111.111"], "Fingerprint": "1"}` exits = setupExitList(t, testData) // Should match the accept rule first expectDump(t, exits, "222.222.222.222", 80, "111.111.111.111") } func TestPastHours(t *testing.T) { - testData := `{"Rules": [{"IsAccept": true, "MinPort": 80, "MaxPort": 80, "Address": null, "IsAddressWildcard": true}], "IsAllowedDefault": false, "Address": "111.111.111.111", "Tminus": 4} - {"Rules": [{"IsAccept": true, "MinPort": 80, "MaxPort": 80, "Address": null, "IsAddressWildcard": true}], "IsAllowedDefault": false, "Address": "222.222.222.222", "Tminus": 17}` + testData := `{"Rules": [{"IsAccept": true, "MinPort": 80, "MaxPort": 80, "Address": null, "IsAddressWildcard": true}], "IsAllowedDefault": false, "Address": ["111.111.111.111"], "Fingerprint": "1", "Tminus": 4} + {"Rules": [{"IsAccept": true, "MinPort": 80, "MaxPort": 80, "Address": null, "IsAddressWildcard": true}], "IsAllowedDefault": false, "Address": ["222.222.222.222"], "Fingerprint": "2", "Tminus": 17}` exits := setupExitList(t, testData) // Should reject expectDump(t, exits, "123.123.123.123", 80, "111.111.111.111") diff --git a/handlers.go b/handlers.go index f852a0a..be9bd6a 100644 --- a/handlers.go +++ b/handlers.go @@ -11,8 +11,8 @@ import ( "net/http" "regexp" "strconv" - "time" "strings" + "time" ) // page model @@ -48,7 +48,7 @@ func RootHandler(Layout *template.Template, Exits *Exits, domain *gettext.Domain if len(host) > 0 { parts := strings.Split(host, ",") // apache will append the remote address - host = strings.TrimSpace(parts[len(parts) - 1]) + host = strings.TrimSpace(parts[len(parts)-1]) } else { host, _, err = net.SplitHostPort(r.RemoteAddr) } diff --git a/scripts/exitips.py b/scripts/exitips.py index 3c5bf45..81059b1 100755 --- a/scripts/exitips.py +++ b/scripts/exitips.py @@ -18,7 +18,7 @@ from stem.exit_policy import AddressType class Router(): def __init__(self, router, tminus): self.Fingerprint = router.fingerprint - self.Address = router.address + self.Address = [router.address] self.IsAllowedDefault = router.exit_policy._is_allowed_default self.IsAllowed = router.exit_policy.is_exiting_allowed() self.Rules = [] @@ -73,11 +73,13 @@ def main(consensuses, exit_lists): # update exit addresses with data from TorDNSEL for descriptor in parse_file("data/exit-lists/" + m[0], "tordnsel 1.0"): - descriptor.exit_addresses.sort(key=operator.itemgetter(1), - reverse=True) e = exits.get(descriptor.fingerprint, None) - if e is not None and e.Tminus == t: - e.Address = descriptor.exit_addresses[0][0] + if e is not None: + if e.Tminus == t: + e.Address = [] + for a in descriptor.exit_addresses: + if a[0] not in e.Address: + e.Address.append(a[0]) # update all with server descriptor info for descriptor in parse_file("data/cached-descriptors", [View Less]

1 0

[check/master] TorButton's Test Settings requires valid XHTML.
by arlo＠torproject.org 24 Nov '13

24 Nov '13

commit 3ef383c8e1fa477ee867cc11dfb05eac19cba548 Author: Arlo Breault <arlolra(a)gmail.com> Date: Sun Nov 24 12:15:17 2013 -0800 TorButton's Test Settings requires valid XHTML. Reported in trac #10189. --- public/torbutton.html | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/public/torbutton.html b/public/torbutton.html index 17b6b90..969f97e 100644 --- a/public/torbutton.html +++ b/public/torbutton.html @@ -1,5 +1,10 @@ -<!doctype html&… [View More]

1 0

[flashproxy/master] I don't want "make" to "make dist".
by dcf＠torproject.org 24 Nov '13

24 Nov '13

commit d95a3e19c2a5cdacc1c1bb4f74946f4cc191c93e Author: David Fifield <david(a)bamsoftware.com> Date: Sun Nov 24 09:01:14 2013 -0800 I don't want "make" to "make dist". --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 93287f6..0303862 100644 --- a/Makefile +++ b/Makefile @@ -27,7 +27,7 @@ MAKE_CLIENT = $(MAKE) -f Makefile.client PYTHON="$(PYTHON)" REBUILD_MAN = 0 # all is N/A for a binary package, but include for … [View More]

1 0