March 2018 - tor-commits - lists.torproject.org

[translation/whisperback] Update translations for whisperback
by translation＠torproject.org 14 Mar '18

14 Mar '18

commit cf91dc0d191a100285112a1a331385a14c6c26f0 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 14 23:45:20 2018 +0000 Update translations for whisperback --- nb/nb.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nb/nb.po b/nb/nb.po index 5b16080c7..5f4758c02 100644 --- a/nb/nb.po +++ b/nb/nb.po @@ -3,14 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Allan Nordhøy <epost(a)anotheragency.no>, 2016-2017 +# Allan Nordhøy <epost(a)anotheragency.no>, 2016-2018 # lateralus, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-03-20 12:09+0000\n" -"PO-Revision-Date: 2017-09-19 19:43+0000\n" +"PO-Revision-Date: 2018-03-14 23:26+0000\n" "Last-Translator: Allan Nordhøy <epost(a)anotheragency.no>\n" "Language-Team: Norwegian Bokmål (http://www.transifex.com/otf/torproject/language/nb/)\n" "MIME-Version: 1.0\n" @@ -32,7 +32,7 @@ msgstr "Ugyldig OpenPGP-nøkkel: %s" #: ../whisperBack/whisperback.py:75 msgid "Invalid contact OpenPGP public key block" -msgstr "Ugyldig offentlig OpenPGP-nøkkelblokk for kontakt" +msgstr "Kunne ikke lese (offentlig nøkkel) innhold fra nøkkelblokk-del" #: ../whisperBack/exceptions.py:41 #, python-format

1 0

[nyx/master] ControllerError has no strerror attribute.
by atagar＠torproject.org 14 Mar '18

14 Mar '18

commit 8565384dc42b3f0faef027f890602b15513787be Author: Rémi Oudin <oudin(a)crans.org> Date: Wed Mar 14 10:54:11 2018 +0100 ControllerError has no strerror attribute. Moreover, a more accurate handling of exceptions is performed. --- nyx/panel/config.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nyx/panel/config.py b/nyx/panel/config.py index af899b1..372ca66 100644 --- a/nyx/panel/config.py +++ b/nyx/panel/config.py @@ -218,8 +218,10 @@ class ConfigPanel(nyx.panel.Panel): try: controller.save_conf() show_message('Saved configuration to %s' % controller.get_info('config-file', '<unknown>'), HIGHLIGHT, max_wait = 2) + except stem.OperationFailed as exc: + show_message('Unable to save configuration ([%s] %s)' % (exc.code, exc.message), HIGHLIGHT, max_wait = 2) except stem.ControllerError as exc: - show_message('Unable to save configuration (%s)' % exc.strerror, HIGHLIGHT, max_wait = 2) + show_message('Unable to save configuration (%s)' % exc, HIGHLIGHT, max_wait = 2) self.redraw()

1 0

[nyx/master] Max recursion depth error when resizing terminal
by atagar＠torproject.org 14 Mar '18

14 Mar '18

commit 26e40be0b4ad080535e5685eb7643d88b26202ca Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Mar 14 12:51:41 2018 -0700 Max recursion depth error when resizing terminal When squishing the terminal I can occasionally trigger a maximum recursion loop... Traceback (most recent call last): ... File "/home/atagar/Desktop/nyx/nyx/panel/log.py", line 326, in _draw self.redraw() File "/home/atagar/Desktop/nyx/nyx/panel/__init__.py", line 175, in redraw self._last_draw_size = nyx.curses.draw(self._draw, top = self._top, height = self.get_height(), draw_if_resized = draw_dimension) File "/home/atagar/Desktop/nyx/nyx/curses.py", line 746, in draw func(_Subwindow(subwindow_width, subwindow_height, curses_subwindow)) File "/home/atagar/Desktop/nyx/nyx/panel/log.py", line 326, in _draw self.redraw() RuntimeError: maximum recursion depth exceeded in cmp Adjustments made by the log panel within its draw function *should* prevent a need to iterate a second time, but evidently that's not always the case. Simply adjusting how we iterate to prevent a forced redraw from triggering another forced redraw. --- nyx/panel/log.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nyx/panel/log.py b/nyx/panel/log.py index 18c247c..3f20c4b 100644 --- a/nyx/panel/log.py +++ b/nyx/panel/log.py @@ -275,7 +275,7 @@ class LogPanel(nyx.panel.DaemonPanel): ]), ]) - def _draw(self, subwindow): + def _draw(self, subwindow, is_correction = False): scroll = self._scroller.location(self._last_content_height, subwindow.height - 1) event_filter = self._filter.clone() @@ -321,9 +321,9 @@ class LogPanel(nyx.panel.DaemonPanel): self._last_content_height = new_content_height self._has_new_event = False - if force_redraw: + if force_redraw and not is_correction: log.debug('redrawing the log panel with the corrected content height (%s)' % force_redraw_reason) - self.redraw() + self._draw(subwindow, True) def _update(self): """

1 0

[tor/master] Reset all main.c state at exit
by nickm＠torproject.org 14 Mar '18

14 Mar '18

commit 3809036c6310e7d22027cb01001ad24aab8d125e Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 11 13:43:48 2017 -0500 Reset all main.c state at exit This change is part of 24587. --- src/or/main.c | 61 ++++++++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 46 insertions(+), 15 deletions(-) diff --git a/src/or/main.c b/src/or/main.c index aae98dd8a..5869b2b4d 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1392,6 +1392,7 @@ teardown_periodic_events(void) for (i = 0; periodic_events[i].name; ++i) { periodic_event_destroy(&periodic_events[i]); } + periodic_events_initialized = 0; } /** @@ -1859,14 +1860,14 @@ reset_padding_counts_callback(time_t now, const or_options_t *options) return REPHIST_CELL_PADDING_COUNTS_INTERVAL; } +static int should_init_bridge_stats = 1; + /** * Periodic callback: Write bridge statistics to disk if appropriate. */ static int record_bridge_stats_callback(time_t now, const or_options_t *options) { - static int should_init_bridge_stats = 1; - /* 1h. Check whether we should write bridge statistics to disk. */ if (should_record_bridge_info(options)) { @@ -2059,6 +2060,8 @@ expire_old_ciruits_serverside_callback(time_t now, const or_options_t *options) return 11; } +static int dns_honesty_first_time = 1; + /** * Periodic event: if we're an exit, see if our DNS server is telling us * obvious lies. @@ -2074,10 +2077,9 @@ check_dns_honesty_callback(time_t now, const or_options_t *options) router_my_exit_policy_is_reject_star()) return PERIODIC_EVENT_NO_UPDATE; - static int first_time = 1; - if (first_time) { + if (dns_honesty_first_time) { /* Don't launch right when we start */ - first_time = 0; + dns_honesty_first_time = 0; return crypto_rand_int_range(60, 180); } @@ -2128,6 +2130,8 @@ check_fw_helper_app_callback(time_t now, const or_options_t *options) return PORT_FORWARDING_CHECK_INTERVAL; } +static int heartbeat_callback_first_time = 1; + /** * Periodic callback: write the heartbeat message in the logs. * @@ -2137,16 +2141,14 @@ check_fw_helper_app_callback(time_t now, const or_options_t *options) static int heartbeat_callback(time_t now, const or_options_t *options) { - static int first = 1; - /* Check if heartbeat is disabled */ if (!options->HeartbeatPeriod) { return PERIODIC_EVENT_NO_UPDATE; } /* Skip the first one. */ - if (first) { - first = 0; + if (heartbeat_callback_first_time) { + heartbeat_callback_first_time = 0; return options->HeartbeatPeriod; } @@ -2198,6 +2200,8 @@ hs_service_callback(time_t now, const or_options_t *options) static periodic_timer_t *second_timer = NULL; /** Number of libevent errors in the last second: we die if we get too many. */ static int n_libevent_errors = 0; +/** Last time that second_elapsed_callback was called. */ +static time_t current_second = 0; /** Libevent callback: invoked once every second. */ static void @@ -2206,7 +2210,6 @@ second_elapsed_callback(periodic_timer_t *timer, void *arg) /* XXXX This could be sensibly refactored into multiple callbacks, and we * could use Libevent's timers for this rather than checking the current * time against a bunch of timeouts every second. */ - static time_t current_second = 0; time_t now; size_t bytes_written; size_t bytes_read; @@ -2301,12 +2304,14 @@ systemd_watchdog_callback(periodic_timer_t *timer, void *arg) /** Timer: used to invoke refill_callback(). */ static periodic_timer_t *refill_timer = NULL; +/** Millisecond when refall_callback was last invoked. */ +static struct timeval refill_timer_current_millisecond; + /** Libevent callback: invoked periodically to refill token buckets * and count r/w bytes. */ static void refill_callback(periodic_timer_t *timer, void *arg) { - static struct timeval current_millisecond; struct timeval now; size_t bytes_written; @@ -2322,12 +2327,13 @@ refill_callback(periodic_timer_t *timer, void *arg) tor_gettimeofday(&now); /* If this is our first time, no time has passed. */ - if (current_millisecond.tv_sec) { - long mdiff = tv_mdiff(&current_millisecond, &now); + if (refill_timer_current_millisecond.tv_sec) { + long mdiff = tv_mdiff(&refill_timer_current_millisecond, &now); if (mdiff > INT_MAX) mdiff = INT_MAX; milliseconds_elapsed = (int)mdiff; - seconds_rolled_over = (int)(now.tv_sec - current_millisecond.tv_sec); + seconds_rolled_over = (int)(now.tv_sec - + refill_timer_current_millisecond.tv_sec); } bytes_written = stats_prev_global_write_bucket - global_write_bucket; @@ -2344,7 +2350,8 @@ refill_callback(periodic_timer_t *timer, void *arg) stats_prev_global_read_bucket = global_read_bucket; stats_prev_global_write_bucket = global_write_bucket; - current_millisecond = now; /* remember what time it is, for next time */ + /* remember what time it is, for next time */ + refill_timer_current_millisecond = now; } #ifndef _WIN32 @@ -3384,6 +3391,30 @@ tor_free_all(int postfork) periodic_timer_free(second_timer); teardown_periodic_events(); periodic_timer_free(refill_timer); +#ifdef HAVE_SYSTEMD_209 + periodic_timer_free(systemd_watchdog_timer); +#endif + + global_read_bucket = global_write_bucket = 0; + global_relayed_read_bucket = global_relayed_write_bucket = 0; + stats_prev_global_read_bucket = stats_prev_global_write_bucket = 0; + stats_prev_n_read = stats_prev_n_written = 0; + stats_n_bytes_read = stats_n_bytes_written = 0; + time_of_process_start = 0; + time_of_last_signewnym = 0; + signewnym_is_pending = 0; + newnym_epoch = 0; + called_loop_once = 0; + main_loop_should_exit = 0; + main_loop_exit_value = 0; + can_complete_circuits = 0; + quiet_level = 0; + should_init_bridge_stats = 1; + dns_honesty_first_time = 1; + heartbeat_callback_first_time = 1; + n_libevent_errors = 0; + current_second = 0; + memset(&refill_timer_current_millisecond, 0, sizeof(struct timeval)); if (!postfork) { release_lockfile();

1 0

[tor/master] In control.c, reset the bootstrapping status on shutdown
by nickm＠torproject.org 14 Mar '18

14 Mar '18

commit 6033538ac3466557a3453436a1a4fc98d6c581ab Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 11 12:59:23 2017 -0500 In control.c, reset the bootstrapping status on shutdown Part of #24587 --- src/or/control.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/or/control.c b/src/or/control.c index cce5c7953..0d63e3e3b 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -7620,6 +7620,9 @@ control_free_all(void) tor_event_free(flush_queued_events_event); flush_queued_events_event = NULL; } + bootstrap_percent = BOOTSTRAP_STATUS_UNDEF; + notice_bootstrap_percent = 0; + bootstrap_problems = 0; } #ifdef TOR_UNIT_TESTS

1 0

[tor/master] Merge remote-tracking branch 'public/restart_reset_bootstrap'
by nickm＠torproject.org 14 Mar '18

14 Mar '18

commit 4e5e973421ce17c1b4466722390f0e47bdeaa527 Merge: 42008ee72 3809036c6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 14 12:12:37 2018 +0100 Merge remote-tracking branch 'public/restart_reset_bootstrap' src/or/control.c | 3 +++ src/or/main.c | 62 ++++++++++++++++++++++++++++++++++++++++++-------------- 2 files changed, 50 insertions(+), 15 deletions(-) diff --cc src/or/main.c index 077d8f882,5869b2b4d..65340751e --- a/src/or/main.c +++ b/src/or/main.c @@@ -3520,9 -3391,31 +3527,34 @@@ tor_free_all(int postfork periodic_timer_free(second_timer); teardown_periodic_events(); periodic_timer_free(refill_timer); + tor_event_free(shutdown_did_not_work_event); + tor_event_free(initialize_periodic_events_event); + + #ifdef HAVE_SYSTEMD_209 + periodic_timer_free(systemd_watchdog_timer); + #endif + + global_read_bucket = global_write_bucket = 0; + global_relayed_read_bucket = global_relayed_write_bucket = 0; + stats_prev_global_read_bucket = stats_prev_global_write_bucket = 0; + stats_prev_n_read = stats_prev_n_written = 0; + stats_n_bytes_read = stats_n_bytes_written = 0; + time_of_process_start = 0; + time_of_last_signewnym = 0; + signewnym_is_pending = 0; + newnym_epoch = 0; + called_loop_once = 0; + main_loop_should_exit = 0; + main_loop_exit_value = 0; + can_complete_circuits = 0; + quiet_level = 0; + should_init_bridge_stats = 1; + dns_honesty_first_time = 1; + heartbeat_callback_first_time = 1; + n_libevent_errors = 0; + current_second = 0; + memset(&refill_timer_current_millisecond, 0, sizeof(struct timeval)); + if (!postfork) { release_lockfile(); }

1 0

[snowflake/master] Call explicit frees in server-webrtc.
by arlo＠torproject.org 14 Mar '18

14 Mar '18

commit c834c76fc50677cfb98e516e5d9d630ecfe691c2 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Mar 12 19:59:21 2018 -0700 Call explicit frees in server-webrtc. https://bugs.torproject.org/21312 Cf. corresponding change for proxy-go: https://gitweb.torproject.org/pluggable-transports/snowflake.git/commit/?id… --- server-webrtc/snowflake.go | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/server-webrtc/snowflake.go b/server-webrtc/snowflake.go index b95829d..82b6afe 100644 --- a/server-webrtc/snowflake.go +++ b/server-webrtc/snowflake.go @@ -52,12 +52,14 @@ func (c *webRTCConn) Read(b []byte) (int, error) { func (c *webRTCConn) Write(b []byte) (int, error) { // log.Printf("webrtc Write %d %+q", len(b), string(b)) log.Printf("Write %d bytes --> WebRTC", len(b)) - c.dc.Send(b) + if c.dc != nil { + c.dc.Send(b) + } return len(b), nil } func (c *webRTCConn) Close() error { - return c.pc.Close() + return c.pc.Destroy() } func (c *webRTCConn) LocalAddr() net.Addr { @@ -121,12 +123,16 @@ func makePeerConnectionFromOffer(sdp *webrtc.SessionDescription, config *webrtc. pr, pw := io.Pipe() + conn := &webRTCConn{pc: pc, dc: dc, pr: pr} + dc.OnOpen = func() { log.Println("OnOpen channel") } dc.OnClose = func() { log.Println("OnClose channel") pw.Close() + conn.dc = nil + pc.DeleteDataChannel(dc) } dc.OnMessage = func(msg []byte) { log.Printf("OnMessage <--- %d bytes", len(msg)) @@ -139,13 +145,12 @@ func makePeerConnectionFromOffer(sdp *webrtc.SessionDescription, config *webrtc. } } - conn := &webRTCConn{pc: pc, dc: dc, pr: pr} go datachannelHandler(conn) } err = pc.SetRemoteDescription(sdp) if err != nil { - pc.Close() + pc.Destroy() return nil, fmt.Errorf("accept: SetRemoteDescription: %s", err) } log.Println("sdp offer successfully received.") @@ -167,11 +172,11 @@ func makePeerConnectionFromOffer(sdp *webrtc.SessionDescription, config *webrtc. // Wait until answer is ready. select { case err = <-errChan: - pc.Close() + pc.Destroy() return nil, err case _, ok := <-answerChan: if !ok { - pc.Close() + pc.Destroy() return nil, fmt.Errorf("Failed gathering ICE candidates.") } }

1 0

[snowflake/master] Try to protect against crash from dereferencing a NULL in go-proxy
by arlo＠torproject.org 14 Mar '18

14 Mar '18

commit f2abf5b60c289103d8661b8e54b3d3aee43a4aaf Author: Arlo Breault <arlolra(a)gmail.com> Date: Wed Mar 14 00:15:13 2018 -0400 Try to protect against crash from dereferencing a NULL in go-proxy Follow up to ff8f385 Similar to c834c76 --- proxy-go/snowflake.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/proxy-go/snowflake.go b/proxy-go/snowflake.go index b3b97b3..a12cfb2 100644 --- a/proxy-go/snowflake.go +++ b/proxy-go/snowflake.go @@ -71,7 +71,9 @@ func (c *webRTCConn) Read(b []byte) (int, error) { func (c *webRTCConn) Write(b []byte) (int, error) { // log.Printf("webrtc Write %d %+q", len(b), string(b)) log.Printf("Write %d bytes --> WebRTC", len(b)) - c.dc.Send(b) + if c.dc != nil { + c.dc.Send(b) + } return len(b), nil } @@ -254,12 +256,15 @@ func makePeerConnectionFromOffer(sdp *webrtc.SessionDescription, config *webrtc. pr, pw := io.Pipe() + conn := &webRTCConn{pc: pc, dc: dc, pr: pr} + dc.OnOpen = func() { log.Println("OnOpen channel") } dc.OnClose = func() { log.Println("OnClose channel") pw.Close() + conn.dc = nil pc.DeleteDataChannel(dc) } dc.OnMessage = func(msg []byte) { @@ -273,7 +278,6 @@ func makePeerConnectionFromOffer(sdp *webrtc.SessionDescription, config *webrtc. } } - conn := &webRTCConn{pc: pc, dc: dc, pr: pr} go datachannelHandler(conn, conn.RemoteAddr()) }

1 0

[snowflake/master] Allow broker base url to have a path
by arlo＠torproject.org 14 Mar '18

14 Mar '18

commit 42ec097a58cd7a0bf9a6d2e24fe9beeec689c0f4 Author: Arlo Breault <arlolra(a)gmail.com> Date: Tue Mar 13 16:03:19 2018 -0400 Allow broker base url to have a path --- proxy-go/snowflake.go | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/proxy-go/snowflake.go b/proxy-go/snowflake.go index debe23c..b3b97b3 100644 --- a/proxy-go/snowflake.go +++ b/proxy-go/snowflake.go @@ -26,7 +26,7 @@ const defaultBrokerURL = "https://snowflake-reg.appspot.com/" const defaultRelayURL = "wss://snowflake.bamsoftware.com/" const defaultSTUNURL = "stun:stun.l.google.com:19302" -var brokerURL string +var brokerURL *url.URL var relayURL string const ( @@ -121,18 +121,8 @@ func genSessionID() string { return strings.TrimRight(base64.StdEncoding.EncodeToString(buf), "=") } -// Parses a URL with url.Parse and panics on any error. -func mustParseURL(rawurl string) *url.URL { - u, err := url.Parse(rawurl) - if err != nil { - panic(err) - } - return u -} - func pollOffer(sid string) *webrtc.SessionDescription { - broker := mustParseURL(brokerURL) - broker.Path = "/proxy" + broker := brokerURL.ResolveReference(&url.URL{Path: "proxy"}) for { req, _ := http.NewRequest("POST", broker.String(), bytes.NewBuffer([]byte(sid))) req.Header.Set("X-Session-ID", sid) @@ -156,8 +146,7 @@ func pollOffer(sid string) *webrtc.SessionDescription { } func sendAnswer(sid string, pc *webrtc.PeerConnection) error { - broker := mustParseURL(brokerURL) - broker.Path = "/answer" + broker := brokerURL.ResolveReference(&url.URL{Path: "answer"}) body := bytes.NewBuffer([]byte(pc.LocalDescription().Serialize())) req, _ := http.NewRequest("POST", broker.String(), body) req.Header.Set("X-Session-ID", sid) @@ -349,9 +338,10 @@ func main() { var capacity uint var stunURL string var logFilename string + var rawBrokerURL string flag.UintVar(&capacity, "capacity", 10, "maximum concurrent clients") - flag.StringVar(&brokerURL, "broker", defaultBrokerURL, "broker URL") + flag.StringVar(&rawBrokerURL, "broker", defaultBrokerURL, "broker URL") flag.StringVar(&relayURL, "relay", defaultRelayURL, "websocket relay URL") flag.StringVar(&stunURL, "stun", defaultSTUNURL, "stun URL") flag.StringVar(&logFilename, "log", "", "log filename") @@ -370,7 +360,7 @@ func main() { log.Println("starting") var err error - _, err = url.Parse(brokerURL) + brokerURL, err = url.Parse(rawBrokerURL) if err != nil { log.Fatalf("invalid broker url: %s", err) }

1 0

[snowflake/master] Add a "starting" log line to proxy-go.
by dcf＠torproject.org 14 Mar '18

14 Mar '18

commit 44ab82bc612dac3f9605afd44f057ef199b2cc12 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Mar 13 19:25:41 2018 -0700 Add a "starting" log line to proxy-go. --- proxy-go/snowflake.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/proxy-go/snowflake.go b/proxy-go/snowflake.go index ca59adf..debe23c 100644 --- a/proxy-go/snowflake.go +++ b/proxy-go/snowflake.go @@ -367,6 +367,8 @@ func main() { log.SetOutput(io.MultiWriter(os.Stderr, f)) } + log.Println("starting") + var err error _, err = url.Parse(brokerURL) if err != nil {

1 0