From 84d8e36bb7245d1957a6506d8e2a9ff0497d330e Mon Sep 17 00:00:00 2001
From: Luke Huang <huangluke@google.com>
Date: Fri, 21 Dec 2018 18:50:41 +0800
Subject: [PATCH 1/2] Add resolver flags to DNS query CTS tests

This is a following commit for cts of asynchronous DNS query API.
Change test path and adjust for the API changing.

Test: build
      atest CtsNativeNetDnsTestCases

Change-Id: I7bc20a4d61293fc1d9e330250455709982639330
---
 tests/cts/net/native/{dns_async => dns}/Android.bp   |  9 ++++++---
 .../net/native/{dns_async => dns}/AndroidTest.xml    |  2 +-
 .../{dns_async/src => dns}/NativeDnsAsyncTest.cpp    | 12 ++++++------
 3 files changed, 13 insertions(+), 10 deletions(-)
 rename tests/cts/net/native/{dns_async => dns}/Android.bp (76%)
 rename tests/cts/net/native/{dns_async => dns}/AndroidTest.xml (94%)
 rename tests/cts/net/native/{dns_async/src => dns}/NativeDnsAsyncTest.cpp (93%)

diff --git a/tests/cts/net/native/dns_async/Android.bp b/tests/cts/net/native/dns/Android.bp
similarity index 76%
rename from tests/cts/net/native/dns_async/Android.bp
rename to tests/cts/net/native/dns/Android.bp
index 2b9346fc0b..9fbc3fc83d 100644
--- a/tests/cts/net/native/dns_async/Android.bp
+++ b/tests/cts/net/native/dns/Android.bp
@@ -7,15 +7,18 @@ cc_defaults {
         "-Wall",
         "-Wextra",
         "-Werror",
-        "-fno-builtin",
+        "-Wnullable-to-nonnull-conversion",
+        "-Wsign-compare",
+        "-Wthread-safety",
+        "-Wunused-parameter",
     ],
     srcs: [
-        "src/NativeDnsAsyncTest.cpp",
+        "NativeDnsAsyncTest.cpp",
     ],
     shared_libs: [
+        "libandroid",
         "liblog",
         "libutils",
-        "libandroid",
     ],
 }
 
diff --git a/tests/cts/net/native/dns_async/AndroidTest.xml b/tests/cts/net/native/dns/AndroidTest.xml
similarity index 94%
rename from tests/cts/net/native/dns_async/AndroidTest.xml
rename to tests/cts/net/native/dns/AndroidTest.xml
index e092b36186..e63c6789a5 100644
--- a/tests/cts/net/native/dns_async/AndroidTest.xml
+++ b/tests/cts/net/native/dns/AndroidTest.xml
@@ -13,7 +13,7 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<configuration description="Config for CTS Native Network dns_async test cases">
+<configuration description="Config for CTS Native Network dns test cases">
     <option name="test-suite-tag" value="cts" />
     <option name="config-descriptor:metadata" key="component" value="networking" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">
diff --git a/tests/cts/net/native/dns_async/src/NativeDnsAsyncTest.cpp b/tests/cts/net/native/dns/NativeDnsAsyncTest.cpp
similarity index 93%
rename from tests/cts/net/native/dns_async/src/NativeDnsAsyncTest.cpp
rename to tests/cts/net/native/dns/NativeDnsAsyncTest.cpp
index 087eb5ed5a..0d1fb158ab 100644
--- a/tests/cts/net/native/dns_async/src/NativeDnsAsyncTest.cpp
+++ b/tests/cts/net/native/dns/NativeDnsAsyncTest.cpp
@@ -92,12 +92,12 @@ void expectAnswersValid(int fd, int ipType, int expectedRcode) {
 
 TEST (NativeDnsAsyncTest, Async_Query) {
     // V4
-    int fd = android_res_nquery(NETWORK_UNSPECIFIED ,"www.google.com", ns_c_in, ns_t_a);
+    int fd = android_res_nquery(NETWORK_UNSPECIFIED ,"www.google.com", ns_c_in, ns_t_a, 0);
     EXPECT_GT(fd, 0);
     expectAnswersValid(fd, AF_INET, NOERROR);
 
     // V6
-    fd = android_res_nquery(NETWORK_UNSPECIFIED ,"www.google.com", ns_c_in, ns_t_aaaa);
+    fd = android_res_nquery(NETWORK_UNSPECIFIED ,"www.google.com", ns_c_in, ns_t_aaaa, 0);
     EXPECT_GT(fd, 0);
     expectAnswersValid(fd, AF_INET6, NOERROR);
 }
@@ -108,7 +108,7 @@ TEST (NativeDnsAsyncTest, Async_Send) {
     int len = res_mkquery(QUERY, "www.youtube.com",
             ns_c_in, ns_t_a, nullptr, 0, nullptr, buf, sizeof(buf));
     EXPECT_GT(len, 0);
-    int fd = android_res_nsend(NETWORK_UNSPECIFIED , buf, len);
+    int fd = android_res_nsend(NETWORK_UNSPECIFIED , buf, len, 0);
     EXPECT_GT(fd, 0);
     expectAnswersValid(fd, AF_INET, NOERROR);
 
@@ -117,7 +117,7 @@ TEST (NativeDnsAsyncTest, Async_Send) {
     len = res_mkquery(QUERY, "www.youtube.com",
             ns_c_in, ns_t_aaaa, nullptr, 0, nullptr, buf, sizeof(buf));
     EXPECT_GT(len, 0);
-    fd = android_res_nsend(NETWORK_UNSPECIFIED , buf, len);
+    fd = android_res_nsend(NETWORK_UNSPECIFIED , buf, len, 0);
     EXPECT_GT(fd, 0);
     expectAnswersValid(fd, AF_INET6, NOERROR);
 }
@@ -127,13 +127,13 @@ TEST (NativeDnsAsyncTest, Async_NXDOMAIN) {
     int len = res_mkquery(QUERY, "test-nx.metric.gstatic.com",
             ns_c_in, ns_t_a, nullptr, 0, nullptr, buf, sizeof(buf));
     EXPECT_GT(len, 0);
-    int fd = android_res_nsend(NETWORK_UNSPECIFIED , buf, len);
+    int fd = android_res_nsend(NETWORK_UNSPECIFIED , buf, len, 0);
     EXPECT_GT(fd, 0);
     expectAnswersValid(fd, AF_INET, NXDOMAIN);
 }
 
 TEST (NativeDnsAsyncTest, Async_Cancel) {
-    int fd = android_res_nquery(NETWORK_UNSPECIFIED ,"www.google.com", ns_c_in, ns_t_a);
+    int fd = android_res_nquery(NETWORK_UNSPECIFIED ,"www.google.com", ns_c_in, ns_t_a, 0);
     int rcode = -1;
     u_char buf[MAXPACKET] = {};
     android_res_cancel(fd);

From c4464a086cf229121ff7c37523d68fa877d08e53 Mon Sep 17 00:00:00 2001
From: Luke Huang <huangluke@google.com>
Date: Fri, 21 Dec 2018 18:55:11 +0800
Subject: [PATCH 2/2] More cts test cases for asynchronous DNS query API

Add more cts test case for corner cases.

Test: build
      atest CtsNativeNetDnsTestCases

Change-Id: I8891a4cb40ee788f001a8c2ccf52f2a9574bbd3c
---
 .../cts/net/native/dns/NativeDnsAsyncTest.cpp | 191 ++++++++++++++----
 1 file changed, 149 insertions(+), 42 deletions(-)

diff --git a/tests/cts/net/native/dns/NativeDnsAsyncTest.cpp b/tests/cts/net/native/dns/NativeDnsAsyncTest.cpp
index 0d1fb158ab..6ce89a041f 100644
--- a/tests/cts/net/native/dns/NativeDnsAsyncTest.cpp
+++ b/tests/cts/net/native/dns/NativeDnsAsyncTest.cpp
@@ -16,15 +16,15 @@
 
 #include <arpa/inet.h>
 #include <arpa/nameser.h>
-#include <netinet/in.h>
-#include <sys/socket.h>
 #include <error.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <inttypes.h>
+#include <netinet/in.h>
 #include <poll.h> /* poll */
 #include <resolv.h>
 #include <string.h>
+#include <sys/socket.h>
 
 #include <android/multinetwork.h>
 #include <gtest/gtest.h>
@@ -32,8 +32,9 @@
 namespace {
 constexpr int MAXPACKET = 8 * 1024;
 constexpr int PTON_MAX = 16;
+constexpr int TIMEOUT_MS = 10000;
 
-int getAsyncResponse(int fd, int timeoutMs, int* rcode, u_char* buf, int bufLen) {
+int getAsyncResponse(int fd, int timeoutMs, int* rcode, uint8_t* buf, size_t bufLen) {
     struct pollfd wait_fd[1];
     wait_fd[0].fd = fd;
     wait_fd[0].events = POLLIN;
@@ -49,19 +50,19 @@ int getAsyncResponse(int fd, int timeoutMs, int* rcode, u_char* buf, int bufLen)
     return -1;
 }
 
-std::vector<std::string> extractIpAddressAnswers(u_char* buf, int bufLen, int ipType) {
+std::vector<std::string> extractIpAddressAnswers(uint8_t* buf, size_t bufLen, int ipType) {
     ns_msg handle;
     if (ns_initparse((const uint8_t*) buf, bufLen, &handle) < 0) {
         return {};
     }
-    int ancount = ns_msg_count(handle, ns_s_an);
+    const int ancount = ns_msg_count(handle, ns_s_an);
     ns_rr rr;
     std::vector<std::string> answers;
     for (int i = 0; i < ancount; i++) {
         if (ns_parserr(&handle, ns_s_an, i, &rr) < 0) {
             continue;
         }
-        const u_char* rdata = ns_rr_rdata(rr);
+        const uint8_t* rdata = ns_rr_rdata(rr);
         char buffer[INET6_ADDRSTRLEN];
         if (inet_ntop(ipType, (const char*) rdata, buffer, sizeof(buffer))) {
             answers.push_back(buffer);
@@ -72,15 +73,15 @@ std::vector<std::string> extractIpAddressAnswers(u_char* buf, int bufLen, int ip
 
 void expectAnswersValid(int fd, int ipType, int expectedRcode) {
     int rcode = -1;
-    u_char buf[MAXPACKET] = {};
-    int res = getAsyncResponse(fd, 10000, &rcode, buf, MAXPACKET);
-    EXPECT_GT(res, 0);
+    uint8_t buf[MAXPACKET] = {};
+    int res = getAsyncResponse(fd, TIMEOUT_MS, &rcode, buf, MAXPACKET);
+    EXPECT_GE(res, 0);
     EXPECT_EQ(rcode, expectedRcode);
 
 
-    if (expectedRcode == NOERROR) {
+    if (expectedRcode == ns_r_noerror) {
         auto answers = extractIpAddressAnswers(buf, res, ipType);
-        EXPECT_GT(answers.size(), 0U);
+        EXPECT_GE(answers.size(), 0U);
         for (auto &answer : answers) {
             char pton[PTON_MAX];
             EXPECT_EQ(1, inet_pton(ipType, answer.c_str(), pton));
@@ -88,61 +89,167 @@ void expectAnswersValid(int fd, int ipType, int expectedRcode) {
     }
 }
 
+void expectAnswersNotValid(int fd, int expectedErrno) {
+    int rcode = -1;
+    uint8_t buf[MAXPACKET] = {};
+    int res = getAsyncResponse(fd, TIMEOUT_MS, &rcode, buf, MAXPACKET);
+    EXPECT_EQ(expectedErrno, res);
+}
+
 } // namespace
 
 TEST (NativeDnsAsyncTest, Async_Query) {
     // V4
-    int fd = android_res_nquery(NETWORK_UNSPECIFIED ,"www.google.com", ns_c_in, ns_t_a, 0);
-    EXPECT_GT(fd, 0);
-    expectAnswersValid(fd, AF_INET, NOERROR);
+    int fd1 = android_res_nquery(
+            NETWORK_UNSPECIFIED, "www.google.com", ns_c_in, ns_t_a, ResNsendFlags(0));
+    EXPECT_GE(fd1, 0);
+    int fd2 = android_res_nquery(
+            NETWORK_UNSPECIFIED, "www.youtube.com", ns_c_in, ns_t_a, ResNsendFlags(0));
+    EXPECT_GE(fd2, 0);
+    expectAnswersValid(fd2, AF_INET, ns_r_noerror);
+    expectAnswersValid(fd1, AF_INET, ns_r_noerror);
 
     // V6
-    fd = android_res_nquery(NETWORK_UNSPECIFIED ,"www.google.com", ns_c_in, ns_t_aaaa, 0);
-    EXPECT_GT(fd, 0);
-    expectAnswersValid(fd, AF_INET6, NOERROR);
+    fd1 = android_res_nquery(
+            NETWORK_UNSPECIFIED, "www.google.com", ns_c_in, ns_t_aaaa, ResNsendFlags(0));
+    EXPECT_GE(fd1, 0);
+    fd2 = android_res_nquery(
+            NETWORK_UNSPECIFIED, "www.youtube.com", ns_c_in, ns_t_aaaa, ResNsendFlags(0));
+    EXPECT_GE(fd2, 0);
+    expectAnswersValid(fd2, AF_INET6, ns_r_noerror);
+    expectAnswersValid(fd1, AF_INET6, ns_r_noerror);
 }
 
 TEST (NativeDnsAsyncTest, Async_Send) {
     // V4
-    u_char buf[MAXPACKET] = {};
-    int len = res_mkquery(QUERY, "www.youtube.com",
-            ns_c_in, ns_t_a, nullptr, 0, nullptr, buf, sizeof(buf));
-    EXPECT_GT(len, 0);
-    int fd = android_res_nsend(NETWORK_UNSPECIFIED , buf, len, 0);
-    EXPECT_GT(fd, 0);
-    expectAnswersValid(fd, AF_INET, NOERROR);
+    uint8_t buf1[MAXPACKET] = {};
+    int len1 = res_mkquery(ns_o_query, "www.googleapis.com",
+            ns_c_in, ns_t_a, nullptr, 0, nullptr, buf1, sizeof(buf1));
+    EXPECT_GT(len1, 0);
+
+    uint8_t buf2[MAXPACKET] = {};
+    int len2 = res_mkquery(ns_o_query, "play.googleapis.com",
+            ns_c_in, ns_t_a, nullptr, 0, nullptr, buf2, sizeof(buf2));
+    EXPECT_GT(len2, 0);
+
+    int fd1 = android_res_nsend(NETWORK_UNSPECIFIED, buf1, len1, ResNsendFlags(0));
+    EXPECT_GE(fd1, 0);
+    int fd2 = android_res_nsend(NETWORK_UNSPECIFIED, buf2, len2, ResNsendFlags(0));
+    EXPECT_GE(fd2, 0);
+
+    expectAnswersValid(fd2, AF_INET, ns_r_noerror);
+    expectAnswersValid(fd1, AF_INET, ns_r_noerror);
 
     // V6
-    memset(buf, 0, MAXPACKET);
-    len = res_mkquery(QUERY, "www.youtube.com",
-            ns_c_in, ns_t_aaaa, nullptr, 0, nullptr, buf, sizeof(buf));
-    EXPECT_GT(len, 0);
-    fd = android_res_nsend(NETWORK_UNSPECIFIED , buf, len, 0);
-    EXPECT_GT(fd, 0);
-    expectAnswersValid(fd, AF_INET6, NOERROR);
+    memset(buf1, 0, sizeof(buf1));
+    memset(buf2, 0, sizeof(buf2));
+    len1 = res_mkquery(ns_o_query, "www.googleapis.com",
+            ns_c_in, ns_t_aaaa, nullptr, 0, nullptr, buf1, sizeof(buf1));
+    EXPECT_GT(len1, 0);
+    len2 = res_mkquery(ns_o_query, "play.googleapis.com",
+            ns_c_in, ns_t_aaaa, nullptr, 0, nullptr, buf2, sizeof(buf2));
+    EXPECT_GT(len2, 0);
+
+    fd1 = android_res_nsend(NETWORK_UNSPECIFIED, buf1, len1, ResNsendFlags(0));
+    EXPECT_GE(fd1, 0);
+    fd2 = android_res_nsend(NETWORK_UNSPECIFIED, buf2, len2, ResNsendFlags(0));
+    EXPECT_GE(fd2, 0);
+
+    expectAnswersValid(fd2, AF_INET6, ns_r_noerror);
+    expectAnswersValid(fd1, AF_INET6, ns_r_noerror);
 }
 
 TEST (NativeDnsAsyncTest, Async_NXDOMAIN) {
-    u_char buf[MAXPACKET] = {};
-    int len = res_mkquery(QUERY, "test-nx.metric.gstatic.com",
+    uint8_t buf[MAXPACKET] = {};
+    int len = res_mkquery(ns_o_query, "test1-nx.metric.gstatic.com",
             ns_c_in, ns_t_a, nullptr, 0, nullptr, buf, sizeof(buf));
     EXPECT_GT(len, 0);
-    int fd = android_res_nsend(NETWORK_UNSPECIFIED , buf, len, 0);
-    EXPECT_GT(fd, 0);
-    expectAnswersValid(fd, AF_INET, NXDOMAIN);
+    int fd1 = android_res_nsend(NETWORK_UNSPECIFIED, buf, len, ANDROID_RESOLV_NO_CACHE_LOOKUP);
+    EXPECT_GE(fd1, 0);
+
+    len = res_mkquery(ns_o_query, "test2-nx.metric.gstatic.com",
+            ns_c_in, ns_t_a, nullptr, 0, nullptr, buf, sizeof(buf));
+    EXPECT_GT(len, 0);
+    int fd2 = android_res_nsend(NETWORK_UNSPECIFIED, buf, len, ANDROID_RESOLV_NO_CACHE_LOOKUP);
+    EXPECT_GE(fd2, 0);
+
+    expectAnswersValid(fd2, AF_INET, ns_r_nxdomain);
+    expectAnswersValid(fd1, AF_INET, ns_r_nxdomain);
+
+    fd1 = android_res_nquery(
+            NETWORK_UNSPECIFIED, "test3-nx.metric.gstatic.com",
+            ns_c_in, ns_t_aaaa, ANDROID_RESOLV_NO_CACHE_LOOKUP);
+    EXPECT_GE(fd1, 0);
+    fd2 = android_res_nquery(
+            NETWORK_UNSPECIFIED, "test4-nx.metric.gstatic.com",
+            ns_c_in, ns_t_aaaa, ANDROID_RESOLV_NO_CACHE_LOOKUP);
+    EXPECT_GE(fd2, 0);
+    expectAnswersValid(fd2, AF_INET6, ns_r_nxdomain);
+    expectAnswersValid(fd1, AF_INET6, ns_r_nxdomain);
 }
 
 TEST (NativeDnsAsyncTest, Async_Cancel) {
-    int fd = android_res_nquery(NETWORK_UNSPECIFIED ,"www.google.com", ns_c_in, ns_t_a, 0);
+    int fd = android_res_nquery(
+            NETWORK_UNSPECIFIED, "www.google.com", ns_c_in, ns_t_a, ResNsendFlags(0));
     int rcode = -1;
-    u_char buf[MAXPACKET] = {};
+    uint8_t buf[MAXPACKET] = {};
+    android_res_cancel(fd);
     android_res_cancel(fd);
 
     int res = android_res_nresult(fd, &rcode, buf, MAXPACKET);
-    EXPECT_EQ(res, -EBADF);
+    EXPECT_EQ(-EBADF, res);
 }
 
-int main(int argc, char **argv) {
-    testing::InitGoogleTest(&argc, argv);
-    return RUN_ALL_TESTS();
+TEST (NativeDnsAsyncTest, Async_Query_MALFORMED) {
+    // Empty string to create BLOB and query, we will get empty result and rcode = 0
+    // on DNSTLS.
+    int fd = android_res_nquery(
+            NETWORK_UNSPECIFIED, "", ns_c_in, ns_t_a, ResNsendFlags(0));
+    EXPECT_GE(fd, 0);
+    expectAnswersValid(fd, AF_INET, ns_r_noerror);
+
+    std::string exceedingLabelQuery = "www." + std::string(70, 'g') + ".com";
+    std::string exceedingDomainQuery = "www." + std::string(255, 'g') + ".com";
+
+    fd = android_res_nquery(NETWORK_UNSPECIFIED,
+            exceedingLabelQuery.c_str(), ns_c_in, ns_t_a, ResNsendFlags(0));
+    EXPECT_EQ(-EMSGSIZE, fd);
+    fd = android_res_nquery(NETWORK_UNSPECIFIED,
+            exceedingDomainQuery.c_str(), ns_c_in, ns_t_a, ResNsendFlags(0));
+    EXPECT_EQ(-EMSGSIZE, fd);
 }
+
+TEST (NativeDnsAsyncTest, Async_Send_MALFORMED) {
+    uint8_t buf[10] = {};
+    // empty BLOB
+    int fd = android_res_nsend(NETWORK_UNSPECIFIED, buf, 10, ResNsendFlags(0));
+    EXPECT_GE(fd, 0);
+    expectAnswersNotValid(fd, -EINVAL);
+
+    std::vector<uint8_t> largeBuf(2 * MAXPACKET, 0);
+    // A buffer larger than 8KB
+    fd = android_res_nsend(
+            NETWORK_UNSPECIFIED, largeBuf.data(), largeBuf.size(), ResNsendFlags(0));
+    EXPECT_EQ(-EMSGSIZE, fd);
+
+    // 1000 bytes filled with 0. This returns EMSGSIZE because FrameworkListener limits the size of
+    // commands to 1024 bytes. TODO: fix this.
+    fd = android_res_nsend(NETWORK_UNSPECIFIED, largeBuf.data(), 1000, ResNsendFlags(0));
+    EXPECT_EQ(-EMSGSIZE, fd);
+
+    // 500 bytes filled with 0
+    fd = android_res_nsend(NETWORK_UNSPECIFIED, largeBuf.data(), 500, ResNsendFlags(0));
+    EXPECT_GE(fd, 0);
+    expectAnswersNotValid(fd, -EINVAL);
+
+    // 1000 bytes filled with 0xFF
+    std::vector<uint8_t> ffBuf(1000, 255);
+    fd = android_res_nsend(
+            NETWORK_UNSPECIFIED, ffBuf.data(), ffBuf.size(), ResNsendFlags(0));
+    EXPECT_EQ(-EMSGSIZE, fd);
+
+    // 500 bytes filled with 0xFF
+    fd = android_res_nsend(NETWORK_UNSPECIFIED, ffBuf.data(), 500, ResNsendFlags(0));
+    EXPECT_GE(fd, 0);
+    expectAnswersNotValid(fd, -EINVAL);
+}
\ No newline at end of file