December 2020 - tor-commits - lists.torproject.org

[depictor/master] Add a timeout to the clock skew request
by tom＠torproject.org 18 Dec '20

18 Dec '20

commit 3355279b34a3e21c64cd61fc81b5eb7566a0d895 Author: Tom Ritter <tom(a)ritter.vg> Date: Fri Dec 18 12:55:56 2020 -0600 Add a timeout to the clock skew request --- utility.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utility.py b/utility.py index 7b35f00..390cebf 100755 --- a/utility.py +++ b/utility.py @@ -112,7 +112,7 @@ def get_clockskew(): try: startTimeStamp = datetime.datetime.utcnow() startTime = time.time() - f = urllib.request.urlopen(authority_address) + f = urllib.request.urlopen(authority_address, timeout=30) h = f.getheader('date') if h: clockskew[nickname] = datetime.datetime.strptime(h, '%a, %d %b %Y %H:%M:%S %Z')

1 0

[tor/master] Use SRWLocks to implement locking on Windows #17927
by ahf＠torproject.org 18 Dec '20

18 Dec '20

commit 877dbfc0561dfc5297cf446fe653cc3095d20b46 Author: Daniel Pinto <danielpinto52(a)gmail.com> Date: Thu Nov 12 19:40:07 2020 +0000 Use SRWLocks to implement locking on Windows #17927 Replace the Windows locking implementation which used critical sections with the faster SRWLocks available since Vista. --- changes/ticket17927 | 4 ++ src/lib/lock/compat_mutex.h | 11 ++++- src/lib/lock/compat_mutex_winthreads.c | 76 +++++++++++++++++++++++++++++++--- src/lib/thread/compat_winthreads.c | 8 +++- 4 files changed, 90 insertions(+), 9 deletions(-) diff --git a/changes/ticket17927 b/changes/ticket17927 new file mode 100644 index 0000000000..532416dac4 --- /dev/null +++ b/changes/ticket17927 @@ -0,0 +1,4 @@ + o Minor features (performance, windows): + - Use SRWLocks to implement locking on Windows. Replaces the critical + section locking implementation with the faster SRWLocks available + since Windows Vista. Closes ticket 17927. Patch by Daniel Pinto. diff --git a/src/lib/lock/compat_mutex.h b/src/lib/lock/compat_mutex.h index 5631993cc4..14bdf70ce5 100644 --- a/src/lib/lock/compat_mutex.h +++ b/src/lib/lock/compat_mutex.h @@ -39,8 +39,15 @@ /** A generic lock structure for multithreaded builds. */ typedef struct tor_mutex_t { #if defined(USE_WIN32_THREADS) - /** Windows-only: on windows, we implement locks with CRITICAL_SECTIONS. */ - CRITICAL_SECTION mutex; + /** Windows-only: on windows, we implement locks with SRW locks. */ + SRWLOCK mutex; + /** For recursive lock support (SRW locks are not recursive) */ + enum mutex_type_t { + NON_RECURSIVE = 0, + RECURSIVE + } type; + DWORD lock_owner; // id of the thread that owns the lock + int lock_count; // number of times the lock is held recursively #elif defined(USE_PTHREADS) /** Pthreads-only: with pthreads, we implement locks with * pthread_mutex_t. */ diff --git a/src/lib/lock/compat_mutex_winthreads.c b/src/lib/lock/compat_mutex_winthreads.c index 5fe6870a93..03cf5082e0 100644 --- a/src/lib/lock/compat_mutex_winthreads.c +++ b/src/lib/lock/compat_mutex_winthreads.c @@ -9,6 +9,23 @@ * \brief Implement the tor_mutex API using CRITICAL_SECTION. **/ +#include "orconfig.h" + +/* For SRW locks support */ +#ifndef WINVER +#error "orconfig.h didn't define WINVER" +#endif +#ifndef _WIN32_WINNT +#error "orconfig.h didn't define _WIN32_WINNT" +#endif +#if WINVER < 0x0600 +#error "winver too low" +#endif +#if _WIN32_WINNT < 0x0600 +#error "winver too low" +#endif + +#include <windows.h> #include "lib/lock/compat_mutex.h" #include "lib/err/torerr.h" @@ -20,27 +37,76 @@ tor_locking_init(void) void tor_mutex_init(tor_mutex_t *m) { - InitializeCriticalSection(&m->mutex); + m->type = RECURSIVE; + m->lock_owner = 0; + m->lock_count = 0; + InitializeSRWLock(&m->mutex); } void tor_mutex_init_nonrecursive(tor_mutex_t *m) { - InitializeCriticalSection(&m->mutex); + m->type = NON_RECURSIVE; + InitializeSRWLock(&m->mutex); } void tor_mutex_uninit(tor_mutex_t *m) { - DeleteCriticalSection(&m->mutex); + (void) m; +} + +static void +tor_mutex_acquire_recursive(tor_mutex_t *m) +{ + DWORD thread_id = GetCurrentThreadId(); + if (thread_id == m->lock_owner) { + ++m->lock_count; + return; + } + AcquireSRWLockExclusive(&m->mutex); + m->lock_owner = thread_id; + m->lock_count = 1; +} + +static void +tor_mutex_acquire_nonrecursive(tor_mutex_t *m) +{ + AcquireSRWLockExclusive(&m->mutex); } + void tor_mutex_acquire(tor_mutex_t *m) { raw_assert(m); - EnterCriticalSection(&m->mutex); + if (m->type == NON_RECURSIVE) { + tor_mutex_acquire_nonrecursive(m); + } else { + tor_mutex_acquire_recursive(m); + } +} + +static void +tor_mutex_release_recursive(tor_mutex_t *m) +{ + if (--m->lock_count) { + return; + } + m->lock_owner = 0; + ReleaseSRWLockExclusive(&m->mutex); } + +static void +tor_mutex_release_nonrecursive(tor_mutex_t *m) +{ + ReleaseSRWLockExclusive(&m->mutex); +} + void tor_mutex_release(tor_mutex_t *m) { - LeaveCriticalSection(&m->mutex); + if (m->type == NON_RECURSIVE) { + tor_mutex_release_nonrecursive(m); + } else { + tor_mutex_release_recursive(m); + } } diff --git a/src/lib/thread/compat_winthreads.c b/src/lib/thread/compat_winthreads.c index fcc9c0279b..a6213aa46a 100644 --- a/src/lib/thread/compat_winthreads.c +++ b/src/lib/thread/compat_winthreads.c @@ -144,13 +144,17 @@ tor_threadlocal_set(tor_threadlocal_t *threadlocal, void *value) int tor_cond_wait(tor_cond_t *cond, tor_mutex_t *lock_, const struct timeval *tv) { - CRITICAL_SECTION *lock = &lock_->mutex; + // recursive SRW locks are not supported because they need extra logic for + // acquiring and releasing but SleepConditionVariableSRW will use the OS + // lock relase function which lacks our extra logic + tor_assert(lock_->type == NON_RECURSIVE); + SRWLOCK *lock = &lock_->mutex; DWORD ms = INFINITE; if (tv) { ms = tv->tv_sec*1000 + (tv->tv_usec+999)/1000; } - BOOL ok = SleepConditionVariableCS(&cond->cond, lock, ms); + BOOL ok = SleepConditionVariableSRW(&cond->cond, lock, ms, 0); if (!ok) { DWORD err = GetLastError(); if (err == ERROR_TIMEOUT) {

1 0

[tor/master] Use atomic ops to access lock_owner in WIN32 tor_mutex_t #17927
by ahf＠torproject.org 18 Dec '20

18 Dec '20

commit 328f38a59f5e1b049350d05dcb29e7c511cffd79 Author: Daniel Pinto <danielpinto52(a)gmail.com> Date: Mon Nov 30 02:54:13 2020 +0000 Use atomic ops to access lock_owner in WIN32 tor_mutex_t #17927 --- src/lib/lock/compat_mutex.h | 2 +- src/lib/lock/compat_mutex_winthreads.c | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/lib/lock/compat_mutex.h b/src/lib/lock/compat_mutex.h index 14bdf70ce5..518ba96b53 100644 --- a/src/lib/lock/compat_mutex.h +++ b/src/lib/lock/compat_mutex.h @@ -46,7 +46,7 @@ typedef struct tor_mutex_t { NON_RECURSIVE = 0, RECURSIVE } type; - DWORD lock_owner; // id of the thread that owns the lock + LONG lock_owner; // id of the thread that owns the lock int lock_count; // number of times the lock is held recursively #elif defined(USE_PTHREADS) /** Pthreads-only: with pthreads, we implement locks with diff --git a/src/lib/lock/compat_mutex_winthreads.c b/src/lib/lock/compat_mutex_winthreads.c index 03cf5082e0..151a7b80f7 100644 --- a/src/lib/lock/compat_mutex_winthreads.c +++ b/src/lib/lock/compat_mutex_winthreads.c @@ -58,13 +58,15 @@ tor_mutex_uninit(tor_mutex_t *m) static void tor_mutex_acquire_recursive(tor_mutex_t *m) { - DWORD thread_id = GetCurrentThreadId(); - if (thread_id == m->lock_owner) { + LONG thread_id = GetCurrentThreadId(); + // use InterlockedCompareExchange to perform an atomic read + LONG lock_owner = InterlockedCompareExchange(&m->lock_owner, 0, 0); + if (thread_id == lock_owner) { ++m->lock_count; return; } AcquireSRWLockExclusive(&m->mutex); - m->lock_owner = thread_id; + InterlockedExchange(&m->lock_owner, thread_id); m->lock_count = 1; } @@ -91,7 +93,7 @@ tor_mutex_release_recursive(tor_mutex_t *m) if (--m->lock_count) { return; } - m->lock_owner = 0; + InterlockedExchange(&m->lock_owner, 0); ReleaseSRWLockExclusive(&m->mutex); }

1 0

[tor/master] Merge remote-tracking branch 'tor-gitlab/mr/211'
by ahf＠torproject.org 18 Dec '20

18 Dec '20

commit db5f7b4250e14d53dc72fd0c8b2ad8822f77e848 Merge: b645fbdb54 328f38a59f Author: Alexander Færøy <ahf(a)torproject.org> Date: Fri Dec 18 14:22:23 2020 +0000 Merge remote-tracking branch 'tor-gitlab/mr/211' changes/ticket17927 | 4 ++ src/lib/lock/compat_mutex.h | 11 ++++- src/lib/lock/compat_mutex_winthreads.c | 78 +++++++++++++++++++++++++++++++--- src/lib/thread/compat_winthreads.c | 8 +++- 4 files changed, 92 insertions(+), 9 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'tor-gitlab/mr/207'
by ahf＠torproject.org 18 Dec '20

18 Dec '20

commit b645fbdb54c300dae21882c99959eddbc0be6ce1 Merge: 5527aef56f d1494d140c Author: Alexander Færøy <ahf(a)torproject.org> Date: Fri Dec 18 14:19:24 2020 +0000 Merge remote-tracking branch 'tor-gitlab/mr/207' changes/ticket33383 | 4 +++ src/core/mainloop/connection.c | 2 -- src/feature/relay/ext_orport.c | 58 ------------------------------------------ src/feature/relay/ext_orport.h | 7 ----- src/test/test_extorport.c | 55 --------------------------------------- 5 files changed, 4 insertions(+), 122 deletions(-)

1 0

[tor/master] Remove orconn_ext_or_id_map and related functions
by ahf＠torproject.org 18 Dec '20

18 Dec '20

commit d1494d140cbb3f8b8734e3973378e99128b308c9 Author: Neel Chauhan <neel(a)neelc.org> Date: Thu Nov 12 11:19:21 2020 -0800 Remove orconn_ext_or_id_map and related functions --- changes/ticket33383 | 4 +++ src/core/mainloop/connection.c | 2 -- src/feature/relay/ext_orport.c | 58 ------------------------------------------ src/feature/relay/ext_orport.h | 7 ----- src/test/test_extorport.c | 55 --------------------------------------- 5 files changed, 4 insertions(+), 122 deletions(-) diff --git a/changes/ticket33383 b/changes/ticket33383 new file mode 100644 index 0000000000..8a1b83cdab --- /dev/null +++ b/changes/ticket33383 @@ -0,0 +1,4 @@ + o Code simplification and refactoring: + - Remove the orconn_ext_or_id_map structure and related functions. Nothing + outside of unit tests looks up anything in this structure. Closes ticket + 33383. Patch by Neel Chauhan. diff --git a/src/core/mainloop/connection.c b/src/core/mainloop/connection.c index 3d551c4ba8..4c226abc4b 100644 --- a/src/core/mainloop/connection.c +++ b/src/core/mainloop/connection.c @@ -948,7 +948,6 @@ connection_free_minimal(connection_t *conn) connection_or_clear_identity(TO_OR_CONN(conn)); } if (conn->type == CONN_TYPE_OR || conn->type == CONN_TYPE_EXT_OR) { - connection_or_remove_from_ext_or_id_map(TO_OR_CONN(conn)); tor_free(TO_OR_CONN(conn)->ext_or_conn_id); tor_free(TO_OR_CONN(conn)->ext_or_auth_correct_client_hash); tor_free(TO_OR_CONN(conn)->ext_or_transport); @@ -5824,7 +5823,6 @@ connection_free_all(void) /* Unlink everything from the identity map. */ connection_or_clear_identity_map(); - connection_or_clear_ext_or_id_map(); /* Clear out our list of broken connections */ clear_broken_connection_map(0); diff --git a/src/feature/relay/ext_orport.c b/src/feature/relay/ext_orport.c index 1bb8741e45..c45a0b463f 100644 --- a/src/feature/relay/ext_orport.c +++ b/src/feature/relay/ext_orport.c @@ -656,75 +656,17 @@ connection_ext_or_start_auth(or_connection_t *or_conn) return 0; } -/** Global map between Extended ORPort identifiers and OR - * connections. */ -static digestmap_t *orconn_ext_or_id_map = NULL; - -/** Remove the Extended ORPort identifier of conn from the - * global identifier list. Also, clear the identifier from the - * connection itself. */ -void -connection_or_remove_from_ext_or_id_map(or_connection_t *conn) -{ - or_connection_t *tmp; - if (!orconn_ext_or_id_map) - return; - if (!conn->ext_or_conn_id) - return; - - tmp = digestmap_remove(orconn_ext_or_id_map, conn->ext_or_conn_id); - if (!tor_digest_is_zero(conn->ext_or_conn_id)) - tor_assert(tmp == conn); - - memset(conn->ext_or_conn_id, 0, EXT_OR_CONN_ID_LEN); -} - -#ifdef TOR_UNIT_TESTS -/** Return the connection whose ext_or_id is id. Return NULL if no such - * connection is found. */ -or_connection_t * -connection_or_get_by_ext_or_id(const char *id) -{ - if (!orconn_ext_or_id_map) - return NULL; - return digestmap_get(orconn_ext_or_id_map, id); -} -#endif /* defined(TOR_UNIT_TESTS) */ - -/** Deallocate the global Extended ORPort identifier list */ -void -connection_or_clear_ext_or_id_map(void) -{ - digestmap_free(orconn_ext_or_id_map, NULL); - orconn_ext_or_id_map = NULL; -} - /** Creates an Extended ORPort identifier for conn and deposits * it into the global list of identifiers. */ void connection_or_set_ext_or_identifier(or_connection_t *conn) { char random_id[EXT_OR_CONN_ID_LEN]; - or_connection_t *tmp; - - if (!orconn_ext_or_id_map) - orconn_ext_or_id_map = digestmap_new(); - - /* Remove any previous identifiers: */ - if (conn->ext_or_conn_id && !tor_digest_is_zero(conn->ext_or_conn_id)) - connection_or_remove_from_ext_or_id_map(conn); - - do { - crypto_rand(random_id, sizeof(random_id)); - } while (digestmap_get(orconn_ext_or_id_map, random_id)); if (!conn->ext_or_conn_id) conn->ext_or_conn_id = tor_malloc_zero(EXT_OR_CONN_ID_LEN); memcpy(conn->ext_or_conn_id, random_id, EXT_OR_CONN_ID_LEN); - - tmp = digestmap_set(orconn_ext_or_id_map, random_id, conn); - tor_assert(!tmp); } /** Free any leftover allocated memory of the ext_orport.c subsystem. */ diff --git a/src/feature/relay/ext_orport.h b/src/feature/relay/ext_orport.h index 416c358397..b149f9eb1c 100644 --- a/src/feature/relay/ext_orport.h +++ b/src/feature/relay/ext_orport.h @@ -36,8 +36,6 @@ int connection_ext_or_start_auth(or_connection_t *or_conn); void connection_or_set_ext_or_identifier(or_connection_t *conn); -void connection_or_remove_from_ext_or_id_map(or_connection_t *conn); -void connection_or_clear_ext_or_id_map(void); int connection_ext_or_finished_flushing(or_connection_t *conn); int connection_ext_or_process_inbuf(or_connection_t *or_conn); char *get_ext_or_auth_cookie_file_name(void); @@ -71,10 +69,6 @@ connection_ext_or_process_inbuf(or_connection_t *conn) } #define connection_or_set_ext_or_identifier(conn) \ ((void)(conn)) -#define connection_or_remove_from_ext_or_id_map(conn) \ - ((void)(conn)) -#define connection_or_clear_ext_or_id_map() \ - STMT_NIL #define get_ext_or_auth_cookie_file_name() \ (NULL) @@ -94,7 +88,6 @@ STATIC int handle_client_auth_nonce(const char *client_nonce, #ifdef TOR_UNIT_TESTS extern uint8_t *ext_or_auth_cookie; extern int ext_or_auth_cookie_is_set; -or_connection_t *connection_or_get_by_ext_or_id(const char *id); #endif #endif /* defined(EXT_ORPORT_PRIVATE) */ diff --git a/src/test/test_extorport.c b/src/test/test_extorport.c index 7935530653..fd260f06dc 100644 --- a/src/test/test_extorport.c +++ b/src/test/test_extorport.c @@ -24,60 +24,6 @@ #include <sys/stat.h> #endif -/* Test connection_or_remove_from_ext_or_id_map and - * connection_or_set_ext_or_identifier */ -static void -test_ext_or_id_map(void *arg) -{ - or_connection_t *c1 = NULL, *c2 = NULL, *c3 = NULL; - char *idp = NULL, *idp2 = NULL; - (void)arg; - - /* pre-initialization */ - tt_ptr_op(NULL, OP_EQ, - connection_or_get_by_ext_or_id("xxxxxxxxxxxxxxxxxxxx")); - - c1 = or_connection_new(CONN_TYPE_EXT_OR, AF_INET); - c2 = or_connection_new(CONN_TYPE_EXT_OR, AF_INET); - c3 = or_connection_new(CONN_TYPE_OR, AF_INET); - - tt_ptr_op(c1->ext_or_conn_id, OP_NE, NULL); - tt_ptr_op(c2->ext_or_conn_id, OP_NE, NULL); - tt_ptr_op(c3->ext_or_conn_id, OP_EQ, NULL); - - tt_ptr_op(c1, OP_EQ, connection_or_get_by_ext_or_id(c1->ext_or_conn_id)); - tt_ptr_op(c2, OP_EQ, connection_or_get_by_ext_or_id(c2->ext_or_conn_id)); - tt_ptr_op(NULL, OP_EQ, - connection_or_get_by_ext_or_id("xxxxxxxxxxxxxxxxxxxx")); - - idp = tor_memdup(c2->ext_or_conn_id, EXT_OR_CONN_ID_LEN); - - /* Give c2 a new ID. */ - connection_or_set_ext_or_identifier(c2); - tt_mem_op(idp, OP_NE, c2->ext_or_conn_id, EXT_OR_CONN_ID_LEN); - idp2 = tor_memdup(c2->ext_or_conn_id, EXT_OR_CONN_ID_LEN); - tt_assert(!tor_digest_is_zero(idp2)); - - tt_ptr_op(NULL, OP_EQ, connection_or_get_by_ext_or_id(idp)); - tt_ptr_op(c2, OP_EQ, connection_or_get_by_ext_or_id(idp2)); - - /* Now remove it. */ - connection_or_remove_from_ext_or_id_map(c2); - tt_ptr_op(NULL, OP_EQ, connection_or_get_by_ext_or_id(idp)); - tt_ptr_op(NULL, OP_EQ, connection_or_get_by_ext_or_id(idp2)); - - done: - if (c1) - connection_free_minimal(TO_CONN(c1)); - if (c2) - connection_free_minimal(TO_CONN(c2)); - if (c3) - connection_free_minimal(TO_CONN(c3)); - tor_free(idp); - tor_free(idp2); - connection_or_clear_ext_or_id_map(); -} - /* Simple connection_write_to_buf_impl_ replacement that unconditionally * writes to outbuf. */ static void @@ -581,7 +527,6 @@ test_ext_or_handshake(void *arg) } struct testcase_t extorport_tests[] = { - { "id_map", test_ext_or_id_map, TT_FORK, NULL, NULL }, { "write_command", test_ext_or_write_command, TT_FORK, NULL, NULL }, { "init_auth", test_ext_or_init_auth, TT_FORK, NULL, NULL }, { "cookie_auth", test_ext_or_cookie_auth, TT_FORK, NULL, NULL },

1 0

[torspec/master] bandwidth-file: Remove KeyValue recent_measurement_attempt_count
by ahf＠torproject.org 18 Dec '20

18 Dec '20

commit 85e94b9c540cf9d078509d7c8c8dd0429adc6823 Author: juga0 <juga(a)riseup.net> Date: Mon Dec 7 10:49:13 2020 +0000 bandwidth-file: Remove KeyValue recent_measurement_attempt_count because of sbws#40020 and potentially sbws#40023. Closes: #34. --- bandwidth-file-spec.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bandwidth-file-spec.txt b/bandwidth-file-spec.txt index fd08955..fdb5bd5 100644 --- a/bandwidth-file-spec.txt +++ b/bandwidth-file-spec.txt @@ -70,6 +70,7 @@ Tor SHOULD NOT use their bandwidths in its votes. Also adds Tor version. + 1.5.0 - Removes "recent_measurement_attempt_count" KeyValue. All Tor versions can consume format version 1.0.0. @@ -403,7 +404,8 @@ has been prioritized unless there are system, network or implementation issues. - This Line was added in version 1.4.0 of this specification. + This Line was added in version 1.4.0 of this specification and removed + in version 1.5.0. "recent_measurement_failure_count=" Int NL

1 0

[metrics-lib/master] Parse new NAT-based Snowflake lines.
by karsten＠torproject.org 18 Dec '20

18 Dec '20

commit 8976cdd9be1bb70d3457bf2551971e12ee253ce1 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Dec 18 12:02:55 2020 +0100 Parse new NAT-based Snowflake lines. Implements #40002. --- CHANGELOG.md | 5 +- .../org/torproject/descriptor/SnowflakeStats.java | 54 ++++++++++++++++ .../java/org/torproject/descriptor/impl/Key.java | 5 ++ .../descriptor/impl/SnowflakeStatsImpl.java | 75 ++++++++++++++++++++++ .../descriptor/impl/SnowflakeStatsImplTest.java | 50 +++++++++++++++ 5 files changed, 188 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ac865a9..68ad2a2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,7 @@ -# Changes in version 2.??.? - 2020-??-?? +# Changes in version 2.16.0 - 2020-??-?? + + * Medium changes + - Parse new NAT-based Snowflake lines. # Changes in version 2.15.0 - 2020-12-11 diff --git a/src/main/java/org/torproject/descriptor/SnowflakeStats.java b/src/main/java/org/torproject/descriptor/SnowflakeStats.java index 2fe78df..967d061 100644 --- a/src/main/java/org/torproject/descriptor/SnowflakeStats.java +++ b/src/main/java/org/torproject/descriptor/SnowflakeStats.java @@ -103,6 +103,30 @@ public interface SnowflakeStats extends Descriptor { */ Optional<Long> clientDeniedCount(); + /** + * Return a count of the number of times a client with a restricted or unknown + * NAT type has requested a proxy from the broker but no proxies were + * available, rounded up to the nearest multiple of 8. + * + * @return Count of the number of times a client with a restricted or unknown + * NAT type has requested a proxy from the broker but no proxies were + * available, rounded up to the nearest multiple of 8. + * @since 2.16.0 + */ + Optional<Long> clientRestrictedDeniedCount(); + + /** + * Return a count of the number of times a client with an unrestricted NAT + * type has requested a proxy from the broker but no proxies were available, + * rounded up to the nearest multiple of 8. + * + * @return Count of the number of times a client with an unrestricted NAT type + * has requested a proxy from the broker but no proxies were available, + * rounded up to the nearest multiple of 8. + * @since 2.16.0 + */ + Optional<Long> clientUnrestrictedDeniedCount(); + /** * Return a count of the number of times a client successfully received a * proxy from the broker, rounded up to the nearest multiple of 8. @@ -112,5 +136,35 @@ public interface SnowflakeStats extends Descriptor { * @since 2.7.0 */ Optional<Long> clientSnowflakeMatchCount(); + + /** + * Return a count of the total number of unique IP addresses of snowflake + * proxies that have a restricted NAT type. + * + * @return Count of the total number of unique IP addresses of snowflake + * proxies that have a restricted NAT type. + * @since 2.16.0 + */ + Optional<Long> snowflakeIpsNatRestricted(); + + /** + * Return a count of the total number of unique IP addresses of snowflake + * proxies that have an unrestricted NAT type. + * + * @return Count of the total number of unique IP addresses of snowflake + * proxies that have an unrestricted NAT type. + * @since 2.16.0 + */ + Optional<Long> snowflakeIpsNatUnrestricted(); + + /** + * Return a count of the total number of unique IP addresses of snowflake + * proxies that have an unknown NAT type. + * + * @return Count of the total number of unique IP addresses of snowflake + * proxies that have an unknown NAT type. + * @since 2.16.0 + */ + Optional<Long> snowflakeIpsNatUnknown(); } diff --git a/src/main/java/org/torproject/descriptor/impl/Key.java b/src/main/java/org/torproject/descriptor/impl/Key.java index b02d96e..410cef6 100644 --- a/src/main/java/org/torproject/descriptor/impl/Key.java +++ b/src/main/java/org/torproject/descriptor/impl/Key.java @@ -36,7 +36,9 @@ public enum Key { CELL_STATS_END("cell-stats-end"), CELL_TIME_IN_QUEUE("cell-time-in-queue"), CLIENT_DENIED_COUNT("client-denied-count"), + CLIENT_RESTRICTED_DENIED_COUNT("client-restricted-denied-count"), CLIENT_SNOWFLAKE_MATCH_COUNT("client-snowflake-match-count"), + CLIENT_UNRESTRICTED_DENIED_COUNT("client-unrestricted-denied-count"), CLIENT_VERSIONS("client-versions"), CONN_BI_DIRECT("conn-bi-direct"), CONSENSUS_METHOD("consensus-method"), @@ -149,6 +151,9 @@ public enum Key { SNOWFLAKE_IDLE_COUNT("snowflake-idle-count"), SNOWFLAKE_IPS("snowflake-ips"), SNOWFLAKE_IPS_BADGE("snowflake-ips-badge"), + SNOWFLAKE_IPS_NAT_RESTRICTED("snowflake-ips-nat-restricted"), + SNOWFLAKE_IPS_NAT_UNKNOWN("snowflake-ips-nat-unknown"), + SNOWFLAKE_IPS_NAT_UNRESTRICTED("snowflake-ips-nat-unrestricted"), SNOWFLAKE_IPS_STANDALONE("snowflake-ips-standalone"), SNOWFLAKE_IPS_TOTAL("snowflake-ips-total"), SNOWFLAKE_IPS_WEBEXT("snowflake-ips-webext"), diff --git a/src/main/java/org/torproject/descriptor/impl/SnowflakeStatsImpl.java b/src/main/java/org/torproject/descriptor/impl/SnowflakeStatsImpl.java index f52281e..2af40b5 100644 --- a/src/main/java/org/torproject/descriptor/impl/SnowflakeStatsImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/SnowflakeStatsImpl.java @@ -80,9 +80,24 @@ public class SnowflakeStatsImpl extends DescriptorImpl case CLIENT_DENIED_COUNT: this.parseClientDeniedCount(line, parts); break; + case CLIENT_RESTRICTED_DENIED_COUNT: + this.parseClientRestrictedDeniedCount(line, parts); + break; + case CLIENT_UNRESTRICTED_DENIED_COUNT: + this.parseClientUnrestrictedDeniedCount(line, parts); + break; case CLIENT_SNOWFLAKE_MATCH_COUNT: this.parseClientSnowflakeMatchCount(line, parts); break; + case SNOWFLAKE_IPS_NAT_RESTRICTED: + this.parseSnowflakeIpsNatRestricted(line, parts); + break; + case SNOWFLAKE_IPS_NAT_UNRESTRICTED: + this.parseSnowflakeIpsNatUnrestricted(line, parts); + break; + case SNOWFLAKE_IPS_NAT_UNKNOWN: + this.parseSnowflakeIpsNatUnknown(line, parts); + break; case INVALID: default: ParseHelper.parseKeyword(line, parts[0]); @@ -142,11 +157,36 @@ public class SnowflakeStatsImpl extends DescriptorImpl this.clientDeniedCount = ParseHelper.parseLong(line, parts, 1); } + private void parseClientRestrictedDeniedCount(String line, String[] parts) + throws DescriptorParseException { + this.clientRestrictedDeniedCount = ParseHelper.parseLong(line, parts, 1); + } + + private void parseClientUnrestrictedDeniedCount(String line, String[] parts) + throws DescriptorParseException { + this.clientUnrestrictedDeniedCount = ParseHelper.parseLong(line, parts, 1); + } + private void parseClientSnowflakeMatchCount(String line, String[] parts) throws DescriptorParseException { this.clientSnowflakeMatchCount = ParseHelper.parseLong(line, parts, 1); } + private void parseSnowflakeIpsNatRestricted(String line, String[] parts) + throws DescriptorParseException { + this.snowflakeIpsNatRestricted = ParseHelper.parseLong(line, parts, 1); + } + + private void parseSnowflakeIpsNatUnrestricted(String line, String[] parts) + throws DescriptorParseException { + this.snowflakeIpsNatUnrestricted = ParseHelper.parseLong(line, parts, 1); + } + + private void parseSnowflakeIpsNatUnknown(String line, String[] parts) + throws DescriptorParseException { + this.snowflakeIpsNatUnknown = ParseHelper.parseLong(line, parts, 1); + } + private LocalDateTime snowflakeStatsEnd; @Override @@ -210,11 +250,46 @@ public class SnowflakeStatsImpl extends DescriptorImpl return Optional.ofNullable(this.clientDeniedCount); } + private Long clientRestrictedDeniedCount; + + @Override + public Optional<Long> clientRestrictedDeniedCount() { + return Optional.ofNullable(this.clientRestrictedDeniedCount); + } + + private Long clientUnrestrictedDeniedCount; + + @Override + public Optional<Long> clientUnrestrictedDeniedCount() { + return Optional.ofNullable(this.clientUnrestrictedDeniedCount); + } + private Long clientSnowflakeMatchCount; @Override public Optional<Long> clientSnowflakeMatchCount() { return Optional.ofNullable(this.clientSnowflakeMatchCount); } + + private Long snowflakeIpsNatRestricted; + + @Override + public Optional<Long> snowflakeIpsNatRestricted() { + return Optional.ofNullable(this.snowflakeIpsNatRestricted); + } + + private Long snowflakeIpsNatUnrestricted; + + @Override + public Optional<Long> snowflakeIpsNatUnrestricted() { + return Optional.ofNullable(this.snowflakeIpsNatUnrestricted); + } + + private Long snowflakeIpsNatUnknown; + + @Override + public Optional<Long> snowflakeIpsNatUnknown() { + return Optional.ofNullable(this.snowflakeIpsNatUnknown); + } } diff --git a/src/test/java/org/torproject/descriptor/impl/SnowflakeStatsImplTest.java b/src/test/java/org/torproject/descriptor/impl/SnowflakeStatsImplTest.java index 4051b74..8d03511 100644 --- a/src/test/java/org/torproject/descriptor/impl/SnowflakeStatsImplTest.java +++ b/src/test/java/org/torproject/descriptor/impl/SnowflakeStatsImplTest.java @@ -42,6 +42,36 @@ public class SnowflakeStatsImplTest { "client-denied-count 0", "client-snowflake-match-count 864" }; + /** + * Snowflake statistics written on 2020-12-16 at 19:24:38 as obtained from + * CollecTor. + */ + private static final String[] snowflakeStats20201216192438 = new String[] { + "@type snowflake-stats 1.0", + "snowflake-stats-end 2020-12-16 19:24:38 (86400 s)", + "snowflake-ips US=1716,SE=109,PH=97,EC=5,FO=1,AU=121,SA=12,PK=8,IR=12," + + "GF=2,UZ=1,BY=12,BE=39,MT=2,BA=2,SC=1,MM=3,FR=272,PS=7,LT=12," + + "NL=209,CY=4,TW=26,GA=4,IL=25,MX=38,HU=35,HR=21,AE=6,PY=5,PT=50," + + "FI=48,RO=116,DE=877,MY=27,CA=223,IQ=1,CZ=46,SI=7,RS=14,KN=3,JO=2," + + "TN=3,LB=2,PE=6,ID=28,MK=2,AT=70,MV=1,BR=149,TR=19,JP=513,CH=151," + + "NZ=36,VN=18,MD=2,GR=56,UA=33,AZ=3,CN=74,RU=113,LV=23,EE=10,TH=63," + + "BG=10,??=15,HK=22,CR=3,SD=2,GB=372,DK=37,BD=5,ZA=22,LU=24,KR=26," + + "LK=3,IS=3,PR=1,MO=1,PL=165,NO=49,CL=15,IE=24,KE=1,MA=2,GT=1,ES=74," + + "EG=16,PA=3,IN=142,CO=5,GI=1,DZ=12,KZ=1,AR=24,UY=3,NP=8,SN=2,SG=45," + + "TZ=1,SK=20,TG=8,BZ=5,IT=172,BF=2", + "snowflake-ips-total 6943", + "snowflake-ips-standalone 32", + "snowflake-ips-badge 27", + "snowflake-ips-webext 6882", + "snowflake-idle-count 956568", + "client-denied-count 640", + "client-restricted-denied-count 640", + "client-unrestricted-denied-count 0", + "client-snowflake-match-count 11456", + "snowflake-ips-nat-restricted 3140", + "snowflake-ips-nat-unrestricted 29", + "snowflake-ips-nat-unknown 3768" }; + @Test public void testExampleMetricsLog() throws DescriptorParseException { SnowflakeStats snowflakeStats = new SnowflakeStatsImpl( @@ -145,5 +175,25 @@ public class SnowflakeStatsImplTest { new SnowflakeStatsImpl(new TestDescriptorBuilder( "snowflake-stats-end 2019-08-07 19:52:11 (0 s)").build(), null); } + + @Test + public void testNatBasedSnowflakeLines() throws DescriptorParseException { + SnowflakeStats snowflakeStats = new SnowflakeStatsImpl( + new TestDescriptorBuilder(snowflakeStats20201216192438).build(), null); + assertTrue(snowflakeStats.clientRestrictedDeniedCount().isPresent()); + assertEquals((Long) 640L, + snowflakeStats.clientRestrictedDeniedCount().get()); + assertTrue(snowflakeStats.clientUnrestrictedDeniedCount().isPresent()); + assertEquals((Long) 0L, + snowflakeStats.clientUnrestrictedDeniedCount().get()); + assertTrue(snowflakeStats.snowflakeIpsNatRestricted().isPresent()); + assertEquals((Long) 3140L, + snowflakeStats.snowflakeIpsNatRestricted().get()); + assertTrue(snowflakeStats.snowflakeIpsNatUnrestricted().isPresent()); + assertEquals((Long) 29L, + snowflakeStats.snowflakeIpsNatUnrestricted().get()); + assertTrue(snowflakeStats.snowflakeIpsNatUnknown().isPresent()); + assertEquals((Long) 3768L, snowflakeStats.snowflakeIpsNatUnknown().get()); + } }

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 18 Dec '20

18 Dec '20

commit 7143f3ed086a909de4e1d86ad498a566556fd5f5 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Dec 18 02:47:51 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+fr.po | 43 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 41 insertions(+), 2 deletions(-) diff --git a/contents+fr.po b/contents+fr.po index e6a0b395e1..ccfdcf0c79 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -3362,6 +3362,9 @@ msgid "" "onion routing in 2001-2002, we would tell people we were working on onion " "routing, and they would say \"Neat. Which one?\"" msgstr "" +"Lorsque nous avons commencé la nouvelle génération de conception et de mise " +"en œuvre du routage en onion en 2001-2002, nous disions aux gens que nous " +"travaillions sur le routage des oignons, et ils disaient \"Neat\". Lequel ?" #: https//support.torproject.org/about/why-is-it-called-tor/ #: (content/about/why-is-it-called-tor/contents+en.lrquestion.description) @@ -3370,11 +3373,14 @@ msgid "" " of the actual [onion routing project](https://www.onion-router.net/) run by" " the Naval Research Lab." msgstr "" +"Même si l'acheminement du routage onion est devenu un terme courant dans les" +" ménages, Tor est né du [projet du routage onion] (https://www.onion-" +"router.net/) géré par le laboratoire de recherche navale." #: https//support.torproject.org/about/why-is-it-called-tor/ #: (content/about/why-is-it-called-tor/contents+en.lrquestion.description) msgid "(It's also got a fine meaning in German and Turkish.)" -msgstr "" +msgstr "(Il a aussi une belle signification en allemand et en turc)." #: https//support.torproject.org/about/why-is-it-called-tor/ #: (content/about/why-is-it-called-tor/contents+en.lrquestion.description) @@ -3397,11 +3403,14 @@ msgid "" " have instead learned everything they know about Tor from news articles) by " "the fact that they spell it wrong." msgstr "" +"En fait, nous pouvons généralement repérer les personnes qui n'ont lu aucun " +"de nos sites web (et qui ont plutôt appris tout ce qu'elles savent sur Tor à" +" partir d'articles de presse) par le fait qu'elles l'orthographient mal." #: https//support.torproject.org/tbb/antivirus-false-positive/ #: (content/tbb/antivirus-false-positive/contents+en.lrquestion.title) msgid "Tor Browser and antivirus false positive warnings" -msgstr "" +msgstr "Navigateur Tor et antivirus : fausses alertes positives" #: https//support.torproject.org/tbb/antivirus-false-positive/ #: (content/tbb/antivirus-false-positive/contents+en.lrquestion.description) @@ -3409,6 +3418,8 @@ msgid "" "Some antivirus software will pop up malware and/or vulnerability warnings " "when Tor Browser is launched." msgstr "" +"Certains logiciels antivirus affichent des avertissements de programmes " +"malveillants et/ou de vulnérabilité lorsque le Navigateur Tor est lancé." #: https//support.torproject.org/tbb/antivirus-false-positive/ #: (content/tbb/antivirus-false-positive/contents+en.lrquestion.description) @@ -3419,6 +3430,11 @@ msgid "" "it](https://support.torproject.org/tbb/how-to-verify-signature/), these are " "false positives and you have nothing to worry about." msgstr "" +"Si vous avez téléchargé le Navigateur Tor depuis [notre site " +"principal](https://www.torproject.org/download/) ou utilisé " +"[GetTor](https://gettor.torproject.org/), et " +"[vérifié](https://support.torproject.org/tbb/how-to-verify-signature/), il " +"s'agit de faux positifs et vous n'avez rien à craindre." #: https//support.torproject.org/tbb/antivirus-false-positive/ #: (content/tbb/antivirus-false-positive/contents+en.lrquestion.description) @@ -3426,6 +3442,8 @@ msgid "" "Some antiviruses consider that files that have not been seen by a lot of " "users as suspicious." msgstr "" +"Certains antivirus considèrent que les fichiers qui n'ont pas été vus par un" +" grand nombre d'utilisateurs sont suspects." #: https//support.torproject.org/tbb/antivirus-false-positive/ #: (content/tbb/antivirus-false-positive/contents+en.lrquestion.description) @@ -3434,6 +3452,10 @@ msgid "" "and has not been modified by some attacker, you can [verify Tor Browser's " "signature](https://support.torproject.org/tbb/how-to-verify-signature/)." msgstr "" +"Pour vous assurer que le programme Tor que vous téléchargez est bien celui " +"que nous avons créé et n'a pas été modifié par un attaquant, vous pouvez " +"[vérifier la signature du Navigateur Tor] " +"(https://support.torproject.org/tbb/how-to-verify-signature/)" #: https//support.torproject.org/tbb/antivirus-false-positive/ #: (content/tbb/antivirus-false-positive/contents+en.lrquestion.description) @@ -3442,6 +3464,9 @@ msgid "" "processes](https://support.torproject.org/tbb/tbb-10) to prevent antiviruses" " from blocking access to Tor Browser." msgstr "" +"Vous pouvez également vouloir [mettre en liste blanche certains processus] " +"(https://support.torproject.org/tbb/tbb-10) pour empêcher les antivirus de " +"bloquer l'accès au Navigateur Tor." #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.title) @@ -3495,6 +3520,8 @@ msgid "" "For example, `torbrowser-install-win64-9.0_en-US.exe` is accompanied by " "`torbrowser-install-win64-9.0_en-US.exe.asc`." msgstr "" +"Par exemple, `torbrowser-install-win64-9.0_fr-US.exe` est accompagné de " +"`torbrowser-install-win64-9.0_fr-US.exe.asc`." #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -3502,6 +3529,8 @@ msgid "" "These are example file names and will not exactly match the file names that " "you download." msgstr "" +"Ce sont des exemples de noms de fichiers et ils ne correspondent pas " +"exactement aux noms de fichiers que vous téléchargez." #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -3706,6 +3735,10 @@ msgid "" " import the key using the **Workaround (using a public key)** section " "instead." msgstr "" +"Si vous recevez un message d'erreur, c'est que quelque chose a mal tourné et" +" vous ne pouvez pas poursuivre tant que vous n'avez pas compris pourquoi " +"cela n'a pas fonctionné. Vous pouvez peut-être importer la clé en utilisant " +"la section **solution de rechange (using a public key)** à la place." #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -3732,6 +3765,9 @@ msgid "" "gone wrong and you cannot continue until you've figured out why this didn't " "work." msgstr "" +"Si `./tor.keyring` n'existe pas après avoir lancé cette commande, quelque " +"chose a mal tourné et vous ne pouvez pas poursuivre tant que vous n'avez pas" +" compris pourquoi cela n'a pas marché." #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -3768,6 +3804,9 @@ msgid "" " you will have downloaded a different version than 9.0 and you may not have " "chosen the English (en-US) version." msgstr "" +"Notez que ces commandes utilisent des noms de fichiers d'exemple et que le " +"vôtre sera différent : vous aurez téléchargé une version différente de la " +"9.0 et vous n'aurez peut-être pas choisi la version anglaise (en-US)." #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 18 Dec '20

18 Dec '20

commit cbaf714e147c21e4c3231e068292c346f76e2faa Author: Translation commit bot <translation(a)torproject.org> Date: Fri Dec 18 02:17:58 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+fr.po | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/contents+fr.po b/contents+fr.po index 8669127d95..e6a0b395e1 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -3323,6 +3323,9 @@ msgid "" "The way most people use Tor is with Tor Browser, which is a version of " "Firefox that fixes many privacy issues." msgstr "" +"La façon dont la plupart des gens utilisent Tor est avec le Navigateur Tor, " +"qui est une version de Firefox qui corrige de nombreux problèmes de " +"protection des renseignements personnels." #: https//support.torproject.org/about/what-is-tor/ #: (content/about/what-is-tor/contents+en.lrquestion.description) @@ -3330,6 +3333,8 @@ msgid "" "You can read more about Tor on our " "[about](https://www.torproject.org/about/history/) page." msgstr "" +"Vous pouvez en lire plus sur Tor sur notre page " +"[about](https://www.torproject.org/about/history/)." #: https//support.torproject.org/about/what-is-tor/ #: (content/about/what-is-tor/contents+en.lrquestion.description) @@ -3337,6 +3342,8 @@ msgid "" "The Tor Project is a non-profit (charity) organization that maintains and " "develops the Tor software." msgstr "" +"Le Projet Tor est un organisme sans but lucratif (charité) qui maintient et " +"développe le logiciel Tor." #: https//support.torproject.org/about/why-is-it-called-tor/ #: (content/about/why-is-it-called-tor/contents+en.lrquestion.title) @@ -3346,7 +3353,7 @@ msgstr "Pourquoi s’appelle-t-il Tor ?" #: https//support.torproject.org/about/why-is-it-called-tor/ #: (content/about/why-is-it-called-tor/contents+en.lrquestion.description) msgid "Tor is the onion routing network." -msgstr "" +msgstr "Tor est le réseau de routage onion." #: https//support.torproject.org/about/why-is-it-called-tor/ #: (content/about/why-is-it-called-tor/contents+en.lrquestion.description)

1 0