- tor-commits - lists.torproject.org

[metrics-web/master] Start partitioning statusentry table.
by karsten＠torproject.org 11 Jan '12

11 Jan '12

commit 87722e25db2065d2c0e2b33849959df64aa2db02 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Jan 6 11:35:26 2012 +0100 Start partitioning statusentry table. --- db/tordir.sql | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 53 insertions(+), 4 deletions(-) diff --git a/db/tordir.sql b/db/tordir.sql index f01a662..fbb1341 100644 --- a/db/tordir.sql +++ b/db/tordir.sql @@ -1,6 +1,8 @@ -- Copyright 2010 The Tor Project -- See LICENSE for licensing information +CREATE LANGUAGE plpgsql; + -- TABLE descriptor -- Contains all of the descriptors published by routers. CREATE TABLE descriptor ( @@ -80,10 +82,59 @@ CREATE TABLE statusentry ( version CHARACTER VARYING(50), bandwidth BIGINT, ports TEXT, - rawdesc BYTEA NOT NULL, - CONSTRAINT statusentry_pkey PRIMARY KEY (validafter, fingerprint) + rawdesc BYTEA NOT NULL ); +CREATE OR REPLACE FUNCTION statusentry_insert_trigger() +RETURNS TRIGGER AS $$ + +DECLARE + tablename TEXT; + selectresult TEXT; + nextmonth TIMESTAMP WITHOUT TIME ZONE; + v_year INTEGER; + v_month INTEGER; + n_year INTEGER; + n_month INTEGER; + +BEGIN + v_year := extract(YEAR FROM new.validafter); + v_month := extract(MONTH FROM new.validafter); + tablename := 'statusentry_y' || v_year || 'm' || v_month; + EXECUTE 'SELECT relname FROM pg_class WHERE relname = '''|| tablename || + '''' INTO selectresult; + IF selectresult IS NULL THEN + nextmonth := new.validafter + interval '1 month'; + n_year := extract(YEAR FROM nextmonth); + n_month := extract(MONTH FROM nextmonth); + EXECUTE 'CREATE TABLE ' || tablename || + ' ( CHECK ( validafter >= ''' || v_year || '-' || v_month || + '-01 00:00:00'' AND validafter < ''' || n_year || '-' || n_month || + '-01 00:00:00'') ) INHERITS (statusentry_all)'; + EXECUTE 'ALTER TABLE ' || tablename || ' ADD CONSTRAINT ' || + tablename || '_pkey PRIMARY KEY (validafter, fingerprint)'; + EXECUTE 'CREATE INDEX ' || tablename || '_address ON ' || + tablename || ' (address)'; + EXECUTE 'CREATE INDEX ' || tablename || '_fingerprint ON ' || + tablename || ' (fingerprint)'; + EXECUTE 'CREATE INDEX ' || tablename || '_nickname ON ' || + tablename || ' (LOWER(nickname))'; + EXECUTE 'CREATE INDEX ' || tablename || '_validafter ON ' || + tablename || ' (validafter)'; + EXECUTE 'CREATE INDEX ' || tablename || '_descriptor ON ' || + tablename || ' (descriptor)'; + EXECUTE 'CREATE INDEX ' || tablename || '_validafter_date ON ' || + tablename || ' (DATE(validafter))'; + END IF; + EXECUTE 'INSERT INTO ' || tablename || ' SELECT ($1).*' USING NEW; + RETURN NULL; +END; +$$ LANGUAGE plpgsql; + +CREATE TRIGGER insert_statusentry_trigger + BEFORE INSERT ON statusentry_all + FOR EACH ROW EXECUTE PROCEDURE statusentry_insert_trigger(); + -- TABLE consensus -- Contains all of the consensuses published by the directories. CREATE TABLE consensus ( @@ -307,8 +358,6 @@ LEFT JOIN descriptor ON status.descriptor = descriptor.descriptor ORDER BY validafter, fingerprint; -CREATE LANGUAGE plpgsql; - -- FUNCTION refresh_relay_statuses_per_day() -- Updates helper table which is used to refresh the aggregate tables. CREATE OR REPLACE FUNCTION refresh_relay_statuses_per_day()

1 0

[metrics-web/master] Merge branch 'statusentry'
by karsten＠torproject.org 11 Jan '12

11 Jan '12

commit 8d8542c8f43d5f301533fb13593f3694986ee1d5 Merge: 075fd8e 87722e2 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Jan 11 11:26:30 2012 +0100 Merge branch 'statusentry' db/tordir.sql | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 53 insertions(+), 4 deletions(-)

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 11 Jan '12

11 Jan '12

commit 14b623decf95dca65000c4c5125fef43370ec594 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 11 10:15:07 2012 +0000 Update translations for orbot --- values-el/strings.xml | 54 ++++++++++++++++++++++++------------------------ 1 files changed, 27 insertions(+), 27 deletions(-) diff --git a/values-el/strings.xml b/values-el/strings.xml index df4cdf5..f1d01c5 100644 --- a/values-el/strings.xml +++ b/values-el/strings.xml @@ -36,33 +36,33 @@ <string name="pref_trans_proxy_group">Διαφανής Πληρεξούσιος Διακομηστής (Απαιτεί διαχείριση root)</string> <string name="pref_trans_proxy_title">Διαφανής Πληρεξούσιος Διακομηστής</string> <string name="pref_trans_proxy_summary">Αυτόματη Προσαρμογή Εφαρμογών στο Tor</string> - <string name="pref_transparent_all_title"></string> - <string name="pref_transparent_all_summary"></string> - <string name="pref_transparent_port_fallback_title"></string> - <string name="pref_transparent_port_fallback_summary"></string> - <string name="pref_transparent_port_title"></string> - <string name="pref_transparent_port_summary"></string> - <string name="pref_transparent_port_dialog"></string> - <string name="pref_has_root"></string> - <string name="pref_has_root_summary"></string> - <string name="status_install_success"></string> - <string name="status_install_fail"></string> - <string name="title_error"></string> - <string name="wizard_title"></string> - <string name="wizard_btn_tell_me_more"></string> - <string name="btn_next"></string> - <string name="btn_back"></string> - <string name="btn_finish"></string> - <string name="btn_okay"></string> - <string name="btn_cancel"></string> - <string name="wizard_details"></string> - <string name="wizard_details_msg"></string> - <string name="wizard_permissions_root"></string> - <string name="wizard_permissions_stock"></string> - <string name="wizard_premissions_msg_root"></string> - <string name="wizard_permissions_msg_stock"></string> - <string name="wizard_permissions_no_root"></string> - <string name="wizard_permissions_consent"></string> + <string name="pref_transparent_all_title">Ανωνυμοποίηση Όλων</string> + <string name="pref_transparent_all_summary">Να γίνεται η μεταβίβαση της κυκλοφορίας όλων των εφαρμογών μέσω του Tor</string> + <string name="pref_transparent_port_fallback_title">Θύρα αναδίπλωσης του πληρεξούσιου διακομιστή</string> + <string name="pref_transparent_port_fallback_summary">ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Παρακάμπτει τις κοινές θύρες (80, 443, κλπ). *ΝΑ ΧΡΗΣΙΜΟΠΟΙΕΙΤΑΙ ΜΟΝΟΝ* όταν οι λειτουργίες \'All\' ή \'App\' δεν αποδίδουν.</string> + <string name="pref_transparent_port_title">Λίστα θυρών</string> + <string name="pref_transparent_port_summary">Λίστα θυρών πληρεξούσιου διακομιστή. *ΝΑ ΧΡΗΣΙΜΟΠΟΙΕΙΤΑΙ ΜΟΝΟΝ* όταν οι λειτουργίες \'All\' ή \'App\' δεν αποδίδουν.</string> + <string name="pref_transparent_port_dialog">Εισάγετε θύρες πληρεξούσιου διακομιστή</string> + <string name="pref_has_root">Άιτημα πρόσβασης με δικαιώματα υπερχρήστη</string> + <string name="pref_has_root_summary">Άιτημα πρόσβασης με δικαιώματα υπερχρήστη για διαφανή μεταβίβαση δεδομένων μέσω πληρεξούσιου διακομιστή</string> + <string name="status_install_success">Τα δυαδικά αρχεία του Tor εγκαταστάθηκαν με επιτυχία!</string> + <string name="status_install_fail">Τα δυαδικά αρχεία του Tor δεν εγκαταστάθηκαν. Ελέγξτε τις καταγραφές και ειδοποιείστε στην διεύθυνση tor-assistants(a)torproject.org</string> + <string name="title_error">Σφάλμα εφαρμογής</string> + <string name="wizard_title">Orbot</string> + <string name="wizard_btn_tell_me_more">Σχετικά με το Orbot</string> + <string name="btn_next">Επόμενο</string> + <string name="btn_back">Πίσω</string> + <string name="btn_finish">Τέλος</string> + <string name="btn_okay">Okay</string> + <string name="btn_cancel">Άκυρο</string> + <string name="wizard_details">Μερικές λεπτομέρειες για το Orbot</string> + <string name="wizard_details_msg">Το Orbot είναι μια εφαρμογή ανοικτού λογισμικού που περιέχει τα Tor, LibEvent και Privoxy. Διαθέτει τοπικούς πληρεξούσιους διακομιστές (proxies) HTTP (8118) και SOCKS (9050) για το δίκτυο Tor. Σε συσκευές που έχουν διαμορφωθεί για ριζική χρήση (rooted devices), το Orbot μπορεί να μεταδίδει όλη την διαδυκτιακή κυκλοφορία μέσω Tor.</string> + <string name="wizard_permissions_root">Η άδεια παραχωρήθηκε</string> + <string name="wizard_permissions_stock">Άδειες Orbot</string> + <string name="wizard_premissions_msg_root">Καλώς! Διαπιστώνουμε ότι έχετε ενεργοποιημένο τον υπερχρήστη για το Orbot. Θα χρησιμοποιήσουμε το προνόμιο αυτό με σύνεση.</string> + <string name="wizard_permissions_msg_stock"> Αν και δεν είναι απαραίτητο, το Orbot μπορεί να γίνει ισχυρότερο όταν η συσκευή σας έχει διαμορφωθεί για πρόσβαση υπερχρήστη. Πατήστε το πιο κάτω κουμπί για να δώσετε αυξημένα δικαιώματα στο Orbot! </string> + <string name="wizard_permissions_no_root">Αν δεν διαθέτετε πρόσβαση υπερχήστη ή δεν καταλαβαίνετε τι εννοούμε, απλώς χρησιμοποιείτε εφαρμογές που φτιάχτηκαν για να συνεργάζονται με το Orbot.</string> + <string name="wizard_permissions_consent">Καταλαβαίνω και θέλω να συνεχίσω ως Υπερχρήστης</string> <string name="wizard_permission_enable_root"></string> <string name="wizard_configure"></string> <string name="wizard_configure_msg"></string>

1 0

[tor/release-0.2.2] Fix a trivial log message error in renservice.c
by arma＠torproject.org 11 Jan '12

11 Jan '12

commit 6fd61cf767c0680707e034d9e6a4d46b44bd10af Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 9 12:21:04 2012 -0500 Fix a trivial log message error in renservice.c Fixes bug 4856; bugfix on 0.0.6 This bug was introduced in 79fc5217, back in 2004. --- changes/bug4856 | 3 +++ src/or/rendservice.c | 2 +- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/changes/bug4856 b/changes/bug4856 new file mode 100644 index 0000000..fa284a0 --- /dev/null +++ b/changes/bug4856 @@ -0,0 +1,3 @@ + o Trivial bugfixes + - Fix a typo in a log message in rend_service_rendezvous_has_opened(). + Fixes bug 4856; bugfix on Tor 0.0.6. diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 25695c5..bb3aacd 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -1564,7 +1564,7 @@ rend_service_rendezvous_has_opened(origin_circuit_t *circuit) circuit->rend_data->rend_pk_digest); if (!service) { log_warn(LD_GENERAL, "Internal error: unrecognized service ID on " - "introduction circuit."); + "rendezvous circuit."); reason = END_CIRC_REASON_INTERNAL; goto err; }

1 0

[tor/release-0.2.2] Merge branch 'maint-0.2.2' into release-0.2.2
by arma＠torproject.org 11 Jan '12

11 Jan '12

commit 6cd68895fb373cc10825368ecfa345a100da7ac4 Merge: 0a77d53 c78a314 Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Jan 10 20:26:50 2012 -0500 Merge branch 'maint-0.2.2' into release-0.2.2 changes/bug4856 | 3 +++ src/common/tortls.c | 13 ++++--------- src/or/rendservice.c | 2 +- 3 files changed, 8 insertions(+), 10 deletions(-)

1 0

[tor/release-0.2.2] Fix comment about TLSv1_method() per comments by wanoskarnet
by arma＠torproject.org 11 Jan '12

11 Jan '12

commit c78a314e95ef7f0d05e9d58066ee6bf6795ee9d7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 9 16:40:21 2012 -0500 Fix comment about TLSv1_method() per comments by wanoskarnet --- src/common/tortls.c | 13 ++++--------- 1 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/common/tortls.c b/src/common/tortls.c index 37074de..f7a15b0 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -777,15 +777,10 @@ tor_tls_context_new(crypto_pk_env_t *identity, unsigned int key_lifetime, } #if 0 - /* Tell OpenSSL to only use TLS1. This would actually break compatibility - * with clients that are configured to use SSLv23_method(), so we should - * probably never use it. - */ - /* XXX wanoskarnet says this comment is bunk -- that even if we turn - * this line on, clients configured to use SSLv23 would still able to - * talk to us. But he also says it's ok to leave it out. I suggest we - * delete this whole clause (the one that's #if 0'ed out). I'll leave - * it in place until Nick expresses an opinion. -RD */ + /* Tell OpenSSL to only use TLS1. This may have subtly different results + * from SSLv23_method() with SSLv2 and SSLv3 disabled, so we need to do some + * investigation before we consider adjusting it. It should be compatible + * with existing Tors. */ if (!(result->ctx = SSL_CTX_new(TLSv1_method()))) goto error; #endif

1 0

[tor/master] Chop out the intro point calculation until it is simple enough for nickm to grok
by nickm＠torproject.org 11 Jan '12

11 Jan '12

commit fe4811471d0ab823ee722f8dd747c87ad48e11de Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 10 18:50:48 2012 -0500 Chop out the intro point calculation until it is simple enough for nickm to grok --- src/or/rendservice.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 1f72c61..dc51d68 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -974,11 +974,14 @@ rend_service_note_removing_intro_point(rend_service_t *service, * service->n_intro_points_wanted and let rend_services_introduce * create the new intro points we want (if any). */ - double fractional_n_intro_points_wanted_to_replace_this_one = - (1.5 * ((intro_point_accepted_intro_count(intro) / - (double)INTRO_POINT_LIFETIME_INTRODUCTIONS) / - (((double)now - intro->time_published) / - INTRO_POINT_LIFETIME_MIN_SECONDS))); + const double intro_point_usage = + intro_point_accepted_intro_count(intro) / + (double)(now - intro->time_published); + const double intro_point_target_usage = + INTRO_POINT_LIFETIME_INTRODUCTIONS / + (double)INTRO_POINT_LIFETIME_MIN_SECONDS; + const double fractional_n_intro_points_wanted_to_replace_this_one = + (1.5 * (intro_point_usage / intro_point_target_usage)); unsigned int n_intro_points_wanted_to_replace_this_one; unsigned int n_intro_points_wanted_now; unsigned int n_intro_points_really_wanted_now;

1 0

[tor/master] Merge branch 'bug3825c_squashed'
by nickm＠torproject.org 11 Jan '12

11 Jan '12

commit 53d88eb1ecf7714772d9cb54a1d649e518dd5f47 Merge: 5e9d349 fe48114 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 10 19:23:44 2012 -0500 Merge branch 'bug3825c_squashed' src/or/rendservice.c | 30 ++++++++++++++++-------------- 1 files changed, 16 insertions(+), 14 deletions(-)

1 0

[tor/master] Use my original formula for number of replacements for an intro point
by nickm＠torproject.org 11 Jan '12

11 Jan '12

commit 31d6350737437c61da82647f7ac5a41edaa16c3e Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Sun Jan 8 01:48:39 2012 -0800 Use my original formula for number of replacements for an intro point A fixup commit which was intended to make this formula easier to read broke it instead. --- src/or/rendservice.c | 25 ++++++++++++------------- 1 files changed, 12 insertions(+), 13 deletions(-) diff --git a/src/or/rendservice.c b/src/or/rendservice.c index dcd962d..1f72c61 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -958,15 +958,14 @@ rend_service_note_removing_intro_point(rend_service_t *service, * _LIFETIME_INTRODUCTIONS introductions that it has handled by * the fraction of _LIFETIME_MIN_SECONDS for which it existed. * - * Then we take the reciprocal of that fraction of desired usage, - * then multiply by a fudge factor of 1.5, to decide how many new - * introduction points should ideally replace intro (which is now - * closed or soon to be closed). In theory, assuming that - * introduction load is distributed equally across all intro - * points and ignoring the fact that different intro points are - * established and closed at different times, that number of intro - * points should bring all of our intro points exactly to our - * target usage. + * Then we multiply that fraction of desired usage by a fudge + * factor of 1.5, to decide how many new introduction points + * should ideally replace intro (which is now closed or soon to be + * closed). In theory, assuming that introduction load is + * distributed equally across all intro points and ignoring the + * fact that different intro points are established and closed at + * different times, that number of intro points should bring all + * of our intro points exactly to our target usage. * * Then we clamp that number to a number of intro points we might * be willing to replace this intro point with and turn it into an @@ -976,10 +975,10 @@ rend_service_note_removing_intro_point(rend_service_t *service, * create the new intro points we want (if any). */ double fractional_n_intro_points_wanted_to_replace_this_one = - ((((double)now - intro->time_published) / - INTRO_POINT_LIFETIME_MIN_SECONDS) * - ((intro_point_accepted_intro_count(intro)) / - INTRO_POINT_LIFETIME_INTRODUCTIONS)) * 1.5; + (1.5 * ((intro_point_accepted_intro_count(intro) / + (double)INTRO_POINT_LIFETIME_INTRODUCTIONS) / + (((double)now - intro->time_published) / + INTRO_POINT_LIFETIME_MIN_SECONDS))); unsigned int n_intro_points_wanted_to_replace_this_one; unsigned int n_intro_points_wanted_now; unsigned int n_intro_points_really_wanted_now;

1 0

[tor/master] Disallow disabling DisableDebuggerAttachment on runnning Tor
by nickm＠torproject.org 10 Jan '12

10 Jan '12

commit 98959f63aca84e605fb98f10d943f2d28d627039 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Thu Dec 8 09:19:09 2011 +0100 Disallow disabling DisableDebuggerAttachment on runnning Tor Also, have tor_disable_debugger_attach() return a tristate of success/failure/don't-know-how , and only log appropriately. --- doc/tor.1.txt | 4 ++-- src/common/compat.c | 9 +++++---- src/or/config.c | 33 +++++++++++++++++++++++++++------ 3 files changed, 34 insertions(+), 12 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 91a7c69..fcc566e 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -282,8 +282,8 @@ Other options can be specified either on the command-line (--option to alter the system wide ptrace scope as it may not even exist. If you wish to attach to Tor with a debugger such as gdb or strace you will want to set this to 0 for the duration of your debugging. Normal users should leave it - on. (Default: 1) - + on. Disabling this option while Tor is running is prohibited. (Default: 1) + **FetchDirInfoEarly** **0**|**1**:: If set to 1, Tor will always fetch directory information like other directory caches, even if you don't meet the normal criteria for fetching diff --git a/src/common/compat.c b/src/common/compat.c index 27e0060..ff9d877 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -1542,8 +1542,8 @@ switch_id(const char *user) * CAP_SYS_PTRACE and so it is very likely that root will still be able to * attach to the Tor process. */ -/** Attempt to disable debugger attachment: return 0 on success, -1 on - * failure. */ +/** Attempt to disable debugger attachment: return 1 on success, -1 on + * failure, and 0 if we don't know how to try on this platform. */ int tor_disable_debugger_attach(void) { @@ -1568,11 +1568,12 @@ tor_disable_debugger_attach(void) // XXX: TODO - Mac OS X has dtrace and this may be disabled. // XXX: TODO - Windows probably has something similar - if (r == 0) { + if (r == 0 && attempted) { log_debug(LD_CONFIG,"Debugger attachment disabled for " "unprivileged users."); + return 1; } else if (attempted) { - log_warn(LD_CONFIG, "Unable to disable ptrace attach: %s", + log_warn(LD_CONFIG, "Unable to disable debugger attaching: %s", strerror(errno)); } return r; diff --git a/src/or/config.c b/src/or/config.c index 740a9db..b118f30 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1326,12 +1326,26 @@ options_act(const or_options_t *old_options) const int transition_affects_workers = old_options && options_transition_affects_workers(old_options, options); - /* disable ptrace and later, other basic debugging techniques */ - if (options->DisableDebuggerAttachment) { - tor_disable_debugger_attach(); - } else { - log_notice(LD_CONFIG,"Debugger attachment enabled " - "for unprivileged users."); + /* disable ptrace and later, other basic debugging techniques */ + { + /* Remember if we already disabled debugger attachment */ + static int disabled_debugger_attach = 0; + /* Remember if we already warned about being configured not to disable + * debugger attachment */ + static int warned_debugger_attach = 0; + if (options->DisableDebuggerAttachment && !disabled_debugger_attach) { + int ok = tor_disable_debugger_attach(); + if (warned_debugger_attach && ok == 1) { + log_notice(LD_CONFIG, "Disabled attaching debuggers for unprivileged " + "users."); + } + disabled_debugger_attach = (ok == 1); + } else if (!options->DisableDebuggerAttachment && + !warned_debugger_attach) { + log_notice(LD_CONFIG, "Not disabling debugger attaching for " + "unprivileged users."); + warned_debugger_attach = 1; + } } if (running_tor && !have_lockfile()) { @@ -4170,6 +4184,13 @@ options_transition_allowed(const or_options_t *old, return -1; } + if (old->DisableDebuggerAttachment && + !new_val->DisableDebuggerAttachment) { + *msg = tor_strdup("While Tor is running, disabling " + "DisableDebuggerAttachment is not allowed."); + return -1; + } + return 0; }

1 0