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

[tor-browser/tor-browser-52.7.2esr-8.0-1] Orfox: confvars changes to disable screen casting
by gk＠torproject.org 20 Mar '18

20 Mar '18

commit 36df808f70e1108b926a1187a03387d4b4823878 Author: Amogh Pradeep <amoghbl1(a)gmail.com> Date: Wed Jun 10 17:12:02 2015 -0400 Orfox: confvars changes to disable screen casting Signed-off-by: Amogh Pradeep <amoghbl1(a)gmail.com> --- mobile/android/confvars.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/mobile/android/confvars.sh b/mobile/android/confvars.sh index b4215ca89a0c..8af6925a6dc9 100644 --- a/mobile/android/confvars.sh +++ b/mobile/android/confvars.sh @@ -32,6 +32,11 @@ MOZ_RAW=1 MOZ_RUST_MP4PARSE=1 +MOZ_PLACES= +MOZ_SOCIAL= +MOZ_ANDROID_HISTORY=0 +MOZ_DISABLE_EXPORT_JS=1 + # use custom widget for html:select MOZ_USE_NATIVE_POPUP_WINDOWS=1 @@ -40,7 +45,7 @@ MOZ_APP_ID={aa3c5121-dab2-40e2-81ca-7ea25febc110} MOZ_APP_STATIC_INI=1 # Enable second screen using native Android libraries. -MOZ_NATIVE_DEVICES=1 +MOZ_NATIVE_DEVICES=0 # Enable install tracking SDK if we have Google Play support; MOZ_NATIVE_DEVICES # is a proxy flag for that support.

1 0

[tor/master] Remove changes files already merged into 0.3.3
by nickm＠torproject.org 20 Mar '18

20 Mar '18

commit a08e18545abc8c195531dff78bf9aa5a838cff39 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 20 07:26:07 2018 -0400 Remove changes files already merged into 0.3.3 --- changes/bug25249 | 3 --- changes/bug25249.2 | 3 --- changes/bug25378 | 4 ---- changes/bug25450 | 8 -------- changes/bug25474 | 5 ----- changes/bug25479 | 4 ---- changes/geoip-2018-03-08 | 4 ---- changes/refactor23814 | 4 ---- changes/ticket23635 | 3 --- changes/trove-2018-001.1 | 6 ------ changes/trove-2018-004 | 8 -------- 11 files changed, 52 deletions(-) diff --git a/changes/bug25249 b/changes/bug25249 deleted file mode 100644 index b4153eeae..000000000 --- a/changes/bug25249 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes (spec conformance): - - Forbid "-0" as a protocol version. Fixes part of bug 25249; bugfix on - 0.2.9.4-alpha. diff --git a/changes/bug25249.2 b/changes/bug25249.2 deleted file mode 100644 index 9058c1107..000000000 --- a/changes/bug25249.2 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes (spec conformance): - - Forbid UINT32_MAX as a protocol version. Fixes part of bug 25249; - bugfix on 0.2.9.4-alpha. diff --git a/changes/bug25378 b/changes/bug25378 deleted file mode 100644 index 4648a0a31..000000000 --- a/changes/bug25378 +++ /dev/null @@ -1,4 +0,0 @@ - o Documentation: - - Update the documentation for "Log" to include the current list - of logging domains. Closes ticket 25378. - diff --git a/changes/bug25450 b/changes/bug25450 deleted file mode 100644 index ae14135a7..000000000 --- a/changes/bug25450 +++ /dev/null @@ -1,8 +0,0 @@ - o Minor bugfixes (testing): - - Avoid intermittent test failures due to relying on hidden service - introductory point creation within 5 seconds of real clock time. The - time limit for the test has been increased to 500 seconds, which may - still result in intermittent failures (e.g. if the system doing the - testing enters sleep/hibernation or experiences some other clock jump). - However, this should elliminate test failures currently happening on - developer and CI systems. Fixes bug 25450; bugfix on 0.3.1.3-alpha. diff --git a/changes/bug25474 b/changes/bug25474 deleted file mode 100644 index 7d3bd1c5f..000000000 --- a/changes/bug25474 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes (compilation): - - Fix a c99 compliance issue in our configuration script that was - causing compilation issues when compiling Tor with certain - versions of xtools. Fixes bug 25474; bugfix on 0.3.2.5-alpha. - diff --git a/changes/bug25479 b/changes/bug25479 deleted file mode 100644 index e693b8ec7..000000000 --- a/changes/bug25479 +++ /dev/null @@ -1,4 +0,0 @@ - o Major bugfixes (benchmarks): - - Fix a crash when running benchmark tests on win32 systems which - was due to an uninitialised mutex before logging and options - were initialised. Fixes bug 25479; bugfix on 0.3.3.3-alpha. diff --git a/changes/geoip-2018-03-08 b/changes/geoip-2018-03-08 deleted file mode 100644 index d9696aab5..000000000 --- a/changes/geoip-2018-03-08 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor features (geoip): - - Update geoip and geoip6 to the March 8 2018 Maxmind GeoLite2 - Country database. Closes ticket 25469. - diff --git a/changes/refactor23814 b/changes/refactor23814 deleted file mode 100644 index a67b6989f..000000000 --- a/changes/refactor23814 +++ /dev/null @@ -1,4 +0,0 @@ - o Code simplification and refactoring: - - Remove the old (deterministic) directory retry logic entirely: - We've used exponential backoff exclusively for some time. - Closes ticket 23814. diff --git a/changes/ticket23635 b/changes/ticket23635 deleted file mode 100644 index 54d303e4b..000000000 --- a/changes/ticket23635 +++ /dev/null @@ -1,3 +0,0 @@ - o Documentation: - - Improved the documentation of AccountingStart paremeter. - Closes ticket 23635. diff --git a/changes/trove-2018-001.1 b/changes/trove-2018-001.1 deleted file mode 100644 index f0ee92f40..000000000 --- a/changes/trove-2018-001.1 +++ /dev/null @@ -1,6 +0,0 @@ - o Major bugfixes (denial-of-service, directory authority): - - Fix a protocol-list handling bug that could be used to remotely crash - directory authorities with a null-pointer exception. Fixes bug 25074; - bugfix on 0.2.9.4-alpha. Also tracked as TROVE-2018-001. - - diff --git a/changes/trove-2018-004 b/changes/trove-2018-004 deleted file mode 100644 index 37e0a89b0..000000000 --- a/changes/trove-2018-004 +++ /dev/null @@ -1,8 +0,0 @@ - o Minor bugfixes (denial-of-service): - - Fix a possible crash on malformed consensus. If a consensus had - contained an unparseable protocol line, it could have made clients - and relays crash with a null-pointer exception. To exploit this - issue, however, an attacker would need to be able to subvert the - directory-authority system. Fixes bug 25251; bugfix on - 0.2.9.4-alpha. Also tracked as TROVE-2018-004. -

1 0

[webwml/master] Deprecate Tor Browser 8.0a3
by gk＠torproject.org 20 Mar '18

20 Mar '18

commit c9cd4e2e1103c71cc10e30357518f2244f8d7a19 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Mar 20 10:23:14 2018 +0000 Deprecate Tor Browser 8.0a3 --- projects/torbrowser/RecommendedTBBVersions | 4 ---- 1 file changed, 4 deletions(-) diff --git a/projects/torbrowser/RecommendedTBBVersions b/projects/torbrowser/RecommendedTBBVersions index 0d1e187e..2d65a840 100644 --- a/projects/torbrowser/RecommendedTBBVersions +++ b/projects/torbrowser/RecommendedTBBVersions @@ -3,10 +3,6 @@ "7.5.2-MacOS", "7.5.2-Linux", "7.5.2-Windows", -"8.0a3", -"8.0a3-MacOS", -"8.0a3-Linux", -"8.0a3-Windows", "8.0a4", "8.0a4-MacOS", "8.0a4-Linux",

1 0

[tor/master] Move rust-specific declarations outside of #else block
by nickm＠torproject.org 20 Mar '18

20 Mar '18

commit 228b65593533a796243853f53109049ebc2b4efa Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 19 19:18:23 2018 -0400 Move rust-specific declarations outside of #else block These declarations need to exist unconditionally, but they were trapped inside an "#else /* !(defined(HAVE_SYSLOG_H)) */" block. Fixes a travis regression caused by 23881; bug not in any released tor. --- src/common/torlog.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/common/torlog.h b/src/common/torlog.h index a8b5604d8..ac632ff52 100644 --- a/src/common/torlog.h +++ b/src/common/torlog.h @@ -31,16 +31,6 @@ * "maximum severity" read "most severe" and "numerically *lowest* severity". */ -/** This defines log levels that are linked in the Rust log module, rather - * than re-defining these in both Rust and C. - * - * C_RUST_COUPLED src/rust/tor_log LogSeverity, LogDomain - */ -extern const int LOG_WARN_; -extern const int LOG_NOTICE_; -extern const log_domain_mask_t LD_NET_; -extern const log_domain_mask_t LD_GENERAL_; - /** Debug-level severity: for hyper-verbose messages of no interest to * anybody but developers. */ #define LOG_DEBUG 7 @@ -262,6 +252,16 @@ void tor_log_string(int severity, log_domain_mask_t domain, args, ##__VA_ARGS__) #endif /* defined(__GNUC__) && __GNUC__ <= 3 */ +/** This defines log levels that are linked in the Rust log module, rather + * than re-defining these in both Rust and C. + * + * C_RUST_COUPLED src/rust/tor_log LogSeverity, LogDomain + */ +extern const int LOG_WARN_; +extern const int LOG_NOTICE_; +extern const log_domain_mask_t LD_NET_; +extern const log_domain_mask_t LD_GENERAL_; + #ifdef LOG_PRIVATE MOCK_DECL(STATIC void, logv, (int severity, log_domain_mask_t domain, const char *funcname, const char *suffix, const char *format,

1 0

[metrics-web/master] Cut off lower number of expected clients at 0.
by karsten＠torproject.org 20 Mar '18

20 Mar '18

commit 5d039ad44c10cd82dd9ba8fb1efd6a7caa9b6090 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Mar 12 17:33:47 2018 +0100 Cut off lower number of expected clients at 0. Fixes #25397. --- src/main/python/clients/detector.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/python/clients/detector.py b/src/main/python/clients/detector.py index 611f25b..6cf1c7d 100644 --- a/src/main/python/clients/detector.py +++ b/src/main/python/clients/detector.py @@ -363,6 +363,8 @@ def write_all(tss, minc, maxc, RANGES_FILE, INTERVAL=7): if not minv < maxv: print minv, maxv, series[i-INTERVAL], minc[i], maxc[i] assert minv < maxv + if minv < 0.0: + minv = 0.0 ranges_file.write("%s,%s,%s,%s\n" % (tss.all_dates[i], c, minv, maxv)) ranges_file.close()

1 0

[metrics-web/master] Remove unused code from the censorship detector.
by karsten＠torproject.org 20 Mar '18

20 Mar '18

commit 4a30e7a9fbdded5318506302543b5d5e07571670 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Mar 12 17:49:40 2018 +0100 Remove unused code from the censorship detector. --- src/main/python/clients/detector.py | 199 +----------------------------------- 1 file changed, 2 insertions(+), 197 deletions(-) diff --git a/src/main/python/clients/detector.py b/src/main/python/clients/detector.py index 6cf1c7d..3d17bf0 100644 --- a/src/main/python/clients/detector.py +++ b/src/main/python/clients/detector.py @@ -60,8 +60,6 @@ import country_info # write utf8 to file import codecs -days = ["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"] - def get_country_name_from_cc(country_code): if (country_code.lower() in country_info.countries): return country_info.countries[country_code.lower()] @@ -208,145 +206,6 @@ def make_tendencies_minmax(l, INTERVAL = 1): ## print minx[-1], maxx[-1] return minx, maxx -# Makes pretty plots -def raw_plot(series, minc, maxc, labels, xtitle): - assert len(xtitle) == 3 - fname, stitle, slegend = xtitle - - font = {'family' : 'Bitstream Vera Sans', - 'weight' : 'normal', - 'size' : 8} - matplotlib.rc('font', **font) - - ylim( (-max(series)*0.1, max(series)*1.1) ) - plot(labels, series, linewidth=1.0, label="Users") - - wherefill = [] - for mm,mx in zip(minc, maxc): - wherefill += [not (mm == None and mx == None)] - assert mm < mx or (mm == None and mx == None) - - fill_between(labels, minc, maxc, where=wherefill, color="gray", label="Prediction") - - vdown = [] - vup = [] - for i,v in enumerate(series): - if minc[i] != None and v < minc[i]: - vdown += [v] - vup += [None] - elif maxc[i] != None and v > maxc[i]: - vdown += [None] - vup += [v] - else: - vup += [None] - vdown += [None] - - plot(labels, vdown, 'o', ms=10, lw=2, alpha=0.5, mfc='orange', label="Downturns") - plot(labels, vup, 'o', ms=10, lw=2, alpha=0.5, mfc='green', label="Upturns") - - legend(loc=2) - - xlabel('Time (days)') - ylabel('Users') - title(stitle) - grid(True) - F = gcf() - - F.set_size_inches(10,5) - F.savefig(fname, format="png", dpi = (150)) - close() - -def absolute_plot(series, minc, maxc, labels,INTERVAL, xtitle): - in_minc = [] - in_maxc = [] - for i, v in enumerate(series): - if i > 0 and i - INTERVAL >= 0 and series[i] != None and series[i-INTERVAL] != None and series[i-INTERVAL] != 0 and minc[i]!= None and maxc[i]!= None: - in_minc += [minc[i] * poisson.ppf(1-0.9999, series[i-INTERVAL])] - in_maxc += [maxc[i] * poisson.ppf(0.9999, series[i-INTERVAL])] - if not in_minc[-1] < in_maxc[-1]: - print in_minc[-1], in_maxc[-1], series[i-INTERVAL], minc[i], maxc[i] - assert in_minc[-1] < in_maxc[-1] - else: - in_minc += [None] - in_maxc += [None] - raw_plot(series, in_minc, in_maxc, labels, xtitle) - -"""Return the number of downscores and upscores of a time series -'series', given tendencies 'minc' and 'maxc' for the time interval -'INTERVAL'. - -If 'scoring_interval' is specifed we only consider upscore/downscore -that happened in the latest 'scoring_interval' days. -""" -def censor_score(series, minc, maxc, INTERVAL, scoring_interval=None): - upscore = 0 - downscore = 0 - - if scoring_interval is None: - scoring_interval = len(series) - assert(len(series) >= scoring_interval) - - for i, v in enumerate(series): - if i > 0 and i - INTERVAL >= 0 and series[i] != None and series[i-INTERVAL] != None and series[i-INTERVAL] != 0 and minc[i]!= None and maxc[i]!= None: - in_minc = minc[i] * poisson.ppf(1-0.9999, series[i-INTERVAL]) - in_maxc = maxc[i] * poisson.ppf(0.9999, series[i-INTERVAL]) - if (i >= (len(series) - scoring_interval)): - downscore += 1 if minc[i] != None and v < in_minc else 0 - upscore += 1 if maxc[i] != None and v > in_maxc else 0 - - return downscore, upscore - -def plot_target(tss, TARGET, xtitle, minx, maxx, DAYS=365, INTERV = 7): - ctarget = tss.get_country_series(TARGET) - c = n_day_rel(ctarget, INTERV) - absolute_plot(ctarget[-DAYS:], minx[-DAYS:], maxx[-DAYS:], tss.all_dates[-DAYS:],INTERV, xtitle = xtitle) - -def write_censorship_report_prologue(report_file, dates, notification_period): - if (notification_period == 1): - date_str = "%s" % (dates[-1]) # no need for date range if it's just one day - else: - date_str = "%s to %s" % (dates[-notification_period], dates[-1]) - - prologue = "=======================\n" - prologue += "Automatic Censorship Report for %s\n" % (date_str) - prologue += "=======================\n\n" - report_file.write(prologue) - -## Make a league table of censorship + nice graphs -def plot_all(tss, minx, maxx, INTERV, DAYS=None, rdir="img"): - rdir = os.path.realpath(rdir) - if not os.path.exists(rdir) or not os.path.isdir(rdir): - print "ERROR: %s does not exist or is not a directory." % rdir - return - - summary_file = file(os.path.join(rdir, "summary.txt"), "w") - - if DAYS == None: - DAYS = 6*31 - - s = tss.get_largest(200) - scores = [] - for num, li in s: - print ".", - ds,us = censor_score(tss.get_country_series(li)[-DAYS:], minx[-DAYS:], maxx[-DAYS:], INTERV) - # print ds, us - scores += [(ds,num, us, li)] - scores.sort() - scores.reverse() - s = "\n=======================\n" - s+= "Report for %s to %s\n" % (tss.all_dates[-DAYS], tss.all_dates[-1]) - s+= "=======================\n" - print s - summary_file.write(s) - for a,nx, b,c in scores: - if a > 0: - s = "%s -- down: %2d (up: %2d affected: %s)" % (c, a, b, nx) - print s - summary_file.write(s + "\n") - xtitle = (os.path.join(rdir, "%03d-%s-censor.png" % (a,c)), "Tor report for %s -- down: %2d (up: %2d affected: %s)" % (c, a, b, nx),"") - plot_target(tss, c,xtitle, minx, maxx, DAYS, INTERV) - summary_file.close() - """Write a CSV report on the minimum/maximum users of each country per date.""" def write_all(tss, minc, maxc, RANGES_FILE, INTERVAL=7): ranges_file = file(RANGES_FILE, "w") @@ -368,70 +227,16 @@ def write_all(tss, minc, maxc, RANGES_FILE, INTERVAL=7): ranges_file.write("%s,%s,%s,%s\n" % (tss.all_dates[i], c, minv, maxv)) ranges_file.close() -"""Return a URL that points to a graph in metrics.tpo that displays -the number of direct Tor users in country 'country_code', for a -'period'-days period. - -Let's hope that the metrics.tpo URL scheme doesn't change often. -""" -def get_tor_usage_graph_url_for_cc_and_date(country_code, dates, period): - url = "https://metrics.torproject.org/users.html?graph=userstats-relay-country&sta…" % \ - (dates[-period], dates[-1], country_code) - return url - -"""Write a file containing a short censorship report over the last -'notification_period' days. -""" -def write_ml_report(tss, minx, maxx, INTERV, DAYS, notification_period=None): - if notification_period is None: - notification_period = DAYS - - report_file = codecs.open('short_censorship_report.txt', 'w', 'utf-8') - file_prologue_written = False - - s = tss.get_largest(None) # no restrictions, get 'em all. - scores = [] - for num, li in s: - ds,us = censor_score(tss.get_country_series(li)[-DAYS:], minx[-DAYS:], maxx[-DAYS:], INTERV, notification_period) - scores += [(ds,num, us, li)] - scores.sort() - scores.reverse() - - for downscores,users_n,upscores,country_code in scores: - if (downscores > 0) or (upscores > 0): - if not file_prologue_written: - write_censorship_report_prologue(report_file, tss.all_dates, notification_period) - file_prologue_written = True - - if ((upscores > 0) and (downscores == 0)): - s = "We detected an unusual spike of Tor users in %s (%d upscores, %d users):\n" % \ - (get_country_name_from_cc(country_code), upscores, users_n) - else: - s = "We detected %d potential censorship events in %s (users: %d, upscores: %d):\n" % \ - (downscores, get_country_name_from_cc(country_code), users_n, upscores) - - # Also give out a link for the appropriate usage graph for a 90-days period. - s += get_tor_usage_graph_url_for_cc_and_date(country_code, tss.all_dates, 90) - - report_file.write(s + "\n") - - report_file.close() - # INTERV is the time interval to model connection rates; # consider maximum DAYS days back. def detect(CSV_FILE = "userstats-detector.csv", - RANGES_FILE = "userstats-ranges.csv", GRAPH_DIR = "img", - INTERV = 7, DAYS = 6 * 31, REPORT = True): + RANGES_FILE = "userstats-ranges.csv", + INTERV = 7, DAYS = 6 * 31): tss = torstatstore(CSV_FILE) l = tss.get_largest_locations(50) minx, maxx = make_tendencies_minmax(l, INTERV) - #plot_all(tss, minx, maxx, INTERV, DAYS, rdir=GRAPH_DIR) write_all(tss, minx, maxx, RANGES_FILE, INTERV) - if REPORT: - # Make our short report; only consider events of the last day - write_ml_report(tss, minx, maxx, INTERV, DAYS, 1) - def main(): detect()

1 0

[metrics-web/master] Update to latest metrics-lib.
by karsten＠torproject.org 20 Mar '18

20 Mar '18

commit 08b646bb16142f627a0ce804fce1722bdd272096 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Mar 20 10:31:55 2018 +0100 Update to latest metrics-lib. --- src/submods/metrics-lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/submods/metrics-lib b/src/submods/metrics-lib index 7648780..2e235ef 160000 --- a/src/submods/metrics-lib +++ b/src/submods/metrics-lib @@ -1 +1 @@ -Subproject commit 7648780844f809f3068d3e625973fe43c78ccbb3 +Subproject commit 2e235ef8f38aac679817fa8e8b9171aadb3d5b9d

1 0

[collector/master] Corrected description of vote descriptor path.
by karsten＠torproject.org 20 Mar '18

20 Mar '18

commit 770f55cf82a1281e5081de7731adc9e36a916622 Author: iwakeh <iwakeh(a)torproject.org> Date: Mon Feb 26 15:24:50 2018 +0000 Corrected description of vote descriptor path. Implements task-20287. --- src/main/resources/docs/PROTOCOL | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/resources/docs/PROTOCOL b/src/main/resources/docs/PROTOCOL index c84c286..2c8b603 100644 --- a/src/main/resources/docs/PROTOCOL +++ b/src/main/resources/docs/PROTOCOL @@ -209,7 +209,8 @@ Where VOTE is the string "vote" and all time related values are derived from the valid-after dates. 'fingerprint' is the fingerprint of the authority and 'digest' is the SHA1 - digest of the authority's medium term signing key. + digest for the vote document, i.e., the digest of the descriptor + bytes from the start of the vote to the 'directory-signature'. 4.3.4 'microdescs' contains the subfolders

1 0

[tor/master] Add minimal implementations of functions Rust needs for logging
by nickm＠torproject.org 19 Mar '18

19 Mar '18

commit 719db28f54ad1fa957999f2a6256e07bdb412e4f Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 20 16:52:55 2017 -0500 Add minimal implementations of functions Rust needs for logging --- src/common/log.c | 24 ++++++++++++++++++++++++ src/common/torlog.h | 4 ++++ 2 files changed, 28 insertions(+) diff --git a/src/common/log.c b/src/common/log.c index ac6d07a92..608ffea95 100644 --- a/src/common/log.c +++ b/src/common/log.c @@ -225,6 +225,30 @@ log_set_application_name(const char *name) appname = name ? tor_strdup(name) : NULL; } +/** Return true if some of the running logs might be interested in a log + * message of the given severity in the given domains. If this function + * returns true, the log message might be ignored anyway, but if it returns + * false, it is definitely_ safe not to log the message. */ +int +log_message_is_interesting(int severity, log_domain_mask_t domain) +{ + (void) domain; + return (severity <= log_global_min_severity_); +} + +/** + * As tor_log, but takes an optional function name, and does not treat its + * <b>string</b> as a printf format. + * + * For use by Rust integration. + */ +void +tor_log_string(int severity, log_domain_mask_t domain, + const char *function, const char *string) +{ + log_fn_(severity, domain, function, "%s", string); +} + /** Log time granularity in milliseconds. */ static int log_time_granularity = 1; diff --git a/src/common/torlog.h b/src/common/torlog.h index b7d033adb..be8a39a1b 100644 --- a/src/common/torlog.h +++ b/src/common/torlog.h @@ -189,6 +189,10 @@ void log_fn_ratelim_(struct ratelim_t *ratelim, int severity, const char *format, ...) CHECK_PRINTF(5,6); +int log_message_is_interesting(int severity, log_domain_mask_t domain); +void tor_log_string(int severity, log_domain_mask_t domain, + const char *function, const char *string); + #if defined(__GNUC__) && __GNUC__ <= 3 /* These are the GCC varidaic macros, so that older versions of GCC don't

1 0

[tor/master] add minimal rust module for logging to tor's logger
by nickm＠torproject.org 19 Mar '18

19 Mar '18

commit 3dfe8e6522460817100582a33a382be3c3efd988 Author: Chelsea Holland Komlo <me(a)chelseakomlo.com> Date: Mon Nov 27 22:59:54 2017 -0500 add minimal rust module for logging to tor's logger Allows an optional no-op for testing purposes --- src/common/log.c | 7 + src/common/torlog.h | 10 ++ src/or/main.c | 8 +- src/rust/Cargo.lock | 10 ++ src/rust/Cargo.toml | 3 +- src/rust/protover/Cargo.toml | 3 + src/rust/protover/lib.rs | 1 + src/rust/protover/protover.rs | 20 ++- src/rust/tor_allocate/tor_allocate.rs | 19 ++- src/rust/tor_log/Cargo.toml | 18 +++ src/rust/tor_log/lib.rs | 17 +++ src/rust/tor_log/tor_log.rs | 236 ++++++++++++++++++++++++++++++++++ src/rust/tor_util/Cargo.toml | 3 + src/rust/tor_util/ffi.rs | 13 +- src/rust/tor_util/lib.rs | 1 + src/test/test_rust.sh | 2 +- 16 files changed, 350 insertions(+), 21 deletions(-) diff --git a/src/common/log.c b/src/common/log.c index 608ffea95..ebe6c228c 100644 --- a/src/common/log.c +++ b/src/common/log.c @@ -52,6 +52,13 @@ #define raw_assert(x) assert(x) // assert OK +/** Defining compile-time constants for Tor log levels (used by the Rust + * log wrapper at src/rust/tor_log) */ +const int _LOG_WARN = LOG_WARN; +const int _LOG_NOTICE = LOG_NOTICE; +const log_domain_mask_t _LD_GENERAL = LD_GENERAL; +const log_domain_mask_t _LD_NET = LD_NET; + /** Information for a single logfile; only used in log.c */ typedef struct logfile_t { struct logfile_t *next; /**< Next logfile_t in the linked list. */ diff --git a/src/common/torlog.h b/src/common/torlog.h index be8a39a1b..0ed990b6e 100644 --- a/src/common/torlog.h +++ b/src/common/torlog.h @@ -31,6 +31,16 @@ * "maximum severity" read "most severe" and "numerically *lowest* severity". */ +/** This defines log levels that are linked in the Rust log module, rather + * than re-defining these in both Rust and C. + * + * C_RUST_COUPLED src/rust/tor_log LogSeverity, LogDomain + */ +extern const int _LOG_WARN; +extern const int _LOG_NOTICE; +extern const log_domain_mask_t _LD_NET; +extern const log_domain_mask_t _LD_GENERAL; + /** Debug-level severity: for hyper-verbose messages of no interest to * anybody but developers. */ #define LOG_DEBUG 7 diff --git a/src/or/main.c b/src/or/main.c index e449b95b9..c19d4f690 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -132,7 +132,7 @@ void evdns_shutdown(int); #ifdef HAVE_RUST // helper function defined in Rust to output a log message indicating if tor is // running with Rust enabled. See src/rust/tor_util -char *rust_welcome_string(void); +void rust_welcome_string(void); #endif /********* PROTOTYPES **********/ @@ -3283,11 +3283,7 @@ tor_init(int argc, char *argv[]) } #ifdef HAVE_RUST - char *rust_str = rust_welcome_string(); - if (rust_str != NULL && strlen(rust_str) > 0) { - log_notice(LD_GENERAL, "%s", rust_str); - } - tor_free(rust_str); + rust_welcome_string(); #endif /* defined(HAVE_RUST) */ if (network_init()<0) { diff --git a/src/rust/Cargo.lock b/src/rust/Cargo.lock index 224d2135b..116ef17f1 100644 --- a/src/rust/Cargo.lock +++ b/src/rust/Cargo.lock @@ -4,6 +4,7 @@ version = "0.0.1" dependencies = [ "libc 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", "tor_allocate 0.0.1", + "tor_log 0.1.0", ] [[package]] @@ -26,6 +27,7 @@ dependencies = [ "libc 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", "smartlist 0.0.1", "tor_allocate 0.0.1", + "tor_log 0.1.0", "tor_util 0.0.1", ] @@ -44,6 +46,14 @@ dependencies = [ ] [[package]] +name = "tor_log" +version = "0.1.0" +dependencies = [ + "libc 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", + "tor_allocate 0.0.1", +] + +[[package]] name = "tor_rust" version = "0.1.0" dependencies = [ diff --git a/src/rust/Cargo.toml b/src/rust/Cargo.toml index 953c9b96b..4ae8033eb 100644 --- a/src/rust/Cargo.toml +++ b/src/rust/Cargo.toml @@ -1,5 +1,6 @@ [workspace] -members = ["tor_util", "protover", "smartlist", "external", "tor_allocate", "tor_rust"] +members = ["tor_util", "protover", "smartlist", "external", "tor_allocate", +"tor_rust", "tor_log"] [profile.release] debug = true diff --git a/src/rust/protover/Cargo.toml b/src/rust/protover/Cargo.toml index 04d2f2ed7..279916bd2 100644 --- a/src/rust/protover/Cargo.toml +++ b/src/rust/protover/Cargo.toml @@ -18,6 +18,9 @@ path = "../tor_util" [dependencies.tor_allocate] path = "../tor_allocate" +[dependencies.tor_log] +path = "../tor_log" + [lib] name = "protover" path = "lib.rs" diff --git a/src/rust/protover/lib.rs b/src/rust/protover/lib.rs index 5a5dea440..a9e8e1ee6 100644 --- a/src/rust/protover/lib.rs +++ b/src/rust/protover/lib.rs @@ -26,6 +26,7 @@ extern crate libc; extern crate smartlist; extern crate external; extern crate tor_allocate; +extern crate tor_log; mod protover; pub mod ffi; diff --git a/src/rust/protover/protover.rs b/src/rust/protover/protover.rs index 7d5947ca2..1c159afef 100644 --- a/src/rust/protover/protover.rs +++ b/src/rust/protover/protover.rs @@ -1,13 +1,14 @@ // Copyright (c) 2016-2017, The Tor Project, Inc. */ // See LICENSE for licensing information */ -use external::c_tor_version_as_new_as; - use std::str::FromStr; use std::fmt; use std::collections::{HashMap, HashSet}; use std::string::String; +use tor_log::*; +use external::c_tor_version_as_new_as; + /// The first version of Tor that included "proto" entries in its descriptors. /// Authorities should use this to decide whether to guess proto lines. /// @@ -186,7 +187,6 @@ fn get_versions(version_string: &str) -> Result<HashSet<u32>, &'static str> { Ok(versions) } - /// Parse the subprotocol type and its version numbers. /// /// # Inputs @@ -240,6 +240,20 @@ fn get_proto_and_vers<'a>( fn contains_only_supported_protocols(proto_entry: &str) -> bool { let (name, mut vers) = match get_proto_and_vers(proto_entry) { Ok(n) => n, + Err("Too many versions to expand") => { + tor_log_msg!( + LogSeverity::Warn, + LogDomain::LdNet, + "get_versions", + "When expanding a protocol list from an authority, I + got too many protocols. This is possibly an attack or a bug, + unless the Tor network truly has expanded to support over {} + different subprotocol versions. The offending string was: {}", + MAX_PROTOCOLS_TO_EXPAND, + proto_entry + ); + return false; + } Err(_) => return false, }; diff --git a/src/rust/tor_allocate/tor_allocate.rs b/src/rust/tor_allocate/tor_allocate.rs index 359df1cd7..3c0037f13 100644 --- a/src/rust/tor_allocate/tor_allocate.rs +++ b/src/rust/tor_allocate/tor_allocate.rs @@ -1,12 +1,17 @@ // Copyright (c) 2016-2017, The Tor Project, Inc. */ // See LICENSE for licensing information */ +// No-op defined purely for testing at the module level +use libc::c_char; -use libc::{c_char, c_void}; +#[cfg(not(feature = "testing"))] use std::{ptr, slice, mem}; +use libc::c_void; -#[cfg(not(test))] -extern "C" { - fn tor_malloc_(size: usize) -> *mut c_void; +// Define a no-op implementation for testing Rust modules without linking to C +#[cfg(feature = "testing")] +pub fn allocate_and_copy_string(s: &String) -> *mut c_char { + use std::ffi::CString; + CString::new(s.as_str()).unwrap().into_raw() } // Defined only for tests, used for testing purposes, so that we don't need @@ -17,6 +22,11 @@ unsafe extern "C" fn tor_malloc_(size: usize) -> *mut c_void { malloc(size) } +#[cfg(all(not(test), not(feature = "testing")))] +extern "C" { + fn tor_malloc_(size: usize) -> *mut c_void; +} + /// Allocate memory using tor_malloc_ and copy an existing string into the /// allocated buffer, returning a pointer that can later be called in C. /// @@ -28,6 +38,7 @@ unsafe extern "C" fn tor_malloc_(size: usize) -> *mut c_void { /// /// A `*mut c_char` that should be freed by tor_free in C /// +#[cfg(not(feature = "testing"))] pub fn allocate_and_copy_string(src: &String) -> *mut c_char { let bytes: &[u8] = src.as_bytes(); diff --git a/src/rust/tor_log/Cargo.toml b/src/rust/tor_log/Cargo.toml new file mode 100644 index 000000000..f31d27b04 --- /dev/null +++ b/src/rust/tor_log/Cargo.toml @@ -0,0 +1,18 @@ +[package] +name = "tor_log" +version = "0.1.0" +authors = ["The Tor Project"] + +[lib] +name = "tor_log" +path = "lib.rs" +crate_type = ["rlib", "staticlib"] + +[features] +testing = [] + +[dependencies] +libc = "0.2.22" + +[dependencies.tor_allocate] +path = "../tor_allocate" diff --git a/src/rust/tor_log/lib.rs b/src/rust/tor_log/lib.rs new file mode 100644 index 000000000..915910d00 --- /dev/null +++ b/src/rust/tor_log/lib.rs @@ -0,0 +1,17 @@ +//! Copyright (c) 2016-2017, The Tor Project, Inc. */ +//! See LICENSE for licensing information */ + +//! Logging wrapper for Rust to utilize Tor's logger, found at +//! src/common/log.c and src/common/torlog.h +//! +//! Exposes different interfaces depending on whether we are running in test +//! or non-test mode. When testing, we use a no-op implementation, +//! otherwise we link directly to C. + +extern crate libc; +extern crate tor_allocate; + +mod tor_log; + +pub use tor_log::*; +pub use tor_log::log::*; diff --git a/src/rust/tor_log/tor_log.rs b/src/rust/tor_log/tor_log.rs new file mode 100644 index 000000000..394e23244 --- /dev/null +++ b/src/rust/tor_log/tor_log.rs @@ -0,0 +1,236 @@ +// Copyright (c) 2016-2017, The Tor Project, Inc. */ +// See LICENSE for licensing information */ + + +/// The related domain which the logging message is relevant. For example, +/// log messages relevant to networking would use LogDomain::LdNet, whereas +/// general messages can use LdGeneral. +#[derive(Eq, PartialEq)] +pub enum LogDomain { + LdNet, + LdGeneral, +} + +/// The severity level at which to log messages. +#[derive(Eq, PartialEq)] +pub enum LogSeverity { + Notice, + Warn, +} + +/// Main entry point for Rust modules to log messages. +/// +/// # Inputs +/// +/// * A `severity` of type LogSeverity, which defines the level of severity the +/// message will be logged. +/// * A `domain` of type LogDomain, which defines the domain the log message +/// will be associated with. +/// * A `function` of type &str, which defines the name of the function where +/// the message is being logged. There is a current RFC for a macro that +/// defines function names. When it is, we should use it. See +/// https://github.com/rust-lang/rfcs/pull/1719 +/// * A `message` of type &str, which is the log message itself. +#[macro_export] +macro_rules! tor_log_msg { + ($severity: path, + $domain: path, + $function: expr, + $($message:tt)*) => + { + { + use std::ffi::CString; + + /// Default function name to log in case of errors when converting + /// a function name to a CString + const ERR_LOG_FUNCTION: &'static str = "tor_log_msg"; + + /// Default message to log in case of errors when converting a log + /// message to a CString + const ERR_LOG_MSG: &'static str = "Unable to log message from Rust + module due to error when converting to CString"; + + let func = match CString::new($function) { + Ok(n) => n, + Err(_) => CString::new(ERR_LOG_FUNCTION).unwrap(), + }; + + let msg = match CString::new(format!($($message)*)) { + Ok(n) => n, + Err(_) => CString::new(ERR_LOG_MSG).unwrap(), + }; + + let func_ptr = func.as_ptr(); + let msg_ptr = msg.as_ptr(); + + unsafe { + tor_log_string(translate_severity($severity), + translate_domain($domain), + func_ptr, msg_ptr + ) + } + } + }; +} + +/// This module exposes no-op functionality purely for the purpose of testing +/// Rust at the module level. +#[cfg(any(test, feature = "testing"))] +pub mod log { + use libc::{c_char, c_int}; + use super::LogDomain; + use super::LogSeverity; + + /// Expose a no-op logging interface purely for testing Rust modules at the + /// module level. + pub fn tor_log_string<'a>( + severity: c_int, + domain: u32, + function: *const c_char, + message: *const c_char, + ) -> (c_int, u32, String, String) { + use std::ffi::CStr; + + let func = unsafe { CStr::from_ptr(function) }.to_str().unwrap(); + let func_allocated = String::from(func); + + let msg = unsafe { CStr::from_ptr(message) }.to_str().unwrap(); + let msg_allocated = String::from(msg); + (severity, domain, func_allocated, msg_allocated) + } + + pub unsafe fn translate_domain(_domain: LogDomain) -> u32 { + 1 + } + + pub unsafe fn translate_severity(_severity: LogSeverity) -> c_int { + 1 + } +} + +/// This implementation is used when compiling for actual use, as opposed to +/// testing. +#[cfg(all(not(test), not(feature = "testing")))] +pub mod log { + use libc::{c_char, c_int}; + use super::LogDomain; + use super::LogSeverity; + + /// Severity log types. These mirror definitions in /src/common/torlog.h + /// C_RUST_COUPLED: src/common/log.c, log domain types + extern "C" { + #[no_mangle] + static _LOG_WARN: c_int; + static _LOG_NOTICE: c_int; + } + + /// Domain log types. These mirror definitions in /src/common/torlog.h + /// C_RUST_COUPLED: src/common/log.c, log severity types + extern "C" { + #[no_mangle] + static _LD_NET: u32; + static _LD_GENERAL: u32; + } + + /// Translate Rust defintions of log domain levels to C. This exposes a 1:1 + /// mapping between types. + /// + /// Allow for default cases in case Rust and C log types get out of sync + #[allow(unreachable_patterns)] + pub unsafe fn translate_domain(domain: LogDomain) -> u32 { + match domain { + LogDomain::LdNet => _LD_NET, + LogDomain::LdGeneral => _LD_GENERAL, + _ => _LD_GENERAL, + } + } + + /// Translate Rust defintions of log severity levels to C. This exposes a + /// 1:1 mapping between types. + /// + /// Allow for default cases in case Rust and C log types get out of sync + #[allow(unreachable_patterns)] + pub unsafe fn translate_severity(severity: LogSeverity) -> c_int { + match severity { + LogSeverity::Warn => _LOG_WARN, + LogSeverity::Notice => _LOG_NOTICE, + _ => _LOG_NOTICE, + } + } + + /// The main entry point into Tor's logger. When in non-test mode, this + /// will link directly with `tor_log_string` in /src/or/log.c + extern "C" { + pub fn tor_log_string( + severity: c_int, + domain: u32, + function: *const c_char, + string: *const c_char, + ); + } +} + +#[cfg(test)] +mod test { + use tor_log::*; + use tor_log::log::*; + + use libc::c_int; + + #[test] + fn test_get_log_message() { + + fn test_macro<'a>() -> (c_int, u32, String, String) { + let (x, y, z, a) = + tor_log_msg!( + LogSeverity::Warn, + LogDomain::LdNet, + "test_macro", + "test log message {}", + "a", + ); + (x, y, z, a) + } + + let (severity, domain, function_name, log_msg) = test_macro(); + + let expected_severity = + unsafe { translate_severity(LogSeverity::Warn) }; + assert_eq!(severity, expected_severity); + + let expected_domain = unsafe { translate_domain(LogDomain::LdNet) }; + assert_eq!(domain, expected_domain); + + assert_eq!("test_macro", function_name); + assert_eq!("test log message a", log_msg); + } + + #[test] + fn test_get_log_message_multiple_values() { + fn test_macro<'a>() -> (c_int, u32, String, String) { + let (x, y, z, a) = tor_log_msg!( + LogSeverity::Warn, + LogDomain::LdNet, + "test_macro 2", + "test log message {} {} {} {}", + 10, + 9, + 8, + 7 + ); + (x, y, z, a) + } + + let (severity, domain, function_name, log_msg) = test_macro(); + + let expected_severity = + unsafe { translate_severity(LogSeverity::Warn) }; + assert_eq!(severity, expected_severity); + + let expected_domain = unsafe { translate_domain(LogDomain::LdNet) }; + assert_eq!(domain, expected_domain); + + assert_eq!("test_macro 2", function_name); + assert_eq!("test log message 10 9 8 7", log_msg); + } +} diff --git a/src/rust/tor_util/Cargo.toml b/src/rust/tor_util/Cargo.toml index d7379a598..adc3390b5 100644 --- a/src/rust/tor_util/Cargo.toml +++ b/src/rust/tor_util/Cargo.toml @@ -11,6 +11,9 @@ crate_type = ["rlib", "staticlib"] [dependencies.tor_allocate] path = "../tor_allocate" +[dependencies.tor_log] +path = "../tor_log" + [dependencies] libc = "0.2.22" diff --git a/src/rust/tor_util/ffi.rs b/src/rust/tor_util/ffi.rs index 5c3cdba4b..866d11974 100644 --- a/src/rust/tor_util/ffi.rs +++ b/src/rust/tor_util/ffi.rs @@ -5,8 +5,7 @@ //! called from C. //! -use libc::c_char; -use tor_allocate::allocate_and_copy_string; +use tor_log::*; /// Returns a short string to announce Rust support during startup. /// @@ -17,10 +16,12 @@ use tor_allocate::allocate_and_copy_string; /// tor_free(rust_str); /// ``` #[no_mangle] -pub extern "C" fn rust_welcome_string() -> *mut c_char { - let rust_welcome = String::from( +pub extern "C" fn rust_welcome_string() { + tor_log_msg!( + LogSeverity::Notice, + LogDomain::LdGeneral, + "rust_welcome_string", "Tor is running with Rust integration. Please report \ - any bugs you encounter.", + any bugs you encounter." ); - allocate_and_copy_string(&rust_welcome) } diff --git a/src/rust/tor_util/lib.rs b/src/rust/tor_util/lib.rs index 42fa9d5ad..86785c344 100644 --- a/src/rust/tor_util/lib.rs +++ b/src/rust/tor_util/lib.rs @@ -7,5 +7,6 @@ extern crate libc; extern crate tor_allocate; +extern crate tor_log; pub mod ffi; diff --git a/src/test/test_rust.sh b/src/test/test_rust.sh index 133f2bb94..0268668b3 100755 --- a/src/test/test_rust.sh +++ b/src/test/test_rust.sh @@ -11,7 +11,7 @@ for crate in $crates; do cd "${abs_top_builddir:-../../..}/src/rust" CARGO_TARGET_DIR="${abs_top_builddir:-../../..}/src/rust/target" \ CARGO_HOME="${abs_top_builddir:-../../..}/src/rust" \ - "${CARGO:-cargo}" test ${CARGO_ONLINE-"--frozen"} \ + "${CARGO:-cargo}" test --all-features ${CARGO_ONLINE-"--frozen"} \ --manifest-path "${abs_top_srcdir:-.}/src/rust/${crate}/Cargo.toml" \ || exitcode=1 cd -

1 0