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

Commit af130a4c authored by Mike Yu's avatar Mike Yu
Browse files

Read test cacert and keys from files 

Change the way how the tests read CaCerts and private key. Now,
they are read from the files in test_keys directory. This is
in preparation for DoH tests because quiche can read them only
from file path.

Bug: 181642979
Test: cd packages/modules/DnsResolver && atest
Test: mts-tradefed run mts-dnsresolver-native
Change-Id: Ifc9813f22afe4d8780bdceb6d7a1a5d24717f5d5
parent b29545b9

Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -145,6 +145,9 @@ cc_defaults { 
            suffix: "64",

        },

    },

    data: [

        ":resolv_test_keys",

    ],

}



cc_library {

resolv_test_config_template.xml

+12 −0
Original line number Diff line number Diff line
@@ -27,6 +27,18 @@ 
       <option name="push" value="{MODULE}->/data/local/tmp/{MODULE}" />

       <option name="append-bitness" value="true" />

   </target_preparer>



   <!-- For test files which are not renamed with bitness appended -->

   <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">

       <option name="cleanup" value="true" />

       <option name="push"

            value="server_certificate.pem->/data/local/tmp/test_keys/server_certificate.pem" />

       <option name="push" value="server_key.pem->/data/local/tmp/test_keys/server_key.pem" />

       <option name="push"

            value="ca_certificate.pem->/data/local/tmp/test_keys/ca_certificate.pem" />

       <option name="append-bitness" value="false" />

   </target_preparer>



   <test class="com.android.tradefed.testtype.GTest" >

       <option name="native-test-device-path" value="/data/local/tmp" />

       <option name="module-name" value="{MODULE}" />

tests/Android.bp

+7 −1
Original line number Diff line number Diff line
@@ -89,7 +89,10 @@ cc_test { 
    // TODO: Remove the xml after MTS fixing the problem.

    test_config: "resolv_gold_test_config.xml",

    defaults: ["netd_defaults", "resolv_test_defaults"],

    data: [":resolv_gold_test_pbtxt2pb"],

    data: [

        ":resolv_gold_test_pbtxt2pb",

        ":resolv_test_keys",

    ],

    srcs: [

        "resolv_gold_test.cpp",

    ],
@@ -188,6 +191,9 @@ cc_test { 
        "libipchecksum",

        "resolv_unsolicited_listener",

    ],

    data: [

        ":resolv_test_keys",

    ],

    // This test talks to the DnsResolver module over a binary protocol on a socket, so keep it as

    // multilib setting is worth because we might be able to get some coverage for the case where

    // 32bit apps talk to 64bit resolvers.

tests/dns_responder/Android.bp

+6 −0
Original line number Diff line number Diff line
@@ -33,6 +33,12 @@ cc_test_library { 
        "dns_responder.cpp",

        "dns_responder_client_ndk.cpp",

        "dns_tls_frontend.cpp",

        "dns_tls_certificate.cpp",

    ],

    export_include_dirs: ["."],

}



filegroup {

    name: "resolv_test_keys",

    srcs: ["test_keys/*.pem"],

}

tests/dns_responder/dns_responder_client_ndk.cpp

+2 −2
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ bool DnsResponderClient::SetResolversWithTls(const std::vector<std::string>& ser 
                                             const std::vector<std::string>& tlsServers,

                                             const std::string& name) {

    const auto& resolverParams = makeResolverParamsParcel(TEST_NETID, params, servers, domains,

                                                          name, tlsServers, kCaCert);

                                                          name, tlsServers, sCaCert);

    const auto rv = mDnsResolvSrv->setResolverConfiguration(resolverParams);

    if (!rv.isOk()) LOG(ERROR) << "SetResolversWithTls() -> " << rv.getMessage();

    return rv.isOk();
@@ -148,7 +148,7 @@ bool DnsResponderClient::SetResolversFromParcel(const ResolverParamsParcel& reso 
ResolverParamsParcel DnsResponderClient::GetDefaultResolverParamsParcel() {

    return makeResolverParamsParcel(TEST_NETID, kDefaultParams, kDefaultServers,

                                    kDefaultSearchDomains, {} /* tlsHostname */, kDefaultServers,

                                    kCaCert);

                                    sCaCert);

}



void DnsResponderClient::SetupDNSServers(unsigned numServers, const std::vector<Mapping>& mappings,