September 2019 - tor-commits - lists.torproject.org

[translation/torbutton-torbuttondtd_completed] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttondtd_completed
by translation＠torproject.org 25 Sep '19

25 Sep '19

commit 729c7ce31da31b8353999c1e8e7f25cf68c984e5 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Sep 25 12:51:27 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbutton… --- zh-CN/torbutton.dtd | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/zh-CN/torbutton.dtd b/zh-CN/torbutton.dtd index edd8e88a4..b711df557 100644 --- a/zh-CN/torbutton.dtd +++ b/zh-CN/torbutton.dtd @@ -37,13 +37,13 @@ <!ENTITY torbutton.prefs.sec_limit_typography "一些字体与数学符号被禁用。"> <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "一些字体，图标，数学符号与图片被禁用。"> <!ENTITY torbutton.prefs.sec_click_to_play_media "点击播放音频或视频（HTML5 媒体）和WebGL。"> -<!ENTITY torbutton.prefs.sec_custom_warning ""> -<!ENTITY torbutton.prefs.sec_overview ""> -<!ENTITY torbutton.prefs.sec_standard_tooltip ""> -<!ENTITY torbutton.prefs.sec_safer_tooltip ""> -<!ENTITY torbutton.prefs.sec_safest_tooltip ""> -<!ENTITY torbutton.prefs.sec_custom_summary ""> -<!ENTITY torbutton.prefs.sec_restore_defaults ""> -<!ENTITY torbutton.prefs.sec_advanced_security_settings ""> +<!ENTITY torbutton.prefs.sec_custom_warning "自定义"> +<!ENTITY torbutton.prefs.sec_overview "禁用部分能影响你安全和匿名性的互联网功能。"> +<!ENTITY torbutton.prefs.sec_standard_tooltip "安全等级：标准"> +<!ENTITY torbutton.prefs.sec_safer_tooltip "安全等级：较安全"> +<!ENTITY torbutton.prefs.sec_safest_tooltip "安全等级：最安全"> +<!ENTITY torbutton.prefs.sec_custom_summary "您自定义的浏览器设置导致了不安全的安全设置。出于安全和隐私考虑，我们建议您选择一个默认的安全级别。"> +<!ENTITY torbutton.prefs.sec_restore_defaults "恢复默认设置"> +<!ENTITY torbutton.prefs.sec_advanced_security_settings "高级安全选项…"> <!ENTITY torbutton.circuit_display.title "Tor 链路"> <!ENTITY torbutton.circuit_display.new_circuit "为此站点使用新线路">

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] fixup! Bug 24920 - Only create Private tabs if browser.privatebrowsing.autostart is true
by gk＠torproject.org 25 Sep '19

25 Sep '19

commit a07356ac7693bec4ed1b206bdbeb64287cb2a7f6 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Thu Sep 19 02:13:08 2019 +0000 fixup! Bug 24920 - Only create Private tabs if browser.privatebrowsing.autostart is true --- mobile/android/chrome/content/browser.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/mobile/android/chrome/content/browser.js b/mobile/android/chrome/content/browser.js index dbecd308a3dc..fc66e8b4f23e 100644 --- a/mobile/android/chrome/content/browser.js +++ b/mobile/android/chrome/content/browser.js @@ -4413,9 +4413,14 @@ Tab.prototype = { // Must be called after appendChild so the docShell has been created. this.setActive(false); + // Create a Private tab if it was explicitly requested or if the pref + // |browser.privatebrowsing.autostart| is true. If the pref is true, then all tabs are created + // as private tabs. The first clause covers new tabs requested by a user. The preference check + // is important because extensions directly open tabs (usually not private tabs) and bypass the + // private tab checks. let isPrivate = (("isPrivate" in aParams) && aParams.isPrivate) || Services.prefs.getBoolPref("browser.privatebrowsing.autostart"); if (isPrivate) { - attrs['privateBrowsingId'] = 1; + attrs.privateBrowsingId = 1; } this.browser.docShell.setOriginAttributes(attrs);

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] Bug 31720: Enable website suggestions in address bar
by gk＠torproject.org 25 Sep '19

25 Sep '19

commit 683863bc344137462c60c6ae001d1333df41297d Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Wed Sep 18 18:32:24 2019 +0000 Bug 31720: Enable website suggestions in address bar --- mobile/android/base/java/org/mozilla/gecko/BrowserApp.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java index f03548e30ced..5d6f725dc1c5 100644 --- a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java +++ b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java @@ -1452,7 +1452,9 @@ public class BrowserApp extends GeckoApp // Website suggestions for address bar inputs should not be enabled when running in automation. // After the upgrade to support library v.26 it could fail otherwise unrelated Robocop tests // See https://bugzilla.mozilla.org/show_bug.cgi?id=1385464#c3 - if (!isInAutomation) { + // But only disable it when this isn't Tor Browser, because isInAutomation is overloaded such + // that it is |true| in Tor Browser. + if (!isInAutomation || AppConstants.isTorBrowser()) { mBrowserToolbar.setOnFilterListener(new BrowserToolbar.OnFilterListener() { @Override public void onFilter(String searchText, AutocompleteHandler handler) {

1 0

[tor/master] Practracker: do not list problems when told to --list-overbroad.
by asn＠torproject.org 25 Sep '19

25 Sep '19

commit 25d55fa01ebc8d9bc8cd52672605636a9261ddf5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 18 08:49:57 2019 -0400 Practracker: do not list problems when told to --list-overbroad. --- scripts/maint/practracker/practracker.py | 9 +++++++++ scripts/maint/practracker/util.py | 7 +++++++ 2 files changed, 16 insertions(+) diff --git a/scripts/maint/practracker/practracker.py b/scripts/maint/practracker/practracker.py index ce9c5f5d8..6f1a771ef 100755 --- a/scripts/maint/practracker/practracker.py +++ b/scripts/maint/practracker/practracker.py @@ -224,6 +224,11 @@ def main(argv): filt.addThreshold(problem.DependencyViolationItem("*.c", int(args.max_dependency_violations))) filt.addThreshold(problem.DependencyViolationItem("*.h", int(args.max_dependency_violations))) + if args.list_overbroad and args.regen: + print("Cannot use --regen with --list-overbroad", + file=sys.stderr) + sys.exit(1) + # 1) Get all the .c files we care about files_list = util.get_tor_c_files(TOR_TOPDIR, args.include_dir) @@ -239,6 +244,10 @@ def main(argv): ProblemVault = problem.ProblemVault(exceptions_file) problem_file = sys.stdout + if args.list_overbroad: + # If we're listing overbroad exceptions, don't list problems. + problem_file = util.NullFile() + # 2.1) Adjust the exceptions so that we warn only about small problems, # and produce errors on big ones. if not (args.regen or args.list_overbroad or args.strict): diff --git a/scripts/maint/practracker/util.py b/scripts/maint/practracker/util.py index 4b4256552..df629110c 100644 --- a/scripts/maint/practracker/util.py +++ b/scripts/maint/practracker/util.py @@ -41,3 +41,10 @@ def get_tor_c_files(tor_topdir, include_dirs=None): files_list.append(full_path) return files_list + +class NullFile: + """A file-like object that we can us to suppress output.""" + def __init__(self): + pass + def write(self, s): + pass

1 0

[tor/master] changes file for 31338
by asn＠torproject.org 25 Sep '19

25 Sep '19

commit 82ad63ef404c4634ea98352febe70296918df28d Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 18 08:56:47 2019 -0400 changes file for 31338 --- changes/ticket31338 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changes/ticket31338 b/changes/ticket31338 new file mode 100644 index 000000000..b76add635 --- /dev/null +++ b/changes/ticket31338 @@ -0,0 +1,4 @@ + o Minor bugfixes (best practices tracker): + - When listing overbroad exceptions, do not also list problems, + and do not list insufficiently broad exceptions. Fixes bug 31338; + bugfix on 0.4.2.1-alpha.

1 0

[tor/master] Merge branch 'tor-github/pr/1337'
by asn＠torproject.org 25 Sep '19

25 Sep '19

commit 7157d80c6f0dc2bdcaf8993f5010f0e8d791c675 Merge: 01a797be4 82ad63ef4 Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Sep 25 14:19:49 2019 +0300 Merge branch 'tor-github/pr/1337' Makefile.am | 1 + changes/ticket31338 | 4 ++++ scripts/maint/practracker/practracker.py | 9 +++++++++ scripts/maint/practracker/problem.py | 6 ++++-- scripts/maint/practracker/test_practracker.sh | 6 ++++++ scripts/maint/practracker/testdata/ex1-overbroad-expected.txt | 2 ++ scripts/maint/practracker/testdata/ex1.txt | 5 ++++- scripts/maint/practracker/util.py | 7 +++++++ 8 files changed, 37 insertions(+), 3 deletions(-)

1 0

[tor/master] practracker: Integration test for --list-overbroad
by asn＠torproject.org 25 Sep '19

25 Sep '19

commit 1c67d261d528767bc3a24f738dc316635f000f7e Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 18 08:53:17 2019 -0400 practracker: Integration test for --list-overbroad Make sure that we list overbroad exceptions, and nothing else --- Makefile.am | 1 + scripts/maint/practracker/test_practracker.sh | 6 ++++++ scripts/maint/practracker/testdata/ex1-overbroad-expected.txt | 2 ++ scripts/maint/practracker/testdata/ex1.txt | 5 ++++- 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 491b4c8f9..845440b56 100644 --- a/Makefile.am +++ b/Makefile.am @@ -183,6 +183,7 @@ EXTRA_DIST+= \ scripts/maint/practracker/testdata/ex0.txt \ scripts/maint/practracker/testdata/ex1-expected.txt \ scripts/maint/practracker/testdata/ex1.txt \ + scripts/maint/practracker/testdata/ex1-overbroad-expected.txt \ scripts/maint/practracker/testdata/ex.txt \ scripts/maint/practracker/testdata/header.h \ scripts/maint/practracker/testdata/not_c_file \ diff --git a/scripts/maint/practracker/test_practracker.sh b/scripts/maint/practracker/test_practracker.sh index bfbd0c656..9b107e071 100755 --- a/scripts/maint/practracker/test_practracker.sh +++ b/scripts/maint/practracker/test_practracker.sh @@ -61,3 +61,9 @@ echo "ex1:" run_practracker --exceptions "${DATA}/ex1.txt" > "${TMPDIR}/ex1-received.txt" compare "${TMPDIR}/ex1-received.txt" "${DATA}/ex1-expected.txt" + +echo "ex1.overbroad:" + +run_practracker --exceptions "${DATA}/ex1.txt" --list-overbroad > "${TMPDIR}/ex1-overbroad-received.txt" + +compare "${TMPDIR}/ex1-overbroad-received.txt" "${DATA}/ex1-overbroad-expected.txt" diff --git a/scripts/maint/practracker/testdata/ex1-overbroad-expected.txt b/scripts/maint/practracker/testdata/ex1-overbroad-expected.txt new file mode 100644 index 000000000..f69c608f4 --- /dev/null +++ b/scripts/maint/practracker/testdata/ex1-overbroad-expected.txt @@ -0,0 +1,2 @@ +problem file-size a.c 40 -> 38 +problem file-size z.c 100 -> 0 diff --git a/scripts/maint/practracker/testdata/ex1.txt b/scripts/maint/practracker/testdata/ex1.txt index f619e33b2..c698005d0 100644 --- a/scripts/maint/practracker/testdata/ex1.txt +++ b/scripts/maint/practracker/testdata/ex1.txt @@ -1,5 +1,5 @@ -problem file-size a.c 38 +problem file-size a.c 40 problem include-count a.c 4 # this problem will produce an error problem function-size a.c:i_am_a_function() 8 @@ -8,6 +8,9 @@ problem function-size a.c:another_function() 11 problem file-size b.c 15 # This is removed, and so will produce an error. # problem function-size b.c:foo() 4 +# This exception isn't used. +problem file-size z.c 100 + problem function-size b.c:bar() 5 problem dependency-violation a.c 3 problem dependency-violation header.h 3

1 0

[tor/master] practracker: An exception is "used" even when it is violated.
by asn＠torproject.org 25 Sep '19

25 Sep '19

commit d1ffac3f8abbdd5b7d8e5955615821bff3ee3729 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 18 08:52:01 2019 -0400 practracker: An exception is "used" even when it is violated. The purpose of tracking whether an exception is used is so that we can tell whether it is overbroad. This means that an _underbroad_ exception is still a used one. Fixes bug 31338. --- scripts/maint/practracker/problem.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/maint/practracker/problem.py b/scripts/maint/practracker/problem.py index 88e1044fb..d21840a21 100644 --- a/scripts/maint/practracker/problem.py +++ b/scripts/maint/practracker/problem.py @@ -77,8 +77,10 @@ class ProblemVault(object): # (e.g. we went from 4k LoC to 3k LoC), but we do warn if the # situation worsened (e.g. we went from 60 includes to 80). status = problem.is_worse_than(self.exceptions[problem.key()]) - if status == STATUS_OK: - self.used_exception_for[problem.key()] = problem + + # Remember that we used this exception, so that we can later + # determine whether the exception was overbroad. + self.used_exception_for[problem.key()] = problem return status

1 0

[tor/master] Treat an unexpected constant-sized VERSIONS cell as a PROTOCOL_WARN.
by asn＠torproject.org 25 Sep '19

25 Sep '19

commit 3c97ab3c24ba4a133377c7ec6ec89cc6903ffb2e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 17 09:09:36 2019 -0400 Treat an unexpected constant-sized VERSIONS cell as a PROTOCOL_WARN. We previously used tor_fragile_assert() to declare that this case could not happen: VERSIONS cells are always supposed to be variable-sized, right? This is incorrect, though. On a v1 link protocol connection, all cells are fixed-sized. There aren't supposed to be any VERSIONS cells with this version of the protocol, but apparently, somebody was messing up. (The v1 link protocol is obsolete, so probably the implementer responsible didn't mean to be using it.) Fixes bug 31107. Bugfix on 0.2.4.4-alpha, when we introduced a tor_fragile_assert() for this case. --- changes/bug31107 | 4 ++++ src/or/channeltls.c | 10 +++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/changes/bug31107 b/changes/bug31107 new file mode 100644 index 000000000..9652927c3 --- /dev/null +++ b/changes/bug31107 @@ -0,0 +1,4 @@ + o Minor bugfixes (logging, protocol violations): + - Do not log a nonfatal assertion failure when receiving a VERSIONS + cell on a connection using the obsolete v1 link protocol. Log a + protocol_warn instead. Fixes bug 31107; bugfix on 0.2.4.4-alpha. diff --git a/src/or/channeltls.c b/src/or/channeltls.c index d44f71913..6f4e413dc 100644 --- a/src/or/channeltls.c +++ b/src/or/channeltls.c @@ -1098,7 +1098,15 @@ channel_tls_handle_cell(cell_t *cell, or_connection_t *conn) /* do nothing */ break; case CELL_VERSIONS: - tor_fragile_assert(); + /* A VERSIONS cell should always be a variable-length cell, and + * so should never reach this function (which handles constant-sized + * cells). But if the connection is using the (obsolete) v1 link + * protocol, all cells will be treated as constant-sized, and so + * it's possible we'll reach this code. + */ + log_fn(LOG_PROTOCOL_WARN, LD_CHANNEL, + "Received unexpected VERSIONS cell on a channel using link " + "protocol %d; ignoring.", conn->link_proto); break; case CELL_NETINFO: ++stats_n_netinfo_cells_processed;

1 0

[tor/master] Merge branch 'bug31107_041' into bug31107_master
by asn＠torproject.org 25 Sep '19

25 Sep '19

commit 4d7ce27105dfb7f04ef14a59d098d2f81363298c Merge: b5f39955d 6ee19e57c Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 17 09:16:53 2019 -0400 Merge branch 'bug31107_041' into bug31107_master changes/bug31107 | 4 ++++ src/core/or/channeltls.c | 10 +++++++++- 2 files changed, 13 insertions(+), 1 deletion(-)

1 0