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

Commit 4414e4c7 authored by Josh Gao's avatar Josh Gao
Browse files

adb: fix authentication when reconnecting. 

If we have multiple keys available for authentication (ADB_VENDOR_KEYS
+ the one in ~/.android), we will still have keys in our list of
avilable keys after we've successfully connected. A subsequent
reconnection will start authorizing using the list of keys after the
key that actually worked, resulting in that session being unauthorized
until another reconnection happens. Clear the key list before
reconnecting to fix this. (We could do this after successfully
connecting, but we need to do this before reconnecting anyway, because
our connection could have died during authorization.)

Bug: http://b/117267347
Test: `adb connect foo; adb -s foo reconnect device` with ADB_VENDOR_KEYS
Change-Id: Ieb7dcc28e333c89ae0d75f97e89bcd1b571cb299
parent 946f7d44

adb/transport.cpp

+15 −1
Original line number Diff line number Diff line
@@ -764,6 +764,10 @@ static void transport_unref(atransport* t) { 
#if ADB_HOST

        if (t->IsTcpDevice() && !t->kicked()) {

            D("transport: %s unref (attempting reconnection)", t->serial.c_str());



            // We need to clear the transport's keys, so that on the next connection, it tries

            // again from the beginning.

            t->ResetKeys();

            reconnect_handler.TrackTransport(t);

        } else {

            D("transport: %s unref (kicking and closing)", t->serial.c_str());
@@ -1331,10 +1335,20 @@ bool check_header(apacket* p, atransport* t) { 


#if ADB_HOST

std::shared_ptr<RSA> atransport::NextKey() {

    if (keys_.empty()) keys_ = adb_auth_get_private_keys();

    if (keys_.empty()) {

        LOG(INFO) << "fetching keys for transport " << this->serial_name();

        keys_ = adb_auth_get_private_keys();



        // We should have gotten at least one key: the one that's automatically generated.

        CHECK(!keys_.empty());

    }



    std::shared_ptr<RSA> result = keys_[0];

    keys_.pop_front();

    return result;

}



void atransport::ResetKeys() {

    keys_.clear();

}

#endif

adb/transport.h

+1 −0
Original line number Diff line number Diff line
@@ -258,6 +258,7 @@ class atransport { 


#if ADB_HOST

    std::shared_ptr<RSA> NextKey();

    void ResetKeys();

#endif



    char token[TOKEN_SIZE] = {};