commit 0ee1dc9635ce7e42cf8f506d95d8c22c750564fb
author Mike Yu <yumike@google.com> Mon Nov 09 14:56:54 2020 +0800
committer Mike Yu <yumike@google.com> Wed Nov 18 17:49:10 2020 +0800
tree 4fbcfbbb75728d346e52e2626968943c7562f79f
parent 8d9da4ae6d04716590b6db112331d79a0e288e43

Add PrivateDnsConfigurationTest

Add some tests for private DNS validation.

Bug: 79727473
Test: Run PrivateDnsConfigurationTest
Change-Id: I8774ea6327865101e9e3bc6e9f784e227490ff47

PrivateDnsConfiguration.cpp

diff --git a/PrivateDnsConfiguration.cpp b/PrivateDnsConfiguration.cpp
index 3a18f1e..c6ae6a2 100644
--- a/PrivateDnsConfiguration.cpp
+++ b/PrivateDnsConfiguration.cpp
@@ -166,6 +166,8 @@
         return;
     }
 
+    maybeNotifyObserver(server, Validation::in_process, netId);
+
     // Note that capturing |server| and |netId| in this lambda create copies.
     std::thread validate_thread([this, server, netId, mark] {
         setThreadName(StringPrintf("TlsVerify_%u", netId).c_str());
@@ -222,12 +224,14 @@
     auto netPair = mPrivateDnsTransports.find(netId);
     if (netPair == mPrivateDnsTransports.end()) {
         LOG(WARNING) << "netId " << netId << " was erased during private DNS validation";
+        maybeNotifyObserver(server, Validation::fail, netId);
         return DONT_REEVALUATE;
     }
 
     const auto mode = mPrivateDnsModes.find(netId);
     if (mode == mPrivateDnsModes.end()) {
         LOG(WARNING) << "netId " << netId << " has no private DNS validation mode";
+        maybeNotifyObserver(server, Validation::fail, netId);
         return DONT_REEVALUATE;
     }
     const bool modeDoesReevaluation = (mode->second == PrivateDnsMode::STRICT);
@@ -270,12 +274,17 @@
 
     if (success) {
         tracker[server] = Validation::success;
+        maybeNotifyObserver(server, Validation::success, netId);
     } else {
         // Validation failure is expected if a user is on a captive portal.
         // TODO: Trigger a second validation attempt after captive portal login
         // succeeds.
         tracker[server] = (reevaluationStatus == NEEDS_REEVALUATION) ? Validation::in_process
                                                                      : Validation::fail;
+        maybeNotifyObserver(server,
+                            (reevaluationStatus == NEEDS_REEVALUATION) ? Validation::in_process
+                                                                       : Validation::fail,
+                            netId);
     }
     LOG(WARNING) << "Validation " << (success ? "success" : "failed");
 
@@ -336,5 +345,17 @@
     return (iter == tracker.end()) || (iter->second == Validation::fail);
 }
 
+void PrivateDnsConfiguration::setObserver(Observer* observer) {
+    std::lock_guard guard(mPrivateDnsLock);
+    mObserver = observer;
+}
+
+void PrivateDnsConfiguration::maybeNotifyObserver(const DnsTlsServer& server, Validation validation,
+                                                  uint32_t netId) const {
+    if (mObserver) {
+        mObserver->onValidationStateUpdate(addrToString(&server.ss), validation, netId);
+    }
+}
+
 }  // namespace net
 }  // namespace android