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

[tor-browser-build/maint-9.0] Release preparations for 9.0
by gk＠torproject.org 18 Oct '19

18 Oct '19

commit b90fa19c19224f2493a28475359fa8c4672658c2 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Oct 17 20:13:36 2019 +0000 Release preparations for 9.0 Changelog update and versions bump --- projects/firefox/config | 4 +- .../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 179 ++++++++++++++++++++- projects/tor-launcher/config | 2 +- projects/tor/config | 2 +- rbm.conf | 6 +- 5 files changed, 185 insertions(+), 8 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index 4370f01..47d70a1 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,14 +1,14 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2-build5' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git git_submodule: 1 gpg_keyring: torbutton.gpg var: - firefox_platform_version: 68.1.0 + firefox_platform_version: 68.2.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 9.0 torbrowser_update_channel: alpha diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 56a7725..9a4666d 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,180 @@ +Tor Browser 9.0 -- October 22 2019 + * All Platforms + * Update Firefox to 68.2.0esr + * Bug 31740: Remove some unnecessary RemoteSettings instances + * Bug 13543: Spoof smooth and powerEfficient for Media Capabilities + * Bug 28196: about:preferences is not properly translated anymore + * Bug 19417: Disable asmjs on safer and safest security levels + * Bug 30463: Explicitly disable MOZ_TELEMETRY_REPORTING + * Bug 31935: Disable profile downgrade protection + * Bug 16285: Disable DRM/EME on Android and drop Adobe CDM + * Bug 31602: Remove Pocket indicators in UI and disable it + * Bug 31914: Fix eslint linter error + * Bug 30429: Rebase patches for Firefox 68 ESR + * Bug 31444: Review network code changes for Firefox 68 ESR + * Bug 10760: Integrate Torbutton into Tor Browser directly + * Bug 25856: Remove XUL overlays from Torbutton + * Bug 31322: Fix about:tor assertion failure debug builds + * Bug 29430: Add support for meek_lite bridges to bridgeParser + * Bug 28561: Migrate "About Tor Browser" dialog to tor-browser + * Bug 30683: Prevent detection of locale via some *.properties + * Bug 31298: Backport patch for #24056 + * Bug 9336: Odd wyswig schemes without isolation for browserspy.dk + * Bug 27601: Browser notifications are not working anymore + * Bug 30845: Make sure internal extensions are enabled + * Bug 28896: Enable extensions in private browsing by default + * Bug 31563: Reload search extensions if extensions.enabledScopes has changed + * Bug 31396: Fix communication with NoScript for security settings + * Bug 31142: Fix crash of tab and messing with about:newtab + * Bug 29049: Backport JS Poison Patch + * Bug 25214: Canvas data extraction on locale pdf file should be allowed + * Bug 30657: Locale is leaked via title of link tag on non-html page + * Bug 31015: Disabling SVG hides UI icons in extensions + * Bug 30681: Set security.enterprise_roots.enabled to false + * Bug 30538: Unable to comment on The Independent Newspaper + * Translations update + * Windows + OS X + Linux + * Update Tor to 0.4.1.6 + * Update OpenSSL to 1.1.1d + * Bug 31844: OpenSSL 1.1.1d fails to compile for some platforms/architectures + * Update Tor Launcher to 0.2.20 + * Bug 28044: Integrate Tor Launcher into tor-browser + * Bug 31286: New strings for about:preferences#tor + * Bug 31303: Do not launch tor in browser toolbox + * Bug 32112: Fix bad & escaping in translations + * Bug 31491: Clean up the old meek http helper browser profiles + * Bug 29197: Remove use of overlays + * Bug 31300: Modify Tor Launcher so it is compatible with ESR68 + * Bug 31487: Modify moat client code so it is compatible with ESR68 + * Bug 31488: Moat: support a comma-separated list of transports + * Bug 30468: Add mk locale + * Bug 30469: Add ro locale + * Bug 30319: Remove FTE bits + * Translations update + * Bug 32092: Fix Tor Browser Support link in preferences + * Bug 32111: Fixed issue parsing user-provided bridge strings + * Bug 31749: Fix security level panel spawning events + * Bug 31920: Fix Security Level panel when its toolbar button moves to overflow + * Bug 31748: Fix 'Learn More' links in Security Level preferences and panel + * Bug 28044: Integrate Tor Launcher into tor-browser + * Bug 31059: Enable Letterboxing + * Bug 30468: Add mk locale + * Bug 30469: Add ro locale + * Bug 29430: Use obfs4proxy's meek_lite with utls instead of meek + * Bug 31251: Security Level button UI polish + * Bug 31344: Register SecurityLevelPreference's 'unload' callback + * Bug 31286: Provide network settings on about:preferences#tor + * Bug 31886: Fix ko bundle bustage + * Bug 31768: Update onboarding for Tor Browser 9 + * Bug 27511: Add new identity button to toolbar + * Bug 31778: Support dark-theme for the Circuit Display UI + * Bug 31910: Replace meek_lite with meek in circuit display + * Bug 30504: Deal with New Identity related browser console errors + * Bug 31929: Don't escape DTD entity in ar + * Bug 31747: Some onboarding UI is always shown in English + * Bug 32041: Replace = with real hamburguer icon ≡ + * Bug 30304: Browser locale can be obtained via DTD strings + * Bug 31065: Set network.proxy.allow_hijacking_localhost to true + * Bug 24653: Merge securityLevel.properties into torbutton.dtd + * Bug 31164: Set up default bridge at Karlstad University + * Bug 15563: Disable ServiceWorkers on all platforms + * Bug 31598: Disable warning on window resize if letterboxing is enabled + * Bug 31562: Fix circuit display for error pages + * Bug 31575: Firefox is phoning home during start-up + * Bug 31491: Clean up the old meek http helper browser profiles + * Bug 26345: Hide tracking protection UI + * Bug 31601: Disable recommended extensions again + * Bug 30662: Don't show Firefox Home when opening new tabs + * Bug 31457: Disable per-installation profiles + * Bug 28822: Re-implement desktop onboarding for ESR 68 + * Windows + * Bug 31942: Re-enable signature check for language packs + * Bug 29013: Enable stack protection for Firefox on Windows + * Bug 30800: ftp:// on Windows can be used to leak the system time zone + * Bug 31547: Back out patch for Mozilla's bug 1574980 + * Bug 31141: Fix typo in font.system.whitelist + * Bug 30319: Remove FTE bits + * OS X + * Bug 30126: Make Tor Browser compatible with macOS 10.15 + * Bug 31607: App menu items stop working on macOS + * Bug 31955: On macOS avoid throwing inside nonBrowserWindowStartup() + * Bug 29818: Adapt #13379 patch for 68esr + * Bug 31464: Meek and moat are broken on macOS 10.9 with Go 1.12 + * Linux + * Bug 31942: Re-enable signature check for language packs + * Bug 31646: Update abicheck to require newer libstdc++.so.6 + * Bug 31968: Don't fail if /proc/cpuinfo is not readable + * Bug 24755: Stop using a heredoc in start-tor-browser + * Bug 31550: Put curly quotes inside single quotes + * Bug 31394: Replace "-1" with "−1" in start-tor-browser.desktop + * Bug 30319: Remove FTE bits + * Android + * Update Tor to 0.4.1.5 + * Bug 31010: Rebase mobile patches for Fennec 68 + * Bug 31010: Don't use addTrustedTab() on mobile + * Bug 30607: Support Tor Browser running on Android Q + * Bug 31192: Support x86_64 target on Android + * Bug 30380: Cancel dormant by startup + * Bug 30943: Show version number on mobile + * Bug 31720: Enable website suggestions in address bar + * Bug 31822: Security slider is not really visible on Android anymore + * Bug 24920: Only create Private tabs in permanent Private Browsing Mode + * Bug 31730: Revert aarch64-workaround against JIT-related crashes + * Build System + * All Platforms + * Bug 30585: Provide standalone clang 8 project across all platforms + * Bug 30376: Use Rust 1.34 for Tor Browser 9 + * Bug 30490: Add cbindgen project for building Firefox 68 ESR/Fennec 68 + * Bug 30701: Add nodejs project for building Firefox 68 ESR/Fennec 68 + * Bug 31621: Fix node bug that makes large writes to stdout fail + * Bug 30734: Add nasm project for building Firefox 68 ESR/Fennec 68 + * Bug 31293: Make sure the lo interface inside the containers is up + * Bug 27493: Clean up mozconfig options + * Bug 31308: Sync mozconfig files used in tor-browser over to tor-browser-build for esr68 + * Windows + * Bug 29307: Use Stretch for cross-compiling for Windows + * Bug 29731: Remove faketime for Windows builds + * Bug 30322: Windows toolchain update for Firefox 68 ESR + * Bug 28716: Create mingw-w64-clang toolchain + * Bug 28238: Adapt firefox and fxc2 projects for Windows builds + * Bug 28716: Optionally omit timestamp in PE header + * Bug 31567: NS_tsnprintf() does not handle %s correctly on Windows + * Bug 31458: Revert patch for #27503 and bump mingw-w64 revision used + * Bug 9898: Provide clean fix for strcmpi issue in NSPR + * Bug 29013: Enable stack protection support for Firefox on Windows + * Bug 30384: Use 64bit containers to build 32bit Windows Tor Browser + * Bug 31538: Windows bundles based on ESR 68 are not built reproducibly + * Bug 31584: Clean up mingw-w64 project + * Bug 31596: Bump mingw-w64 version to pick up fix for #31567 + * Bug 29187: Bump NSIS version to 3.04 + * Bug 31732: Windows nightly builds are busted due to mingw-w64 commit bump + * Bug 29319: Remove FTE support for Windows + * OS X + * Bug 30323: MacOS toolchain update for Firefox 68 ESR + * Bug 31467: Switch to clang for cctools project + * Bug 31465: Adapt tor-browser-build projects for macOS notarization + * Linux + * Bug 31448: gold and lld break linking 32bit Linux bundles + * Bug 31618: Linux32 builds of Tor Browser 9.0a6 are not matching + * Bug 31450: Still use GCC for our ASan builds + * Bug 30321: Linux toolchain update for Firefox ESR 68 + * Bug 30736: Install yasm from wheezy-backports + * Bug 31447: Don't install Python just for Mach + * Bug 30448: Strip Browser/gtk2/libmozgtk.so + * Android + * Bug 30324: Android toolchain update for Fennec 68 + * Bug 31173: Update android-toolchain project to match Firefox + * Bug 31389: Update Android Firefox to build with Clang + * Bug 31388: Update Rust project for Android + * Bug 30665: Get Firefox 68 ESR working with latest android toolchain + * Bug 30460: Update TOPL project to use Firefox 68 toolchain + * Bug 30461: Update tor-android-service project to use Firefox 68 toolchain + * Bug 28753: Use Gradle with --offline when building the browser part + * Bug 31564: Make Android bundles based on ESR 68 reproducible + * Bug 31981: Remove require-api.patch + * Bug 31979: TOPL: Sort dependency list + * Bug 30665: Remove unnecessary build patches for Firefox + Tor Browser 9.0a8 -- October 14 2019 * All Platforms * Bug 13543: Spoof smooth and powerEfficient for Media Capabilities @@ -364,7 +541,7 @@ Tor Browser 9.0a1 -- May 21 2019 * Update Tor Launcher to 0.2.19 * Bug 28044: Integrate Tor Launcher into tor-browser * Bug 29627: Moat: add support for obfsproxy's meek_lite - * Bug 30139: Remove FTE bits + * Bug 30319: Remove FTE bits * Translations update * Bug 28044: Integrate Tor Launcher into tor-browser * Bug 30372: Backport letterboxing (bug 1538130) diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index 3171be7..54e4973 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.2.19.5 +version: 0.2.20 git_url: https://git.torproject.org/tor-launcher.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg diff --git a/projects/tor/config b/projects/tor/config index ae2ef16..74790af 100644 --- a/projects/tor/config +++ b/projects/tor/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -version: 0.4.2.2-alpha +version: 0.4.1.6 git_hash: 'tor-[% c("version") %]' git_url: https://git.torproject.org/tor.git git_submodule: 1 diff --git a/rbm.conf b/rbm.conf index 3ba38e4..ab0bbb5 100644 --- a/rbm.conf +++ b/rbm.conf @@ -24,10 +24,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '9.0a8' - torbrowser_build: 'build2' + torbrowser_version: '9.0' + torbrowser_build: 'build1' torbrowser_incremental_from: - - 9.0a7 + - 8.5.5 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[onionoo/master] Bump version to 7.0-1.21.0-dev.
by karsten＠torproject.org 18 Oct '19

18 Oct '19

commit 06ab8b46f03b612f551025fcb5abaff690ee70c6 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Oct 18 09:08:28 2019 +0200 Bump version to 7.0-1.21.0-dev. --- CHANGELOG.md | 3 +++ build.xml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d0f9e8d..29b57e0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +# Changes in version 7.0-1.??.? - 2019-1?-?? + + # Changes in version 7.0-1.21.0 - 2019-10-18 * Medium changes diff --git a/build.xml b/build.xml index 91e6130..ec84464 100644 --- a/build.xml +++ b/build.xml @@ -11,7 +11,7 @@ <property name="implementation-title" value="Onionoo" /> <property name="onionoo.protocol.version" value="7.0"/> <property name="release.version" - value="${onionoo.protocol.version}-1.21.0"/> + value="${onionoo.protocol.version}-1.21.0-dev"/> <property name="metricslibversion" value="2.6.2"/> <property name="jetty.version" value="-9.2.21.v20170120" /> <property name="warfile"

1 0

[onionoo/release] Increase timeout for testCountryDeDe even more.
by karsten＠torproject.org 18 Oct '19

18 Oct '19

commit 1579c1e2c103880129271daf30f49cb2e52f7b10 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Oct 4 11:01:52 2019 +0200 Increase timeout for testCountryDeDe even more. The timeout was again being reached in the GitLab CI environment. --- .../java/org/torproject/metrics/onionoo/server/ResourceServletTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/org/torproject/metrics/onionoo/server/ResourceServletTest.java b/src/test/java/org/torproject/metrics/onionoo/server/ResourceServletTest.java index 935c06e..7df56ea 100644 --- a/src/test/java/org/torproject/metrics/onionoo/server/ResourceServletTest.java +++ b/src/test/java/org/torproject/metrics/onionoo/server/ResourceServletTest.java @@ -1134,7 +1134,7 @@ public class ResourceServletTest { null); } - @Test(timeout = 400) + @Test(timeout = 800) public void testCountryDeDe() { this.assertSummaryDocument( "/summary?country=de&country=de", 1, new String[] { "TorkaZ" }, 0,

1 0

[onionoo/release] Update to latest metrics-base.
by karsten＠torproject.org 18 Oct '19

18 Oct '19

commit df7d3369e7418ff381e8f6b9850311fa0187e757 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Oct 14 16:32:25 2019 +0200 Update to latest metrics-base. --- src/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/build b/src/build index 62a964a..d82fff9 160000 --- a/src/build +++ b/src/build @@ -1 +1 @@ -Subproject commit 62a964a7702086ca6ba0e2307809d4f983163b47 +Subproject commit d82fff984634fe006ac7b0b102e7f48a52ca20d9

1 0

[onionoo/release] Bump version to 7.0-1.20.0-dev.
by karsten＠torproject.org 18 Oct '19

18 Oct '19

commit c61ce6c4ec69741c3fe35f48e4cddf18f5a8ee49 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Oct 4 11:09:15 2019 +0200 Bump version to 7.0-1.20.0-dev. --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index 360dc8b..a6969f5 100644 --- a/build.xml +++ b/build.xml @@ -11,7 +11,7 @@ <property name="implementation-title" value="Onionoo" /> <property name="onionoo.protocol.version" value="7.0"/> <property name="release.version" - value="${onionoo.protocol.version}-1.20.0"/> + value="${onionoo.protocol.version}-1.20.0-dev"/> <property name="metricslibversion" value="2.6.2"/> <property name="jetty.version" value="-9.2.21.v20170120" /> <property name="warfile"

1 0

[onionoo/release] Prepare for 7.0-1.21.0 release.
by karsten＠torproject.org 18 Oct '19

18 Oct '19

commit 08f4d3a7f628c0adaba11363d997eaf453982c76 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Oct 18 08:58:11 2019 +0200 Prepare for 7.0-1.21.0 release. --- CHANGELOG.md | 3 ++- build.xml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3ab6329..d0f9e8d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ -# Changes in version 7.0-1.21.0 - 2019-1?-?? +# Changes in version 7.0-1.21.0 - 2019-10-18 * Medium changes + - Add previously missing Jetty servlets dependency. - Fix a bug where old reverse DNS lookups were sometimes not cleared properly. diff --git a/build.xml b/build.xml index a6969f5..91e6130 100644 --- a/build.xml +++ b/build.xml @@ -11,7 +11,7 @@ <property name="implementation-title" value="Onionoo" /> <property name="onionoo.protocol.version" value="7.0"/> <property name="release.version" - value="${onionoo.protocol.version}-1.20.0-dev"/> + value="${onionoo.protocol.version}-1.21.0"/> <property name="metricslibversion" value="2.6.2"/> <property name="jetty.version" value="-9.2.21.v20170120" /> <property name="warfile"

1 0

[onionoo/release] Always clear old reverse DNS lookups.
by karsten＠torproject.org 18 Oct '19

18 Oct '19

commit 6faa1ab757f16263f7925dbe4c49d6dfb698f265 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Oct 3 16:43:21 2019 +0200 Always clear old reverse DNS lookups. The fix is to distinguish between lookup results being null for a given fingerprint (because we didn't have enough time to look up an address) and the empty set (because we received 0 verified or 0 unverified host names in response). Fixes #31941. --- CHANGELOG.md | 9 ++++++++- .../metrics/onionoo/updater/NodeDetailsStatusUpdater.java | 4 ++-- .../metrics/onionoo/updater/RdnsLookupRequest.java | 14 +++++++------- .../metrics/onionoo/updater/RdnsLookupWorker.java | 4 ++-- 4 files changed, 19 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 696b33d..3ab6329 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,11 @@ -# Changes in version 7.0-1.20.0 - 2019-0?-?? +# Changes in version 7.0-1.21.0 - 2019-1?-?? + + * Medium changes + - Fix a bug where old reverse DNS lookups were sometimes not + cleared properly. + + +# Changes in version 7.0-1.20.0 - 2019-10-04 * Medium changes - Use Ivy for resolving external dependencies rather than relying diff --git a/src/main/java/org/torproject/metrics/onionoo/updater/NodeDetailsStatusUpdater.java b/src/main/java/org/torproject/metrics/onionoo/updater/NodeDetailsStatusUpdater.java index 2bdf03f..a5f16e4 100644 --- a/src/main/java/org/torproject/metrics/onionoo/updater/NodeDetailsStatusUpdater.java +++ b/src/main/java/org/torproject/metrics/onionoo/updater/NodeDetailsStatusUpdater.java @@ -771,10 +771,10 @@ public class NodeDetailsStatusUpdater implements DescriptorListener, verifiedLookupResults.get(nodeStatus.getAddress()); SortedSet<String> unverifiedHostNames = unverifiedLookupResults.get(nodeStatus.getAddress()); - if (null != verifiedHostNames && !verifiedHostNames.isEmpty()) { + if (null != verifiedHostNames) { this.rdnsVerifiedLookupResults.put(fingerprint, verifiedHostNames); } - if (null != unverifiedHostNames && !unverifiedHostNames.isEmpty()) { + if (null != unverifiedHostNames) { this.rdnsUnverifiedLookupResults.put(fingerprint, unverifiedHostNames); } } diff --git a/src/main/java/org/torproject/metrics/onionoo/updater/RdnsLookupRequest.java b/src/main/java/org/torproject/metrics/onionoo/updater/RdnsLookupRequest.java index 2f598a4..53e3fa9 100644 --- a/src/main/java/org/torproject/metrics/onionoo/updater/RdnsLookupRequest.java +++ b/src/main/java/org/torproject/metrics/onionoo/updater/RdnsLookupRequest.java @@ -39,9 +39,9 @@ class RdnsLookupRequest extends Thread { @Override public void run() { this.lookupStartedMillis = System.currentTimeMillis(); + final SortedSet<String> verifiedResults = new TreeSet<>(); + final SortedSet<String> unverifiedResults = new TreeSet<>(); try { - final SortedSet<String> verifiedResults = new TreeSet<>(); - final SortedSet<String> unverifiedResults = new TreeSet<>(); final String[] bytes = this.address.split("\\."); if (bytes.length == 4) { final String reverseDnsDomain = @@ -69,15 +69,15 @@ class RdnsLookupRequest extends Thread { } } } - synchronized (this) { - this.verifiedHostNames = verifiedResults; - this.unverifiedHostNames = unverifiedResults; - } } catch (NamingException e) { /* The Onionoo field is omitted for both lookup failure and absence of * a host name. We'll try again the next time. */ } - this.lookupCompletedMillis = System.currentTimeMillis(); + synchronized (this) { + this.verifiedHostNames = verifiedResults; + this.unverifiedHostNames = unverifiedResults; + this.lookupCompletedMillis = System.currentTimeMillis(); + } this.parent.interrupt(); } diff --git a/src/main/java/org/torproject/metrics/onionoo/updater/RdnsLookupWorker.java b/src/main/java/org/torproject/metrics/onionoo/updater/RdnsLookupWorker.java index ab5360e..6353daa 100644 --- a/src/main/java/org/torproject/metrics/onionoo/updater/RdnsLookupWorker.java +++ b/src/main/java/org/torproject/metrics/onionoo/updater/RdnsLookupWorker.java @@ -40,7 +40,7 @@ class RdnsLookupWorker extends Thread { /* Getting interrupted should be the default case. */ } SortedSet<String> verifiedHostNames = request.getVerifiedHostNames(); - if (null != verifiedHostNames && !verifiedHostNames.isEmpty()) { + if (null != verifiedHostNames) { synchronized (this.reverseDomainNameResolver .rdnsVerifiedLookupResults) { this.reverseDomainNameResolver.rdnsVerifiedLookupResults.put( @@ -48,7 +48,7 @@ class RdnsLookupWorker extends Thread { } } SortedSet<String> unverifiedHostNames = request.getUnverifiedHostNames(); - if (null != unverifiedHostNames && !unverifiedHostNames.isEmpty()) { + if (null != unverifiedHostNames) { synchronized (this.reverseDomainNameResolver .rdnsUnverifiedLookupResults) { this.reverseDomainNameResolver.rdnsUnverifiedLookupResults.put(

1 0

[onionoo/master] Prepare for 7.0-1.21.0 release.
by karsten＠torproject.org 18 Oct '19

18 Oct '19

commit 08f4d3a7f628c0adaba11363d997eaf453982c76 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Oct 18 08:58:11 2019 +0200 Prepare for 7.0-1.21.0 release. --- CHANGELOG.md | 3 ++- build.xml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3ab6329..d0f9e8d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ -# Changes in version 7.0-1.21.0 - 2019-1?-?? +# Changes in version 7.0-1.21.0 - 2019-10-18 * Medium changes + - Add previously missing Jetty servlets dependency. - Fix a bug where old reverse DNS lookups were sometimes not cleared properly. diff --git a/build.xml b/build.xml index a6969f5..91e6130 100644 --- a/build.xml +++ b/build.xml @@ -11,7 +11,7 @@ <property name="implementation-title" value="Onionoo" /> <property name="onionoo.protocol.version" value="7.0"/> <property name="release.version" - value="${onionoo.protocol.version}-1.20.0-dev"/> + value="${onionoo.protocol.version}-1.21.0"/> <property name="metricslibversion" value="2.6.2"/> <property name="jetty.version" value="-9.2.21.v20170120" /> <property name="warfile"

1 0

[tor/master] core: tabify a line in include.am
by teor＠torproject.org 18 Oct '19

18 Oct '19

commit 1697019d5f4b7306f4c7ffb54178530461a54a52 Author: teor <teor(a)torproject.org> Date: Fri Oct 18 13:42:22 2019 +1000 core: tabify a line in include.am --- src/core/include.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/include.am b/src/core/include.am index f6ae3f2b5..a5d11c24f 100644 --- a/src/core/include.am +++ b/src/core/include.am @@ -323,7 +323,7 @@ noinst_HEADERS += \ src/feature/control/fmt_serverstatus.h \ src/feature/control/getinfo_geoip.h \ src/feature/dirauth/authmode.h \ - src/feature/dirauth/bridgeauth.h \ + src/feature/dirauth/bridgeauth.h \ src/feature/dirauth/bwauth.h \ src/feature/dirauth/dirauth_periodic.h \ src/feature/dirauth/dirauth_sys.h \

1 0

[onionoo/master] Always clear old reverse DNS lookups.
by karsten＠torproject.org 18 Oct '19

18 Oct '19

commit 6faa1ab757f16263f7925dbe4c49d6dfb698f265 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Oct 3 16:43:21 2019 +0200 Always clear old reverse DNS lookups. The fix is to distinguish between lookup results being null for a given fingerprint (because we didn't have enough time to look up an address) and the empty set (because we received 0 verified or 0 unverified host names in response). Fixes #31941. --- CHANGELOG.md | 9 ++++++++- .../metrics/onionoo/updater/NodeDetailsStatusUpdater.java | 4 ++-- .../metrics/onionoo/updater/RdnsLookupRequest.java | 14 +++++++------- .../metrics/onionoo/updater/RdnsLookupWorker.java | 4 ++-- 4 files changed, 19 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 696b33d..3ab6329 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,11 @@ -# Changes in version 7.0-1.20.0 - 2019-0?-?? +# Changes in version 7.0-1.21.0 - 2019-1?-?? + + * Medium changes + - Fix a bug where old reverse DNS lookups were sometimes not + cleared properly. + + +# Changes in version 7.0-1.20.0 - 2019-10-04 * Medium changes - Use Ivy for resolving external dependencies rather than relying diff --git a/src/main/java/org/torproject/metrics/onionoo/updater/NodeDetailsStatusUpdater.java b/src/main/java/org/torproject/metrics/onionoo/updater/NodeDetailsStatusUpdater.java index 2bdf03f..a5f16e4 100644 --- a/src/main/java/org/torproject/metrics/onionoo/updater/NodeDetailsStatusUpdater.java +++ b/src/main/java/org/torproject/metrics/onionoo/updater/NodeDetailsStatusUpdater.java @@ -771,10 +771,10 @@ public class NodeDetailsStatusUpdater implements DescriptorListener, verifiedLookupResults.get(nodeStatus.getAddress()); SortedSet<String> unverifiedHostNames = unverifiedLookupResults.get(nodeStatus.getAddress()); - if (null != verifiedHostNames && !verifiedHostNames.isEmpty()) { + if (null != verifiedHostNames) { this.rdnsVerifiedLookupResults.put(fingerprint, verifiedHostNames); } - if (null != unverifiedHostNames && !unverifiedHostNames.isEmpty()) { + if (null != unverifiedHostNames) { this.rdnsUnverifiedLookupResults.put(fingerprint, unverifiedHostNames); } } diff --git a/src/main/java/org/torproject/metrics/onionoo/updater/RdnsLookupRequest.java b/src/main/java/org/torproject/metrics/onionoo/updater/RdnsLookupRequest.java index 2f598a4..53e3fa9 100644 --- a/src/main/java/org/torproject/metrics/onionoo/updater/RdnsLookupRequest.java +++ b/src/main/java/org/torproject/metrics/onionoo/updater/RdnsLookupRequest.java @@ -39,9 +39,9 @@ class RdnsLookupRequest extends Thread { @Override public void run() { this.lookupStartedMillis = System.currentTimeMillis(); + final SortedSet<String> verifiedResults = new TreeSet<>(); + final SortedSet<String> unverifiedResults = new TreeSet<>(); try { - final SortedSet<String> verifiedResults = new TreeSet<>(); - final SortedSet<String> unverifiedResults = new TreeSet<>(); final String[] bytes = this.address.split("\\."); if (bytes.length == 4) { final String reverseDnsDomain = @@ -69,15 +69,15 @@ class RdnsLookupRequest extends Thread { } } } - synchronized (this) { - this.verifiedHostNames = verifiedResults; - this.unverifiedHostNames = unverifiedResults; - } } catch (NamingException e) { /* The Onionoo field is omitted for both lookup failure and absence of * a host name. We'll try again the next time. */ } - this.lookupCompletedMillis = System.currentTimeMillis(); + synchronized (this) { + this.verifiedHostNames = verifiedResults; + this.unverifiedHostNames = unverifiedResults; + this.lookupCompletedMillis = System.currentTimeMillis(); + } this.parent.interrupt(); } diff --git a/src/main/java/org/torproject/metrics/onionoo/updater/RdnsLookupWorker.java b/src/main/java/org/torproject/metrics/onionoo/updater/RdnsLookupWorker.java index ab5360e..6353daa 100644 --- a/src/main/java/org/torproject/metrics/onionoo/updater/RdnsLookupWorker.java +++ b/src/main/java/org/torproject/metrics/onionoo/updater/RdnsLookupWorker.java @@ -40,7 +40,7 @@ class RdnsLookupWorker extends Thread { /* Getting interrupted should be the default case. */ } SortedSet<String> verifiedHostNames = request.getVerifiedHostNames(); - if (null != verifiedHostNames && !verifiedHostNames.isEmpty()) { + if (null != verifiedHostNames) { synchronized (this.reverseDomainNameResolver .rdnsVerifiedLookupResults) { this.reverseDomainNameResolver.rdnsVerifiedLookupResults.put( @@ -48,7 +48,7 @@ class RdnsLookupWorker extends Thread { } } SortedSet<String> unverifiedHostNames = request.getUnverifiedHostNames(); - if (null != unverifiedHostNames && !unverifiedHostNames.isEmpty()) { + if (null != unverifiedHostNames) { synchronized (this.reverseDomainNameResolver .rdnsUnverifiedLookupResults) { this.reverseDomainNameResolver.rdnsUnverifiedLookupResults.put(

1 0