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

Commit 3d5130d4 authored by Mike Yu's avatar Mike Yu
Browse files

Logging private DNS validation state 

Log the validation state whenever it's changed, and output the
result to dumpsys.

Bug: 79727473
Test: cd packages/modules/DnsResolver && atest
Change-Id: I3afe28f546562228e1a0dfc2a8a55de5b5f08a7e
parent a86a9708

DnsQueryLog.cpp

+1 −12
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 


#include "DnsQueryLog.h"



#include <android-base/stringprintf.h>

#include "util.h"



namespace android::net {
@@ -45,17 +45,6 @@ std::string maskIps(const std::vector<std::string>& ips) { 
    return ret.empty() ? "" : ret.substr(0, ret.length() - 2);

}



// Return the readable string format "hr:min:sec.ms".

std::string timestampToString(const std::chrono::system_clock::time_point& ts) {

    using std::chrono::duration_cast;

    using std::chrono::milliseconds;

    const auto time_sec = std::chrono::system_clock::to_time_t(ts);

    char buf[32];

    std::strftime(buf, sizeof(buf), "%H:%M:%S", std::localtime(&time_sec));

    int ms = duration_cast<milliseconds>(ts.time_since_epoch()).count() % 1000;

    return android::base::StringPrintf("%s.%03d", buf, ms);

}



}  // namespace



void DnsQueryLog::push(Record&& record) {

DnsResolverService.cpp

+3 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
#include "DnsResolver.h"

#include "Experiments.h"

#include "NetdPermissions.h"  // PERM_*

#include "PrivateDnsConfiguration.h"

#include "ResolverEventReporter.h"

#include "resolv_cache.h"
@@ -117,6 +118,8 @@ binder_status_t DnsResolverService::dump(int fd, const char** args, uint32_t num 
        gDnsResolv->resolverCtrl.dump(dw, netId);

        dw.blankline();

    }



    PrivateDnsConfiguration::getInstance().dump(dw);

    Experiments::getInstance()->dump(dw);

    return STATUS_OK;

}

PrivateDnsCommon.h

+30 −0
Original line number Diff line number Diff line
@@ -35,4 +35,34 @@ enum class PrivateDnsMode : uint8_t { 
    STRICT,

};



constexpr const char* validationStatusToString(Validation value) {

    switch (value) {

        case Validation::in_process:

            return "in_process";

        case Validation::success:

            return "success";

        case Validation::success_but_expired:

            return "success_but_expired";

        case Validation::fail:

            return "fail";

        case Validation::unknown_server:

            return "unknown_server";

        case Validation::unknown_netid:

            return "unknown_netid";

        default:

            return "unknown_status";

    }

}



constexpr const char* getPrivateDnsModeString(PrivateDnsMode mode) {

    switch (mode) {

        case PrivateDnsMode::OFF:

            return "OFF";

        case PrivateDnsMode::OPPORTUNISTIC:

            return "OPPORTUNISTIC";

        case PrivateDnsMode::STRICT:

            return "STRICT";

    }

}



}  // namespace android::net

PrivateDnsConfiguration.cpp

+17 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 


#include "PrivateDnsConfiguration.h"



#include <android-base/format.h>

#include <android-base/logging.h>

#include <android-base/stringprintf.h>

#include <netdutils/ThreadUtil.h>
@@ -312,6 +313,9 @@ void PrivateDnsConfiguration::updateServerState(const ServerIdentity& identity, 


    tracker[identity].setValidationState(state);

    notifyValidationStateUpdate(identity.ip.toString(), state, netId);



    RecordEntry record(netId, identity, state);

    mPrivateDnsLog.push(std::move(record));

}



bool PrivateDnsConfiguration::needsValidation(const DnsTlsServer& server) {
@@ -343,5 +347,18 @@ void PrivateDnsConfiguration::notifyValidationStateUpdate(const std::string& ser 
    }

}



void PrivateDnsConfiguration::dump(netdutils::DumpWriter& dw) const {

    dw.println("PrivateDnsLog:");

    netdutils::ScopedIndent indentStats(dw);



    for (const auto& record : mPrivateDnsLog.copy()) {

        dw.println(fmt::format("{} - netId={} PrivateDns={{{}/{}}} state={}",

                               timestampToString(record.timestamp), record.netId,

                               record.serverIdentity.ip.toString(), record.serverIdentity.name,

                               validationStatusToString(record.state)));

    }

    dw.blankline();

}



}  // namespace net

}  // namespace android

PrivateDnsConfiguration.h

+16 −0
Original line number Diff line number Diff line
@@ -22,9 +22,11 @@ 
#include <vector>



#include <android-base/thread_annotations.h>

#include <netdutils/DumpWriter.h>

#include <netdutils/InternetAddresses.h>



#include "DnsTlsServer.h"

#include "LockedQueue.h"

#include "PrivateDnsValidationObserver.h"



namespace android {
@@ -88,6 +90,8 @@ class PrivateDnsConfiguration { 


    void setObserver(PrivateDnsValidationObserver* observer);



    void dump(netdutils::DumpWriter& dw) const;



  private:

    typedef std::map<ServerIdentity, DnsTlsServer> PrivateDnsTracker;

    typedef std::set<DnsTlsServer, AddressComparator> ThreadTracker;
@@ -123,6 +127,18 @@ class PrivateDnsConfiguration { 
    PrivateDnsValidationObserver* mObserver GUARDED_BY(mPrivateDnsLock);



    friend class PrivateDnsConfigurationTest;



    struct RecordEntry {

        RecordEntry(uint32_t netId, const ServerIdentity& identity, Validation state)

            : netId(netId), serverIdentity(identity), state(state) {}



        const uint32_t netId;

        const ServerIdentity serverIdentity;

        const Validation state;

        const std::chrono::system_clock::time_point timestamp = std::chrono::system_clock::now();

    };



    LockedRingBuffer<RecordEntry> mPrivateDnsLog{100};

};



}  // namespace net