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

[torspec/master] prop224: Change the publish/fetch HSDir HTTP URL
by nickm＠torproject.org 07 Sep '16

07 Sep '16

commit d4607a7d2e24ef304021a6e88824647ec330b7f3 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Aug 24 13:06:55 2016 -0400 prop224: Change the publish/fetch HSDir HTTP URL Use a more generic way to version the URL for the command so it's much easier to parse in the implementation but also decoupled from the command type. Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- proposals/224-rend-spec-ng.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/proposals/224-rend-spec-ng.txt b/proposals/224-rend-spec-ng.txt index 3b41403..9833b49 100644 --- a/proposals/224-rend-spec-ng.txt +++ b/proposals/224-rend-spec-ng.txt @@ -835,12 +835,12 @@ Table of contents: 2.2.6. URLs for anonymous uploading and downloading - Hidden service descriptors conforming to this specification are - uploaded with an HTTP POST request to the URL - /tor/rendezvous3/publish relative to the hidden service directory's - root, and downloaded with an HTTP GET request for the URL - /tor/rendezvous3/<z> where z is a base-64 encoding of the hidden - service's blinded public key. + Hidden service descriptors conforming to this specification are uploaded + with an HTTP POST request to the URL /tor/hs/<version>/publish relative to + the hidden service directory's root, and downloaded with an HTTP GET + request for the URL /tor/hs/<version>/<z> where <z> is a base64 encoding of + the hidden service's blinded public key and <version> is the protocol + version which is "3" in this case. These requests must be made anonymously, on circuits not used for anything else.

1 0

[tor/master] Merge remote-tracking branch 'teor/bug20012'
by nickm＠torproject.org 06 Sep '16

06 Sep '16

commit af58a89b86c462a23e39ba60b04812fd23734e1b Merge: 43092e2 0a3009b Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 6 19:14:02 2016 -0400 Merge remote-tracking branch 'teor/bug20012' changes/bug20012 | 12 ++++++++++++ src/or/rendclient.c | 41 ++++++++--------------------------------- 2 files changed, 20 insertions(+), 33 deletions(-)

1 0

[tor/master] Stop inadvertently upgrading client intro connections to ntor
by nickm＠torproject.org 06 Sep '16

06 Sep '16

commit 0a3009bb85d5675e1565020de08df1081e52253c Author: teor <teor2345(a)gmail.com> Date: Wed Aug 31 15:10:58 2016 +1000 Stop inadvertently upgrading client intro connections to ntor Also stop logging the intro point details on error by default. Fixes #20012, introduced with ntor in tor 0.2.4.8-alpha. --- changes/bug20012 | 12 ++++++++++++ src/or/rendclient.c | 41 ++++++++--------------------------------- 2 files changed, 20 insertions(+), 33 deletions(-) diff --git a/changes/bug20012 b/changes/bug20012 new file mode 100644 index 0000000..f67ee65 --- /dev/null +++ b/changes/bug20012 @@ -0,0 +1,12 @@ + o Major bugfixes (hidden services): + - Clients require hidden services to include the TAP keys + for their intro points in the hidden service descriptor. + This prevents an inadvertent upgrade to ntor, which a + malicious hidden service could use to discover which + consensus a client has. + Fixes bug 20012; bugfix on 0.2.4.8-alpha. Patch by teor. + o Minor bugfixes (hidden services): + - Stop logging intro point details to the client log on + certain error conditions. + Fixed as part of bug 20012; bugfix on 0.2.4.8-alpha. + Patch by teor. diff --git a/src/or/rendclient.c b/src/or/rendclient.c index 3a742fe..263dd3d 100644 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@ -1373,40 +1373,15 @@ rend_client_get_random_intro_impl(const rend_cache_entry_t *entry, smartlist_del(usable_nodes, i); goto again; } - /* Do we need to look up the router or is the extend info complete? */ + /* All version 2 HS descriptors come with a TAP onion key. + * Clients used to try to get the TAP onion key from the consensus, but this + * meant that hidden services could discover which consensus clients have. */ if (!extend_info_supports_tap(intro->extend_info)) { - const node_t *node; - extend_info_t *new_extend_info; - if (tor_digest_is_zero(intro->extend_info->identity_digest)) - node = node_get_by_hex_id(intro->extend_info->nickname); - else - node = node_get_by_id(intro->extend_info->identity_digest); - if (!node) { - log_info(LD_REND, "Unknown router with nickname '%s'; trying another.", - intro->extend_info->nickname); - smartlist_del(usable_nodes, i); - goto again; - } -#ifdef ENABLE_TOR2WEB_MODE - new_extend_info = extend_info_from_node(node, options->Tor2webMode); -#else - new_extend_info = extend_info_from_node(node, 0); -#endif - if (!new_extend_info) { - const char *alternate_reason = ""; -#ifdef ENABLE_TOR2WEB_MODE - alternate_reason = ", or we cannot connect directly to it"; -#endif - log_info(LD_REND, "We don't have a descriptor for the intro-point relay " - "'%s'%s; trying another.", - extend_info_describe(intro->extend_info), alternate_reason); - smartlist_del(usable_nodes, i); - goto again; - } else { - extend_info_free(intro->extend_info); - intro->extend_info = new_extend_info; - } - tor_assert(intro->extend_info != NULL); + log_info(LD_REND, "The HS descriptor is missing a TAP onion key for the " + "intro-point relay '%s'; trying another.", + safe_str_client(extend_info_describe(intro->extend_info))); + smartlist_del(usable_nodes, i); + goto again; } /* Check if we should refuse to talk to this router. */ if (strict &&

1 0

[tor/master] Add hs-ipv6 to the chutney IPv6 tests
by nickm＠torproject.org 06 Sep '16

06 Sep '16

commit 26b47f80dd87b3684d43bd6d1b4b9f4d773eed75 Author: teor <teor2345(a)gmail.com> Date: Tue Sep 6 13:45:09 2016 +1000 Add hs-ipv6 to the chutney IPv6 tests Requires a recent version of chutney. Also remove bridges+hs, as it's somewhat redundant. --- changes/feature20069 | 6 ++++++ src/test/include.am | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/changes/feature20069 b/changes/feature20069 new file mode 100644 index 0000000..039fb75 --- /dev/null +++ b/changes/feature20069 @@ -0,0 +1,6 @@ + o Minor feature (testing, ipv6): + - Add the hs-ipv6 chutney target to make test-network-all's IPv6 + tests. Remove bridges+hs, as it's somewhat redundant. + This requires a recent chutney version that supports IPv6 clients, + relays, and authorities. + Closes ticket 20069; patch by teor. diff --git a/src/test/include.am b/src/test/include.am index 2e91f7c..0aff395 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -28,9 +28,9 @@ TESTS += src/test/test src/test/test-slow src/test/test-memwipe \ $(TESTSCRIPTS) # These flavors are run using automake's test-driver and test-network.sh -TEST_CHUTNEY_FLAVORS = basic-min bridges-min hs-min bridges+hs +TEST_CHUTNEY_FLAVORS = basic-min bridges-min hs-min # only run if we can ping6 ::1 (localhost) -TEST_CHUTNEY_FLAVORS_IPV6 = bridges+ipv6-min ipv6-exit-min +TEST_CHUTNEY_FLAVORS_IPV6 = bridges+ipv6-min ipv6-exit-min hs-ipv6 # only run if we can find a stable (or simply another) version of tor TEST_CHUTNEY_FLAVORS_MIXED = mixed

1 0

[tor/master] Merge remote-tracking branch 'teor/feature20069'
by nickm＠torproject.org 06 Sep '16

06 Sep '16

commit 43092e21c1874086076aa910fc2cba843bcaed39 Merge: 128f7ff 26b47f8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 6 19:06:32 2016 -0400 Merge remote-tracking branch 'teor/feature20069' changes/feature20069 | 6 ++++++ src/test/include.am | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-)

1 0

[chutney/master] Add a hidden service to the IPv6 client network
by teor＠torproject.org 06 Sep '16

06 Sep '16

commit 90a008d8d69593a655b959f693d7dbe7f04cf0f3 Author: teor <teor2345(a)gmail.com> Date: Wed Sep 7 08:14:21 2016 +1000 Add a hidden service to the IPv6 client network --- networks/client-ipv6-only | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/networks/client-ipv6-only b/networks/client-ipv6-only index 19e5ad8..d36ba4f 100644 --- a/networks/client-ipv6-only +++ b/networks/client-ipv6-only @@ -8,6 +8,7 @@ ExitRelay6 = Node(tag="r", relay=1, exit=1, ipv6_addr=os.environ.get('CHUTNEY_LISTEN_ADDRESS_V6', '[::1]'), torrc="relay-orport-v6-exit.tmpl") +HS = Node(tag="h", hs=1, torrc="hs.tmpl") Client6 = Node(tag="c", torrc="client-only-v6.tmpl") # Since only 25% of relays get the guard flag, @@ -15,6 +16,6 @@ Client6 = Node(tag="c", torrc="client-only-v6.tmpl") # The minimum number of authorities/relays/exits is 3, the minimum path length # But for some reason, Tor wants 4 "acceptable routers" (Tor bug #20071) -NODES = Authority6.getN(3) + ExitRelay6.getN(1) + Client6.getN(1) +NODES = Authority6.getN(3) + ExitRelay6.getN(1) + HS.getN(1) + Client6.getN(1) ConfigureNodes(NODES)

1 0

[tor-messenger-build/master] Release version 0.2.0b2
by sukhbir＠torproject.org 06 Sep '16

06 Sep '16

commit cd6c78cdc4eb0d797718e5817558d2dfe5a2baab Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Tue Sep 6 15:31:02 2016 -0400 Release version 0.2.0b2 --- rbm.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm.conf b/rbm.conf index caf7a43..7569a12 100644 --- a/rbm.conf +++ b/rbm.conf @@ -6,7 +6,7 @@ output_dir: "out/[% project %]" pkg_type: build var: - tormessenger_version: '0.2.0b1' + tormessenger_version: '0.2.0b2' build_id: '[% sha256(c("var/build_id_txt")).substr(0, 6) %]' build_id_txt: | [% c("version") %]

1 0

[collector/master] Change default log thresholds from TRACE to INFO.
by karsten＠torproject.org 06 Sep '16

06 Sep '16

commit 3148d4886746498ae1f8cc065706b60dc91aeb39 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Sep 6 20:47:27 2016 +0200 Change default log thresholds from TRACE to INFO. Implements #20079. --- CHANGELOG.md | 1 + src/main/resources/logback.xml | 11 +++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 81aa94e..24206ee 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ * Minor changes - Remove quotes around base URL in index.json. + - Change default log thresholds from TRACE to INFO. # Changes in version 1.0.1 - 2016-08-22 diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml index 1d97d00..6cb5831 100644 --- a/src/main/resources/logback.xml +++ b/src/main/resources/logback.xml @@ -46,6 +46,9 @@ <maxFileSize>1MB</maxFileSize> </timeBasedFileNamingAndTriggeringPolicy> </rollingPolicy> + <filter class="ch.qos.logback.classic.filter.ThresholdFilter"> + <level>INFO</level> + </filter> </appender> <appender name="FILEBRIDGEDESCS" class="ch.qos.logback.core.FileAppender"> @@ -55,7 +58,7 @@ </encoder> <filter class="ch.qos.logback.classic.filter.ThresholdFilter"> - <level>TRACE</level> + <level>INFO</level> </filter> </appender> @@ -66,7 +69,7 @@ </encoder> <filter class="ch.qos.logback.classic.filter.ThresholdFilter"> - <level>TRACE</level> + <level>INFO</level> </filter> </appender> @@ -77,7 +80,7 @@ </encoder> <filter class="ch.qos.logback.classic.filter.ThresholdFilter"> - <level>TRACE</level> + <level>INFO</level> </filter> </appender> @@ -88,7 +91,7 @@ </encoder> <filter class="ch.qos.logback.classic.filter.ThresholdFilter"> - <level>TRACE</level> + <level>INFO</level> </filter> </appender>

1 0

[collector/master] Add change log entry and tweaks for shutdown hook.
by karsten＠torproject.org 06 Sep '16

06 Sep '16

commit 261f2c06107bfe4e1a860f9d19fb23ace5c41a5e Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Sep 6 20:41:32 2016 +0200 Add change log entry and tweaks for shutdown hook. --- CHANGELOG.md | 4 +++- src/main/java/org/torproject/collector/cron/Scheduler.java | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cf1ea12..81aa94e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,9 @@ -# Changes in version 1.1.0 - 2016-08-31 +# Changes in version 1.1.0 - 2016-09-xx * Medium changes - Add support for Bifroest's bridge descriptor tarballs. + - Use a shutdown hook that gives currently running modules up to 10 + minutes to finish properly, rather than killing them immediately. * Minor changes - Remove quotes around base URL in index.json. diff --git a/src/main/java/org/torproject/collector/cron/Scheduler.java b/src/main/java/org/torproject/collector/cron/Scheduler.java index 1863d73..aa86cad 100644 --- a/src/main/java/org/torproject/collector/cron/Scheduler.java +++ b/src/main/java/org/torproject/collector/cron/Scheduler.java @@ -36,7 +36,7 @@ public final class Scheduler implements ThreadFactory { private final ThreadFactory threads = Executors.defaultThreadFactory(); private int currentThreadNo = 0; - private long gracePeriodMinutes = 20L; + private long gracePeriodMinutes = 10L; private final ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(10, this); @@ -59,7 +59,7 @@ public final class Scheduler implements ThreadFactory { gracePeriodMinutes = conf.getLong(Key.ShutdownGraceWaitMinutes); } catch (ConfigurationException ce) { logger.warn("Cannot read grace period: {}", ce); - gracePeriodMinutes = 20L; + gracePeriodMinutes = 10L; } List<Callable<Object>> runOnceMains = new ArrayList<>(); for (Map.Entry<Key, Class<? extends CollecTorMain>> ctmEntry

1 0

[collector/master] Provide a shutdown-hook that allows running modules to finish properly.
by karsten＠torproject.org 06 Sep '16

06 Sep '16

commit 7cec1c874adffd14b7f152e289a0ccdc7cac7ad5 Author: iwakeh <iwakeh(a)torproject.org> Date: Mon Sep 5 20:54:09 2016 +0200 Provide a shutdown-hook that allows running modules to finish properly. Implements task-19016. Adapted logback default to log shutdown-hook log statements also to the console. Corrected coverage-check values. --- build.xml | 4 ++-- src/main/java/org/torproject/collector/Main.java | 2 ++ .../org/torproject/collector/cron/Scheduler.java | 8 ++++--- .../torproject/collector/cron/ShutdownHook.java | 28 ++++++++++++++++++++++ src/main/resources/logback.xml | 9 +++++++ 5 files changed, 46 insertions(+), 5 deletions(-) diff --git a/build.xml b/build.xml index 1e292b7..11d1f92 100644 --- a/build.xml +++ b/build.xml @@ -280,13 +280,13 @@ <include name="**/*.java" /> </fileset> </cobertura-report> - <cobertura-check totallinerate="5" totalbranchrate="1" > + <cobertura-check totallinerate="7" totalbranchrate="2" > <regex pattern="org.torproject.collector.conf" branchrate="87" linerate="100"/> <regex pattern="org.torproject.collector.cron" branchrate="50" linerate="71" /> <regex pattern="org.torproject.collector.Main" - branchrate="100" linerate="100" /> + branchrate="100" linerate="91" /> </cobertura-check> </target> <target name="test" depends="compile,compile-tests"> diff --git a/src/main/java/org/torproject/collector/Main.java b/src/main/java/org/torproject/collector/Main.java index 997ee2a..289cf30 100644 --- a/src/main/java/org/torproject/collector/Main.java +++ b/src/main/java/org/torproject/collector/Main.java @@ -9,6 +9,7 @@ import org.torproject.collector.conf.ConfigurationException; import org.torproject.collector.conf.Key; import org.torproject.collector.cron.CollecTorMain; import org.torproject.collector.cron.Scheduler; +import org.torproject.collector.cron.ShutdownHook; import org.torproject.collector.exitlists.ExitListDownloader; import org.torproject.collector.index.CreateIndexJson; import org.torproject.collector.relaydescs.ArchiveWriter; @@ -79,6 +80,7 @@ public class Main { printUsage(ce.getMessage()); return; } + Runtime.getRuntime().addShutdownHook(new ShutdownHook()); } private static void printUsage(String msg) { diff --git a/src/main/java/org/torproject/collector/cron/Scheduler.java b/src/main/java/org/torproject/collector/cron/Scheduler.java index 12fe1bb..1e72dc0 100644 --- a/src/main/java/org/torproject/collector/cron/Scheduler.java +++ b/src/main/java/org/torproject/collector/cron/Scheduler.java @@ -29,6 +29,8 @@ public final class Scheduler implements ThreadFactory { public static final String ACTIVATED = "Activated"; public static final String PERIODMIN = "PeriodMinutes"; public static final String OFFSETMIN = "OffsetMinutes"; + private static final long GRACE_MIN = 20L; + private static final long MILLIS_IN_A_MINUTE = 60_000L; private static final Logger logger = LoggerFactory.getLogger(Scheduler.class); @@ -89,8 +91,6 @@ public final class Scheduler implements ThreadFactory { } } - private static final long MILLIS_IN_A_MINUTE = 60_000L; - private void scheduleExecutions(CollecTorMain ctm, int offset, int period) { logger.info("Periodic updater started for " + ctm.getClass().getName() + "; offset=" + offset + ", period=" + period + "."); @@ -118,8 +118,10 @@ public final class Scheduler implements ThreadFactory { */ public void shutdownScheduler() { try { + logger.info("Waiting at most {} minutes for termination " + + "of running tasks ... ", GRACE_MIN); scheduler.shutdown(); - scheduler.awaitTermination(20L, java.util.concurrent.TimeUnit.MINUTES); + scheduler.awaitTermination(GRACE_MIN, java.util.concurrent.TimeUnit.MINUTES); logger.info("Shutdown of all scheduled tasks completed successfully."); } catch (InterruptedException ie) { List<Runnable> notTerminated = scheduler.shutdownNow(); diff --git a/src/main/java/org/torproject/collector/cron/ShutdownHook.java b/src/main/java/org/torproject/collector/cron/ShutdownHook.java new file mode 100644 index 0000000..519f16d --- /dev/null +++ b/src/main/java/org/torproject/collector/cron/ShutdownHook.java @@ -0,0 +1,28 @@ +/* Copyright 2016 The Tor Project + * See LICENSE for licensing information */ + +package org.torproject.collector.cron; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * Scheduler that starts the modules configured in collector.properties. + */ +public final class ShutdownHook extends Thread { + + private static final Logger log = LoggerFactory.getLogger(ShutdownHook.class); + + /** Names the shutdown thread for debugging purposes. */ + public ShutdownHook() { + super("CollecTor-ShutdownThread"); + } + + @Override + public void run() { + log.info("Shutdown in progress ... "); + Scheduler.getInstance().shutdownScheduler(); + log.info("Shutdown finished. Exiting."); + } +} + diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml index 2d8a1ce..1d97d00 100644 --- a/src/main/resources/logback.xml +++ b/src/main/resources/logback.xml @@ -25,6 +25,12 @@ </filter> </appender> + <appender name="SHUTDOWN" class="ch.qos.logback.core.ConsoleAppender"> + <encoder> + <pattern>${utc-date-pattern} %level %logger{20}:%line %msg%n</pattern> + </encoder> + </appender> + <appender name="FILEALL" class="ch.qos.logback.core.rolling.RollingFileAppender"> <file>${fileall-logname}.log</file> <encoder> @@ -146,6 +152,9 @@ <appender-ref ref="CONSOLE" /> </logger> + <logger name="org.torproject.collector.cron.ShutdownHook" > + <appender-ref ref="SHUTDOWN" /> + </logger> <root level="ALL"> <appender-ref ref="FILEALL" />

1 0