October 2016 - tor-commits - lists.torproject.org

[torbutton/master] Bug 20394: Remove obsolete code
by gk＠torproject.org 20 Oct '16

20 Oct '16

commit 70e5f3b26c7e4d22158b02757681170ac0daadf5 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Tue Oct 18 11:29:27 2016 -0700 Bug 20394: Remove obsolete code --- src/chrome/content/contents.rdf | 50 ------------------------------------ src/chrome/content/torbutton.js | 23 ++--------------- src/chrome/content/torbutton_util.js | 8 +----- src/chrome/skin/contents.rdf | 45 -------------------------------- 4 files changed, 3 insertions(+), 123 deletions(-) diff --git a/src/chrome/content/contents.rdf b/src/chrome/content/contents.rdf deleted file mode 100644 index c7afa3a..0000000 --- a/src/chrome/content/contents.rdf +++ /dev/null @@ -1,50 +0,0 @@ - -<?xml version="1.0"?> - -<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:chrome="http://www.mozilla.org/rdf/chrome#"> - - <Seq about="urn:mozilla:package:root"> - <li resource="urn:mozilla:package:torbutton"/> - </Seq> - - <Description about="urn:mozilla:package:torbutton" - chrome:athor="Scott Squires" - chrome:displayName="Torbutton" - chrome:extension="true" - chrome:name="torbutton"> - </Description> - - <Seq about="urn:mozilla:overlays"> -  - <li resource="chrome://browser/content/browser.xul"/> - <li resource="chrome://browser/content/pref/pref-connection.xul"/> -  - <li resource="chrome://messenger/content/messenger.xul"/> - <li resource="chrome://messenger/content/messengercompose/messengercompose.xul"/> -  - <li resource="chrome://torbutton/content/torbutton.xul"/> - </Seq> - -  - <Seq about="chrome://browser/content/browser.xul"> - <li>chrome://torbutton/content/torbutton.xul</li> - </Seq> - <Seq about="chrome://browser/content/pref/pref-connection.xul"> - <li>chrome://torbutton/content/pref-connection.xul</li> - </Seq> - -  - <Seq about="chrome://messenger/content/messenger.xul"> - <li>chrome://torbutton/content/torbutton_tb.xul</li> - </Seq> - <Seq about="chrome://messenger/content/messengercompose/messengercompose.xul"> - <li>chrome://torbutton/content/torbutton_tb.xul</li> - </Seq> - -  - <Seq about="chrome://torbutton/content/torbutton.xul"> - <li>chrome://torbutton/content/popup.xul</li> - </Seq> - -</RDF> diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 3c05047..d2824cb 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -1,4 +1,4 @@ -// Bug 1506 P0-P5: This is the main Torbutton overlay file. Much needs to be +// Bug 1506 P1-P5: This is the main Torbutton overlay file. Much needs to be // preserved here, but in an ideal world, most of this code should perhaps be // moved into an XPCOM service, and much can also be tossed. See also // individual 1506 comments for details. @@ -2110,25 +2110,6 @@ function torbutton_open_prefs_dialog() { torbutton_log(2, 'opened preferences window'); } -// Bug 1506 P0: Support code for checking Firefox versions. Not needed. -function torbutton_gecko_compare(aVersion) { - var ioService = Components.classes["@mozilla.org/network/io-service;1"] - .getService(Components.interfaces.nsIIOService); - var httpProtocolHandler = ioService.getProtocolHandler("http") - .QueryInterface(Components.interfaces.nsIHttpProtocolHandler); - var versionComparator = null; - - if ("nsIVersionComparator" in Components.interfaces) { - versionComparator = Components.classes["@mozilla.org/xpcom/version-comparator;1"] - .getService(Components.interfaces.nsIVersionComparator); - } else { - versionComparator = Components.classes["@mozilla.org/updates/version-checker;1"] - .getService(Components.interfaces.nsIVersionChecker); - } - var geckoVersion = httpProtocolHandler.misc.match(/rv:([0-9.]+)/)[1]; - return versionComparator.compare(aVersion, geckoVersion); -} - // -------------- HISTORY & COOKIES --------------------- // Bug 1506 P4: Used by New Identity if cookie protections are @@ -2321,7 +2302,7 @@ function torbutton_do_startup() } } -// Bug 1506 P0: Perform version check when a new tab is opened. +// Perform version check when a new tab is opened. function torbutton_new_tab(event) { // listening for new tabs diff --git a/src/chrome/content/torbutton_util.js b/src/chrome/content/torbutton_util.js index f1263f1..e6de768 100644 --- a/src/chrome/content/torbutton_util.js +++ b/src/chrome/content/torbutton_util.js @@ -1,4 +1,4 @@ -// Bug 1506 P0-P3: These utility functions might be useful, but +// Bug 1506 P1-P3: These utility functions might be useful, but // you probably just want to rewrite them or use the underlying // code directly. I don't see any of them as essential for 1506, // really. @@ -8,12 +8,6 @@ var m_tb_torlog = Components.classes["@torproject.org/torbutton-logger;1"] var m_tb_string_bundle = torbutton_get_stringbundle(); -// Bug 1506 P0: Use the log service directly -function torbutton_eclog(nLevel, sMsg) { - m_tb_torlog.eclog(nLevel, sMsg); - return true; -} - function torbutton_safelog(nLevel, sMsg, scrub) { m_tb_torlog.safe_log(nLevel, sMsg, scrub); return true; diff --git a/src/chrome/skin/contents.rdf b/src/chrome/skin/contents.rdf deleted file mode 100644 index 53bde17..0000000 --- a/src/chrome/skin/contents.rdf +++ /dev/null @@ -1,45 +0,0 @@ - -<?xml version="1.0"?> - -<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:chrome="http://www.mozilla.org/rdf/chrome#"> - - <Seq about="urn:mozilla:skin:root"> - <li resource="urn:mozilla:skin:classic/1.0"/> - </Seq> - - <Description about="urn:mozilla:skin:classic/1.0"> - <chrome:packages> - <Seq about="urn:mozilla:skin:classic/1.0:packages"> - <li resource="urn:mozilla:skin:classic/1.0:torbutton"/> - </Seq> - </chrome:packages> - </Description> - - <Seq about="urn:mozilla:stylesheets"> - <li resource="chrome://global/content/customizeToolbar.xul"/> -  - <li resource="chrome://browser/content/browser.xul"/> -  - <li resource="chrome://messenger/content/messenger.xul"/> - <li resource="chrome://messenger/content/messengercompose/messengercompose.xul"/> - </Seq> - - <Seq about="chrome://global/content/customizeToolbar.xul"> - <li>chrome://torbutton/skin/torbutton.css</li> - </Seq> - -  - <Seq about="chrome://browser/content/browser.xul"> - <li>chrome://torbutton/skin/torbutton.css</li> - </Seq> - -  - <Seq about="chrome://messenger/content/messenger.xul"> - <li>chrome://torbutton/skin/torbutton.css</li> - </Seq> - <Seq about="chrome://messenger/content/messengercompose/messengercompose.xul"> - <li>chrome://torbutton/skin/torbutton.css</li> - </Seq> - -</RDF>

1 0

[obfs4/master] Reusing read buffer for readPackets
by yawning＠torproject.org 20 Oct '16

20 Oct '16

commit df6aeeca8cc8e953284ce1cb8a0910500579dfaf Author: Ox Cart <ox.to.a.cart(a)gmail.com> Date: Wed Oct 19 20:18:07 2016 -0500 Reusing read buffer for readPackets --- transports/obfs4/obfs4.go | 5 +++-- transports/obfs4/packet.go | 5 ++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/transports/obfs4/obfs4.go b/transports/obfs4/obfs4.go index 40b1406..304097e 100644 --- a/transports/obfs4/obfs4.go +++ b/transports/obfs4/obfs4.go @@ -265,7 +265,7 @@ func (sf *obfs4ServerFactory) WrapConn(conn net.Conn) (net.Conn, error) { iatDist = probdist.New(sf.iatSeed, 0, maxIATDelay, biasedDist) } - c := &obfs4Conn{conn, true, lenDist, iatDist, sf.iatMode, bytes.NewBuffer(nil), bytes.NewBuffer(nil), nil, nil} + c := &obfs4Conn{conn, true, lenDist, iatDist, sf.iatMode, bytes.NewBuffer(nil), bytes.NewBuffer(nil), make([]byte, consumeReadSize), nil, nil} startTime := time.Now() @@ -288,6 +288,7 @@ type obfs4Conn struct { receiveBuffer *bytes.Buffer receiveDecodedBuffer *bytes.Buffer + readBuffer []byte encoder *framing.Encoder decoder *framing.Decoder @@ -311,7 +312,7 @@ func newObfs4ClientConn(conn net.Conn, args *obfs4ClientArgs) (c *obfs4Conn, err } // Allocate the client structure. - c = &obfs4Conn{conn, false, lenDist, iatDist, args.iatMode, bytes.NewBuffer(nil), bytes.NewBuffer(nil), nil, nil} + c = &obfs4Conn{conn, false, lenDist, iatDist, args.iatMode, bytes.NewBuffer(nil), bytes.NewBuffer(nil), make([]byte, consumeReadSize), nil, nil} // Start the handshake timeout. deadline := time.Now().Add(clientHandshakeTimeout) diff --git a/transports/obfs4/packet.go b/transports/obfs4/packet.go index 461ad54..5125be6 100644 --- a/transports/obfs4/packet.go +++ b/transports/obfs4/packet.go @@ -110,9 +110,8 @@ func (conn *obfs4Conn) makePacket(w io.Writer, pktType uint8, data []byte, padLe func (conn *obfs4Conn) readPackets() (err error) { // Attempt to read off the network. - var buf [consumeReadSize]byte - rdLen, rdErr := conn.Conn.Read(buf[:]) - conn.receiveBuffer.Write(buf[:rdLen]) + rdLen, rdErr := conn.Conn.Read(conn.readBuffer) + conn.receiveBuffer.Write(conn.readBuffer[:rdLen]) var decoded [framing.MaximumFramePayloadLength]byte for conn.receiveBuffer.Len() > 0 {

1 0

[obfs4/master] Add a ChgangeLog entry for the read buffer fix (No functional changes).
by yawning＠torproject.org 20 Oct '16

20 Oct '16

commit 64e5920c8438db8f0fbee292403264b178336ecb Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Thu Oct 20 01:36:21 2016 +0000 Add a ChgangeLog entry for the read buffer fix (No functional changes). --- ChangeLog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ChangeLog b/ChangeLog index 09655b3..0d0d037 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,8 @@ Changes in version 0.0.7 - UNRELEASED: to the state file. - Correctly use the derived epoch hour when generating the server obfs4 ntor handshake response to be more tollerant of clock skew. + - Reuse the read buffer when consuming obfs4 frames over the network to + reduce memory consumption. Patch by oxtoacart. Changes in version 0.0.6 - 2016-01-25: - Delay transport factory initialization till after logging has been

1 0

[obfs4/master] Merge branch 'getlantern-memreduce'
by yawning＠torproject.org 20 Oct '16

20 Oct '16

commit a9e8a62f9b914d872f0b83528c60f22bada0fcd1 Merge: 6205762 64e5920 Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Thu Oct 20 01:36:53 2016 +0000 Merge branch 'getlantern-memreduce' ChangeLog | 2 ++ transports/obfs4/obfs4.go | 5 +++-- transports/obfs4/packet.go | 5 ++--- 3 files changed, 7 insertions(+), 5 deletions(-)

1 0

[tor/master] changes file for 20389
by nickm＠torproject.org 19 Oct '16

19 Oct '16

commit 7010e8593978ff52e4f81e959f39e6215cd72a15 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 19 18:07:02 2016 -0400 changes file for 20389 --- changes/bug20389 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changes/bug20389 b/changes/bug20389 new file mode 100644 index 0000000..8f1b9f5 --- /dev/null +++ b/changes/bug20389 @@ -0,0 +1,4 @@ + o Minor features (controller): + - When HSFETCH arguments cannot be parsed, say "Invalid argument" + rather than "unrecognized." Closes ticket 20389; patch from + Ivan Markin.

1 0

[tor/master] Say 'Invalid argument' instead of unclear 'Unrecognized'
by nickm＠torproject.org 19 Oct '16

19 Oct '16

commit e77033e9eee4d40b258e3702e3f4a44fc7f1d436 Author: Ivan Markin <twim(a)riseup.net> Date: Mon Oct 17 20:10:39 2016 +0000 Say 'Invalid argument' instead of unclear 'Unrecognized' --- src/or/control.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/control.c b/src/or/control.c index a4f8e37..92f1fc0 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -4081,7 +4081,7 @@ handle_control_hsfetch(control_connection_t *conn, uint32_t len, * of the id. */ desc_id = digest; } else { - connection_printf_to_buf(conn, "513 Unrecognized \"%s\"\r\n", + connection_printf_to_buf(conn, "513 Invalid argument \"%s\"\r\n", arg1); goto done; }

1 0

[tor/master] Refactor to use purpose_needs_anonymity and remove is_sensitive_dir_purpose
by nickm＠torproject.org 19 Oct '16

19 Oct '16

commit 195ccce94e250a150e208f7a8fb9ba8375b6fe89 Author: Chelsea H. Komlo <chelsea.komlo(a)gmail.com> Date: Sat Oct 8 19:28:38 2016 -0500 Refactor to use purpose_needs_anonymity and remove is_sensitive_dir_purpose --- changes/ticket20077 | 3 +++ src/or/connection_edge.c | 2 +- src/or/directory.c | 25 +++++++++---------------- src/or/directory.h | 3 --- src/test/test_dir.c | 47 ++++++++++++++++++++++++++++++++++++++++++----- 5 files changed, 55 insertions(+), 25 deletions(-) diff --git a/changes/ticket20077 b/changes/ticket20077 new file mode 100644 index 0000000..bc0e38e --- /dev/null +++ b/changes/ticket20077 @@ -0,0 +1,3 @@ + o Code simplification and refactoring: + - Remove redundant behavior of is_sensitive_dir_purpose, refactor to use + only purpose_needs_anonymity diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 24842e4..44dfcef 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -2434,7 +2434,7 @@ connection_ap_handshake_send_begin(entry_connection_t *ap_conn) * Otherwise, directory connections are typically one-hop. * This matches the earlier check for directory connection path anonymity * in directory_initiate_command_rend(). */ - if (is_sensitive_dir_purpose(linked_dir_conn_base->purpose)) { + if (purpose_needs_anonymity(linked_dir_conn_base->purpose, 0)) { assert_circ_anonymity_ok(circ, options); } } else { diff --git a/src/or/directory.c b/src/or/directory.c index 1f894d9..8dc3095 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -120,17 +120,22 @@ static void connection_dir_close_consensus_fetches( /********* END VARIABLES ************/ -/** Return true iff the directory purpose dir_purpose (and if it's - * fetching descriptors, it's fetching them for router_purpose) - * must use an anonymous connection to a directory. */ +/** Return false if the directory purpose dir_purpose + * does not require an anonymous (three-hop) connection. + * + * Return true 1) by default, 2) if all directory actions have + * specifically been configured to be over an anonymous connection, + * or 3) if the router is a bridge */ int purpose_needs_anonymity(uint8_t dir_purpose, uint8_t router_purpose) { if (get_options()->AllDirActionsPrivate) return 1; + if (router_purpose == ROUTER_PURPOSE_BRIDGE) return 1; /* if no circuits yet, this might break bootstrapping, but it's * needed to be safe. */ + if (dir_purpose == DIR_PURPOSE_UPLOAD_DIR || dir_purpose == DIR_PURPOSE_UPLOAD_VOTE || dir_purpose == DIR_PURPOSE_UPLOAD_SIGNATURES || @@ -1078,18 +1083,6 @@ directory_initiate_command(const tor_addr_t *or_addr, uint16_t or_port, if_modified_since, NULL); } -/** Return non-zero iff a directory connection with purpose - * dir_purpose reveals sensitive information about a Tor - * instance's client activities. (Such connections must be performed - * through normal three-hop Tor circuits.) */ -int -is_sensitive_dir_purpose(uint8_t dir_purpose) -{ - return ((dir_purpose == DIR_PURPOSE_HAS_FETCHED_RENDDESC_V2) || - (dir_purpose == DIR_PURPOSE_UPLOAD_RENDDESC_V2) || - (dir_purpose == DIR_PURPOSE_FETCH_RENDDESC_V2)); -} - /** Same as directory_initiate_command(), but accepts rendezvous data to * fetch a hidden service descriptor, and takes its address & port arguments * as tor_addr_port_t. */ @@ -1137,7 +1130,7 @@ directory_initiate_command_rend(const tor_addr_port_t *or_addr_port, log_debug(LD_DIR, "Initiating %s", dir_conn_purpose_to_string(dir_purpose)); - if (is_sensitive_dir_purpose(dir_purpose)) { + if (purpose_needs_anonymity(dir_purpose, router_purpose)) { tor_assert(anonymized_connection || rend_non_anonymous_mode_enabled(options)); } diff --git a/src/or/directory.h b/src/or/directory.h index 9477948..f04e7ab 100644 --- a/src/or/directory.h +++ b/src/or/directory.h @@ -132,10 +132,7 @@ int download_status_get_n_failures(const download_status_t *dls); int download_status_get_n_attempts(const download_status_t *dls); time_t download_status_get_next_attempt_at(const download_status_t *dls); -/* Yes, these two functions are confusingly similar. - * Let's sort that out in #20077. */ int purpose_needs_anonymity(uint8_t dir_purpose, uint8_t router_purpose); -int is_sensitive_dir_purpose(uint8_t dir_purpose); #ifdef TOR_UNIT_TESTS /* Used only by directory.c and test_dir.c */ diff --git a/src/test/test_dir.c b/src/test/test_dir.c index 77c5dc1..73a8a35 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -3253,17 +3253,52 @@ test_dir_http_handling(void *args) } static void -test_dir_purpose_needs_anonymity(void *arg) +test_dir_purpose_needs_anonymity_returns_true_for_bridges(void *arg) { (void)arg; + tt_int_op(1, ==, purpose_needs_anonymity(0, ROUTER_PURPOSE_BRIDGE)); - tt_int_op(1, ==, purpose_needs_anonymity(0, ROUTER_PURPOSE_GENERAL)); - tt_int_op(0, ==, purpose_needs_anonymity(DIR_PURPOSE_FETCH_MICRODESC, - ROUTER_PURPOSE_GENERAL)); + tt_int_op(1, ==, purpose_needs_anonymity(DIR_PURPOSE_HAS_FETCHED_RENDDESC_V2, + ROUTER_PURPOSE_BRIDGE)); + done: ; +} + +static void +test_dir_purpose_needs_anonymity_returns_true_for_sensitive_purpose(void *arg) +{ + (void)arg; + + tt_int_op(1, ==, purpose_needs_anonymity( + DIR_PURPOSE_HAS_FETCHED_RENDDESC_V2, + ROUTER_PURPOSE_GENERAL)); + tt_int_op(1, ==, purpose_needs_anonymity( + DIR_PURPOSE_UPLOAD_RENDDESC_V2, 0)); + tt_int_op(1, ==, purpose_needs_anonymity( + DIR_PURPOSE_FETCH_RENDDESC_V2, 0)); done: ; } static void +test_dir_purpose_needs_anonymity_ret_false_for_non_sensitive_conn(void *arg) +{ + (void)arg; + + tt_int_op(0, ==, purpose_needs_anonymity(DIR_PURPOSE_UPLOAD_DIR, + ROUTER_PURPOSE_GENERAL)); + tt_int_op(0, ==, purpose_needs_anonymity(DIR_PURPOSE_UPLOAD_VOTE, 0)); + tt_int_op(0, ==, purpose_needs_anonymity(DIR_PURPOSE_UPLOAD_SIGNATURES, 0)); + tt_int_op(0, ==, purpose_needs_anonymity(DIR_PURPOSE_FETCH_STATUS_VOTE, 0)); + tt_int_op(0, ==, purpose_needs_anonymity( + DIR_PURPOSE_FETCH_DETACHED_SIGNATURES, 0)); + tt_int_op(0, ==, purpose_needs_anonymity(DIR_PURPOSE_FETCH_CONSENSUS, 0)); + tt_int_op(0, ==, purpose_needs_anonymity(DIR_PURPOSE_FETCH_CERTIFICATE, 0)); + tt_int_op(0, ==, purpose_needs_anonymity(DIR_PURPOSE_FETCH_SERVERDESC, 0)); + tt_int_op(0, ==, purpose_needs_anonymity(DIR_PURPOSE_FETCH_EXTRAINFO, 0)); + tt_int_op(0, ==, purpose_needs_anonymity(DIR_PURPOSE_FETCH_MICRODESC, 0)); + done: ; +} + +static void test_dir_fetch_type(void *arg) { (void)arg; @@ -5464,7 +5499,9 @@ struct testcase_t dir_tests[] = { DIR(fmt_control_ns, 0), DIR(dirserv_set_routerstatus_testing, 0), DIR(http_handling, 0), - DIR(purpose_needs_anonymity, 0), + DIR(purpose_needs_anonymity_returns_true_for_bridges, 0), + DIR(purpose_needs_anonymity_returns_true_for_sensitive_purpose, 0), + DIR(purpose_needs_anonymity_ret_false_for_non_sensitive_conn, 0), DIR(fetch_type, 0), DIR(packages, 0), DIR(download_status_schedule, 0),

1 0

[tor/master] Merge remote-tracking branch 'chelseakomlo/master'
by nickm＠torproject.org 19 Oct '16

19 Oct '16

commit df387b94e8c4ebac964dcf2227b9a01d6a9481cc Merge: 9f6bb29 471b0c5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 19 17:17:12 2016 -0400 Merge remote-tracking branch 'chelseakomlo/master' changes/ticket20077 | 5 +++++ src/or/connection_edge.c | 2 +- src/or/directory.c | 52 +++++++++++++++++++++---------------------- src/or/directory.h | 3 --- src/test/test_dir.c | 57 +++++++++++++++++++++++++++++++++++++++++++----- 5 files changed, 83 insertions(+), 36 deletions(-)

1 0

[tor/master] BUG in purpose_needs_anonymity if switch not matched.
by nickm＠torproject.org 19 Oct '16

19 Oct '16

commit c87d9b13a4e56237e22df776c47e5520e0d37103 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 19 17:23:11 2016 -0400 BUG in purpose_needs_anonymity if switch not matched. I believe that this should never trigger, but if it does, it suggests that there was a gap between is_sensitive_dir_purpose and purpose_needs_anonymity that we need to fill. Related to 20077. --- src/or/directory.c | 11 +++++++++-- src/test/test_dir.c | 3 +++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/or/directory.c b/src/or/directory.c index abe1372..facd588 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -149,10 +149,17 @@ purpose_needs_anonymity(uint8_t dir_purpose, uint8_t router_purpose) case DIR_PURPOSE_FETCH_EXTRAINFO: case DIR_PURPOSE_FETCH_MICRODESC: return 0; + case DIR_PURPOSE_HAS_FETCHED_RENDDESC_V2: + case DIR_PURPOSE_UPLOAD_RENDDESC_V2: + case DIR_PURPOSE_FETCH_RENDDESC_V2: + return 1; + case DIR_PURPOSE_SERVER: default: - break; + log_warn(LD_BUG, "Called with dir_purpose=%d, router_purpose=%d", + dir_purpose, router_purpose); + tor_assert_nonfatal_unreached(); + return 1; /* Assume it needs anonymity; better safe than sorry. */ } - return 1; } /** Return a newly allocated string describing auth. Only describes diff --git a/src/test/test_dir.c b/src/test/test_dir.c index 0f6166d..d9c565c 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -3257,7 +3257,10 @@ test_dir_purpose_needs_anonymity_returns_true_by_default(void *arg) { (void)arg; + tor_capture_bugs_(1); tt_int_op(1, ==, purpose_needs_anonymity(0, 0)); + tt_int_op(1, ==, smartlist_len(tor_get_captured_bug_log_())); + tor_end_capture_bugs_(); done: ; }

1 0

[tor/master] Refactor purpose_needs_anonymity to use switch statement
by nickm＠torproject.org 19 Oct '16

19 Oct '16

commit 471b0c5175521bb2bc49eb7e30d78f656a3a2843 Author: Chelsea H. Komlo <chelsea.komlo(a)gmail.com> Date: Tue Oct 18 19:04:22 2016 -0500 Refactor purpose_needs_anonymity to use switch statement --- changes/ticket20077 | 2 ++ src/or/directory.c | 27 ++++++++++++++++----------- src/test/test_dir.c | 10 ++++++++++ 3 files changed, 28 insertions(+), 11 deletions(-) diff --git a/changes/ticket20077 b/changes/ticket20077 index bc0e38e..d551069 100644 --- a/changes/ticket20077 +++ b/changes/ticket20077 @@ -1,3 +1,5 @@ o Code simplification and refactoring: - Remove redundant behavior of is_sensitive_dir_purpose, refactor to use only purpose_needs_anonymity + - Refactor large if statement in purpose_needs_anonymity to use switch + statement instead. diff --git a/src/or/directory.c b/src/or/directory.c index 8dc3095..abe1372 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -136,17 +136,22 @@ purpose_needs_anonymity(uint8_t dir_purpose, uint8_t router_purpose) return 1; /* if no circuits yet, this might break bootstrapping, but it's * needed to be safe. */ - if (dir_purpose == DIR_PURPOSE_UPLOAD_DIR || - dir_purpose == DIR_PURPOSE_UPLOAD_VOTE || - dir_purpose == DIR_PURPOSE_UPLOAD_SIGNATURES || - dir_purpose == DIR_PURPOSE_FETCH_STATUS_VOTE || - dir_purpose == DIR_PURPOSE_FETCH_DETACHED_SIGNATURES || - dir_purpose == DIR_PURPOSE_FETCH_CONSENSUS || - dir_purpose == DIR_PURPOSE_FETCH_CERTIFICATE || - dir_purpose == DIR_PURPOSE_FETCH_SERVERDESC || - dir_purpose == DIR_PURPOSE_FETCH_EXTRAINFO || - dir_purpose == DIR_PURPOSE_FETCH_MICRODESC) - return 0; + switch (dir_purpose) + { + case DIR_PURPOSE_UPLOAD_DIR: + case DIR_PURPOSE_UPLOAD_VOTE: + case DIR_PURPOSE_UPLOAD_SIGNATURES: + case DIR_PURPOSE_FETCH_STATUS_VOTE: + case DIR_PURPOSE_FETCH_DETACHED_SIGNATURES: + case DIR_PURPOSE_FETCH_CONSENSUS: + case DIR_PURPOSE_FETCH_CERTIFICATE: + case DIR_PURPOSE_FETCH_SERVERDESC: + case DIR_PURPOSE_FETCH_EXTRAINFO: + case DIR_PURPOSE_FETCH_MICRODESC: + return 0; + default: + break; + } return 1; } diff --git a/src/test/test_dir.c b/src/test/test_dir.c index 73a8a35..0f6166d 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -3253,6 +3253,15 @@ test_dir_http_handling(void *args) } static void +test_dir_purpose_needs_anonymity_returns_true_by_default(void *arg) +{ + (void)arg; + + tt_int_op(1, ==, purpose_needs_anonymity(0, 0)); + done: ; +} + +static void test_dir_purpose_needs_anonymity_returns_true_for_bridges(void *arg) { (void)arg; @@ -5500,6 +5509,7 @@ struct testcase_t dir_tests[] = { DIR(dirserv_set_routerstatus_testing, 0), DIR(http_handling, 0), DIR(purpose_needs_anonymity_returns_true_for_bridges, 0), + DIR(purpose_needs_anonymity_returns_true_by_default, 0), DIR(purpose_needs_anonymity_returns_true_for_sensitive_purpose, 0), DIR(purpose_needs_anonymity_ret_false_for_non_sensitive_conn, 0), DIR(fetch_type, 0),

1 0