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

Commit 26363f21 authored by Josh Gao's avatar Josh Gao Committed by Automerger Merge Worker
Browse files

Merge "adbd: check auth id." into rvc-dev am: d389d983 am: 9634c0f4 am:... 

Merge "adbd: check auth id." into rvc-dev am: d389d983 am: 9634c0f4 am: 61deb8b6 am: 92463764

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/11988040

Change-Id: I5eb65ed39752e504789225bc42b1ef501e57ed52
parents 38a44505 92463764

adb/daemon/adb_wifi.cpp

+2 −1
Original line number Diff line number Diff line
@@ -42,7 +42,8 @@ static struct adisconnect adb_disconnect = {adb_disconnected, nullptr}; 


static void adb_disconnected(void* unused, atransport* t) {

    LOG(INFO) << "ADB wifi device disconnected";

    adbd_auth_tls_device_disconnected(auth_ctx, kAdbTransportTypeWifi, t->auth_id);

    CHECK(t->auth_id.has_value());

    adbd_auth_tls_device_disconnected(auth_ctx, kAdbTransportTypeWifi, t->auth_id.value());

}



// TODO(b/31559095): need bionic host so that we can use 'prop_info' returned

adb/daemon/auth.cpp

+25 −7
Original line number Diff line number Diff line
@@ -207,15 +207,27 @@ void adbd_cloexec_auth_socket() { 
}



static void adbd_auth_key_authorized(void* arg, uint64_t id) {

    LOG(INFO) << "adb client authorized";

    LOG(INFO) << "adb client " << id << " authorized";

    fdevent_run_on_main_thread([=]() {

        LOG(INFO) << "arg = " << reinterpret_cast<uintptr_t>(arg);

        auto* transport = transport_from_callback_arg(arg);

        if (!transport) {

            LOG(ERROR) << "authorization received for deleted transport, ignoring";

            LOG(ERROR) << "authorization received for deleted transport (" << id << "), ignoring";

            return;

        }



        if (transport->auth_id.has_value()) {

            if (transport->auth_id.value() != id) {

                LOG(ERROR)

                        << "authorization received, but auth id doesn't match, ignoring (expected "

                        << transport->auth_id.value() << ", got " << id << ")";

                return;

            }

        } else {

            // Older versions (i.e. dogfood/beta builds) of libadbd_auth didn't pass the initial

            // auth id to us, so we'll just have to trust it until R ships and we can retcon this.

            transport->auth_id = id;

        }



        adbd_auth_verified(transport);

    });

}
@@ -265,15 +277,21 @@ void adbd_auth_verified(atransport* t) { 


static void adb_disconnected(void* unused, atransport* t) {

    LOG(INFO) << "ADB disconnect";

    adbd_auth_notify_disconnect(auth_ctx, t->auth_id);

    CHECK(t->auth_id.has_value());

    adbd_auth_notify_disconnect(auth_ctx, t->auth_id.value());

}



void adbd_auth_confirm_key(atransport* t) {

    LOG(INFO) << "prompting user to authorize key";

    t->AddDisconnect(&adb_disconnect);

    if (adbd_auth_prompt_user_with_id) {

        t->auth_id = adbd_auth_prompt_user_with_id(auth_ctx, t->auth_key.data(), t->auth_key.size(),

                                                   transport_to_callback_arg(t));

    } else {

        adbd_auth_prompt_user(auth_ctx, t->auth_key.data(), t->auth_key.size(),

                              transport_to_callback_arg(t));

    }

}



void adbd_notify_framework_connected_key(atransport* t) {

    t->auth_id = adbd_auth_notify_auth(auth_ctx, t->auth_key.data(), t->auth_key.size());

adb/transport.h

+2 −1
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include <list>

#include <memory>

#include <mutex>

#include <optional>

#include <string>

#include <string_view>

#include <thread>
@@ -320,7 +321,7 @@ class atransport : public enable_weak_from_this<atransport> { 
#if !ADB_HOST

    // Used to provide the key to the framework.

    std::string auth_key;

    uint64_t auth_id;

    std::optional<uint64_t> auth_id;

#endif



    bool IsTcpDevice() const { return type == kTransportLocal; }