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

Commit c6556625 authored by Hungming Chen's avatar Hungming Chen
Browse files

resolv_gold_test: Add DNS-over-TLS test 

Prepare for gold test on private DNS and correct the typo in
generating SSL certificate commands for DNS TLS frontend and client.

Test: cd packages/modules/DnsResolver && atest
Change-Id: Ic30d1ec3e60c2a40390f4e6b7de65ebd1a338b94
parent ef61bff5

tests/Android.bp

+5 −1
Original line number Diff line number Diff line
@@ -40,15 +40,17 @@ cc_test { 
        "resolv_gold_test.cpp",

    ],

    header_libs: [

        "libnetd_client_headers",

        "libnetd_resolv_internal_headers",

    ],

    shared_libs: [

        "libbinder_ndk",

        "libcrypto",

        "libprotobuf-cpp-full",

        "libssl",

    ],

    static_libs: [

        "dnsresolver_aidl_interface-cpp",

        "dnsresolver_aidl_interface-unstable-cpp",

        "golddata_proto",

        "libbase",

        "libgmock",
@@ -57,6 +59,8 @@ cc_test { 
        "libnetd_test_dnsresponder",

        "libnetd_test_resolv_utils",

        "libnetdutils",

        "netd_aidl_interface-cpp",

        "netd_event_listener_interface-ndk_platform",

        "server_configurable_flags",

        "stats_proto",

    ],

tests/dns_responder/dns_responder_client.cpp

+0 −21
Original line number Diff line number Diff line
@@ -35,27 +35,6 @@ using android::base::StringPrintf; 
using android::net::INetd;

using android::net::ResolverParamsParcel;



static const char kCaCert[] = R"(

-----BEGIN CERTIFICATE-----

MIIC4TCCAcmgAwIBAgIUQUHZnWhL6M4qcS+I0lLkMyqf3VMwDQYJKoZIhvcNAQEL

BQAwADAeFw0xOTA2MTAwODM3MzlaFw0yOTA2MDcwODM3MzlaMAAwggEiMA0GCSqG

SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCapRbBg6dRT4id4DxmlyktomE8gpm4W+VA

ZOivhKat4CvGfVjVIAUYxV7LOGREkkT8Qhn5/gU0lShsnURzEDWY+IjMDDw+kRAm

iFAlMRnCobTp/tenseNRB2tDuUhkRbzaT6qaidPbKy099p909gxf4YqsgY2NfsY2

JkideqIkVq2hvLehsu3BgiK06TGUgxOHfj74vx7iGyujq1v38J1hlox5vj/svJF6

jVdDw8p2UkJbO2N9u3al0nNSMG+MCgd3cvKUySTnjedYXsYB0WyH/JZn//KDq6o+

as6eQVHuH1fu+8XPzBNATlkHzy+YAs7T+UWbkoa1F8wIElVQg66lAgMBAAGjUzBR

MB0GA1UdDgQWBBShu/e54D3VdqdLOWo9Ou5hbjaIojAfBgNVHSMEGDAWgBShu/e5

4D3VdqdLOWo9Ou5hbjaIojAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUA

A4IBAQBFkEGqqzzdQlhP5m1kzh+SiUCwekzSump0CSk0JAXAdeLNbWs3H+pE1/hM

Fx7oFonoX5O6pi68JfcIP0u7wNuZkKqubUl4gG6aHDkAad2oeTov0Be7EKt8Ekwf

tmFWVQQrF9otlG3Stn4vmE5zVNGQXDgRsNKPekSo0XJz757q5WgblauB71Rekvio

TCUXXt3jf3SuovcUFjgBkaohikBRbLiPWZrW4y0XUsgBKI6sLtiSZOPiNevY2xAR

y7mCSmi4wP7vtUQ5G8znkAMKoo0FzyfjSogGQeREUM8Oe9Mmh/D39sq/D4TsiAxt

Pwl59DlzlHHJhmOL+SCGciBX4X7p

-----END CERTIFICATE-----

)";



void DnsResponderClient::SetupMappings(unsigned numHosts, const std::vector<std::string>& domains,

                                       std::vector<Mapping>* mappings) {

    mappings->resize(numHosts * domains.size());

tests/dns_responder/dns_responder_client.h

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include "android/net/IDnsResolver.h"

#include "android/net/INetd.h"

#include "dns_responder.h"

#include "dns_tls_certificate.h"



inline const std::vector<std::string> kDefaultServers = {"127.0.0.3"};

inline const std::vector<std::string> kDefaultSearchDomains = {"example.com"};

tests/dns_responder/dns_responder_client_ndk.cpp

+0 −21
Original line number Diff line number Diff line
@@ -37,27 +37,6 @@ using aidl::android::net::ResolverParamsParcel; 
using android::base::StringPrintf;

using android::net::ResolverStats;



static const char kCaCert[] = R"(

-----BEGIN CERTIFICATE-----

MIIC4TCCAcmgAwIBAgIUQUHZnWhL6M4qcS+I0lLkMyqf3VMwDQYJKoZIhvcNAQEL

BQAwADAeFw0xOTA2MTAwODM3MzlaFw0yOTA2MDcwODM3MzlaMAAwggEiMA0GCSqG

SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCapRbBg6dRT4id4DxmlyktomE8gpm4W+VA

ZOivhKat4CvGfVjVIAUYxV7LOGREkkT8Qhn5/gU0lShsnURzEDWY+IjMDDw+kRAm

iFAlMRnCobTp/tenseNRB2tDuUhkRbzaT6qaidPbKy099p909gxf4YqsgY2NfsY2

JkideqIkVq2hvLehsu3BgiK06TGUgxOHfj74vx7iGyujq1v38J1hlox5vj/svJF6

jVdDw8p2UkJbO2N9u3al0nNSMG+MCgd3cvKUySTnjedYXsYB0WyH/JZn//KDq6o+

as6eQVHuH1fu+8XPzBNATlkHzy+YAs7T+UWbkoa1F8wIElVQg66lAgMBAAGjUzBR

MB0GA1UdDgQWBBShu/e54D3VdqdLOWo9Ou5hbjaIojAfBgNVHSMEGDAWgBShu/e5

4D3VdqdLOWo9Ou5hbjaIojAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUA

A4IBAQBFkEGqqzzdQlhP5m1kzh+SiUCwekzSump0CSk0JAXAdeLNbWs3H+pE1/hM

Fx7oFonoX5O6pi68JfcIP0u7wNuZkKqubUl4gG6aHDkAad2oeTov0Be7EKt8Ekwf

tmFWVQQrF9otlG3Stn4vmE5zVNGQXDgRsNKPekSo0XJz757q5WgblauB71Rekvio

TCUXXt3jf3SuovcUFjgBkaohikBRbLiPWZrW4y0XUsgBKI6sLtiSZOPiNevY2xAR

y7mCSmi4wP7vtUQ5G8znkAMKoo0FzyfjSogGQeREUM8Oe9Mmh/D39sq/D4TsiAxt

Pwl59DlzlHHJhmOL+SCGciBX4X7p

-----END CERTIFICATE-----

)";



void DnsResponderClient::SetupMappings(unsigned numHosts, const std::vector<std::string>& domains,

                                       std::vector<Mapping>* mappings) {

    mappings->resize(numHosts * domains.size());

tests/dns_responder/dns_responder_client_ndk.h

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <aidl/android/net/INetd.h>

#include "ResolverStats.h"

#include "dns_responder.h"

#include "dns_tls_certificate.h"

#include "params.h"



inline const std::vector<std::string> kDefaultServers = {"127.0.0.3"};