October 2017 - tor-commits - lists.torproject.org

[onionoo/release] Bump version to 4.2-1.6.0-dev.
by karsten＠torproject.org 26 Oct '17

26 Oct '17

commit da9fe314bfa089536dbbd4901b737e36bd5b9cc6 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Oct 17 21:19:46 2017 +0200 Bump version to 4.2-1.6.0-dev. --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index ee3c0da..5f072bb 100644 --- a/build.xml +++ b/build.xml @@ -10,7 +10,7 @@ <property name="implementation-title" value="Onionoo" /> <property name="onionoo.protocol.version" value="4.2"/> <property name="release.version" - value="${onionoo.protocol.version}-1.6.0"/> + value="${onionoo.protocol.version}-1.6.0-dev"/> <property name="metricslibversion" value="2.1.1"/> <property name="jetty.version" value="-9.2.21.v20170120" /> <property name="warfile"

1 0

[onionoo/release] Fix two NullPointerExceptions.
by karsten＠torproject.org 26 Oct '17

26 Oct '17

commit 563f762ca7eeb649ac3d8777f5924d9c66cfd760 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Oct 26 10:28:11 2017 +0200 Fix two NullPointerExceptions. There's a relay running an alternate Tor version that produces descriptors without "uptime" line, and the directory authorities don't include a "v" line for that relay, likely because its platform string does not include the magic word "Tor". Fixes #24012. --- CHANGELOG.md | 8 ++++++++ .../java/org/torproject/onionoo/docs/DetailsStatus.java | 3 ++- .../java/org/torproject/onionoo/docs/NodeStatus.java | 3 ++- .../onionoo/updater/NodeDetailsStatusUpdater.java | 17 +++++++++++------ 4 files changed, 23 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b2aff31..ca17fa7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +# Changes in version 4.2-1.6.1 - 2017-10-2? + + * Medium changes + - Fix two NullPointerExceptions caused by accessing optional parts + of relay server descriptors and consensuses without checking + first whether they're available or not. + + # Changes in version 4.2-1.6.0 - 2017-10-09 * Medium changes diff --git a/src/main/java/org/torproject/onionoo/docs/DetailsStatus.java b/src/main/java/org/torproject/onionoo/docs/DetailsStatus.java index 0a0c215..faec117 100644 --- a/src/main/java/org/torproject/onionoo/docs/DetailsStatus.java +++ b/src/main/java/org/torproject/onionoo/docs/DetailsStatus.java @@ -45,7 +45,8 @@ public class DetailsStatus extends Document { private String last_restarted; public void setLastRestarted(Long lastRestarted) { - this.last_restarted = DateTimeHelper.format(lastRestarted); + this.last_restarted = null == lastRestarted ? null + : DateTimeHelper.format(lastRestarted); } public Long getLastRestarted() { diff --git a/src/main/java/org/torproject/onionoo/docs/NodeStatus.java b/src/main/java/org/torproject/onionoo/docs/NodeStatus.java index 2943601..24546dd 100644 --- a/src/main/java/org/torproject/onionoo/docs/NodeStatus.java +++ b/src/main/java/org/torproject/onionoo/docs/NodeStatus.java @@ -324,7 +324,8 @@ public class NodeStatus extends Document { private String version; public void setVersion(String version) { - this.version = version.substring(version.lastIndexOf(" ") + 1); + this.version = null == version ? null + : version.substring(version.lastIndexOf(" ") + 1); } public String getVersion() { diff --git a/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java b/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java index ff14d75..04a04fa 100644 --- a/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java +++ b/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java @@ -158,15 +158,13 @@ public class NodeDetailsStatusUpdater implements DescriptorListener, /* Already parsed more recent server descriptor from this relay. */ return; } - long lastRestartedMillis = descriptor.getPublishedMillis() - - descriptor.getUptime() * DateTimeHelper.ONE_SECOND; int bandwidthRate = descriptor.getBandwidthRate(); int bandwidthBurst = descriptor.getBandwidthBurst(); int observedBandwidth = descriptor.getBandwidthObserved(); int advertisedBandwidth = Math.min(bandwidthRate, Math.min(bandwidthBurst, observedBandwidth)); detailsStatus.setDescPublished(descriptor.getPublishedMillis()); - detailsStatus.setLastRestarted(lastRestartedMillis); + detailsStatus.setLastRestarted(calculateLastRestartedMillis(descriptor)); detailsStatus.setBandwidthRate(bandwidthRate); detailsStatus.setBandwidthBurst(bandwidthBurst); detailsStatus.setObservedBandwidth(observedBandwidth); @@ -204,6 +202,15 @@ public class NodeDetailsStatusUpdater implements DescriptorListener, this.documentStore.store(detailsStatus, fingerprint); } + private Long calculateLastRestartedMillis(ServerDescriptor descriptor) { + Long lastRestartedMillis = null; + if (null != descriptor.getUptime()) { + lastRestartedMillis = descriptor.getPublishedMillis() + - descriptor.getUptime() * DateTimeHelper.ONE_SECOND; + } + return lastRestartedMillis; + } + private Map<String, Map<String, Long>> exitListEntries = new HashMap<>(); private void processExitList(ExitList exitList) { @@ -318,13 +325,11 @@ public class NodeDetailsStatusUpdater implements DescriptorListener, /* Already parsed more recent server descriptor from this bridge. */ return; } - long lastRestartedMillis = descriptor.getPublishedMillis() - - descriptor.getUptime() * DateTimeHelper.ONE_SECOND; int advertisedBandwidth = Math.min(descriptor.getBandwidthRate(), Math.min(descriptor.getBandwidthBurst(), descriptor.getBandwidthObserved())); detailsStatus.setDescPublished(descriptor.getPublishedMillis()); - detailsStatus.setLastRestarted(lastRestartedMillis); + detailsStatus.setLastRestarted(calculateLastRestartedMillis(descriptor)); detailsStatus.setAdvertisedBandwidth(advertisedBandwidth); detailsStatus.setPlatform(descriptor.getPlatform()); this.documentStore.store(detailsStatus, fingerprint);

1 0

[onionoo/release] Prepare for 4.2-1.6.1 release.
by karsten＠torproject.org 26 Oct '17

26 Oct '17

commit 8946c7ea9eb81edfc32a5ef3f5f9a11c9d552733 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Oct 26 20:50:30 2017 +0200 Prepare for 4.2-1.6.1 release. --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index 5f072bb..25477df 100644 --- a/build.xml +++ b/build.xml @@ -10,7 +10,7 @@ <property name="implementation-title" value="Onionoo" /> <property name="onionoo.protocol.version" value="4.2"/> <property name="release.version" - value="${onionoo.protocol.version}-1.6.0-dev"/> + value="${onionoo.protocol.version}-1.6.1"/> <property name="metricslibversion" value="2.1.1"/> <property name="jetty.version" value="-9.2.21.v20170120" /> <property name="warfile"

1 0

[onionoo/master] Fix two NullPointerExceptions.
by karsten＠torproject.org 26 Oct '17

26 Oct '17

commit 563f762ca7eeb649ac3d8777f5924d9c66cfd760 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Oct 26 10:28:11 2017 +0200 Fix two NullPointerExceptions. There's a relay running an alternate Tor version that produces descriptors without "uptime" line, and the directory authorities don't include a "v" line for that relay, likely because its platform string does not include the magic word "Tor". Fixes #24012. --- CHANGELOG.md | 8 ++++++++ .../java/org/torproject/onionoo/docs/DetailsStatus.java | 3 ++- .../java/org/torproject/onionoo/docs/NodeStatus.java | 3 ++- .../onionoo/updater/NodeDetailsStatusUpdater.java | 17 +++++++++++------ 4 files changed, 23 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b2aff31..ca17fa7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +# Changes in version 4.2-1.6.1 - 2017-10-2? + + * Medium changes + - Fix two NullPointerExceptions caused by accessing optional parts + of relay server descriptors and consensuses without checking + first whether they're available or not. + + # Changes in version 4.2-1.6.0 - 2017-10-09 * Medium changes diff --git a/src/main/java/org/torproject/onionoo/docs/DetailsStatus.java b/src/main/java/org/torproject/onionoo/docs/DetailsStatus.java index 0a0c215..faec117 100644 --- a/src/main/java/org/torproject/onionoo/docs/DetailsStatus.java +++ b/src/main/java/org/torproject/onionoo/docs/DetailsStatus.java @@ -45,7 +45,8 @@ public class DetailsStatus extends Document { private String last_restarted; public void setLastRestarted(Long lastRestarted) { - this.last_restarted = DateTimeHelper.format(lastRestarted); + this.last_restarted = null == lastRestarted ? null + : DateTimeHelper.format(lastRestarted); } public Long getLastRestarted() { diff --git a/src/main/java/org/torproject/onionoo/docs/NodeStatus.java b/src/main/java/org/torproject/onionoo/docs/NodeStatus.java index 2943601..24546dd 100644 --- a/src/main/java/org/torproject/onionoo/docs/NodeStatus.java +++ b/src/main/java/org/torproject/onionoo/docs/NodeStatus.java @@ -324,7 +324,8 @@ public class NodeStatus extends Document { private String version; public void setVersion(String version) { - this.version = version.substring(version.lastIndexOf(" ") + 1); + this.version = null == version ? null + : version.substring(version.lastIndexOf(" ") + 1); } public String getVersion() { diff --git a/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java b/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java index ff14d75..04a04fa 100644 --- a/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java +++ b/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java @@ -158,15 +158,13 @@ public class NodeDetailsStatusUpdater implements DescriptorListener, /* Already parsed more recent server descriptor from this relay. */ return; } - long lastRestartedMillis = descriptor.getPublishedMillis() - - descriptor.getUptime() * DateTimeHelper.ONE_SECOND; int bandwidthRate = descriptor.getBandwidthRate(); int bandwidthBurst = descriptor.getBandwidthBurst(); int observedBandwidth = descriptor.getBandwidthObserved(); int advertisedBandwidth = Math.min(bandwidthRate, Math.min(bandwidthBurst, observedBandwidth)); detailsStatus.setDescPublished(descriptor.getPublishedMillis()); - detailsStatus.setLastRestarted(lastRestartedMillis); + detailsStatus.setLastRestarted(calculateLastRestartedMillis(descriptor)); detailsStatus.setBandwidthRate(bandwidthRate); detailsStatus.setBandwidthBurst(bandwidthBurst); detailsStatus.setObservedBandwidth(observedBandwidth); @@ -204,6 +202,15 @@ public class NodeDetailsStatusUpdater implements DescriptorListener, this.documentStore.store(detailsStatus, fingerprint); } + private Long calculateLastRestartedMillis(ServerDescriptor descriptor) { + Long lastRestartedMillis = null; + if (null != descriptor.getUptime()) { + lastRestartedMillis = descriptor.getPublishedMillis() + - descriptor.getUptime() * DateTimeHelper.ONE_SECOND; + } + return lastRestartedMillis; + } + private Map<String, Map<String, Long>> exitListEntries = new HashMap<>(); private void processExitList(ExitList exitList) { @@ -318,13 +325,11 @@ public class NodeDetailsStatusUpdater implements DescriptorListener, /* Already parsed more recent server descriptor from this bridge. */ return; } - long lastRestartedMillis = descriptor.getPublishedMillis() - - descriptor.getUptime() * DateTimeHelper.ONE_SECOND; int advertisedBandwidth = Math.min(descriptor.getBandwidthRate(), Math.min(descriptor.getBandwidthBurst(), descriptor.getBandwidthObserved())); detailsStatus.setDescPublished(descriptor.getPublishedMillis()); - detailsStatus.setLastRestarted(lastRestartedMillis); + detailsStatus.setLastRestarted(calculateLastRestartedMillis(descriptor)); detailsStatus.setAdvertisedBandwidth(advertisedBandwidth); detailsStatus.setPlatform(descriptor.getPlatform()); this.documentStore.store(detailsStatus, fingerprint);

1 0

[onionoo/master] Prepare for 4.2-1.6.1 release.
by karsten＠torproject.org 26 Oct '17

26 Oct '17

commit 8946c7ea9eb81edfc32a5ef3f5f9a11c9d552733 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Oct 26 20:50:30 2017 +0200 Prepare for 4.2-1.6.1 release. --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index 5f072bb..25477df 100644 --- a/build.xml +++ b/build.xml @@ -10,7 +10,7 @@ <property name="implementation-title" value="Onionoo" /> <property name="onionoo.protocol.version" value="4.2"/> <property name="release.version" - value="${onionoo.protocol.version}-1.6.0-dev"/> + value="${onionoo.protocol.version}-1.6.1"/> <property name="metricslibversion" value="2.1.1"/> <property name="jetty.version" value="-9.2.21.v20170120" /> <property name="warfile"

1 0

[translation/tails-openpgp-applet] Update translations for tails-openpgp-applet
by translation＠torproject.org 26 Oct '17

26 Oct '17

commit 3e8ed8d28ccbf3bfed8c174c2cce083950bb1549 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Oct 26 16:18:40 2017 +0000 Update translations for tails-openpgp-applet --- ar/openpgp-applet.pot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ar/openpgp-applet.pot b/ar/openpgp-applet.pot index 078fdff74..67a4bdfc8 100644 --- a/ar/openpgp-applet.pot +++ b/ar/openpgp-applet.pot @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: tails(a)boum.org\n" "POT-Creation-Date: 2017-08-05 15:07-0400\n" -"PO-Revision-Date: 2017-09-23 21:55+0000\n" +"PO-Revision-Date: 2017-10-26 16:06+0000\n" "Last-Translator: Singapore Goldindor\n" "Language-Team: Arabic (http://www.transifex.com/otf/torproject/language/ar/)\n" "MIME-Version: 1.0\n"

1 0

[tor/master] Revert "Temporarily disable compilation of the v3 hs fuzzing code"
by nickm＠torproject.org 26 Oct '17

26 Oct '17

commit 4d2de821ce9ab7a79e1a8bf5123adafd4326d023 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Oct 26 09:41:47 2017 -0400 Revert "Temporarily disable compilation of the v3 hs fuzzing code" This reverts commit 5ef656e7d1b1e1e74c46bd02ce8faaa1d8d09403. --- scripts/codegen/fuzzing_include_am.py | 1 + src/test/fuzz/include.am | 28 +++++++++++++++++++++++++--- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/scripts/codegen/fuzzing_include_am.py b/scripts/codegen/fuzzing_include_am.py index e01bc8daa..fee6d4494 100755 --- a/scripts/codegen/fuzzing_include_am.py +++ b/scripts/codegen/fuzzing_include_am.py @@ -7,6 +7,7 @@ FUZZERS = """ diff-apply extrainfo hsdescv2 + hsdescv3 http http-connect iptsv2 diff --git a/src/test/fuzz/include.am b/src/test/fuzz/include.am index 472cbfc8a..cd16dc05b 100644 --- a/src/test/fuzz/include.am +++ b/src/test/fuzz/include.am @@ -17,9 +17,8 @@ FUZZING_LIBS = \ src/trunnel/libor-trunnel-testing.a \ $(rust_ldadd) \ @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ \ - @TOR_LIBEVENT_LIBS@ \ - @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ \ - @CURVE25519_LIBS@ \ + @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ \ + @TOR_LIB_WS32@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ @CURVE25519_LIBS@ \ @TOR_SYSTEMD_LIBS@ \ @TOR_LZMA_LIBS@ \ @TOR_ZSTD_LIBS@ @@ -95,6 +94,14 @@ src_test_fuzz_fuzz_hsdescv2_CFLAGS = $(FUZZING_CFLAGS) src_test_fuzz_fuzz_hsdescv2_LDFLAGS = $(FUZZING_LDFLAG) src_test_fuzz_fuzz_hsdescv2_LDADD = $(FUZZING_LIBS) +src_test_fuzz_fuzz_hsdescv3_SOURCES = \ + src/test/fuzz/fuzzing_common.c \ + src/test/fuzz/fuzz_hsdescv3.c +src_test_fuzz_fuzz_hsdescv3_CPPFLAGS = $(FUZZING_CPPFLAGS) +src_test_fuzz_fuzz_hsdescv3_CFLAGS = $(FUZZING_CFLAGS) +src_test_fuzz_fuzz_hsdescv3_LDFLAGS = $(FUZZING_LDFLAG) +src_test_fuzz_fuzz_hsdescv3_LDADD = $(FUZZING_LIBS) + src_test_fuzz_fuzz_http_SOURCES = \ src/test/fuzz/fuzzing_common.c \ src/test/fuzz/fuzz_http.c @@ -142,6 +149,7 @@ FUZZERS = \ src/test/fuzz/fuzz-diff-apply \ src/test/fuzz/fuzz-extrainfo \ src/test/fuzz/fuzz-hsdescv2 \ + src/test/fuzz/fuzz-hsdescv3 \ src/test/fuzz/fuzz-http \ src/test/fuzz/fuzz-http-connect \ src/test/fuzz/fuzz-iptsv2 \ @@ -193,6 +201,13 @@ src_test_fuzz_lf_fuzz_hsdescv2_CFLAGS = $(LIBFUZZER_CFLAGS) src_test_fuzz_lf_fuzz_hsdescv2_LDFLAGS = $(LIBFUZZER_LDFLAG) src_test_fuzz_lf_fuzz_hsdescv2_LDADD = $(LIBFUZZER_LIBS) +src_test_fuzz_lf_fuzz_hsdescv3_SOURCES = \ + $(src_test_fuzz_fuzz_hsdescv3_SOURCES) +src_test_fuzz_lf_fuzz_hsdescv3_CPPFLAGS = $(LIBFUZZER_CPPFLAGS) +src_test_fuzz_lf_fuzz_hsdescv3_CFLAGS = $(LIBFUZZER_CFLAGS) +src_test_fuzz_lf_fuzz_hsdescv3_LDFLAGS = $(LIBFUZZER_LDFLAG) +src_test_fuzz_lf_fuzz_hsdescv3_LDADD = $(LIBFUZZER_LIBS) + src_test_fuzz_lf_fuzz_http_SOURCES = \ $(src_test_fuzz_fuzz_http_SOURCES) src_test_fuzz_lf_fuzz_http_CPPFLAGS = $(LIBFUZZER_CPPFLAGS) @@ -235,6 +250,7 @@ LIBFUZZER_FUZZERS = \ src/test/fuzz/lf-fuzz-diff-apply \ src/test/fuzz/lf-fuzz-extrainfo \ src/test/fuzz/lf-fuzz-hsdescv2 \ + src/test/fuzz/lf-fuzz-hsdescv3 \ src/test/fuzz/lf-fuzz-http \ src/test/fuzz/lf-fuzz-http-connect \ src/test/fuzz/lf-fuzz-iptsv2 \ @@ -278,6 +294,11 @@ src_test_fuzz_liboss_fuzz_hsdescv2_a_SOURCES = \ src_test_fuzz_liboss_fuzz_hsdescv2_a_CPPFLAGS = $(LIBOSS_FUZZ_CPPFLAGS) src_test_fuzz_liboss_fuzz_hsdescv2_a_CFLAGS = $(LIBOSS_FUZZ_CFLAGS) +src_test_fuzz_liboss_fuzz_hsdescv3_a_SOURCES = \ + $(src_test_fuzz_fuzz_hsdescv3_SOURCES) +src_test_fuzz_liboss_fuzz_hsdescv3_a_CPPFLAGS = $(LIBOSS_FUZZ_CPPFLAGS) +src_test_fuzz_liboss_fuzz_hsdescv3_a_CFLAGS = $(LIBOSS_FUZZ_CFLAGS) + src_test_fuzz_liboss_fuzz_http_a_SOURCES = \ $(src_test_fuzz_fuzz_http_SOURCES) src_test_fuzz_liboss_fuzz_http_a_CPPFLAGS = $(LIBOSS_FUZZ_CPPFLAGS) @@ -310,6 +331,7 @@ OSS_FUZZ_FUZZERS = \ src/test/fuzz/liboss-fuzz-diff-apply.a \ src/test/fuzz/liboss-fuzz-extrainfo.a \ src/test/fuzz/liboss-fuzz-hsdescv2.a \ + src/test/fuzz/liboss-fuzz-hsdescv3.a \ src/test/fuzz/liboss-fuzz-http.a \ src/test/fuzz/liboss-fuzz-http-connect.a \ src/test/fuzz/liboss-fuzz-iptsv2.a \

1 0

[tor/maint-0.3.2] fuzzing: Make hsdescv3 use the decoding API correctly
by nickm＠torproject.org 26 Oct '17

26 Oct '17

commit c4ef21ff5eff26182428d388e0614b4f0c5eed58 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Oct 26 09:52:15 2017 -0400 fuzzing: Make hsdescv3 use the decoding API correctly Fixes #21509 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/bug21509 | 3 +++ src/test/fuzz/fuzz_hsdescv3.c | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/changes/bug21509 b/changes/bug21509 new file mode 100644 index 000000000..593a01ef2 --- /dev/null +++ b/changes/bug21509 @@ -0,0 +1,3 @@ + o Minor bugfixes (hidden service v3, fuzzing): + - Fix the hidden service v3 descriptor decoding fuzzing to use the latest + decoding API correctly. Fixes bug 21509; bugfix on 0.3.2.1-alpha. diff --git a/src/test/fuzz/fuzz_hsdescv3.c b/src/test/fuzz/fuzz_hsdescv3.c index 3fd21148f..03c509e2e 100644 --- a/src/test/fuzz/fuzz_hsdescv3.c +++ b/src/test/fuzz/fuzz_hsdescv3.c @@ -55,10 +55,12 @@ int fuzz_main(const uint8_t *data, size_t sz) { hs_descriptor_t *desc = NULL; + uint8_t subcredential[DIGEST256_LEN]; char *fuzzing_data = tor_memdup_nulterm(data, sz); + memset(subcredential, 'A', sizeof(subcredential)); - hs_desc_decode_descriptor(fuzzing_data, NULL, &desc); + hs_desc_decode_descriptor(fuzzing_data, subcredential, &desc); if (desc) { log_debug(LD_GENERAL, "Decoding okay"); hs_descriptor_free(desc);

1 0

[tor/maint-0.3.2] Revert "Temporarily disable compilation of the v3 hs fuzzing code"
by nickm＠torproject.org 26 Oct '17

26 Oct '17

commit 4d2de821ce9ab7a79e1a8bf5123adafd4326d023 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Oct 26 09:41:47 2017 -0400 Revert "Temporarily disable compilation of the v3 hs fuzzing code" This reverts commit 5ef656e7d1b1e1e74c46bd02ce8faaa1d8d09403. --- scripts/codegen/fuzzing_include_am.py | 1 + src/test/fuzz/include.am | 28 +++++++++++++++++++++++++--- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/scripts/codegen/fuzzing_include_am.py b/scripts/codegen/fuzzing_include_am.py index e01bc8daa..fee6d4494 100755 --- a/scripts/codegen/fuzzing_include_am.py +++ b/scripts/codegen/fuzzing_include_am.py @@ -7,6 +7,7 @@ FUZZERS = """ diff-apply extrainfo hsdescv2 + hsdescv3 http http-connect iptsv2 diff --git a/src/test/fuzz/include.am b/src/test/fuzz/include.am index 472cbfc8a..cd16dc05b 100644 --- a/src/test/fuzz/include.am +++ b/src/test/fuzz/include.am @@ -17,9 +17,8 @@ FUZZING_LIBS = \ src/trunnel/libor-trunnel-testing.a \ $(rust_ldadd) \ @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ \ - @TOR_LIBEVENT_LIBS@ \ - @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ \ - @CURVE25519_LIBS@ \ + @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ \ + @TOR_LIB_WS32@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ @CURVE25519_LIBS@ \ @TOR_SYSTEMD_LIBS@ \ @TOR_LZMA_LIBS@ \ @TOR_ZSTD_LIBS@ @@ -95,6 +94,14 @@ src_test_fuzz_fuzz_hsdescv2_CFLAGS = $(FUZZING_CFLAGS) src_test_fuzz_fuzz_hsdescv2_LDFLAGS = $(FUZZING_LDFLAG) src_test_fuzz_fuzz_hsdescv2_LDADD = $(FUZZING_LIBS) +src_test_fuzz_fuzz_hsdescv3_SOURCES = \ + src/test/fuzz/fuzzing_common.c \ + src/test/fuzz/fuzz_hsdescv3.c +src_test_fuzz_fuzz_hsdescv3_CPPFLAGS = $(FUZZING_CPPFLAGS) +src_test_fuzz_fuzz_hsdescv3_CFLAGS = $(FUZZING_CFLAGS) +src_test_fuzz_fuzz_hsdescv3_LDFLAGS = $(FUZZING_LDFLAG) +src_test_fuzz_fuzz_hsdescv3_LDADD = $(FUZZING_LIBS) + src_test_fuzz_fuzz_http_SOURCES = \ src/test/fuzz/fuzzing_common.c \ src/test/fuzz/fuzz_http.c @@ -142,6 +149,7 @@ FUZZERS = \ src/test/fuzz/fuzz-diff-apply \ src/test/fuzz/fuzz-extrainfo \ src/test/fuzz/fuzz-hsdescv2 \ + src/test/fuzz/fuzz-hsdescv3 \ src/test/fuzz/fuzz-http \ src/test/fuzz/fuzz-http-connect \ src/test/fuzz/fuzz-iptsv2 \ @@ -193,6 +201,13 @@ src_test_fuzz_lf_fuzz_hsdescv2_CFLAGS = $(LIBFUZZER_CFLAGS) src_test_fuzz_lf_fuzz_hsdescv2_LDFLAGS = $(LIBFUZZER_LDFLAG) src_test_fuzz_lf_fuzz_hsdescv2_LDADD = $(LIBFUZZER_LIBS) +src_test_fuzz_lf_fuzz_hsdescv3_SOURCES = \ + $(src_test_fuzz_fuzz_hsdescv3_SOURCES) +src_test_fuzz_lf_fuzz_hsdescv3_CPPFLAGS = $(LIBFUZZER_CPPFLAGS) +src_test_fuzz_lf_fuzz_hsdescv3_CFLAGS = $(LIBFUZZER_CFLAGS) +src_test_fuzz_lf_fuzz_hsdescv3_LDFLAGS = $(LIBFUZZER_LDFLAG) +src_test_fuzz_lf_fuzz_hsdescv3_LDADD = $(LIBFUZZER_LIBS) + src_test_fuzz_lf_fuzz_http_SOURCES = \ $(src_test_fuzz_fuzz_http_SOURCES) src_test_fuzz_lf_fuzz_http_CPPFLAGS = $(LIBFUZZER_CPPFLAGS) @@ -235,6 +250,7 @@ LIBFUZZER_FUZZERS = \ src/test/fuzz/lf-fuzz-diff-apply \ src/test/fuzz/lf-fuzz-extrainfo \ src/test/fuzz/lf-fuzz-hsdescv2 \ + src/test/fuzz/lf-fuzz-hsdescv3 \ src/test/fuzz/lf-fuzz-http \ src/test/fuzz/lf-fuzz-http-connect \ src/test/fuzz/lf-fuzz-iptsv2 \ @@ -278,6 +294,11 @@ src_test_fuzz_liboss_fuzz_hsdescv2_a_SOURCES = \ src_test_fuzz_liboss_fuzz_hsdescv2_a_CPPFLAGS = $(LIBOSS_FUZZ_CPPFLAGS) src_test_fuzz_liboss_fuzz_hsdescv2_a_CFLAGS = $(LIBOSS_FUZZ_CFLAGS) +src_test_fuzz_liboss_fuzz_hsdescv3_a_SOURCES = \ + $(src_test_fuzz_fuzz_hsdescv3_SOURCES) +src_test_fuzz_liboss_fuzz_hsdescv3_a_CPPFLAGS = $(LIBOSS_FUZZ_CPPFLAGS) +src_test_fuzz_liboss_fuzz_hsdescv3_a_CFLAGS = $(LIBOSS_FUZZ_CFLAGS) + src_test_fuzz_liboss_fuzz_http_a_SOURCES = \ $(src_test_fuzz_fuzz_http_SOURCES) src_test_fuzz_liboss_fuzz_http_a_CPPFLAGS = $(LIBOSS_FUZZ_CPPFLAGS) @@ -310,6 +331,7 @@ OSS_FUZZ_FUZZERS = \ src/test/fuzz/liboss-fuzz-diff-apply.a \ src/test/fuzz/liboss-fuzz-extrainfo.a \ src/test/fuzz/liboss-fuzz-hsdescv2.a \ + src/test/fuzz/liboss-fuzz-hsdescv3.a \ src/test/fuzz/liboss-fuzz-http.a \ src/test/fuzz/liboss-fuzz-http-connect.a \ src/test/fuzz/liboss-fuzz-iptsv2.a \

1 0

[tor/release-0.3.2] fuzzing: Make hsdescv3 use the decoding API correctly
by nickm＠torproject.org 26 Oct '17

26 Oct '17

commit c4ef21ff5eff26182428d388e0614b4f0c5eed58 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Oct 26 09:52:15 2017 -0400 fuzzing: Make hsdescv3 use the decoding API correctly Fixes #21509 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/bug21509 | 3 +++ src/test/fuzz/fuzz_hsdescv3.c | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/changes/bug21509 b/changes/bug21509 new file mode 100644 index 000000000..593a01ef2 --- /dev/null +++ b/changes/bug21509 @@ -0,0 +1,3 @@ + o Minor bugfixes (hidden service v3, fuzzing): + - Fix the hidden service v3 descriptor decoding fuzzing to use the latest + decoding API correctly. Fixes bug 21509; bugfix on 0.3.2.1-alpha. diff --git a/src/test/fuzz/fuzz_hsdescv3.c b/src/test/fuzz/fuzz_hsdescv3.c index 3fd21148f..03c509e2e 100644 --- a/src/test/fuzz/fuzz_hsdescv3.c +++ b/src/test/fuzz/fuzz_hsdescv3.c @@ -55,10 +55,12 @@ int fuzz_main(const uint8_t *data, size_t sz) { hs_descriptor_t *desc = NULL; + uint8_t subcredential[DIGEST256_LEN]; char *fuzzing_data = tor_memdup_nulterm(data, sz); + memset(subcredential, 'A', sizeof(subcredential)); - hs_desc_decode_descriptor(fuzzing_data, NULL, &desc); + hs_desc_decode_descriptor(fuzzing_data, subcredential, &desc); if (desc) { log_debug(LD_GENERAL, "Decoding okay"); hs_descriptor_free(desc);

1 0