Fixing Bug: Getting NXDOMAIN when not expected (#668)

Author: mageddo

RELEASE-NOTES.md

@@ -1,3 +1,6 @@
+## 5.6.1
+* Fixing Getting NXDOMAIN when not expected, see #668.
+
 ## 5.6.0
 * Releasing JRE Docker Image Version
 * Enabling DPS to run on any JRE 21+

gradle.properties

@@ -1 +1 @@
-version=5.6.0-snapshot
+version=5.6.1-snapshot

src/main/java/com/mageddo/dns/utils/Messages.java

@@ -329,4 +329,8 @@ public static String findAnswerRawIP(Message res) {
   public static boolean isNxDomain(Message m) {
     return m.getRcode() == Rcode.NXDOMAIN;
   }
+
+  public static Message noData(Message query) {
+    return withResponseCode(query.clone(), Rcode.NOERROR);
+  }
 }

src/main/java/com/mageddo/dnsproxyserver/solver/Response.java

@@ -87,4 +87,5 @@ public Response withTTL(Duration ttl) {
   public int getRCode() {
     return this.message.getRcode();
   }
+
 }

src/main/java/com/mageddo/dnsproxyserver/solver/SolverSystem.java

@@ -29,14 +29,15 @@ public Response handle(Message query) {
 
     final var questionType = Messages.findQuestionType(query);
     if (ConfigEntryTypes.isNot(questionType, Type.A, Type.AAAA)) {
-      log.debug("status=unsupportedType, type={}, query={}", findQuestionTypeCode(query),
-          Messages.simplePrint(query)
+      log.debug(
+          "status=unsupportedType, type={}, query={}",
+          findQuestionTypeCode(query), Messages.simplePrint(query)
       );
       return null;
     }
     final var config = Configs.getInstance();
-    if (hostname.isEqualTo(
-        config.getHostMachineHostname())) { // fixme fazer case com hostname + search domain
+    // fixme fazer case com hostname + search domain
+    if (hostname.isEqualTo(config.getHostMachineHostname())) {
       final var ip = this.machineService.findHostMachineIP(questionType.toVersion());
       log.debug("status=solvingHostMachineName, host={}, ip={}", hostname, ip);
       return ResponseMapper.toDefaultSuccessAnswer(query, ip, questionType.toVersion());

src/main/java/com/mageddo/dnsproxyserver/solver/docker/Entry.java

@@ -16,4 +16,16 @@ public class Entry {
   public String getIpText() {
     return this.ip != null ? this.ip.toText() : null;
   }
+
+  public boolean isHostNameNotMatched() {
+    return !this.hostnameMatched;
+  }
+
+  public boolean hasNotIP() {
+    return this.ip == null;
+  }
+
+  public boolean hasIp() {
+    return this.ip != null;
+  }
 }

src/main/java/com/mageddo/dnsproxyserver/solver/docker/application/ContainerSolvingService.java

@@ -46,7 +46,7 @@ public Entry findBestMatch(HostnameQuery query) {
         .filter(Objects::nonNull)
         .findFirst()
         .orElse(null);
-    final var hostnameMatched = !matchedContainers.isEmpty() && foundIp != null;
+    final var hostnameMatched = !matchedContainers.isEmpty();
     log.trace(
         "status=findDone, query={}, found={}, hostnameMatched={}, time={}",
         query, foundIp, hostnameMatched, stopWatch.getTime()

src/main/java/com/mageddo/dnsproxyserver/solver/docker/dataprovider/ContainerHostnameMatcher.java

@@ -23,8 +23,9 @@ public static Predicate<InspectContainerResponse> buildPredicate(final HostnameQ
     return buildPredicate(host, Configs.getInstance());
   }
 
-  static Predicate<InspectContainerResponse> buildPredicate(final HostnameQuery host,
-      final Config config) {
+  static Predicate<InspectContainerResponse> buildPredicate(
+      final HostnameQuery host, final Config config
+  ) {
     return container -> {
 
       final List<Predicate<InspectContainerResponse>> predicates = List.of(
@@ -49,17 +50,19 @@ public static boolean hostnameMatches(InspectContainerResponse c, HostnameQuery
     return host.matches(Docker.findContainerHostname(c.getConfig()));
   }
 
-  public static boolean hostnamesEnvMatches(InspectContainerResponse c,
-      HostnameQuery hostnameQuery) {
+  public static boolean hostnamesEnvMatches(
+      InspectContainerResponse c, HostnameQuery hostnameQuery
+  ) {
     return findHostnamesFromEnv(c.getConfig()
         .getEnv())
         .stream()
         .anyMatch(hostnameQuery::matches)
         ;
   }
 
-  public static boolean serviceOrContainerNameMatches(InspectContainerResponse c,
-      HostnameQuery hostQuery, Config config) {
+  public static boolean serviceOrContainerNameMatches(
+      InspectContainerResponse c, HostnameQuery hostQuery, Config config
+  ) {
     return isRegisterContainerNames(config)
         && Docker.buildHostnamesFromServiceOrContainerNames(c, config.getDockerDomain())
         .stream()

src/main/java/com/mageddo/dnsproxyserver/solver/remote/CircuitStatus.java

@@ -8,4 +8,8 @@ public enum CircuitStatus {
   public static boolean isOpen(CircuitStatus status) {
     return OPEN == status;
   }
+
+  public static boolean isNotOpen(CircuitStatus status) {
+    return !isOpen(status);
+  }
 }

src/main/java/com/mageddo/dnsproxyserver/solver/remote/circuitbreaker/canaryratethreshold/CircuitBreakerDelegateSelfObservable.java

@@ -68,9 +68,10 @@ private boolean shouldRun() {
 
   private void healthCheckWhenInOpenState() {
     final var status = this.findStatus();
-    final var notInOpenStatus = !CircuitStatus.isOpen(status);
-    log.trace("status=checking, statusBefore={}, notInOpenStatus={}, circuit={}", status,
-        notInOpenStatus, this
+    final var notInOpenStatus = CircuitStatus.isNotOpen(status);
+    log.trace(
+        "status=checking, statusBefore={}, notInOpenStatus={}, circuit={}",
+        status, notInOpenStatus, this
     );
     if (notInOpenStatus) {
       return;
@@ -88,7 +89,7 @@ private boolean isHealthy() {
   }
 
   @Override
-  public void close() throws Exception {
+  public void close() {
     this.open = false;
   }