Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a59ff0ca authored by kfcchen's avatar kfcchen Committed by Automerger Merge Worker
Browse files

Move duplicate functions and variables to resolv_test_utils. am: 71fff449 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/DnsResolver/+/2189661



Change-Id: I5ea7b8504abac0d5c5e7d9b6521eee6500fffc5e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 89e16f15 71fff449

tests/resolv_integration_test.cpp

+0 −18
Original line number Diff line number Diff line
@@ -83,24 +83,6 @@ constexpr int MAXPACKET = (8 * 1024); 
constexpr int RES_TIMEOUT = 5000; /* min. milliseconds between retries */

constexpr int RES_DFLRETRY = 2;   /* Default #/tries. */



const std::string kSortNameserversFlag("persist.device_config.netd_native.sort_nameservers");

const std::string kDotConnectTimeoutMsFlag(

        "persist.device_config.netd_native.dot_connect_timeout_ms");

const std::string kDotAsyncHandshakeFlag("persist.device_config.netd_native.dot_async_handshake");

const std::string kDotMaxretriesFlag("persist.device_config.netd_native.dot_maxtries");

const std::string kDotRevalidationThresholdFlag(

        "persist.device_config.netd_native.dot_revalidation_threshold");

const std::string kDotXportUnusableThresholdFlag(

        "persist.device_config.netd_native.dot_xport_unusable_threshold");

const std::string kDotQueryTimeoutMsFlag("persist.device_config.netd_native.dot_query_timeout_ms");

const std::string kDotValidationLatencyFactorFlag(

        "persist.device_config.netd_native.dot_validation_latency_factor");

const std::string kDotValidationLatencyOffsetMsFlag(

        "persist.device_config.netd_native.dot_validation_latency_offset_ms");

const std::string kDotQuickFallbackFlag("persist.device_config.netd_native.dot_quick_fallback");

const std::string kRetransIntervalFlag(

        "persist.device_config.netd_native.retransmission_time_interval");

const std::string kRetryCountFlag("persist.device_config.netd_native.retry_count");

// Semi-public Bionic hook used by the NDK (frameworks/base/native/android/net.c)

// Tested here for convenience.

extern "C" int android_getaddrinfofornet(const char* hostname, const char* servname,

tests/resolv_private_dns_test.cpp

+22 −34
Original line number Diff line number Diff line
@@ -54,16 +54,6 @@ using android::netdutils::Stopwatch; 
using std::chrono::milliseconds;

using std::this_thread::sleep_for;



const std::string kDohFlag("persist.device_config.netd_native.doh");

const std::string kDohQueryTimeoutFlag("persist.device_config.netd_native.doh_query_timeout_ms");

const std::string kDohProbeTimeoutFlag("persist.device_config.netd_native.doh_probe_timeout_ms");

const std::string kDohIdleTimeoutFlag("persist.device_config.netd_native.doh_idle_timeout_ms");

const std::string kDohSessionResumptionFlag(

        "persist.device_config.netd_native.doh_session_resumption");

const std::string kDohEarlyDataFlag("persist.device_config.netd_native.doh_early_data");

const std::string kDotAsyncHandshakeFlag("persist.device_config.netd_native.dot_async_handshake");

const std::string kDotMaxretriesFlag("persist.device_config.netd_native.dot_maxtries");



constexpr int MAXPACKET = (8 * 1024);



namespace {
@@ -274,10 +264,6 @@ class BaseTest : public NetNativeTestBase { 


class BasePrivateDnsTest : public BaseTest {

  public:

    static constexpr char kDnsPort[] = "53";

    static constexpr char kDohPort[] = "443";

    static constexpr char kDotPort[] = "853";



    static void SetUpTestSuite() {

        BaseTest::SetUpTestSuite();

        test::DohFrontend::initRustAndroidLogger();
@@ -348,11 +334,11 @@ class BasePrivateDnsTest : public BaseTest { 
    static constexpr char kQueryAnswerA[] = "1.2.3.4";

    static constexpr char kQueryAnswerAAAA[] = "2001:db8::100";



    test::DNSResponder dns{test::kDefaultListenAddr, kDnsPort};

    test::DohFrontend doh{test::kDefaultListenAddr, kDohPort, "127.0.1.3", kDnsPort};

    test::DnsTlsFrontend dot{test::kDefaultListenAddr, kDotPort, "127.0.2.3", kDnsPort};

    test::DNSResponder doh_backend{"127.0.1.3", kDnsPort};

    test::DNSResponder dot_backend{"127.0.2.3", kDnsPort};

    test::DNSResponder dns{test::kDefaultListenAddr, kDnsPortString};

    test::DohFrontend doh{test::kDefaultListenAddr, kDohPortString, "127.0.1.3", kDnsPortString};

    test::DnsTlsFrontend dot{test::kDefaultListenAddr, kDotPortString, "127.0.2.3", kDnsPortString};

    test::DNSResponder doh_backend{"127.0.1.3", kDnsPortString};

    test::DNSResponder dot_backend{"127.0.2.3", kDnsPortString};



    // Used to enable DoH during the tests and set up a shorter timeout.

    std::unique_ptr<ScopedSystemProperties> mDohScopedProp;
@@ -638,8 +624,8 @@ TEST_F(PrivateDnsDohTest, PreferIpv6) { 
    // To simplify the test, set the DoT server broken.

    dot.stopServer();



    test::DNSResponder dns_ipv6{listen_ipv6_addr, kDnsPort};

    test::DohFrontend doh_ipv6{listen_ipv6_addr, kDohPort, listen_ipv6_addr, kDnsPort};

    test::DNSResponder dns_ipv6{listen_ipv6_addr, kDnsPortString};

    test::DohFrontend doh_ipv6{listen_ipv6_addr, kDohPortString, listen_ipv6_addr, kDnsPortString};

    dns_ipv6.addMapping(kQueryHostname, ns_type::ns_t_a, kQueryAnswerA);

    dns_ipv6.addMapping(kQueryHostname, ns_type::ns_t_aaaa, kQueryAnswerAAAA);

    ASSERT_TRUE(dns_ipv6.startServer());
@@ -675,8 +661,8 @@ TEST_F(PrivateDnsDohTest, ChangeAndClearPrivateDnsServer) { 
    // To simplify the test, set the DoT server broken.

    dot.stopServer();



    test::DNSResponder dns_ipv6{listen_ipv6_addr, kDnsPort};

    test::DohFrontend doh_ipv6{listen_ipv6_addr, kDohPort, listen_ipv6_addr, kDnsPort};

    test::DNSResponder dns_ipv6{listen_ipv6_addr, kDnsPortString};

    test::DohFrontend doh_ipv6{listen_ipv6_addr, kDohPortString, listen_ipv6_addr, kDnsPortString};

    dns_ipv6.addMapping(kQueryHostname, ns_type::ns_t_a, kQueryAnswerA);

    dns_ipv6.addMapping(kQueryHostname, ns_type::ns_t_aaaa, kQueryAnswerAAAA);

    ASSERT_TRUE(dns_ipv6.startServer());
@@ -731,8 +717,9 @@ TEST_F(PrivateDnsDohTest, ChangePrivateDnsServerAndVerifyOutput) { 
    static const std::string ipv4DohServerAddr = "127.0.0.3";

    static const std::string ipv6DohServerAddr = "::1";



    test::DNSResponder dns_ipv6{ipv6DohServerAddr, kDnsPort};

    test::DohFrontend doh_ipv6{ipv6DohServerAddr, kDohPort, ipv6DohServerAddr, kDnsPort};

    test::DNSResponder dns_ipv6{ipv6DohServerAddr, kDnsPortString};

    test::DohFrontend doh_ipv6{ipv6DohServerAddr, kDohPortString, ipv6DohServerAddr,

                               kDnsPortString};

    dns.addMapping(kQueryHostname, ns_type::ns_t_a, kQueryAnswerA);

    dns.addMapping(kQueryHostname, ns_type::ns_t_aaaa, kQueryAnswerAAAA);

    dns_ipv6.addMapping(kQueryHostname, ns_type::ns_t_a, kQueryAnswerA);
@@ -744,12 +731,12 @@ TEST_F(PrivateDnsDohTest, ChangePrivateDnsServerAndVerifyOutput) { 
    auto parcel = DnsResponderClient::GetDefaultResolverParamsParcel();

    ASSERT_TRUE(mDnsClient.SetResolversFromParcel(parcel));

    EXPECT_TRUE(WaitForDohValidation(test::kDefaultListenAddr, true));

    EXPECT_TRUE(expectLog(ipv4DohServerAddr, kDohPort));

    EXPECT_TRUE(expectLog(ipv4DohServerAddr, kDohPortString));



    // Change to an invalid DoH server.

    parcel.tlsServers = {kHelloExampleComAddrV4};

    ASSERT_TRUE(mDnsClient.SetResolversFromParcel(parcel));

    EXPECT_FALSE(expectLog(kHelloExampleComAddrV4, kDohPort));

    EXPECT_FALSE(expectLog(kHelloExampleComAddrV4, kDohPortString));

    EXPECT_TRUE(expectLog("<no data>", ""));



    // Change to the v6 DoH server.
@@ -757,14 +744,14 @@ TEST_F(PrivateDnsDohTest, ChangePrivateDnsServerAndVerifyOutput) { 
    parcel.tlsServers = {ipv6DohServerAddr};

    ASSERT_TRUE(mDnsClient.SetResolversFromParcel(parcel));

    EXPECT_TRUE(WaitForDohValidation(ipv6DohServerAddr, true));

    EXPECT_TRUE(expectLog(ipv6DohServerAddr, kDohPort));

    EXPECT_FALSE(expectLog(ipv4DohServerAddr, kDohPort));

    EXPECT_TRUE(expectLog(ipv6DohServerAddr, kDohPortString));

    EXPECT_FALSE(expectLog(ipv4DohServerAddr, kDohPortString));



    // Remove the private DNS server.

    parcel.tlsServers = {};

    ASSERT_TRUE(mDnsClient.SetResolversFromParcel(parcel));

    EXPECT_FALSE(expectLog(ipv4DohServerAddr, kDohPort));

    EXPECT_FALSE(expectLog(ipv6DohServerAddr, kDohPort));

    EXPECT_FALSE(expectLog(ipv4DohServerAddr, kDohPortString));

    EXPECT_FALSE(expectLog(ipv6DohServerAddr, kDohPortString));

    EXPECT_TRUE(expectLog("<no data>", ""));

}
@@ -851,9 +838,10 @@ TEST_F(PrivateDnsDohTest, ExcessDnsRequests) { 
    // Set up another network and send a DNS query. Expect that this network is unaffected.

    constexpr int TEST_NETID_2 = 31;

    constexpr char listen_ipv6_addr[] = "::1";

    test::DNSResponder dns_ipv6{listen_ipv6_addr, kDnsPort};

    test::DnsTlsFrontend dot_ipv6{listen_ipv6_addr, kDotPort, listen_ipv6_addr, kDnsPort};

    test::DohFrontend doh_ipv6{listen_ipv6_addr, kDohPort, listen_ipv6_addr, kDnsPort};

    test::DNSResponder dns_ipv6{listen_ipv6_addr, kDnsPortString};

    test::DnsTlsFrontend dot_ipv6{listen_ipv6_addr, kDotPortString, listen_ipv6_addr,

                                  kDnsPortString};

    test::DohFrontend doh_ipv6{listen_ipv6_addr, kDohPortString, listen_ipv6_addr, kDnsPortString};



    dns_ipv6.addMapping(kQueryHostname, ns_type::ns_t_aaaa, kQueryAnswerAAAA);

    ASSERT_TRUE(dns_ipv6.startServer());

tests/resolv_test_utils.h

+30 −0
Original line number Diff line number Diff line
@@ -116,6 +116,36 @@ constexpr int TEST_NETID = 30; 
constexpr int TEST_UID = 99999;

constexpr int TEST_UID2 = 99998;



constexpr char kDnsPortString[] = "53";

constexpr char kDohPortString[] = "443";

constexpr char kDotPortString[] = "853";



const std::string kDohFlag("persist.device_config.netd_native.doh");

const std::string kDohQueryTimeoutFlag("persist.device_config.netd_native.doh_query_timeout_ms");

const std::string kDohProbeTimeoutFlag("persist.device_config.netd_native.doh_probe_timeout_ms");

const std::string kDohIdleTimeoutFlag("persist.device_config.netd_native.doh_idle_timeout_ms");

const std::string kDohSessionResumptionFlag(

        "persist.device_config.netd_native.doh_session_resumption");

const std::string kDohEarlyDataFlag("persist.device_config.netd_native.doh_early_data");

const std::string kDotAsyncHandshakeFlag("persist.device_config.netd_native.dot_async_handshake");

const std::string kDotMaxretriesFlag("persist.device_config.netd_native.dot_maxtries");

const std::string kDotConnectTimeoutMsFlag(

        "persist.device_config.netd_native.dot_connect_timeout_ms");

const std::string kDotRevalidationThresholdFlag(

        "persist.device_config.netd_native.dot_revalidation_threshold");

const std::string kDotXportUnusableThresholdFlag(

        "persist.device_config.netd_native.dot_xport_unusable_threshold");

const std::string kDotQueryTimeoutMsFlag("persist.device_config.netd_native.dot_query_timeout_ms");

const std::string kDotValidationLatencyFactorFlag(

        "persist.device_config.netd_native.dot_validation_latency_factor");

const std::string kDotValidationLatencyOffsetMsFlag(

        "persist.device_config.netd_native.dot_validation_latency_offset_ms");

const std::string kDotQuickFallbackFlag("persist.device_config.netd_native.dot_quick_fallback");

const std::string kRetransIntervalFlag(

        "persist.device_config.netd_native.retransmission_time_interval");

const std::string kRetryCountFlag("persist.device_config.netd_native.retry_count");

const std::string kSortNameserversFlag("persist.device_config.netd_native.sort_nameservers");



static constexpr char kLocalHost[] = "localhost";

static constexpr char kLocalHostAddr[] = "127.0.0.1";

static constexpr char kIp6LocalHost[] = "ip6-localhost";

tests/resolv_test_utils.cpp

+1 −1

File changed.

Contains only whitespace changes.