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

[tor-browser-build/master] Bug 26251: Adapt macOS snowflake compilation to new toolchain
by boklm＠torproject.org 11 Jul '18

11 Jul '18

commit 6d3f0f5dfbec918368f3114ff96fdeb308c9d7a9 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Wed Jun 20 07:32:27 2018 -0400 Bug 26251: Adapt macOS snowflake compilation to new toolchain This commit adds support for building Snowflake (and its associated components, webrtc and go-webrtc) with our updated toolchain that uses clang 3.9.1 and macOS SDK 10.11 For clang, we add the '-Wno-unknown-warning-option' flag; see https://bugs.llvm.org/show_bug.cgi?id=24979 for more information. --- projects/webrtc/build | 10 ++++----- projects/webrtc/webrtc-mac.patch | 45 ++-------------------------------------- rbm.conf | 2 +- 3 files changed, 8 insertions(+), 49 deletions(-) diff --git a/projects/webrtc/build b/projects/webrtc/build index 43b8261..32a66b7 100644 --- a/projects/webrtc/build +++ b/projects/webrtc/build @@ -13,8 +13,8 @@ mkdir -p /var/tmp/dist [% END -%] [% IF c("var/osx") -%] # src/build/toolchain/mac/filter_libtool.py wants libtool to be called exactly "libtool". - ln -sf x86_64-apple-darwin10-libtool $cctoolsdir/libtool - export AR=x86_64-apple-darwin10-ar + ln -sf x86_64-apple-darwin11-libtool $cctoolsdir/libtool + export AR=x86_64-apple-darwin11-ar # Certain cross-compiling flags are set in webrtc-mac.patch because the build # system doesn't honor CFLAGS etc. environment variables. [% ELSE -%] @@ -63,14 +63,14 @@ cd $builddir # needs to be kept in sync with the SDK version. cat <<EOF > build/mac/find_sdk.py print("$sysrootdir") -print("10.7") +print("10.11") EOF cat <<EOF > build/config/mac/sdk_info.py print("machine_os_build=\"10.7\"") -print("sdk_build=\"10.7\"") +print("sdk_build=\"10.11\"") print("sdk_path=\"$sysrootdir\"") print("sdk_platform_path=\"$sysrootdir\"") -print("sdk_version=\"10.7\"") +print("sdk_version=\"10.11\"") print("xcode_build=\"7.3\"") print("xcode_version=\"0730\"") EOF diff --git a/projects/webrtc/webrtc-mac.patch b/projects/webrtc/webrtc-mac.patch index 5c9cedd..6b888bb 100644 --- a/projects/webrtc/webrtc-mac.patch +++ b/projects/webrtc/webrtc-mac.patch @@ -60,8 +60,8 @@ index 84180e6a..2054b46f 100644 sysroot, "-mmacosx-version-min=$mac_deployment_target", + "-target", -+ "x86_64-apple-darwin10", -+ "-mlinker-version=136", ++ "x86_64-apple-darwin11", ++ "-Wno-unknown-warning-option", + "-B", + "/var/tmp/dist/macosx-toolchain/cctools/bin", ] @@ -136,47 +136,6 @@ index 0928fa13..898edc1a 100644 -- 2.11.0 -From d9577991412310d3313d9dcd86453ce24f845c2e Mon Sep 17 00:00:00 2001 -From: David Fifield <david(a)bamsoftware.com> -Date: Mon, 26 Jun 2017 11:37:34 -0700 -Subject: [PATCH 4/8] Hack workaround to disable dispatch_queue_get_label. - -dispatch_queue_get_label and DISPATCH_CURRENT_QUEUE_LABEL require SDK -10.9+. I don't know if removing this code even makes sense, but it at -least won't crash immediately because of a null pointer. - -https://developer.apple.com/documentation/dispatch/dispatch_current_queue_label -https://developer.apple.com/library/content/releasenotes/General/APIDiffsMacOSX10_9/General.html - -FAILED: obj/webrtc/base/rtc_task_queue/sequenced_task_checker_impl.o ../../../../clang/bin/clang++ -MMD -MF obj/webrtc/base/rtc_task_queue/sequenced_task_checker_impl.o.d -DV8_DEPRECATION_WARNINGS -DNO_TCMALLOC -DUSE_EXTERNAL_POPUP_MENU=1 -DFULL_SAFE_BROWSING -DSAFE_BROWSING_CSD -DSAFE_BROWSING_DB_LOCAL -DCHROMIUM_BUILD -DENABLE_MEDIA_ROUTER=1 -DFIELDTRIAL_TESTING_ENABLED -DCR_XCODE_VERSION=0730 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D_FORTIFY_SOURCE=2 -D__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORE=0 -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -DEXPAT_RELATIVE_PATH -DHAVE_SCTP -DWEBRTC_POSIX -DWEBRTC_MAC -I../.. -Igen -fno-strict-aliasing -fstack-protector -Wno-builtin-macro-redefined -D__DATE__= -D__TIME__= -D__TIMESTAMP__= -arch x86_64 -Wall -Wpartial-availability -Wno-unused-local-typedefs -Wno-maybe-uninitialized -Wno-missing-field-initializers -Wno-unused-parameter -O2 -gdwarf-2 -isysroot /home/debian/build/MacOSX10.7.sdk -mmacosx-version-min=10.9 -targ et x86_64-apple-darwin10 -mlinker-version=136 -B /home/debian/build/cctools/bin -fvisibility=hidden -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -Wno-strict-overflow -fvisibility-inlines-hidden -std=c++11 -stdlib=libc++ -Wno-narrowing -fno-rtti -fno-exceptions -Wnon-virtual-dtor -Woverloaded-virtual -c ../../webrtc/base/sequenced_task_checker_impl.cc -o obj/webrtc/base/rtc_task_queue/sequenced_task_checker_impl.o -warning: unknown warning option '-Wno-maybe-uninitialized'; did you mean '-Wno-uninitialized'? [-Wunknown-warning-option] -../../webrtc/base/sequenced_task_checker_impl.cc:34:46: error: use of undeclared identifier 'DISPATCH_CURRENT_QUEUE_LABEL' - current_queue = dispatch_queue_get_label(DISPATCH_CURRENT_QUEUE_LABEL); - ^ ---- - webrtc/base/sequenced_task_checker_impl.cc | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/webrtc/base/sequenced_task_checker_impl.cc b/webrtc/base/sequenced_task_checker_impl.cc -index f03e0b679..352b2162d 100644 ---- a/webrtc/base/sequenced_task_checker_impl.cc -+++ b/webrtc/base/sequenced_task_checker_impl.cc -@@ -30,8 +30,9 @@ bool SequencedTaskCheckerImpl::CalledSequentially() const { - #if defined(WEBRTC_MAC) - // If we're not running on a TaskQueue, use the system dispatch queue - // label as an identifier. -- if (current_queue == nullptr) -- current_queue = dispatch_queue_get_label(DISPATCH_CURRENT_QUEUE_LABEL); -+ // Disable this because dispatch_queue_get_label requires SDK 10.9+. -+ // if (current_queue == nullptr) -+ // current_queue = dispatch_queue_get_label(DISPATCH_CURRENT_QUEUE_LABEL); - #endif - CritScope scoped_lock(&lock_); - if (!attached_) { // true if previously detached. --- -2.11.0 - - From 62a6fa6376194ce673c220eef19fefeebe58fee1 Mon Sep 17 00:00:00 2001 From: David Fifield <david(a)bamsoftware.com> Date: Mon, 26 Jun 2017 11:41:16 -0700 diff --git a/rbm.conf b/rbm.conf index de5102d..bea9d3e 100644 --- a/rbm.conf +++ b/rbm.conf @@ -245,7 +245,7 @@ targets: LDFLAGS: "-Wl,-syslibroot,$sysrootdir -Wl,-dead_strip -Wl,-pie" locale_ja: ja-JP-mac # We only build snowflake for linux on the alpha and nightly channels for now. - snowflake: 0 #'[% c("var/alpha") || c("var/nightly") %]' + snowflake: '[% c("var/alpha") || c("var/nightly") %]' deps: - build-essential - python

1 0

[tor-browser-build/master] Merge remote-tracking branch 'azadi/bug-26251-rev1'
by boklm＠torproject.org 11 Jul '18

11 Jul '18

commit 82a0bd2d85fe53b61460a3e3b833f10a0bb01519 Merge: 6d63b2e 6d3f0f5 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Jul 11 12:58:51 2018 +0200 Merge remote-tracking branch 'azadi/bug-26251-rev1' projects/webrtc/build | 10 ++++----- projects/webrtc/webrtc-mac.patch | 45 ++-------------------------------------- rbm.conf | 2 +- 3 files changed, 8 insertions(+), 49 deletions(-)

1 0

[translation/support-topics_completed] Update translations for support-topics_completed
by translation＠torproject.org 11 Jul '18

11 Jul '18

commit abd8b1ed5609f7bc52072c71cfc03ef4bdd8f26c Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jul 11 10:49:49 2018 +0000 Update translations for support-topics_completed --- es.json | 110 ++++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 55 insertions(+), 55 deletions(-) diff --git a/es.json b/es.json index 86813a614..951832313 100644 --- a/es.json +++ b/es.json @@ -1,57 +1,57 @@ { - "faq": { - "path": "#faq", - "control": "faq", - "label": "Preguntas más frecuentes" - }, - "tbb": { - "path": "\n#tbb", - "control": "tbb", - "label": "Navegador Tor" - }, - "tormessenger": { - "path": "#tormessenger", - "control": "tormessenger", - "label": "Tor Messenger" - }, - "tormobile": { - "path": "#tormobile", - "control": "tormobile", - "label": "Tor Mobile" - }, - "gettor": { - "path": "#gettor", - "control": "gettor", - "label": "GetTor" - }, - "connecting": { - "path": "#connectingtotor", - "control": "connectingtotor", - "label": "Conectar a Tor" - }, - "censorship": { - "path": "#censorship", - "control": "censorship", - "label": "Censura" - }, - "https": { - "path": "#https", - "control": "https", - "label": "HTTPS" - }, - "operators": { - "path": "#operators", - "control": "operators", - "label": "Operadores" - }, - "onionservices": { - "path": "#onionservices", - "control": "servicios onion", - "label": "Servicios onion" - }, - "misc": { - "path": "#misc", - "control": "misc", - "label": "Misc" - } + "faq": { + "path": "#faq", + "control": "faq", + "label": "Preguntas más frecuentes" + }, + "tbb": { + "path": "\n#tbb", + "control": "tbb", + "label": "Navegador Tor" + }, + "tormessenger": { + "path": "#tormessenger", + "control": "tormessenger", + "label": "Tor Messenger" + }, + "tormobile": { + "path": "#tormobile", + "control": "tormobile", + "label": "Tor Mobile" + }, + "gettor": { + "path": "#gettor", + "control": "gettor", + "label": "GetTor" + }, + "connecting": { + "path": "#connectingtotor", + "control": "connectingtotor", + "label": "Conectar a Tor" + }, + "censorship": { + "path": "#censorship", + "control": "censorship", + "label": "Censura" + }, + "https": { + "path": "#https", + "control": "https", + "label": "HTTPS" + }, + "operators": { + "path": "#operators", + "control": "operators", + "label": "Operadores" + }, + "onionservices": { + "path": "#onionservices", + "control": "servicios onion", + "label": "Servicios onion" + }, + "misc": { + "path": "#misc", + "control": "misc", + "label": "Misc" + } }

1 0

[translation/support-topics] Update translations for support-topics
by translation＠torproject.org 11 Jul '18

11 Jul '18

commit f51db707e68fe69e60ffc62bd31a858ffb3c8809 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jul 11 10:49:44 2018 +0000 Update translations for support-topics --- es.json | 110 ++++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 55 insertions(+), 55 deletions(-) diff --git a/es.json b/es.json index 86813a614..951832313 100644 --- a/es.json +++ b/es.json @@ -1,57 +1,57 @@ { - "faq": { - "path": "#faq", - "control": "faq", - "label": "Preguntas más frecuentes" - }, - "tbb": { - "path": "\n#tbb", - "control": "tbb", - "label": "Navegador Tor" - }, - "tormessenger": { - "path": "#tormessenger", - "control": "tormessenger", - "label": "Tor Messenger" - }, - "tormobile": { - "path": "#tormobile", - "control": "tormobile", - "label": "Tor Mobile" - }, - "gettor": { - "path": "#gettor", - "control": "gettor", - "label": "GetTor" - }, - "connecting": { - "path": "#connectingtotor", - "control": "connectingtotor", - "label": "Conectar a Tor" - }, - "censorship": { - "path": "#censorship", - "control": "censorship", - "label": "Censura" - }, - "https": { - "path": "#https", - "control": "https", - "label": "HTTPS" - }, - "operators": { - "path": "#operators", - "control": "operators", - "label": "Operadores" - }, - "onionservices": { - "path": "#onionservices", - "control": "servicios onion", - "label": "Servicios onion" - }, - "misc": { - "path": "#misc", - "control": "misc", - "label": "Misc" - } + "faq": { + "path": "#faq", + "control": "faq", + "label": "Preguntas más frecuentes" + }, + "tbb": { + "path": "\n#tbb", + "control": "tbb", + "label": "Navegador Tor" + }, + "tormessenger": { + "path": "#tormessenger", + "control": "tormessenger", + "label": "Tor Messenger" + }, + "tormobile": { + "path": "#tormobile", + "control": "tormobile", + "label": "Tor Mobile" + }, + "gettor": { + "path": "#gettor", + "control": "gettor", + "label": "GetTor" + }, + "connecting": { + "path": "#connectingtotor", + "control": "connectingtotor", + "label": "Conectar a Tor" + }, + "censorship": { + "path": "#censorship", + "control": "censorship", + "label": "Censura" + }, + "https": { + "path": "#https", + "control": "https", + "label": "HTTPS" + }, + "operators": { + "path": "#operators", + "control": "operators", + "label": "Operadores" + }, + "onionservices": { + "path": "#onionservices", + "control": "servicios onion", + "label": "Servicios onion" + }, + "misc": { + "path": "#misc", + "control": "misc", + "label": "Misc" + } }

1 0

[onionoo/master] Index relays with no known country or AS
by karsten＠torproject.org 11 Jul '18

11 Jul '18

commit 641a939cde75fa3a5cddd32ee29a6508fd66b4c4 Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Tue Jul 10 11:51:23 2018 +0100 Index relays with no known country or AS Indexes are created for relays with no known country code or autonomous system number using the special values "xz" and "AS0" respectively. No changes are made to the summary or details documents. Fixes: #26665 --- CHANGELOG.md | 4 ++ .../org/torproject/onionoo/server/NodeIndexer.java | 43 ++++++++++++++-------- 2 files changed, 32 insertions(+), 15 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c9c9aba..ca0142b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ - Provide more accurate DNS results in "verified_host_names" and "unverified_host_names". + * Minor changes + - Index relays with no known country code or autonomous system + number using the special values "xz" and "AS0" respectively. + # Changes in version 6.0-1.14.0 - 2018-05-29 diff --git a/src/main/java/org/torproject/onionoo/server/NodeIndexer.java b/src/main/java/org/torproject/onionoo/server/NodeIndexer.java index c95818d..f6b84b8 100644 --- a/src/main/java/org/torproject/onionoo/server/NodeIndexer.java +++ b/src/main/java/org/torproject/onionoo/server/NodeIndexer.java @@ -198,23 +198,36 @@ public class NodeIndexer implements ServletContextListener, Runnable { .toUpperCase(); newRelayFingerprintSummaryLines.put(fingerprint, entry); newRelayFingerprintSummaryLines.put(hashedFingerprint, entry); - if (entry.getCountryCode() != null) { - String countryCode = entry.getCountryCode(); - if (!newRelaysByCountryCode.containsKey(countryCode)) { - newRelaysByCountryCode.put(countryCode, - new HashSet<String>()); - } - newRelaysByCountryCode.get(countryCode).add(fingerprint); - newRelaysByCountryCode.get(countryCode).add(hashedFingerprint); + String countryCode; + if (null != entry.getCountryCode()) { + countryCode = entry.getCountryCode(); + } else { + /* The country code xz will never be assigned for use with ISO 3166-1 + * and is "user-assigned". Fun fact: UN/LOCODE assigns XZ to represent + * installations in international waters. */ + countryCode = "xz"; } - if (entry.getAsNumber() != null) { - String asNumber = entry.getAsNumber(); - if (!newRelaysByAsNumber.containsKey(asNumber)) { - newRelaysByAsNumber.put(asNumber, new HashSet<String>()); - } - newRelaysByAsNumber.get(asNumber).add(fingerprint); - newRelaysByAsNumber.get(asNumber).add(hashedFingerprint); + if (!newRelaysByCountryCode.containsKey(countryCode)) { + newRelaysByCountryCode.put(countryCode, + new HashSet<String>()); + } + newRelaysByCountryCode.get(countryCode).add(fingerprint); + newRelaysByCountryCode.get(countryCode).add(hashedFingerprint); + String asNumber; + if (null != entry.getAsNumber()) { + asNumber = entry.getAsNumber(); + } else { + /* Autonomous system number 0 is reserved by RFC6707, to be used for + * networks that are not routed. The use of this number should be, + * and in the majority of cases probably is, filtered and so it + * shouldn't appear in any lookup databases. */ + asNumber = "AS0"; + } + if (!newRelaysByAsNumber.containsKey(asNumber)) { + newRelaysByAsNumber.put(asNumber, new HashSet<String>()); } + newRelaysByAsNumber.get(asNumber).add(fingerprint); + newRelaysByAsNumber.get(asNumber).add(hashedFingerprint); for (String flag : entry.getRelayFlags()) { String flagLowerCase = flag.toLowerCase(); if (!newRelaysByFlag.containsKey(flagLowerCase)) {

1 0

[tor/master] Add the compatibility definition for getdelim.c from netbsd.
by nickm＠torproject.org 11 Jul '18

11 Jul '18

commit 1604c0fe0e5ce74538555c19a307ad38d0fca358 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 10 10:14:24 2018 -0400 Add the compatibility definition for getdelim.c from netbsd. We shouldn't actually need this code nearly anywhere we build: getdelim is POSIX, and mingw provides it. --- LICENSE | 30 ++++++++++++++++++++ src/ext/getdelim.c | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/ext/include.am | 2 +- 3 files changed, 113 insertions(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index 057ae5765..9e2709aea 100644 --- a/LICENSE +++ b/LICENSE @@ -156,6 +156,36 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. =============================================================================== +getdelim.c is distributed under this license: + + Copyright (c) 2011 The NetBSD Foundation, Inc. + All rights reserved. + + This code is derived from software contributed to The NetBSD Foundation + by Christos Zoulas. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS + ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS + BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. + +=============================================================================== src/config/geoip is licensed under the following license: OPEN DATA LICENSE (GeoLite Country and GeoLite City databases) diff --git a/src/ext/getdelim.c b/src/ext/getdelim.c new file mode 100644 index 000000000..60df7e1b6 --- /dev/null +++ b/src/ext/getdelim.c @@ -0,0 +1,82 @@ +/* $NetBSD: getdelim.c,v 1.2 2015/12/25 20:12:46 joerg Exp $ */ +/* NetBSD-src: getline.c,v 1.2 2014/09/16 17:23:50 christos Exp */ + +/*- + * Copyright (c) 2011 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Christos Zoulas. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#include <nbcompat.h> +#include <nbcompat/stdio.h> +#include <nbcompat/stdlib.h> + +#if !HAVE_GETDELIM + +ssize_t +getdelim(char **buf, size_t *bufsiz, int delimiter, FILE *fp) +{ + char *ptr, *eptr; + + + if (*buf == NULL || *bufsiz == 0) { + *bufsiz = BUFSIZ; + if ((*buf = malloc(*bufsiz)) == NULL) + return -1; + } + + for (ptr = *buf, eptr = *buf + *bufsiz;;) { + int c = fgetc(fp); + if (c == -1) { + if (feof(fp)) { + ssize_t diff = (ssize_t)(ptr - *buf); + if (diff != 0) { + *ptr = '\0'; + return diff; + } + } + return -1; + } + *ptr++ = c; + if (c == delimiter) { + *ptr = '\0'; + return ptr - *buf; + } + if (ptr + 2 >= eptr) { + char *nbuf; + size_t nbufsiz = *bufsiz * 2; + ssize_t d = ptr - *buf; + if ((nbuf = realloc(*buf, nbufsiz)) == NULL) + return -1; + *buf = nbuf; + *bufsiz = nbufsiz; + eptr = nbuf + nbufsiz; + ptr = nbuf + d; + } + } +} + +#endif diff --git a/src/ext/include.am b/src/ext/include.am index 7ec2e4331..6bdce2d79 100644 --- a/src/ext/include.am +++ b/src/ext/include.am @@ -10,6 +10,7 @@ EXTHEADERS = \ src/ext/tor_readpassphrase.h \ src/ext/strlcat.c \ src/ext/strlcpy.c \ + src/ext/getdelim.c \ src/ext/tinytest_macros.h \ src/ext/tor_queue.h \ src/ext/siphash.h \ @@ -173,4 +174,3 @@ EXTRA_DIST += \ src/ext/timeouts/Makefile \ src/ext/timeouts/Rules.shrc \ src/ext/timeouts/test-timeout.c -

1 0

[tor/master] Tabify lists in configure.ac
by nickm＠torproject.org 11 Jul '18

11 Jul '18

commit c4dd38e625a105a5d5d29242a8531da9677c98d8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 10 20:15:23 2018 -0400 Tabify lists in configure.ac --- configure.ac | 200 +++++++++++++++++++++++++++++------------------------------ 1 file changed, 100 insertions(+), 100 deletions(-) diff --git a/configure.ac b/configure.ac index ff03cf10e..532476672 100644 --- a/configure.ac +++ b/configure.ac @@ -572,60 +572,60 @@ AM_CONDITIONAL(THREADS_WIN32, test "$bwin32" = "true") AM_CONDITIONAL(THREADS_PTHREADS, test "$bwin32" = "false") AC_CHECK_FUNCS( - _NSGetEnviron \ + _NSGetEnviron \ RtlSecureZeroMemory \ SecureZeroMemory \ - accept4 \ - backtrace \ - backtrace_symbols_fd \ + accept4 \ + backtrace \ + backtrace_symbols_fd \ eventfd \ explicit_bzero \ timingsafe_memcmp \ - flock \ - ftime \ - get_current_dir_name \ - getaddrinfo \ + flock \ + ftime \ + get_current_dir_name \ + getaddrinfo \ getdelim \ - getifaddrs \ + getifaddrs \ getline \ - getpass \ - getrlimit \ - gettimeofday \ - gmtime_r \ + getpass \ + getrlimit \ + gettimeofday \ + gmtime_r \ gnu_get_libc_version \ htonll \ - inet_aton \ - ioctl \ - issetugid \ - llround \ - localtime_r \ - lround \ + inet_aton \ + ioctl \ + issetugid \ + llround \ + localtime_r \ + lround \ mach_approximate_time \ - memmem \ - memset_s \ - mmap \ + memmem \ + memset_s \ + mmap \ pipe \ pipe2 \ - prctl \ + prctl \ readpassphrase \ - rint \ - sigaction \ - socketpair \ + rint \ + sigaction \ + socketpair \ statvfs \ - strncasecmp \ - strcasecmp \ - strlcat \ - strlcpy \ + strncasecmp \ + strcasecmp \ + strlcat \ + strlcpy \ strnlen \ - strptime \ - strtok_r \ - strtoull \ - sysconf \ + strptime \ + strtok_r \ + strtoull \ + sysconf \ sysctl \ truncate \ - uname \ + uname \ usleep \ - vasprintf \ + vasprintf \ _vscprintf ) @@ -1367,57 +1367,57 @@ dnl Make sure to enable support for large off_t if available. AC_SYS_LARGEFILE AC_CHECK_HEADERS([errno.h \ - fcntl.h \ - signal.h \ - string.h \ - sys/capability.h \ - sys/fcntl.h \ - sys/stat.h \ - sys/time.h \ - sys/types.h \ - time.h \ - unistd.h \ - arpa/inet.h \ - crt_externs.h \ - execinfo.h \ - gnu/libc-version.h \ - grp.h \ - ifaddrs.h \ - inttypes.h \ - limits.h \ - linux/types.h \ - machine/limits.h \ - malloc.h \ - malloc/malloc.h \ - malloc_np.h \ - netdb.h \ - netinet/in.h \ - netinet/in6.h \ - pwd.h \ - readpassphrase.h \ - stdatomic.h \ - sys/eventfd.h \ - sys/file.h \ - sys/ioctl.h \ - sys/limits.h \ - sys/mman.h \ - sys/param.h \ - sys/prctl.h \ + fcntl.h \ + signal.h \ + string.h \ + sys/capability.h \ + sys/fcntl.h \ + sys/stat.h \ + sys/time.h \ + sys/types.h \ + time.h \ + unistd.h \ + arpa/inet.h \ + crt_externs.h \ + execinfo.h \ + gnu/libc-version.h \ + grp.h \ + ifaddrs.h \ + inttypes.h \ + limits.h \ + linux/types.h \ + machine/limits.h \ + malloc.h \ + malloc/malloc.h \ + malloc_np.h \ + netdb.h \ + netinet/in.h \ + netinet/in6.h \ + pwd.h \ + readpassphrase.h \ + stdatomic.h \ + sys/eventfd.h \ + sys/file.h \ + sys/ioctl.h \ + sys/limits.h \ + sys/mman.h \ + sys/param.h \ + sys/prctl.h \ sys/random.h \ - sys/resource.h \ - sys/select.h \ - sys/socket.h \ - sys/statvfs.h \ - sys/syscall.h \ - sys/sysctl.h \ - sys/syslimits.h \ - sys/time.h \ - sys/types.h \ - sys/un.h \ - sys/utime.h \ - sys/wait.h \ - syslog.h \ - utime.h]) + sys/resource.h \ + sys/select.h \ + sys/socket.h \ + sys/statvfs.h \ + sys/syscall.h \ + sys/sysctl.h \ + sys/syslimits.h \ + sys/time.h \ + sys/types.h \ + sys/un.h \ + sys/utime.h \ + sys/wait.h \ + syslog.h \ + utime.h]) AC_CHECK_HEADERS(sys/param.h) @@ -2271,20 +2271,20 @@ fi CPPFLAGS="$CPPFLAGS $TOR_CPPFLAGS_libevent $TOR_CPPFLAGS_openssl $TOR_CPPFLAGS_zlib" AC_CONFIG_FILES([ - Doxyfile - Makefile - config.rust - link_rust.sh - contrib/dist/suse/tor.sh - contrib/operator-tools/tor.logrotate - contrib/dist/tor.sh - contrib/dist/torctl - contrib/dist/tor.service - src/config/torrc.sample - src/config/torrc.minimal - src/rust/.cargo/config - scripts/maint/checkOptionDocs.pl - scripts/maint/updateVersions.pl + Doxyfile + Makefile + config.rust + link_rust.sh + contrib/dist/suse/tor.sh + contrib/operator-tools/tor.logrotate + contrib/dist/tor.sh + contrib/dist/torctl + contrib/dist/tor.service + src/config/torrc.sample + src/config/torrc.minimal + src/rust/.cargo/config + scripts/maint/checkOptionDocs.pl + scripts/maint/updateVersions.pl ]) if test "x$asciidoc" = "xtrue" && test "$ASCIIDOC" = "none"; then

1 0

[tor/master] Refactor dirserv_read_measured_bandwidths to have a single exit point
by nickm＠torproject.org 11 Jul '18

11 Jul '18

commit 6574d4bd27471c30da934c4d8b82ecbe2b3eab7e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 10 10:26:22 2018 -0400 Refactor dirserv_read_measured_bandwidths to have a single exit point --- src/feature/dircache/dirserv.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/src/feature/dircache/dirserv.c b/src/feature/dircache/dirserv.c index c5286b0cb..50869c2b9 100644 --- a/src/feature/dircache/dirserv.c +++ b/src/feature/dircache/dirserv.c @@ -2616,6 +2616,7 @@ dirserv_read_measured_bandwidths(const char *from_file, * if there are additional header lines, as introduced in Bandwidth List spec * version 1.1.0 */ int line_is_after_headers = 0; + int rv = -1; /* Initialise line, so that we can't possibly run off the end. */ memset(line, 0, sizeof(line)); @@ -2623,21 +2624,19 @@ dirserv_read_measured_bandwidths(const char *from_file, if (fp == NULL) { log_warn(LD_CONFIG, "Can't open bandwidth file at configured location: %s", from_file); - return -1; + goto err; } /* If fgets fails, line is either unmodified, or indeterminate. */ if (!fgets(line, sizeof(line), fp)) { log_warn(LD_DIRSERV, "Empty bandwidth file"); - fclose(fp); - return -1; + goto err; } if (!strlen(line) || line[strlen(line)-1] != '\n') { log_warn(LD_DIRSERV, "Long or truncated time in bandwidth file: %s", escaped(line)); - fclose(fp); - return -1; + goto err; } line[strlen(line)-1] = '\0'; @@ -2645,16 +2644,14 @@ dirserv_read_measured_bandwidths(const char *from_file, if (!ok) { log_warn(LD_DIRSERV, "Non-integer time in bandwidth file: %s", escaped(line)); - fclose(fp); - return -1; + goto err; } now = time(NULL); if ((now - file_time) > MAX_MEASUREMENT_AGE) { log_warn(LD_DIRSERV, "Bandwidth measurement file stale. Age: %u", (unsigned)(time(NULL) - file_time)); - fclose(fp); - return -1; + goto err; } if (routerstatuses) @@ -2679,11 +2676,15 @@ dirserv_read_measured_bandwidths(const char *from_file, /* Now would be a nice time to clean the cache, too */ dirserv_expire_measured_bw_cache(now); - fclose(fp); log_info(LD_DIRSERV, "Bandwidth measurement file successfully read. " "Applied %d measurements.", applied_lines); - return 0; + rv = 0; + + err: + if (fp) + fclose(fp); + return rv; } /** As dirserv_get_routerdescs(), but instead of getting signed_descriptor_t

1 0

[tor/master] Integrate getdelim() and getline() support into Tor.
by nickm＠torproject.org 11 Jul '18

11 Jul '18

commit b04d719c1067dd1cf9b48295f1d0e7ed5adb7255 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 10 10:23:29 2018 -0400 Integrate getdelim() and getline() support into Tor. --- configure.ac | 2 ++ src/ext/getdelim.c | 16 ++++++---------- src/lib/fs/.may_include | 3 +++ src/lib/fs/files.c | 4 ++++ src/lib/fs/files.h | 34 ++++++++++++++++++++++++++++++++++ 5 files changed, 49 insertions(+), 10 deletions(-) diff --git a/configure.ac b/configure.ac index 296591f02..ff03cf10e 100644 --- a/configure.ac +++ b/configure.ac @@ -585,7 +585,9 @@ AC_CHECK_FUNCS( ftime \ get_current_dir_name \ getaddrinfo \ + getdelim \ getifaddrs \ + getline \ getpass \ getrlimit \ gettimeofday \ diff --git a/src/ext/getdelim.c b/src/ext/getdelim.c index 60df7e1b6..8254103ff 100644 --- a/src/ext/getdelim.c +++ b/src/ext/getdelim.c @@ -30,21 +30,19 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include <nbcompat.h> -#include <nbcompat/stdio.h> -#include <nbcompat/stdlib.h> - -#if !HAVE_GETDELIM +#ifndef BUFSIZ +#define BUFSIZ 512 +#endif ssize_t -getdelim(char **buf, size_t *bufsiz, int delimiter, FILE *fp) +compat_getdelim_(char **buf, size_t *bufsiz, int delimiter, FILE *fp) { char *ptr, *eptr; if (*buf == NULL || *bufsiz == 0) { *bufsiz = BUFSIZ; - if ((*buf = malloc(*bufsiz)) == NULL) + if ((*buf = raw_malloc(*bufsiz)) == NULL) return -1; } @@ -69,7 +67,7 @@ getdelim(char **buf, size_t *bufsiz, int delimiter, FILE *fp) char *nbuf; size_t nbufsiz = *bufsiz * 2; ssize_t d = ptr - *buf; - if ((nbuf = realloc(*buf, nbufsiz)) == NULL) + if ((nbuf = raw_realloc(*buf, nbufsiz)) == NULL) return -1; *buf = nbuf; *bufsiz = nbufsiz; @@ -78,5 +76,3 @@ getdelim(char **buf, size_t *bufsiz, int delimiter, FILE *fp) } } } - -#endif diff --git a/src/lib/fs/.may_include b/src/lib/fs/.may_include index 6c9ce6ca0..b1e49fc89 100644 --- a/src/lib/fs/.may_include +++ b/src/lib/fs/.may_include @@ -1,4 +1,7 @@ orconfig.h + +ext/getdelim.c + lib/cc/*.h lib/container/*.h lib/encoding/*.h diff --git a/src/lib/fs/files.c b/src/lib/fs/files.c index 4e0a398ba..e93d36d86 100644 --- a/src/lib/fs/files.c +++ b/src/lib/fs/files.c @@ -715,3 +715,7 @@ read_file_to_str, (const char *filename, int flags, struct stat *stat_out)) return string; } + +#if !defined(HAVE_GETDELIM) || defined(TOR_UNIT_TESTS) +#include "ext/getdelim.c" +#endif diff --git a/src/lib/fs/files.h b/src/lib/fs/files.h index 5a12eb821..d219e3cf0 100644 --- a/src/lib/fs/files.h +++ b/src/lib/fs/files.h @@ -103,4 +103,38 @@ char *read_file_to_str_until_eof(int fd, size_t max_bytes_to_read, size_t *sz_out) ATTR_MALLOC; +#if !defined(HAVE_GETDELIM) || defined(TOR_UNIT_TESTS) +ssize_t compat_getdelim_(char **lineptr, size_t *n, int delim, FILE *stream); +#endif + +#ifdef HAVE_GETDELIM +/** + * Cross-platform wrapper for getdelim(): behaves as the POSIX-standard + * getdelim() function. + * + * Note that this function will use the libc memory allocator -- so any memory + * passed to this function must come from raw_malloc(), and must be freed by + * raw_free() -- don't use tor_malloc() and tor_free() with this. + */ +#define tor_getdelim(lineptr, n, delim, stream) \ + getdelim((lineptr), (n), (delim), (stream)) +#else +#define tor_getdelim(lineptr, n, delim, stream) \ + compat_getdelim_((lineptr), (n), (delim), (stream)) +#endif + +#ifdef HAVE_GETLINE +/** + * Cross-platform wrapper for getline(): behaves as the POSIX-standard + * getline() function. + * + * See tor_getdelim() for usage notes. + */ +#define tor_getline(lineptr, n, stream) \ + getline((lineptr), (n), (stream)) +#else +#define tor_getline(lineptr, n, stream) \ + tor_getdelim((lineptr), (n), '\n', (stream)) +#endif + #endif

1 0

[tor/master] Use tor_getline() in dirserv.c to remove its upper line limit.
by nickm＠torproject.org 11 Jul '18

11 Jul '18

commit 951d59d706f116cbfa3d3700d9b342a736a571b2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 10 10:32:09 2018 -0400 Use tor_getline() in dirserv.c to remove its upper line limit. Closes ticket 26223. --- changes/bug26223 | 3 +++ src/feature/dircache/dirserv.c | 10 ++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/changes/bug26223 b/changes/bug26223 new file mode 100644 index 000000000..e17b0529e --- /dev/null +++ b/changes/bug26223 @@ -0,0 +1,3 @@ + o Minor features (directory authority): + - There is no longer an artificial upper limit on the length of bandwidth + lines. Closes ticket 26223. diff --git a/src/feature/dircache/dirserv.c b/src/feature/dircache/dirserv.c index 50869c2b9..57de6ab8e 100644 --- a/src/feature/dircache/dirserv.c +++ b/src/feature/dircache/dirserv.c @@ -2606,7 +2606,6 @@ int dirserv_read_measured_bandwidths(const char *from_file, smartlist_t *routerstatuses) { - char line[512]; FILE *fp = tor_fopen_cloexec(from_file, "r"); int applied_lines = 0; time_t file_time, now; @@ -2617,9 +2616,10 @@ dirserv_read_measured_bandwidths(const char *from_file, * version 1.1.0 */ int line_is_after_headers = 0; int rv = -1; + char *line = NULL; + size_t n = 0; /* Initialise line, so that we can't possibly run off the end. */ - memset(line, 0, sizeof(line)); if (fp == NULL) { log_warn(LD_CONFIG, "Can't open bandwidth file at configured location: %s", @@ -2628,7 +2628,7 @@ dirserv_read_measured_bandwidths(const char *from_file, } /* If fgets fails, line is either unmodified, or indeterminate. */ - if (!fgets(line, sizeof(line), fp)) { + if (tor_getline(&line,&n,fp) <= 0) { log_warn(LD_DIRSERV, "Empty bandwidth file"); goto err; } @@ -2659,7 +2659,7 @@ dirserv_read_measured_bandwidths(const char *from_file, while (!feof(fp)) { measured_bw_line_t parsed_line; - if (fgets(line, sizeof(line), fp) && strlen(line)) { + if (tor_getline(&line, &n, fp) >= 0) { if (measured_bw_line_parse(&parsed_line, line, line_is_after_headers) != -1) { /* This condition will be true when the first complete valid bw line @@ -2682,6 +2682,8 @@ dirserv_read_measured_bandwidths(const char *from_file, rv = 0; err: + if (line) + raw_free(line); if (fp) fclose(fp); return rv;

1 0