tor-commits March 2013

tor-commits@lists.torproject.org

21 participants
1373 discussions

[tor/release-0.2.4] parameterize SSLKeyLifetime
by arma＠torproject.org 10 Mar '13

10 Mar '13

commit 599aeef9bc9e707ec7146da79b2018bf2f2924b3 Author: Roger Dingledine <arma(a)torproject.org> Date: Sat Mar 9 16:42:35 2013 -0500 parameterize SSLKeyLifetime no actual changes in behavior yet --- src/or/config.c | 1 + src/or/or.h | 5 +++-- src/or/router.c | 7 +++++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index dad5719..b7613bd 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -380,6 +380,7 @@ static config_var_t option_vars_[] = { V(SocksPolicy, LINELIST, NULL), VPORT(SocksPort, LINELIST, NULL), V(SocksTimeout, INTERVAL, "2 minutes"), + V(SSLKeyLifetime, INTERVAL, "365 days"), OBSOLETE("StatusFetchPeriod"), V(StrictNodes, BOOL, "0"), OBSOLETE("SysLog"), diff --git a/src/or/or.h b/src/or/or.h index c2cd8a6..a71468c 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -177,8 +177,6 @@ #define MIN_ONION_KEY_LIFETIME (7*24*60*60) /** How often do we rotate TLS contexts? */ #define MAX_SSL_KEY_LIFETIME_INTERNAL (2*60*60) -/** What expiry time shall we place on our SSL certs? */ -#define MAX_SSL_KEY_LIFETIME_ADVERTISED (365*24*60*60) /** How old do we allow a router to get before removing it * from the router list? In seconds. */ @@ -4010,6 +4008,9 @@ typedef struct { */ int DisableV2DirectoryInfo_; + /** What expiry time shall we place on our SSL certs? */ + int SSLKeyLifetime; + } or_options_t; /** Persistent state for an onion router, as saved to disk. */ diff --git a/src/or/router.c b/src/or/router.c index 95aa70a..c9c35f6 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -650,6 +650,7 @@ router_initialize_tls_context(void) { unsigned int flags = 0; const or_options_t *options = get_options(); + int lifetime = options->SSLKeyLifetime; if (public_server_mode(options)) flags |= TOR_TLS_CTX_IS_PUBLIC_SERVER; if (options->TLSECGroup) { @@ -659,11 +660,13 @@ router_initialize_tls_context(void) flags |= TOR_TLS_CTX_USE_ECDHE_P224; } + /* It's ok to pass lifetime in as an unsigned int, since + * config_parse_interval() checked it. */ return tor_tls_context_init(flags, get_tlsclient_identity_key(), - server_mode(get_options()) ? + server_mode(options) ? get_server_identity_key() : NULL, - MAX_SSL_KEY_LIFETIME_ADVERTISED); + (unsigned int)lifetime); } /** Initialize all OR private keys, and the TLS context, as necessary.

1 0

[tor/release-0.2.4] randomize SSLKeyLifetime by default
by arma＠torproject.org 10 Mar '13

10 Mar '13

commit edd6f02273c58bfe39a978dd5c7b8765aae0b886 Author: Roger Dingledine <arma(a)torproject.org> Date: Sat Mar 9 17:16:11 2013 -0500 randomize SSLKeyLifetime by default resolves ticket 8443. --- changes/ticket8443 | 4 ++++ doc/tor.1.txt | 9 +++++++-- src/or/config.c | 2 +- src/or/or.h | 3 ++- src/or/router.c | 4 ++++ 5 files changed, 18 insertions(+), 4 deletions(-) diff --git a/changes/ticket8443 b/changes/ticket8443 new file mode 100644 index 0000000..ca6fb2f --- /dev/null +++ b/changes/ticket8443 @@ -0,0 +1,4 @@ + o Minor features: + - Randomize the lifetime of our SSL link certificate, so censors can't + use the static value for filtering Tor flows. Resolves ticket 8443; + related to ticket 4014 which was included in 0.2.2.33. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 75bca79..505a083 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1500,8 +1500,13 @@ is non-zero): **ShutdownWaitLength** __NUM__:: When we get a SIGINT and we're a server, we begin shutting down: we close listeners and start refusing new circuits. After **NUM** - seconds, we exit. If we get a second SIGINT, we exit immedi- - ately. (Default: 30 seconds) + seconds, we exit. If we get a second SIGINT, we exit immediately. + (Default: 30 seconds) + +**SSLKeyLifetime** __N__ **minutes**|**hours**|**days**|**weeks**:: + When creating a link certificate for our outermost SSL handshake, + set its lifetime to this amount of time. If set to 0, Tor will choose + some reasonable random defaults. (Default: 0) **HeartbeatPeriod** __N__ **minutes**|**hours**|**days**|**weeks**:: Log a heartbeat message every **HeartbeatPeriod** seconds. This is diff --git a/src/or/config.c b/src/or/config.c index b7613bd..15138f9 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -380,7 +380,7 @@ static config_var_t option_vars_[] = { V(SocksPolicy, LINELIST, NULL), VPORT(SocksPort, LINELIST, NULL), V(SocksTimeout, INTERVAL, "2 minutes"), - V(SSLKeyLifetime, INTERVAL, "365 days"), + V(SSLKeyLifetime, INTERVAL, "0"), OBSOLETE("StatusFetchPeriod"), V(StrictNodes, BOOL, "0"), OBSOLETE("SysLog"), diff --git a/src/or/or.h b/src/or/or.h index a71468c..c7d2598 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -4008,7 +4008,8 @@ typedef struct { */ int DisableV2DirectoryInfo_; - /** What expiry time shall we place on our SSL certs? */ + /** What expiry time shall we place on our SSL certs? "0" means we + * should guess a suitable value. */ int SSLKeyLifetime; } or_options_t; diff --git a/src/or/router.c b/src/or/router.c index c9c35f6..2113663 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -659,6 +659,10 @@ router_initialize_tls_context(void) else if (!strcasecmp(options->TLSECGroup, "P224")) flags |= TOR_TLS_CTX_USE_ECDHE_P224; } + if (!lifetime) { /* we should guess a good ssl cert lifetime */ + /* choose between 1 and 365 days */ + lifetime = 1*24*3600 + crypto_rand_int(364*24*3600); + } /* It's ok to pass lifetime in as an unsigned int, since * config_parse_interval() checked it. */

1 0

[tor/release-0.2.4] start part-way through the ssl cert lifetime
by arma＠torproject.org 10 Mar '13

10 Mar '13

commit 0196647970a91d2bdb052f38b3749dd0e99348e4 Author: Roger Dingledine <arma(a)torproject.org> Date: Sun Mar 10 16:28:28 2013 -0400 start part-way through the ssl cert lifetime also, snap the start time and end time to a day boundary, since most certs in the wild seem to do this. --- src/common/tortls.c | 16 +++++++++++----- src/or/router.c | 14 ++++++++++++-- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/src/common/tortls.c b/src/common/tortls.c index 94cedba..a08910b 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -234,7 +234,7 @@ static X509* tor_tls_create_certificate(crypto_pk_t *rsa, crypto_pk_t *rsa_sign, const char *cname, const char *cname_sign, - unsigned int lifetime); + unsigned int cert_lifetime); static int tor_tls_context_init_one(tor_tls_context_t **ppcontext, crypto_pk_t *identity, @@ -608,9 +608,10 @@ tor_x509_name_new(const char *cname) /** Generate and sign an X509 certificate with the public key rsa, * signed by the private key rsa_sign. The commonName of the * certificate will be cname; the commonName of the issuer will be - * cname_sign. The cert will be valid for cert_lifetime seconds - * starting from now. Return a certificate on success, NULL on - * failure. + * cname_sign. The cert will be valid for cert_lifetime + * seconds, starting from some time in the past. + * + * Return a certificate on success, NULL on failure. */ static X509 * tor_tls_create_certificate(crypto_pk_t *rsa, @@ -632,7 +633,12 @@ tor_tls_create_certificate(crypto_pk_t *rsa, tor_tls_init(); - start_time = time(NULL); + /* Make sure we're part-way through the certificate lifetime, rather + * than having it start right now. Don't choose quite uniformly, since + * then we might pick a time where we're about to expire. Lastly, be + * sure to start on a day boundary. */ + start_time = time(NULL) - crypto_rand_int(cert_lifetime) + 2*24*3600; + start_time -= start_time % (24*3600); tor_assert(rsa); tor_assert(cname); diff --git a/src/or/router.c b/src/or/router.c index 2113663..422fe5d 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -660,8 +660,18 @@ router_initialize_tls_context(void) flags |= TOR_TLS_CTX_USE_ECDHE_P224; } if (!lifetime) { /* we should guess a good ssl cert lifetime */ - /* choose between 1 and 365 days */ - lifetime = 1*24*3600 + crypto_rand_int(364*24*3600); + + /* choose between 5 and 365 days, and round to the day */ + lifetime = 5*24*3600 + crypto_rand_int(361*24*3600); + lifetime -= lifetime % (24*3600); + + if (crypto_rand_int(2)) { + /* Half the time we expire at midnight, and half the time we expire + * one second before midnight. (Some CAs wobble their expiry times a + * bit in practice, perhaps to reduce collision attacks; see ticket + * 8443 for details about observed certs in the wild.) */ + lifetime--; + } } /* It's ok to pass lifetime in as an unsigned int, since

1 0

[tor/maint-0.2.4] start part-way through the ssl cert lifetime
by arma＠torproject.org 10 Mar '13

10 Mar '13

1 0

[tor/maint-0.2.4] parameterize SSLKeyLifetime
by arma＠torproject.org 10 Mar '13

10 Mar '13

1 0

[tor/maint-0.2.4] randomize SSLKeyLifetime by default
by arma＠torproject.org 10 Mar '13

10 Mar '13

1 0

[tor/master] Add a DisableV2DirectoryInfo_ option to 404 all v2 ns requests
by nickm＠torproject.org 10 Mar '13

10 Mar '13

commit e4614d30e58007be1d44613d039891b6f131f50f Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 28 11:09:37 2012 -0500 Add a DisableV2DirectoryInfo_ option to 404 all v2 ns requests I have no idea whether b0rken clients will DoS the network if the v2 authorities all turn this on or not. It's experimental. See #6783 for a description of how to test it more or less safely, and please be careful! --- changes/6783_big_hammer | 6 ++++++ src/or/config.c | 1 + src/or/directory.c | 13 +++++++++++++ src/or/or.h | 10 ++++++++++ 4 files changed, 30 insertions(+), 0 deletions(-) diff --git a/changes/6783_big_hammer b/changes/6783_big_hammer new file mode 100644 index 0000000..2ff3249 --- /dev/null +++ b/changes/6783_big_hammer @@ -0,0 +1,6 @@ + o Major features (deprecation): + - There's now a "DisableV2DirectoryInfo_" option that prevents us + from serving any directory requests for v2 directory information. + This is for us to test disabling the old deprecated V2 directory + format, so that we can see whether doing so has any effect on + network load. Part of a fix for bug 6783. diff --git a/src/or/config.c b/src/or/config.c index f888426..7e020b8 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -213,6 +213,7 @@ static config_var_t option_vars_[] = { V(DisableAllSwap, BOOL, "0"), V(DisableDebuggerAttachment, BOOL, "1"), V(DisableIOCP, BOOL, "1"), + V(DisableV2DirectoryInfo_, BOOL, "1"), V(DynamicDHGroups, BOOL, "0"), VPORT(DNSPort, LINELIST, NULL), V(DNSListenAddress, LINELIST, NULL), diff --git a/src/or/directory.c b/src/or/directory.c index 6b61fc6..38a423c 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -2805,6 +2805,19 @@ directory_handle_command_get(dir_connection_t *conn, const char *headers, const char *key = url + strlen("/tor/status/"); long lifetime = NETWORKSTATUS_CACHE_LIFETIME; + if (options->DisableV2DirectoryInfo_ && !is_v3) { + static ratelim_t reject_v2_ratelim = RATELIM_INIT(1800); + char *m; + write_http_status_line(conn, 404, "Not found"); + smartlist_free(dir_fps); + geoip_note_ns_response(GEOIP_REJECT_NOT_FOUND); + if ((m = rate_limit_log(&reject_v2_ratelim, approx_time()))) { + log_notice(LD_DIR, "Rejected a v2 networkstatus request.%s", m); + tor_free(m); + } + goto done; + } + if (!is_v3) { dirserv_get_networkstatus_v2_fingerprints(dir_fps, key); if (!strcmpstart(key, "fp/")) diff --git a/src/or/or.h b/src/or/or.h index 45eb467..0f5dbd6 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3999,6 +3999,16 @@ typedef struct { /** Fraction: */ double PathsNeededToBuildCircuits; + + /** Do we serve v2 directory info at all? This is a temporary option, since + * we'd like to disable v2 directory serving entirely, but we need a way to + * make it temporarily disableable, in order to do fast testing and be + * able to turn it back on if it turns out to be non-workable. + * + * XXXX024 Don't actually leave this in. + */ + int DisableV2DirectoryInfo_; + } or_options_t; /** Persistent state for an onion router, as saved to disk. */

1 0

[tor/master] set DisableV2DirectoryInfo_ off by default
by nickm＠torproject.org 10 Mar '13

10 Mar '13

commit f8960ea22bde03ae7c4cd60af395a541fb36354c Author: Roger Dingledine <arma(a)torproject.org> Date: Sun Mar 10 20:40:15 2013 -0400 set DisableV2DirectoryInfo_ off by default since it's only enableable by authorities, nobody else would be able to start their tor --- src/or/config.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 1337056..dad5719 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -213,7 +213,7 @@ static config_var_t option_vars_[] = { V(DisableAllSwap, BOOL, "0"), V(DisableDebuggerAttachment, BOOL, "1"), V(DisableIOCP, BOOL, "1"), - V(DisableV2DirectoryInfo_, BOOL, "1"), + V(DisableV2DirectoryInfo_, BOOL, "0"), V(DynamicDHGroups, BOOL, "0"), VPORT(DNSPort, LINELIST, NULL), V(DNSListenAddress, LINELIST, NULL),

1 0

[tor/master] Tweak bug6783 patch.
by nickm＠torproject.org 10 Mar '13

10 Mar '13

commit 926b3d77f18d2345a70f953560f5a5312992aa73 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 6 15:19:04 2013 -0500 Tweak bug6783 patch. --- src/or/config.c | 4 ++++ src/or/or.h | 3 ++- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 7e020b8..1337056 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -2380,6 +2380,10 @@ options_validate(or_options_t *old_options, or_options_t *options, REJECT("TokenBucketRefillInterval must be between 1 and 1000 inclusive."); } + if (options->DisableV2DirectoryInfo_ && ! authdir_mode(options)) { + REJECT("DisableV2DirectoryInfo_ set, but we aren't an authority."); + } + if (options->ExcludeExitNodes || options->ExcludeNodes) { options->ExcludeExitNodesUnion_ = routerset_new(); routerset_union(options->ExcludeExitNodesUnion_,options->ExcludeExitNodes); diff --git a/src/or/or.h b/src/or/or.h index 0f5dbd6..c2cd8a6 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -4005,7 +4005,8 @@ typedef struct { * make it temporarily disableable, in order to do fast testing and be * able to turn it back on if it turns out to be non-workable. * - * XXXX024 Don't actually leave this in. + * XXXX025 Make this always-on, or always-off. Right now, it's only + * enableable for authorities. */ int DisableV2DirectoryInfo_;

1 0

[tor/master] Merge remote-tracking branch 'arma/bug6783_big_hammer' into maint-0.2.4
by nickm＠torproject.org 10 Mar '13

10 Mar '13

commit e270a066a6262784be317f003f6102430db24880 Merge: 8b4195f f8960ea Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Mar 10 23:01:58 2013 -0400 Merge remote-tracking branch 'arma/bug6783_big_hammer' into maint-0.2.4 changes/6783_big_hammer | 6 ++++++ src/or/config.c | 5 +++++ src/or/directory.c | 13 +++++++++++++ src/or/or.h | 11 +++++++++++ 4 files changed, 35 insertions(+), 0 deletions(-)

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits March 2013