Commit 4693bba8 authored by Karsten Loesing's avatar Karsten Loesing
Browse files

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.
parent bbc5c16d

CHANGELOG.md

+2 −0
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ 
     versions resolved by Ivy are the same as in Debian stretch with

     few exceptions.

   - Remove Cobertura from the build process.

   - Fix a bug where old reverse DNS lookups were sometimes not

     cleared properly.





# Changes in version 7.0-1.19.1 - 2018-11-20

src/main/java/org/torproject/metrics/onionoo/updater/NodeDetailsStatusUpdater.java

+2 −2
Original line number Diff line number Diff line
@@ -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);

      }

    }

src/main/java/org/torproject/metrics/onionoo/updater/RdnsLookupRequest.java

+7 −7
Original line number Diff line number Diff line
@@ -39,9 +39,9 @@ class RdnsLookupRequest extends Thread { 
  @Override

  public void run() {

    this.lookupStartedMillis = System.currentTimeMillis();

    try {

    final SortedSet<String> verifiedResults = new TreeSet<>();

    final SortedSet<String> unverifiedResults = new TreeSet<>();

    try {

      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. */

    }

    synchronized (this) {

      this.verifiedHostNames = verifiedResults;

      this.unverifiedHostNames = unverifiedResults;

      this.lookupCompletedMillis = System.currentTimeMillis();

    }

    this.parent.interrupt();

  }

src/main/java/org/torproject/metrics/onionoo/updater/RdnsLookupWorker.java

+2 −2
Original line number Diff line number Diff line
@@ -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(