diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-03-12 13:13:06 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-03-12 13:13:06 -0400 |
| commit | 16b1b2199d1e23968ab74a8ab08d59e8aae90423 (patch) | |
| tree | 837e4916b7d93b731d1180439e2ee0029a5726f2 | |
| parent | 0f628d6560794b34288963d6e6d974b4273f6421 (diff) | |
| parent | b3281fc6d634ac32c6ce591313600b0ed56a9347 (diff) | |
| download | tor-16b1b2199d1e23968ab74a8ab08d59e8aae90423.tar.gz tor-16b1b2199d1e23968ab74a8ab08d59e8aae90423.zip | |
Merge remote-tracking branch 'origin/maint-0.2.6'
| -rw-r--r-- | changes/bug15240 | 6 | ||||
| -rw-r--r-- | src/or/config.c | 13 |
2 files changed, 13 insertions, 6 deletions
diff --git a/changes/bug15240 b/changes/bug15240 new file mode 100644 index 0000000000..e11f804a12 --- /dev/null +++ b/changes/bug15240 @@ -0,0 +1,6 @@ + o Minor bugfixes (pluggable transports): + - Initialize the extended OR Port authentication cookie before launching + pluggable transports. This prevents a race condition that occured when + server-side pluggable transports would cache the authentication cookie + before it has been (re)generated. Fixes bug 15240; bugfix on + 0.2.5.1-alpha. diff --git a/src/or/config.c b/src/or/config.c index 5ba8c997fa..fca350c203 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1451,6 +1451,13 @@ options_act(const or_options_t *old_options) rep_hist_load_mtbf_data(time(NULL)); } + /* If we have an ExtORPort, initialize its auth cookie. */ + if (running_tor && + init_ext_or_cookie_authentication(!!options->ExtORPort_lines) < 0) { + log_warn(LD_CONFIG,"Error creating Extended ORPort cookie file."); + return -1; + } + mark_transport_list(); pt_prepare_proxy_list_for_config_read(); if (!options->DisableNetwork) { @@ -1555,12 +1562,6 @@ options_act(const or_options_t *old_options) return -1; } - /* If we have an ExtORPort, initialize its auth cookie. */ - if (init_ext_or_cookie_authentication(!!options->ExtORPort_lines) < 0) { - log_warn(LD_CONFIG,"Error creating Extended ORPort cookie file."); - return -1; - } - monitor_owning_controller_process(options->OwningControllerProcess); /* reload keys as needed for rendezvous services. */ |