tequilaOS/platform_frameworks_native
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

adbd_auth: improve logging.

Browse source 
Bug: http://b/159061108
Test: treehugger
Change-Id: I4aa83e71ea99752dd819a5a5a9d7a050f49c1dae
This commit is contained in:
Josh Gao 2020-06-24 16:10:55 -07:00
parent dbc3025d05
commit 975cee7270
1 changed files with 33 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
libs/adbd_auth/adbd_auth.cpp
View file

@ -83,28 +83,28 @@ public:
InitFrameworkHandlers(); InitFrameworkHandlers();
epoll_fd_.reset(epoll_create1(EPOLL_CLOEXEC)); epoll_fd_.reset(epoll_create1(EPOLL_CLOEXEC));
if (epoll_fd_ == -1) { if (epoll_fd_ == -1) {
PLOG(FATAL) << "failed to create epoll fd"; PLOG(FATAL) << "adbd_auth: failed to create epoll fd";
} }
event_fd_.reset(eventfd(0, EFD_CLOEXEC | EFD_NONBLOCK)); event_fd_.reset(eventfd(0, EFD_CLOEXEC | EFD_NONBLOCK));
if (event_fd_ == -1) { if (event_fd_ == -1) {
PLOG(FATAL) << "failed to create eventfd"; PLOG(FATAL) << "adbd_auth: failed to create eventfd";
} }
sock_fd_.reset(android_get_control_socket("adbd")); sock_fd_.reset(android_get_control_socket("adbd"));
if (sock_fd_ == -1) { if (sock_fd_ == -1) {
PLOG(ERROR) << "failed to get adbd authentication socket"; PLOG(ERROR) << "adbd_auth: failed to get adbd authentication socket";
} else { } else {
if (fcntl(sock_fd_.get(), F_SETFD, FD_CLOEXEC) != 0) { if (fcntl(sock_fd_.get(), F_SETFD, FD_CLOEXEC) != 0) {
PLOG(FATAL) << "failed to make adbd authentication socket cloexec"; PLOG(FATAL) << "adbd_auth: failed to make adbd authentication socket cloexec";
} }
if (fcntl(sock_fd_.get(), F_SETFL, O_NONBLOCK) != 0) { if (fcntl(sock_fd_.get(), F_SETFL, O_NONBLOCK) != 0) {
PLOG(FATAL) << "failed to make adbd authentication socket nonblocking"; PLOG(FATAL) << "adbd_auth: failed to make adbd authentication socket nonblocking";
} }
if (listen(sock_fd_.get(), 4) != 0) { if (listen(sock_fd_.get(), 4) != 0) {
PLOG(FATAL) << "failed to listen on adbd authentication socket"; PLOG(FATAL) << "adbd_auth: failed to listen on adbd authentication socket";
} }
} }
} }
@ -146,7 +146,7 @@ public:
struct epoll_event event; struct epoll_event event;
event.events = EPOLLIN; event.events = EPOLLIN;
if (!output_queue_.empty()) { if (!output_queue_.empty()) {
LOG(INFO) << "marking framework writable"; LOG(INFO) << "adbd_auth: marking framework writable";
event.events |= EPOLLOUT; event.events |= EPOLLOUT;
} }
event.data.u64 = kEpollConstFramework; event.data.u64 = kEpollConstFramework;
@ -155,7 +155,7 @@ public:
} }
void ReplaceFrameworkFd(unique_fd new_fd) REQUIRES(mutex_) { void ReplaceFrameworkFd(unique_fd new_fd) REQUIRES(mutex_) {
LOG(INFO) << "received new framework fd " << new_fd.get() LOG(INFO) << "adbd_auth: received new framework fd " << new_fd.get()
<< " (current = " << framework_fd_.get() << ")"; << " (current = " << framework_fd_.get() << ")";
// If we already had a framework fd, clean up after ourselves. // If we already had a framework fd, clean up after ourselves.
@ -170,7 +170,7 @@ public:
struct epoll_event event; struct epoll_event event;
event.events = EPOLLIN; event.events = EPOLLIN;
if (!output_queue_.empty()) { if (!output_queue_.empty()) {
LOG(INFO) << "marking framework writable"; LOG(INFO) << "adbd_auth: marking framework writable";
event.events |= EPOLLOUT; event.events |= EPOLLOUT;
} }
event.data.u64 = kEpollConstFramework; event.data.u64 = kEpollConstFramework;
@ -180,10 +180,10 @@ public:
} }
void HandlePacket(std::string_view packet) EXCLUDES(mutex_) { void HandlePacket(std::string_view packet) EXCLUDES(mutex_) {
LOG(INFO) << "received packet: " << packet; LOG(INFO) << "adbd_auth: received packet: " << packet;
if (packet.size() < 2) { if (packet.size() < 2) {
LOG(ERROR) << "received packet of invalid length"; LOG(ERROR) << "adbd_auth: received packet of invalid length";
std::lock_guard<std::mutex> lock(mutex_); std::lock_guard<std::mutex> lock(mutex_);
ReplaceFrameworkFd(unique_fd()); ReplaceFrameworkFd(unique_fd());
} }
@ -197,7 +197,7 @@ public:
} }
} }
if (!handled_packet) { if (!handled_packet) {
LOG(ERROR) << "unhandled packet: " << packet; LOG(ERROR) << "adbd_auth: unhandled packet: " << packet;
std::lock_guard<std::mutex> lock(mutex_); std::lock_guard<std::mutex> lock(mutex_);
ReplaceFrameworkFd(unique_fd()); ReplaceFrameworkFd(unique_fd());
} }
@ -273,14 +273,14 @@ public:
iovs[2].iov_base = p->public_key.data(); iovs[2].iov_base = p->public_key.data();
iovs[2].iov_len = p->public_key.size(); iovs[2].iov_len = p->public_key.size();
} else { } else {
LOG(FATAL) << "unhandled packet type?"; LOG(FATAL) << "adbd_auth: unhandled packet type?";
} }
output_queue_.pop_front(); output_queue_.pop_front();
ssize_t rc = writev(framework_fd_.get(), iovs, iovcnt); ssize_t rc = writev(framework_fd_.get(), iovs, iovcnt);
if (rc == -1 && errno != EAGAIN && errno != EWOULDBLOCK) { if (rc == -1 && errno != EAGAIN && errno != EWOULDBLOCK) {
PLOG(ERROR) << "failed to write to framework fd"; PLOG(ERROR) << "adbd_auth: failed to write to framework fd";
ReplaceFrameworkFd(unique_fd()); ReplaceFrameworkFd(unique_fd());
return false; return false;
} }
@ -290,7 +290,7 @@ public:
void Run() { void Run() {
if (sock_fd_ == -1) { if (sock_fd_ == -1) {
LOG(ERROR) << "adbd authentication socket unavailable, disabling user prompts"; LOG(ERROR) << "adbd_auth: socket unavailable, disabling user prompts";
} else { } else {
struct epoll_event event; struct epoll_event event;
event.events = EPOLLIN; event.events = EPOLLIN;
@ -309,9 +309,9 @@ public:
struct epoll_event events[3]; struct epoll_event events[3];
int rc = TEMP_FAILURE_RETRY(epoll_wait(epoll_fd_.get(), events, 3, -1)); int rc = TEMP_FAILURE_RETRY(epoll_wait(epoll_fd_.get(), events, 3, -1));
if (rc == -1) { if (rc == -1) {
PLOG(FATAL) << "epoll_wait failed"; PLOG(FATAL) << "adbd_auth: epoll_wait failed";
} else if (rc == 0) { } else if (rc == 0) {
LOG(FATAL) << "epoll_wait returned 0"; LOG(FATAL) << "adbd_auth: epoll_wait returned 0";
} }
bool restart = false; bool restart = false;
@ -326,7 +326,7 @@ public:
unique_fd new_framework_fd(accept4(sock_fd_.get(), nullptr, nullptr, unique_fd new_framework_fd(accept4(sock_fd_.get(), nullptr, nullptr,
SOCK_CLOEXEC | SOCK_NONBLOCK)); SOCK_CLOEXEC | SOCK_NONBLOCK));
if (new_framework_fd == -1) { if (new_framework_fd == -1) {
PLOG(FATAL) << "failed to accept framework fd"; PLOG(FATAL) << "adbd_auth: failed to accept framework fd";
} }
LOG(INFO) << "adbd_auth: received a new framework connection"; LOG(INFO) << "adbd_auth: received a new framework connection";
@ -344,7 +344,8 @@ public:
uint64_t dummy; uint64_t dummy;
int rc = TEMP_FAILURE_RETRY(read(event_fd_.get(), &dummy, sizeof(dummy))); int rc = TEMP_FAILURE_RETRY(read(event_fd_.get(), &dummy, sizeof(dummy)));
if (rc != 8) { if (rc != 8) {
PLOG(FATAL) << "failed to read from eventfd (rc = " << rc << ")"; PLOG(FATAL)
<< "adbd_auth: failed to read from eventfd (rc = " << rc << ")";
} }
std::lock_guard<std::mutex> lock(mutex_); std::lock_guard<std::mutex> lock(mutex_);
@ -357,9 +358,9 @@ public:
if (event.events & EPOLLIN) { if (event.events & EPOLLIN) {
int rc = TEMP_FAILURE_RETRY(read(framework_fd_.get(), buf, sizeof(buf))); int rc = TEMP_FAILURE_RETRY(read(framework_fd_.get(), buf, sizeof(buf)));
if (rc == -1) { if (rc == -1) {
LOG(FATAL) << "failed to read from framework fd"; LOG(FATAL) << "adbd_auth: failed to read from framework fd";
} else if (rc == 0) { } else if (rc == 0) {
LOG(INFO) << "hit EOF on framework fd"; LOG(INFO) << "adbd_auth: hit EOF on framework fd";
std::lock_guard<std::mutex> lock(mutex_); std::lock_guard<std::mutex> lock(mutex_);
ReplaceFrameworkFd(unique_fd()); ReplaceFrameworkFd(unique_fd());
} else { } else {
@ -386,10 +387,10 @@ public:
void IteratePublicKeys(bool (*callback)(void*, const char*, size_t), void* opaque) { void IteratePublicKeys(bool (*callback)(void*, const char*, size_t), void* opaque) {
for (const auto& path : key_paths) { for (const auto& path : key_paths) {
if (access(path, R_OK) == 0) { if (access(path, R_OK) == 0) {
LOG(INFO) << "Loading keys from " << path; LOG(INFO) << "adbd_auth: loading keys from " << path;
std::string content; std::string content;
if (!android::base::ReadFileToString(path, &content)) { if (!android::base::ReadFileToString(path, &content)) {
PLOG(ERROR) << "Couldn't read " << path; PLOG(ERROR) << "adbd_auth: couldn't read " << path;
continue; continue;
} }
for (const auto& line : android::base::Split(content, "\n")) { for (const auto& line : android::base::Split(content, "\n")) {
@ -405,6 +406,7 @@ public:
uint64_t id = NextId(); uint64_t id = NextId();
std::lock_guard<std::mutex> lock(mutex_); std::lock_guard<std::mutex> lock(mutex_);
LOG(INFO) << "adbd_auth: sending prompt with id " << id;
pending_prompts_.emplace_back(id, public_key, arg); pending_prompts_.emplace_back(id, public_key, arg);
DispatchPendingPrompt(); DispatchPendingPrompt();
return id; return id;
@ -423,7 +425,7 @@ public:
std::lock_guard<std::mutex> lock(mutex_); std::lock_guard<std::mutex> lock(mutex_);
auto it = keys_.find(id); auto it = keys_.find(id);
if (it == keys_.end()) { if (it == keys_.end()) {
LOG(DEBUG) << "couldn't find public key to notify disconnection, skipping"; LOG(DEBUG) << "adbd_auth: couldn't find public key to notify disconnection, skipping";
return; return;
} }
output_queue_.emplace_back(AdbdAuthPacketDisconnected{.public_key = std::move(it->second)}); output_queue_.emplace_back(AdbdAuthPacketDisconnected{.public_key = std::move(it->second)});
@ -446,7 +448,8 @@ public:
std::lock_guard<std::mutex> lock(mutex_); std::lock_guard<std::mutex> lock(mutex_);
auto it = keys_.find(id); auto it = keys_.find(id);
if (it == keys_.end()) { if (it == keys_.end()) {
LOG(DEBUG) << "couldn't find public key to notify disconnection of tls device, skipping"; LOG(DEBUG) << "adbd_auth: couldn't find public key to notify disconnection of tls "
"device, skipping";
return; return;
} }
output_queue_.emplace_back(AdbdPacketTlsDeviceDisconnected{ output_queue_.emplace_back(AdbdPacketTlsDeviceDisconnected{
@ -461,9 +464,9 @@ public:
uint64_t value = 1; uint64_t value = 1;
ssize_t rc = write(event_fd_.get(), &value, sizeof(value)); ssize_t rc = write(event_fd_.get(), &value, sizeof(value));
if (rc == -1) { if (rc == -1) {
PLOG(FATAL) << "write to eventfd failed"; PLOG(FATAL) << "adbd_auth: write to eventfd failed";
} else if (rc != sizeof(value)) { } else if (rc != sizeof(value)) {
LOG(FATAL) << "write to eventfd returned short (" << rc << ")"; LOG(FATAL) << "adbd_auth: write to eventfd returned short (" << rc << ")";
} }
} }
@ -516,7 +519,8 @@ AdbdAuthContext* adbd_auth_new(AdbdAuthCallbacks* callbacks) {
if (callbacks->version == 1) { if (callbacks->version == 1) {
return new AdbdAuthContext(reinterpret_cast<AdbdAuthCallbacksV1*>(callbacks)); return new AdbdAuthContext(reinterpret_cast<AdbdAuthCallbacksV1*>(callbacks));
} else { } else {
LOG(ERROR) << "received unknown AdbdAuthCallbacks version " << callbacks->version; LOG(ERROR) << "adbd_auth: received unknown AdbdAuthCallbacks version "
<< callbacks->version;
return nullptr; return nullptr;
} }
} }