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

[translation/torbutton-abouttbupdatedtd] Update translations for torbutton-abouttbupdatedtd
by translation＠torproject.org 18 Sep '18

18 Sep '18

commit 615d1f22854f8275141599cfa186ea3889c98214 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 18 09:48:09 2018 +0000 Update translations for torbutton-abouttbupdatedtd --- nl/abouttbupdate.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nl/abouttbupdate.dtd b/nl/abouttbupdate.dtd index 9f5cc50f0..9536a6287 100644 --- a/nl/abouttbupdate.dtd +++ b/nl/abouttbupdate.dtd @@ -7,4 +7,4 @@ <!ENTITY aboutTBUpdate.circuitDisplayHeading "New, Redesigned Circuit Display"> <!ENTITY aboutTBUpdate.circuitDisplayDescription "The Tor circuit display has been relocated and improved! Click the Site Identity button (located on the left side of the URL bar) to see the new circuit display."> -<!ENTITY aboutTBUpdate.learnMore "Learn More"> +<!ENTITY aboutTBUpdate.learnMore "Meer info">

1 0

[translation/tba-android_stringsdtd] Update translations for tba-android_stringsdtd
by translation＠torproject.org 18 Sep '18

18 Sep '18

commit 977766e6874a9986bf61c737ad2b61f7f1dbb3bc Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 18 09:46:50 2018 +0000 Update translations for tba-android_stringsdtd --- nl/android_strings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nl/android_strings.dtd b/nl/android_strings.dtd index a2da60959..b8525727a 100644 --- a/nl/android_strings.dtd +++ b/nl/android_strings.dtd @@ -667,7 +667,7 @@ just addresses the organization to follow, e.g. "This site is run by " --> <!ENTITY doorhanger_tracking_message_disabled2 "This page includes elements that may track your browsing.">  -<!ENTITY learn_more "Learn More"> +<!ENTITY learn_more "Meer info"> <!ENTITY enable_protection "Enable protection"> <!ENTITY disable_protection "Disable protection">

1 0

[tor-browser/tor-browser-60.2.0esr-8.5-1] Bug 26381: about:tor page does not load on first start on Windows
by gk＠torproject.org 18 Sep '18

18 Sep '18

commit 62001bb019dbf0956454f8fc550ccc1e81ee8d3c Author: Richard Pospesel <richard(a)torproject.org> Date: Sat Sep 15 04:01:17 2018 +0000 Bug 26381: about:tor page does not load on first start on Windows Child content processes require certain directories to be marked as readable or writeable when Sandboxing is enabled. The directories to be whitelisted are saved in static variables in sandboxBroker.cpp and are initialized in SandboxBroker::GeckoDependentInitialize(). Any child content process which is created before these directories are saved will be unable to read or write to them. The tor-launcher extension triggers the creation of a content process which hosts the tor network configuration settings window. This process is created before the whitelisted directories are saved. The network settings process doesn't need access to these directories to function, but subsequent content processes which are created once the settings window exits do need these directories to function. Sometimes, the creation of these subsequent processes is slow enough for the parent process to 'catch up' and create the whitelist resulting in the broken about:tor tab or broken white tab. A previous iteration of this patch moved the GeckoDependentInitialize() call directly above the call to DoStartup(). However, Mozilla dev Bob Owen objected to this since this places the call before various services are initialized which the SandboxBroker may depend on. Some experimentation would seem to confirm his objections: placing the whitelist init just prior to DoStartup() results in an empty value for the profile directory which prevents child processes reading the chrome and extensions directory. This patch inserts the GeckoDependentInitialize() call into DoStartup() just after the profile directory is known and queryable by the SandboxBroker, and before the 'profile-after-change' notification is fired. It also reverts the temp fix which reduced the sandbox level to 2 on windows. --- browser/app/profile/000-tor-browser.js | 5 ----- toolkit/xre/nsAppRunner.cpp | 6 ------ toolkit/xre/nsXREDirProvider.cpp | 19 +++++++++++++++++++ 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index bc7c4b05e3a1..38f72579760a 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -329,11 +329,6 @@ pref("browser.onboarding.newtour", "welcome,privacy,tor-network,circuit-display, pref("browser.onboarding.updatetour", "welcome,privacy,tor-network,circuit-display,security,expect-differences,onion-services"); pref("browser.onboarding.skip-tour-button.hide", true); -#ifdef XP_WIN -// For now, reduce sandboxing level to 2 (see #26381). -pref("security.sandbox.content.level", 2); -#endif - #ifdef TOR_BROWSER_VERSION #expand pref("torbrowser.version", __TOR_BROWSER_VERSION__); #endif diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp index 1000014aedd0..7889919ca677 100644 --- a/toolkit/xre/nsAppRunner.cpp +++ b/toolkit/xre/nsAppRunner.cpp @@ -5249,12 +5249,6 @@ XREMain::XRE_mainRun() // We intentionally leak the string here since it is required by PR_SetEnv. PR_SetEnv(saved.release()); } - -#if defined(MOZ_SANDBOX) - // Call SandboxBroker to initialize things that depend on Gecko machinery like - // the directory provider. - SandboxBroker::GeckoDependentInitialize(); -#endif #endif SaveStateForAppInitiatedRestart(); diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp index b54985292e81..72545d0eb422 100644 --- a/toolkit/xre/nsXREDirProvider.cpp +++ b/toolkit/xre/nsXREDirProvider.cpp @@ -66,6 +66,10 @@ #include "UIKitDirProvider.h" #endif +#if defined(MOZ_SANDBOX) && defined(XP_WIN) +#include "sandboxBroker.h" +#endif + #if defined(MOZ_CONTENT_SANDBOX) #include "mozilla/SandboxSettings.h" #include "nsIUUIDGenerator.h" @@ -1003,6 +1007,21 @@ nsXREDirProvider::DoStartup() policies->Observe(nullptr, "policies-startup", nullptr); } + #if defined(MOZ_SANDBOX) && defined(XP_WIN) + // Call SandboxBroker to initialize things that depend on Gecko machinery like + // the directory provider. + + // We insert this initialization code here so that any child content processes spawned by + // extensions (such as tor-launcher launching the network configuration window) will have + // all the requisite directories white-listed for read/write access + + // It's inserted here (rather than in XREMain::XRE_mainRun) because we need + // NS_APP_USER_PROFILE_50_DIR to be known + + // See tor bug #26381 and mozilla bug #1485836 + SandboxBroker::GeckoDependentInitialize(); + #endif + // Init the Extension Manager nsCOMPtr<nsIObserver> em = do_GetService("@mozilla.org/addons/integration;1"); if (em) {

1 0

[sbws/master] Implement rounding to an opt num of digits
by juga＠torproject.org 18 Sep '18

18 Sep '18

commit f1c961089aec36c5e21d744d1051eddd2fcd0b5b Author: juga0 <juga(a)riseup.net> Date: Fri Aug 31 16:17:16 2018 +0000 Implement rounding to an opt num of digits --- sbws/lib/v3bwfile.py | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/sbws/lib/v3bwfile.py b/sbws/lib/v3bwfile.py index a94ee73..f74792b 100644 --- a/sbws/lib/v3bwfile.py +++ b/sbws/lib/v3bwfile.py @@ -9,8 +9,9 @@ from statistics import median, mean from sbws import __version__ from sbws.globals import (SPEC_VERSION, BW_LINE_SIZE, SBWS_SCALE_CONSTANT, - SBWS_SCALING, TORFLOW_BW_MARGIN, TORFLOW_SCALING, - TORFLOW_OBS_LAST, TORFLOW_OBS_MEAN) + TORFLOW_SCALING, SBWS_SCALING, TORFLOW_BW_MARGIN, + TORFLOW_OBS_LAST, TORFLOW_OBS_MEAN, + TORFLOW_ROUND_DIG) from sbws.lib.resultdump import ResultSuccess, _ResultType from sbws.util.filelock import DirectoryLock from sbws.util.timestamp import now_isodt_str, unixts_to_isodt_str @@ -48,6 +49,12 @@ BW_KEYVALUES_INT = ['bw', 'rtt', 'success', 'error_stream', BW_KEYVALUES = BW_KEYVALUES_BASIC + BW_KEYVALUES_EXTRA +def kb_round_x_sig_dig(bw_bs, digits=TORFLOW_ROUND_DIG): + """Convert bw to KB and round to x most significat digits.""" + bw_kb = bw_bs / 1000 + return max(int(round(bw_kb, -digits)), 1) + + def num_results_of_type(results, type_str): return len([r for r in results if r.type == type_str]) @@ -399,6 +406,7 @@ class V3BWFile(object): scale_constant=SBWS_SCALE_CONSTANT, scaling_method=None, torflow_obs=TORFLOW_OBS_LAST, torflow_cap=TORFLOW_BW_MARGIN, + torflow_round_digs=TORFLOW_ROUND_DIG, reverse=False): """Create V3BWFile class from sbws Results. @@ -434,7 +442,7 @@ class V3BWFile(object): # log.debug(bw_lines[-1]) elif scaling_method == TORFLOW_SCALING: bw_lines = cls.bw_torflow_scale(bw_lines_raw, torflow_obs, - torflow_cap) + torflow_cap, torflow_round_digs) # log.debug(bw_lines[-1]) else: bw_lines = cls.bw_kb(bw_lines_raw) @@ -519,7 +527,8 @@ class V3BWFile(object): @staticmethod def bw_torflow_scale(bw_lines, desc_obs_bws=TORFLOW_OBS_LAST, - cap=TORFLOW_BW_MARGIN, reverse=False): + cap=TORFLOW_BW_MARGIN, + num_round_dig=TORFLOW_ROUND_DIG, reverse=False): """ Obtain final bandwidth measurements applying Torflow's scaling method. @@ -699,11 +708,12 @@ class V3BWFile(object): elif desc_obs_bws == TORFLOW_OBS_MEAN: desc_obs_bw = l.desc_obs_bw_bs_mean # just applying the formula above: - bw_new = max( + bw_new = kb_round_x_sig_dig( + max( l.bw_bs_mean / mu, # ratio min(l.bw_bs_mean, mu) / muf # ratio filtered - ) * desc_obs_bw \ - / 1000 # convert to KB + ) * desc_obs_bw, \ + digits=num_round_dig) # convert to KB # Cap maximum bw if cap is not None: bw_new = min(hlimit, bw_new)

1 0

[sbws/master] Add arg to round to a num of digits
by juga＠torproject.org 18 Sep '18

18 Sep '18

commit 71fffd877b0126089dd2402a0ec449b3fc43013d Author: juga0 <juga(a)riseup.net> Date: Fri Aug 31 16:18:02 2018 +0000 Add arg to round to a num of digits when scaling as Torflow --- sbws/core/generate.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sbws/core/generate.py b/sbws/core/generate.py index fe5459e..b937c5b 100644 --- a/sbws/core/generate.py +++ b/sbws/core/generate.py @@ -1,5 +1,5 @@ from sbws.globals import (fail_hard, SBWS_SCALE_CONSTANT, TORFLOW_SCALING, - SBWS_SCALING, TORFLOW_BW_MARGIN) + SBWS_SCALING, TORFLOW_BW_MARGIN, TORFLOW_ROUND_DIG) from sbws.lib.v3bwfile import V3BWFile from sbws.lib.resultdump import load_recent_results_in_datadir from argparse import ArgumentDefaultsHelpFormatter @@ -44,6 +44,10 @@ def gen_parser(sub): type=float, help="Cap maximum bw when scaling as Torflow. " "(Default: 0.05)") + p.add_argument('-r', '--torflow-round-digs', default=TORFLOW_ROUND_DIG, + type=int, + help="Number of most significant digits to round bw " + "when scaling as Torflow. (Default: 3)") def main(args, conf): @@ -77,7 +81,8 @@ def main(args, conf): state_fpath = conf.getpath('paths', 'state_fname') bw_file = V3BWFile.from_results(results, state_fpath, args.scale_constant, scaling_method, - torflow_cap=args.torflow_bw_margin) + torflow_cap=args.torflow_bw_margin, + torflow_round_digs=args.torflow_round_digs, output = args.output or \ conf.getpath('paths', 'v3bw_fname').format(now_fname()) bw_file.write(output)

1 0

[sbws/master] Add args to method to filter results
by juga＠torproject.org 18 Sep '18

18 Sep '18

commit 54ccf2ce4d52845029757fab43772e5648c53644 Author: juga0 <juga(a)riseup.net> Date: Wed Sep 5 12:20:02 2018 +0000 Add args to method to filter results that are away from each other a min num of secs and have at least x results --- sbws/lib/v3bwfile.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sbws/lib/v3bwfile.py b/sbws/lib/v3bwfile.py index 2d486ef..fcc80d1 100644 --- a/sbws/lib/v3bwfile.py +++ b/sbws/lib/v3bwfile.py @@ -254,7 +254,8 @@ class V3BWLine(object): return self.bw_strv110 @classmethod - def from_results(cls, results): + def from_results(cls, results, secs_recent=None, secs_away=None, + min_num=0): """Convert sbws results to relays' Bandwidth Lines ``bs`` stands for Bytes/seconds

1 0

[sbws/master] Add constants for the min num results
by juga＠torproject.org 18 Sep '18

18 Sep '18

commit 0bca458360746dfe3f63213c8a44355e44b50f40 Author: juga0 <juga(a)riseup.net> Date: Wed Sep 5 12:11:23 2018 +0000 Add constants for the min num results and the min num of secs that the results must be away from each other. --- sbws/globals.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sbws/globals.py b/sbws/globals.py index 7060c1a..52c31bf 100644 --- a/sbws/globals.py +++ b/sbws/globals.py @@ -38,6 +38,8 @@ TORFLOW_OBS_LAST = 0 TORFLOW_OBS_MEAN = 1 TORFLOW_OBS_DECAYING = 3 TORFLOW_ROUND_DIG = 3 +DAY_SECS = 86400 +NUM_MIN_RESULTS = 2 BW_LINE_SIZE = 510

1 0

[sbws/master] Merge pull request #255 from juga0/ticket27337_round_bw
by juga＠torproject.org 18 Sep '18

18 Sep '18

commit 0c5415d4f2d8ebf8982bcb5c2c66814054396c23 Merge: 1603c88 d09dc0e Author: juga0 <juga(a)riseup.net> Date: Thu Sep 13 18:31:46 2018 +0000 Merge pull request #255 from juga0/ticket27337_round_bw Ticket27337 round bw CHANGELOG.md | 1 + sbws/core/generate.py | 9 +++++++-- sbws/globals.py | 1 + sbws/lib/v3bwfile.py | 24 +++++++++++++++++------- 4 files changed, 26 insertions(+), 9 deletions(-)

1 0

[sbws/master] Use args to filter bw lines
by juga＠torproject.org 18 Sep '18

18 Sep '18

commit 19da64c866d2dabdd474dbe717c3c3ab11a9931d Author: juga0 <juga(a)riseup.net> Date: Wed Sep 5 12:26:46 2018 +0000 Use args to filter bw lines when creating a bw file from results --- sbws/lib/v3bwfile.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sbws/lib/v3bwfile.py b/sbws/lib/v3bwfile.py index 66a865b..5567c5c 100644 --- a/sbws/lib/v3bwfile.py +++ b/sbws/lib/v3bwfile.py @@ -469,8 +469,9 @@ class V3BWFile(object): log.info('Processing results to generate a bandwidth list file.') header = V3BWHeader.from_results(results, state_fpath) bw_lines_raw = [] - for fp in results.keys(): - line = V3BWLine.from_results(results[fp]) + for fp, values in results.items(): + line = V3BWLine.from_results(values, secs_recent, secs_away, + min_num) if line is not None: bw_lines_raw.append(line) if not bw_lines_raw:

1 0

[sbws/master] Import timestamp function
by juga＠torproject.org 18 Sep '18

18 Sep '18

commit 5ff83f4c854857746d24702f28f8534b62ec7c28 Author: juga0 <juga(a)riseup.net> Date: Wed Sep 5 12:18:33 2018 +0000 Import timestamp function --- sbws/lib/v3bwfile.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sbws/lib/v3bwfile.py b/sbws/lib/v3bwfile.py index f74792b..2d486ef 100644 --- a/sbws/lib/v3bwfile.py +++ b/sbws/lib/v3bwfile.py @@ -14,7 +14,8 @@ from sbws.globals import (SPEC_VERSION, BW_LINE_SIZE, SBWS_SCALE_CONSTANT, TORFLOW_ROUND_DIG) from sbws.lib.resultdump import ResultSuccess, _ResultType from sbws.util.filelock import DirectoryLock -from sbws.util.timestamp import now_isodt_str, unixts_to_isodt_str +from sbws.util.timestamp import (now_isodt_str, unixts_to_isodt_str, + now_unixts) from sbws.util.state import State log = logging.getLogger(__name__)

1 0