Merge "Move adb_main to its own file."
This commit is contained in:
commit
9a525d7f2e
6 changed files with 415 additions and 379 deletions
|
@ -92,6 +92,7 @@ endif
|
|||
|
||||
LOCAL_SRC_FILES := \
|
||||
adb.c \
|
||||
adb_main.c \
|
||||
console.c \
|
||||
transport_local.c \
|
||||
commandline.c \
|
||||
|
@ -141,6 +142,7 @@ include $(CLEAR_VARS)
|
|||
|
||||
LOCAL_SRC_FILES := \
|
||||
adb.c \
|
||||
adb_main.c \
|
||||
transport_local.c \
|
||||
adb_auth_client.c \
|
||||
sockets.c \
|
||||
|
|
380
adb/adb.c
380
adb/adb.c
|
@ -31,18 +31,13 @@
|
|||
#include "adb.h"
|
||||
#include "adb_auth.h"
|
||||
#include "adb_listeners.h"
|
||||
#include "qemu_tracing.h"
|
||||
|
||||
#define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
|
||||
|
||||
#if !ADB_HOST
|
||||
#include <cutils/properties.h>
|
||||
#include <private/android_filesystem_config.h>
|
||||
#include <sys/capability.h>
|
||||
#include <sys/mount.h>
|
||||
#include <sys/prctl.h>
|
||||
#include <getopt.h>
|
||||
#include <selinux/selinux.h>
|
||||
#endif
|
||||
|
||||
#if ADB_TRACE
|
||||
|
@ -51,11 +46,8 @@ ADB_MUTEX_DEFINE( D_lock );
|
|||
|
||||
int HOST = 0;
|
||||
|
||||
static int auth_enabled = 0;
|
||||
|
||||
#if !ADB_HOST
|
||||
static const char *adb_device_banner = "device";
|
||||
static const char *root_seclabel = NULL;
|
||||
const char *adb_device_banner = "device";
|
||||
#endif
|
||||
|
||||
void fatal(const char *fmt, ...)
|
||||
|
@ -558,119 +550,8 @@ static BOOL WINAPI ctrlc_handler(DWORD type)
|
|||
}
|
||||
#endif
|
||||
|
||||
static void adb_cleanup(void)
|
||||
{
|
||||
usb_cleanup();
|
||||
}
|
||||
|
||||
void start_logging(void)
|
||||
{
|
||||
#if defined(_WIN32)
|
||||
char temp[ MAX_PATH ];
|
||||
FILE* fnul;
|
||||
FILE* flog;
|
||||
|
||||
GetTempPath( sizeof(temp) - 8, temp );
|
||||
strcat( temp, "adb.log" );
|
||||
|
||||
/* Win32 specific redirections */
|
||||
fnul = fopen( "NUL", "rt" );
|
||||
if (fnul != NULL)
|
||||
stdin[0] = fnul[0];
|
||||
|
||||
flog = fopen( temp, "at" );
|
||||
if (flog == NULL)
|
||||
flog = fnul;
|
||||
|
||||
setvbuf( flog, NULL, _IONBF, 0 );
|
||||
|
||||
stdout[0] = flog[0];
|
||||
stderr[0] = flog[0];
|
||||
fprintf(stderr,"--- adb starting (pid %d) ---\n", getpid());
|
||||
#else
|
||||
int fd;
|
||||
|
||||
fd = unix_open("/dev/null", O_RDONLY);
|
||||
dup2(fd, 0);
|
||||
adb_close(fd);
|
||||
|
||||
fd = unix_open("/tmp/adb.log", O_WRONLY | O_CREAT | O_APPEND, 0640);
|
||||
if(fd < 0) {
|
||||
fd = unix_open("/dev/null", O_WRONLY);
|
||||
}
|
||||
dup2(fd, 1);
|
||||
dup2(fd, 2);
|
||||
adb_close(fd);
|
||||
fprintf(stderr,"--- adb starting (pid %d) ---\n", getpid());
|
||||
#endif
|
||||
}
|
||||
|
||||
#if !ADB_HOST
|
||||
void start_device_log(void)
|
||||
{
|
||||
int fd;
|
||||
char path[PATH_MAX];
|
||||
struct tm now;
|
||||
time_t t;
|
||||
char value[PROPERTY_VALUE_MAX];
|
||||
|
||||
// read the trace mask from persistent property persist.adb.trace_mask
|
||||
// give up if the property is not set or cannot be parsed
|
||||
property_get("persist.adb.trace_mask", value, "");
|
||||
if (sscanf(value, "%x", &adb_trace_mask) != 1)
|
||||
return;
|
||||
|
||||
adb_mkdir("/data/adb", 0775);
|
||||
tzset();
|
||||
time(&t);
|
||||
localtime_r(&t, &now);
|
||||
strftime(path, sizeof(path),
|
||||
"/data/adb/adb-%Y-%m-%d-%H-%M-%S.txt",
|
||||
&now);
|
||||
fd = unix_open(path, O_WRONLY | O_CREAT | O_TRUNC, 0640);
|
||||
if (fd < 0)
|
||||
return;
|
||||
|
||||
// redirect stdout and stderr to the log file
|
||||
dup2(fd, 1);
|
||||
dup2(fd, 2);
|
||||
fprintf(stderr,"--- adb starting (pid %d) ---\n", getpid());
|
||||
adb_close(fd);
|
||||
|
||||
fd = unix_open("/dev/null", O_RDONLY);
|
||||
dup2(fd, 0);
|
||||
adb_close(fd);
|
||||
}
|
||||
#endif
|
||||
|
||||
#if ADB_HOST
|
||||
|
||||
#ifdef WORKAROUND_BUG6558362
|
||||
#include <sched.h>
|
||||
#define AFFINITY_ENVVAR "ADB_CPU_AFFINITY_BUG6558362"
|
||||
void adb_set_affinity(void)
|
||||
{
|
||||
cpu_set_t cpu_set;
|
||||
const char* cpunum_str = getenv(AFFINITY_ENVVAR);
|
||||
char* strtol_res;
|
||||
int cpu_num;
|
||||
|
||||
if (!cpunum_str || !*cpunum_str)
|
||||
return;
|
||||
cpu_num = strtol(cpunum_str, &strtol_res, 0);
|
||||
if (*strtol_res != '\0')
|
||||
fatal("bad number (%s) in env var %s. Expecting 0..n.\n", cpunum_str, AFFINITY_ENVVAR);
|
||||
|
||||
sched_getaffinity(0, sizeof(cpu_set), &cpu_set);
|
||||
D("orig cpu_set[0]=0x%08lx\n", cpu_set.__bits[0]);
|
||||
CPU_ZERO(&cpu_set);
|
||||
CPU_SET(cpu_num, &cpu_set);
|
||||
sched_setaffinity(0, sizeof(cpu_set), &cpu_set);
|
||||
sched_getaffinity(0, sizeof(cpu_set), &cpu_set);
|
||||
D("new cpu_set[0]=0x%08lx\n", cpu_set.__bits[0]);
|
||||
}
|
||||
#endif
|
||||
|
||||
int launch_server(int server_port)
|
||||
{
|
||||
#if defined(_WIN32)
|
||||
|
@ -829,226 +710,6 @@ int launch_server(int server_port)
|
|||
}
|
||||
#endif /* ADB_HOST */
|
||||
|
||||
/* Constructs a local name of form tcp:port.
|
||||
* target_str points to the target string, it's content will be overwritten.
|
||||
* target_size is the capacity of the target string.
|
||||
* server_port is the port number to use for the local name.
|
||||
*/
|
||||
void build_local_name(char* target_str, size_t target_size, int server_port)
|
||||
{
|
||||
snprintf(target_str, target_size, "tcp:%d", server_port);
|
||||
}
|
||||
|
||||
#if !ADB_HOST
|
||||
|
||||
static void drop_capabilities_bounding_set_if_needed() {
|
||||
#ifdef ALLOW_ADBD_ROOT
|
||||
char value[PROPERTY_VALUE_MAX];
|
||||
property_get("ro.debuggable", value, "");
|
||||
if (strcmp(value, "1") == 0) {
|
||||
return;
|
||||
}
|
||||
#endif
|
||||
int i;
|
||||
for (i = 0; prctl(PR_CAPBSET_READ, i, 0, 0, 0) >= 0; i++) {
|
||||
if (i == CAP_SETUID || i == CAP_SETGID) {
|
||||
// CAP_SETUID CAP_SETGID needed by /system/bin/run-as
|
||||
continue;
|
||||
}
|
||||
int err = prctl(PR_CAPBSET_DROP, i, 0, 0, 0);
|
||||
|
||||
// Some kernels don't have file capabilities compiled in, and
|
||||
// prctl(PR_CAPBSET_DROP) returns EINVAL. Don't automatically
|
||||
// die when we see such misconfigured kernels.
|
||||
if ((err < 0) && (errno != EINVAL)) {
|
||||
exit(1);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static bool should_drop_privileges() {
|
||||
#if defined(ALLOW_ADBD_ROOT)
|
||||
char value[PROPERTY_VALUE_MAX];
|
||||
|
||||
// The emulator is never secure, so don't drop privileges there.
|
||||
// TODO: this seems like a bug --- shouldn't the emulator behave like a device?
|
||||
property_get("ro.kernel.qemu", value, "");
|
||||
if (strcmp(value, "1") == 0) {
|
||||
return false;
|
||||
}
|
||||
|
||||
property_get("ro.secure", value, "1");
|
||||
bool ro_secure = (strcmp(value, "1") == 0);
|
||||
|
||||
// Drop privileges if ro.secure is set...
|
||||
bool drop = ro_secure;
|
||||
|
||||
property_get("ro.debuggable", value, "");
|
||||
bool ro_debuggable = (strcmp(value, "1") == 0);
|
||||
property_get("service.adb.root", value, "");
|
||||
bool adb_root = (strcmp(value, "1") == 0);
|
||||
bool adb_unroot = (strcmp(value, "0") == 0);
|
||||
|
||||
// ...except "adb root" lets you keep privileges in a debuggable build.
|
||||
if (ro_debuggable && adb_root) {
|
||||
drop = false;
|
||||
}
|
||||
|
||||
// ...and "adb unroot" lets you explicitly drop privileges.
|
||||
if (adb_unroot) {
|
||||
drop = true;
|
||||
}
|
||||
|
||||
return drop;
|
||||
#else
|
||||
return true; // "adb root" not allowed, always drop privileges.
|
||||
#endif /* ALLOW_ADBD_ROOT */
|
||||
}
|
||||
#endif /* !ADB_HOST */
|
||||
|
||||
int adb_main(int is_daemon, int server_port)
|
||||
{
|
||||
#if !ADB_HOST
|
||||
int port;
|
||||
char value[PROPERTY_VALUE_MAX];
|
||||
|
||||
umask(000);
|
||||
#endif
|
||||
|
||||
atexit(adb_cleanup);
|
||||
#if defined(_WIN32)
|
||||
SetConsoleCtrlHandler( ctrlc_handler, TRUE );
|
||||
#else
|
||||
// No SIGCHLD. Let the service subproc handle its children.
|
||||
signal(SIGPIPE, SIG_IGN);
|
||||
#endif
|
||||
|
||||
init_transport_registration();
|
||||
|
||||
#if ADB_HOST
|
||||
HOST = 1;
|
||||
|
||||
#ifdef WORKAROUND_BUG6558362
|
||||
if(is_daemon) adb_set_affinity();
|
||||
#endif
|
||||
usb_init();
|
||||
local_init(DEFAULT_ADB_LOCAL_TRANSPORT_PORT);
|
||||
adb_auth_init();
|
||||
|
||||
char local_name[30];
|
||||
build_local_name(local_name, sizeof(local_name), server_port);
|
||||
if(install_listener(local_name, "*smartsocket*", NULL, 0)) {
|
||||
exit(1);
|
||||
}
|
||||
#else
|
||||
property_get("ro.adb.secure", value, "0");
|
||||
auth_enabled = !strcmp(value, "1");
|
||||
if (auth_enabled)
|
||||
adb_auth_init();
|
||||
|
||||
// Our external storage path may be different than apps, since
|
||||
// we aren't able to bind mount after dropping root.
|
||||
const char* adb_external_storage = getenv("ADB_EXTERNAL_STORAGE");
|
||||
if (NULL != adb_external_storage) {
|
||||
setenv("EXTERNAL_STORAGE", adb_external_storage, 1);
|
||||
} else {
|
||||
D("Warning: ADB_EXTERNAL_STORAGE is not set. Leaving EXTERNAL_STORAGE"
|
||||
" unchanged.\n");
|
||||
}
|
||||
|
||||
/* add extra groups:
|
||||
** AID_ADB to access the USB driver
|
||||
** AID_LOG to read system logs (adb logcat)
|
||||
** AID_INPUT to diagnose input issues (getevent)
|
||||
** AID_INET to diagnose network issues (ping)
|
||||
** AID_NET_BT and AID_NET_BT_ADMIN to diagnose bluetooth (hcidump)
|
||||
** AID_SDCARD_R to allow reading from the SD card
|
||||
** AID_SDCARD_RW to allow writing to the SD card
|
||||
** AID_NET_BW_STATS to read out qtaguid statistics
|
||||
*/
|
||||
gid_t groups[] = { AID_ADB, AID_LOG, AID_INPUT, AID_INET, AID_NET_BT,
|
||||
AID_NET_BT_ADMIN, AID_SDCARD_R, AID_SDCARD_RW,
|
||||
AID_NET_BW_STATS };
|
||||
if (setgroups(sizeof(groups)/sizeof(groups[0]), groups) != 0) {
|
||||
exit(1);
|
||||
}
|
||||
|
||||
/* don't listen on a port (default 5037) if running in secure mode */
|
||||
/* don't run as root if we are running in secure mode */
|
||||
if (should_drop_privileges()) {
|
||||
drop_capabilities_bounding_set_if_needed();
|
||||
|
||||
/* then switch user and group to "shell" */
|
||||
if (setgid(AID_SHELL) != 0) {
|
||||
exit(1);
|
||||
}
|
||||
if (setuid(AID_SHELL) != 0) {
|
||||
exit(1);
|
||||
}
|
||||
|
||||
D("Local port disabled\n");
|
||||
} else {
|
||||
char local_name[30];
|
||||
if ((root_seclabel != NULL) && (is_selinux_enabled() > 0)) {
|
||||
// b/12587913: fix setcon to allow const pointers
|
||||
if (setcon((char *)root_seclabel) < 0) {
|
||||
exit(1);
|
||||
}
|
||||
}
|
||||
build_local_name(local_name, sizeof(local_name), server_port);
|
||||
if(install_listener(local_name, "*smartsocket*", NULL, 0)) {
|
||||
exit(1);
|
||||
}
|
||||
}
|
||||
|
||||
int usb = 0;
|
||||
if (access(USB_ADB_PATH, F_OK) == 0 || access(USB_FFS_ADB_EP0, F_OK) == 0) {
|
||||
// listen on USB
|
||||
usb_init();
|
||||
usb = 1;
|
||||
}
|
||||
|
||||
// If one of these properties is set, also listen on that port
|
||||
// If one of the properties isn't set and we couldn't listen on usb,
|
||||
// listen on the default port.
|
||||
property_get("service.adb.tcp.port", value, "");
|
||||
if (!value[0]) {
|
||||
property_get("persist.adb.tcp.port", value, "");
|
||||
}
|
||||
if (sscanf(value, "%d", &port) == 1 && port > 0) {
|
||||
printf("using port=%d\n", port);
|
||||
// listen on TCP port specified by service.adb.tcp.port property
|
||||
local_init(port);
|
||||
} else if (!usb) {
|
||||
// listen on default port
|
||||
local_init(DEFAULT_ADB_LOCAL_TRANSPORT_PORT);
|
||||
}
|
||||
|
||||
D("adb_main(): pre init_jdwp()\n");
|
||||
init_jdwp();
|
||||
D("adb_main(): post init_jdwp()\n");
|
||||
#endif
|
||||
|
||||
if (is_daemon)
|
||||
{
|
||||
// inform our parent that we are up and running.
|
||||
#if defined(_WIN32)
|
||||
DWORD count;
|
||||
WriteFile( GetStdHandle( STD_OUTPUT_HANDLE ), "OK\n", 3, &count, NULL );
|
||||
#else
|
||||
fprintf(stderr, "OK\n");
|
||||
#endif
|
||||
start_logging();
|
||||
}
|
||||
D("Event loop starting\n");
|
||||
|
||||
fdevent_loop();
|
||||
|
||||
usb_cleanup();
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
// Try to handle a network forwarding request.
|
||||
// This returns 1 on success, 0 on failure, and -1 to indicate this is not
|
||||
// a forwarding-related request.
|
||||
|
@ -1294,42 +955,3 @@ int handle_host_request(char *service, transport_type ttype, char* serial, int r
|
|||
return ret - 1;
|
||||
return -1;
|
||||
}
|
||||
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
#if ADB_HOST
|
||||
adb_sysdeps_init();
|
||||
adb_trace_init();
|
||||
D("Handling commandline()\n");
|
||||
return adb_commandline(argc - 1, argv + 1);
|
||||
#else
|
||||
/* If adbd runs inside the emulator this will enable adb tracing via
|
||||
* adb-debug qemud service in the emulator. */
|
||||
adb_qemu_trace_init();
|
||||
while(1) {
|
||||
int c;
|
||||
int option_index = 0;
|
||||
static struct option opts[] = {
|
||||
{"root_seclabel", required_argument, 0, 's' },
|
||||
{"device_banner", required_argument, 0, 'b' }
|
||||
};
|
||||
c = getopt_long(argc, argv, "", opts, &option_index);
|
||||
if (c == -1)
|
||||
break;
|
||||
switch (c) {
|
||||
case 's':
|
||||
root_seclabel = optarg;
|
||||
break;
|
||||
case 'b':
|
||||
adb_device_banner = optarg;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
start_device_log();
|
||||
D("Handling main()\n");
|
||||
return adb_main(0, DEFAULT_ADB_PORT);
|
||||
#endif
|
||||
}
|
||||
|
|
|
@ -400,6 +400,7 @@ int connection_state(atransport *t);
|
|||
#define CS_SIDELOAD 6
|
||||
#define CS_UNAUTHORIZED 7
|
||||
|
||||
extern const char *adb_device_banner;
|
||||
extern int HOST;
|
||||
extern int SHELL_EXIT_NOTIFY_FD;
|
||||
|
||||
|
|
|
@ -26,6 +26,8 @@
|
|||
#include "adb_auth.h"
|
||||
#include "sysdeps.h"
|
||||
|
||||
int auth_enabled = 0;
|
||||
|
||||
void send_auth_request(atransport *t)
|
||||
{
|
||||
D("Calling send_auth_request\n");
|
||||
|
|
|
@ -21,6 +21,8 @@
|
|||
extern "C" {
|
||||
#endif
|
||||
|
||||
extern int auth_enabled;
|
||||
|
||||
void adb_auth_init(void);
|
||||
int adb_auth_keygen(const char* filename);
|
||||
void adb_auth_verified(atransport *t);
|
||||
|
|
407
adb/adb_main.c
Normal file
407
adb/adb_main.c
Normal file
|
@ -0,0 +1,407 @@
|
|||
/*
|
||||
* Copyright (C) 2015 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
#define TRACE_TAG TRACE_ADB
|
||||
|
||||
#include <errno.h>
|
||||
#include <signal.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <sys/prctl.h>
|
||||
|
||||
#include "adb.h"
|
||||
#include "adb_auth.h"
|
||||
#include "adb_listeners.h"
|
||||
#include "sysdeps.h"
|
||||
|
||||
#if !ADB_HOST
|
||||
#include <getopt.h>
|
||||
|
||||
#include "cutils/properties.h"
|
||||
#include "private/android_filesystem_config.h"
|
||||
#include "selinux/selinux.h"
|
||||
|
||||
#include "qemu_tracing.h"
|
||||
#endif
|
||||
|
||||
static void adb_cleanup(void)
|
||||
{
|
||||
usb_cleanup();
|
||||
}
|
||||
|
||||
#if ADB_HOST
|
||||
#ifdef WORKAROUND_BUG6558362
|
||||
#include <sched.h>
|
||||
#define AFFINITY_ENVVAR "ADB_CPU_AFFINITY_BUG6558362"
|
||||
void adb_set_affinity(void)
|
||||
{
|
||||
cpu_set_t cpu_set;
|
||||
const char* cpunum_str = getenv(AFFINITY_ENVVAR);
|
||||
char* strtol_res;
|
||||
int cpu_num;
|
||||
|
||||
if (!cpunum_str || !*cpunum_str)
|
||||
return;
|
||||
cpu_num = strtol(cpunum_str, &strtol_res, 0);
|
||||
if (*strtol_res != '\0')
|
||||
fatal("bad number (%s) in env var %s. Expecting 0..n.\n", cpunum_str, AFFINITY_ENVVAR);
|
||||
|
||||
sched_getaffinity(0, sizeof(cpu_set), &cpu_set);
|
||||
D("orig cpu_set[0]=0x%08lx\n", cpu_set.__bits[0]);
|
||||
CPU_ZERO(&cpu_set);
|
||||
CPU_SET(cpu_num, &cpu_set);
|
||||
sched_setaffinity(0, sizeof(cpu_set), &cpu_set);
|
||||
sched_getaffinity(0, sizeof(cpu_set), &cpu_set);
|
||||
D("new cpu_set[0]=0x%08lx\n", cpu_set.__bits[0]);
|
||||
}
|
||||
#endif
|
||||
#else /* ADB_HOST */
|
||||
static const char *root_seclabel = NULL;
|
||||
|
||||
static void drop_capabilities_bounding_set_if_needed() {
|
||||
#ifdef ALLOW_ADBD_ROOT
|
||||
char value[PROPERTY_VALUE_MAX];
|
||||
property_get("ro.debuggable", value, "");
|
||||
if (strcmp(value, "1") == 0) {
|
||||
return;
|
||||
}
|
||||
#endif
|
||||
int i;
|
||||
for (i = 0; prctl(PR_CAPBSET_READ, i, 0, 0, 0) >= 0; i++) {
|
||||
if (i == CAP_SETUID || i == CAP_SETGID) {
|
||||
// CAP_SETUID CAP_SETGID needed by /system/bin/run-as
|
||||
continue;
|
||||
}
|
||||
int err = prctl(PR_CAPBSET_DROP, i, 0, 0, 0);
|
||||
|
||||
// Some kernels don't have file capabilities compiled in, and
|
||||
// prctl(PR_CAPBSET_DROP) returns EINVAL. Don't automatically
|
||||
// die when we see such misconfigured kernels.
|
||||
if ((err < 0) && (errno != EINVAL)) {
|
||||
exit(1);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static bool should_drop_privileges() {
|
||||
#if defined(ALLOW_ADBD_ROOT)
|
||||
char value[PROPERTY_VALUE_MAX];
|
||||
|
||||
// The emulator is never secure, so don't drop privileges there.
|
||||
// TODO: this seems like a bug --- shouldn't the emulator behave like a device?
|
||||
property_get("ro.kernel.qemu", value, "");
|
||||
if (strcmp(value, "1") == 0) {
|
||||
return false;
|
||||
}
|
||||
|
||||
property_get("ro.secure", value, "1");
|
||||
bool ro_secure = (strcmp(value, "1") == 0);
|
||||
|
||||
// Drop privileges if ro.secure is set...
|
||||
bool drop = ro_secure;
|
||||
|
||||
property_get("ro.debuggable", value, "");
|
||||
bool ro_debuggable = (strcmp(value, "1") == 0);
|
||||
property_get("service.adb.root", value, "");
|
||||
bool adb_root = (strcmp(value, "1") == 0);
|
||||
bool adb_unroot = (strcmp(value, "0") == 0);
|
||||
|
||||
// ...except "adb root" lets you keep privileges in a debuggable build.
|
||||
if (ro_debuggable && adb_root) {
|
||||
drop = false;
|
||||
}
|
||||
|
||||
// ...and "adb unroot" lets you explicitly drop privileges.
|
||||
if (adb_unroot) {
|
||||
drop = true;
|
||||
}
|
||||
|
||||
return drop;
|
||||
#else
|
||||
return true; // "adb root" not allowed, always drop privileges.
|
||||
#endif /* ALLOW_ADBD_ROOT */
|
||||
}
|
||||
|
||||
void start_device_log(void)
|
||||
{
|
||||
int fd;
|
||||
char path[PATH_MAX];
|
||||
struct tm now;
|
||||
time_t t;
|
||||
char value[PROPERTY_VALUE_MAX];
|
||||
|
||||
// read the trace mask from persistent property persist.adb.trace_mask
|
||||
// give up if the property is not set or cannot be parsed
|
||||
property_get("persist.adb.trace_mask", value, "");
|
||||
if (sscanf(value, "%x", &adb_trace_mask) != 1)
|
||||
return;
|
||||
|
||||
adb_mkdir("/data/adb", 0775);
|
||||
tzset();
|
||||
time(&t);
|
||||
localtime_r(&t, &now);
|
||||
strftime(path, sizeof(path),
|
||||
"/data/adb/adb-%Y-%m-%d-%H-%M-%S.txt",
|
||||
&now);
|
||||
fd = unix_open(path, O_WRONLY | O_CREAT | O_TRUNC, 0640);
|
||||
if (fd < 0)
|
||||
return;
|
||||
|
||||
// redirect stdout and stderr to the log file
|
||||
dup2(fd, 1);
|
||||
dup2(fd, 2);
|
||||
fprintf(stderr,"--- adb starting (pid %d) ---\n", getpid());
|
||||
adb_close(fd);
|
||||
|
||||
fd = unix_open("/dev/null", O_RDONLY);
|
||||
dup2(fd, 0);
|
||||
adb_close(fd);
|
||||
}
|
||||
#endif /* ADB_HOST */
|
||||
|
||||
/* Constructs a local name of form tcp:port.
|
||||
* target_str points to the target string, it's content will be overwritten.
|
||||
* target_size is the capacity of the target string.
|
||||
* server_port is the port number to use for the local name.
|
||||
*/
|
||||
void build_local_name(char* target_str, size_t target_size, int server_port)
|
||||
{
|
||||
snprintf(target_str, target_size, "tcp:%d", server_port);
|
||||
}
|
||||
|
||||
void start_logging(void)
|
||||
{
|
||||
#if defined(_WIN32)
|
||||
char temp[ MAX_PATH ];
|
||||
FILE* fnul;
|
||||
FILE* flog;
|
||||
|
||||
GetTempPath( sizeof(temp) - 8, temp );
|
||||
strcat( temp, "adb.log" );
|
||||
|
||||
/* Win32 specific redirections */
|
||||
fnul = fopen( "NUL", "rt" );
|
||||
if (fnul != NULL)
|
||||
stdin[0] = fnul[0];
|
||||
|
||||
flog = fopen( temp, "at" );
|
||||
if (flog == NULL)
|
||||
flog = fnul;
|
||||
|
||||
setvbuf( flog, NULL, _IONBF, 0 );
|
||||
|
||||
stdout[0] = flog[0];
|
||||
stderr[0] = flog[0];
|
||||
fprintf(stderr,"--- adb starting (pid %d) ---\n", getpid());
|
||||
#else
|
||||
int fd;
|
||||
|
||||
fd = unix_open("/dev/null", O_RDONLY);
|
||||
dup2(fd, 0);
|
||||
adb_close(fd);
|
||||
|
||||
fd = unix_open("/tmp/adb.log", O_WRONLY | O_CREAT | O_APPEND, 0640);
|
||||
if(fd < 0) {
|
||||
fd = unix_open("/dev/null", O_WRONLY);
|
||||
}
|
||||
dup2(fd, 1);
|
||||
dup2(fd, 2);
|
||||
adb_close(fd);
|
||||
fprintf(stderr,"--- adb starting (pid %d) ---\n", getpid());
|
||||
#endif
|
||||
}
|
||||
|
||||
int adb_main(int is_daemon, int server_port)
|
||||
{
|
||||
#if !ADB_HOST
|
||||
int port;
|
||||
char value[PROPERTY_VALUE_MAX];
|
||||
|
||||
umask(000);
|
||||
#endif
|
||||
|
||||
atexit(adb_cleanup);
|
||||
#if defined(_WIN32)
|
||||
SetConsoleCtrlHandler( ctrlc_handler, TRUE );
|
||||
#else
|
||||
// No SIGCHLD. Let the service subproc handle its children.
|
||||
signal(SIGPIPE, SIG_IGN);
|
||||
#endif
|
||||
|
||||
init_transport_registration();
|
||||
|
||||
#if ADB_HOST
|
||||
HOST = 1;
|
||||
|
||||
#ifdef WORKAROUND_BUG6558362
|
||||
if(is_daemon) adb_set_affinity();
|
||||
#endif
|
||||
usb_init();
|
||||
local_init(DEFAULT_ADB_LOCAL_TRANSPORT_PORT);
|
||||
adb_auth_init();
|
||||
|
||||
char local_name[30];
|
||||
build_local_name(local_name, sizeof(local_name), server_port);
|
||||
if(install_listener(local_name, "*smartsocket*", NULL, 0)) {
|
||||
exit(1);
|
||||
}
|
||||
#else
|
||||
property_get("ro.adb.secure", value, "0");
|
||||
auth_enabled = !strcmp(value, "1");
|
||||
if (auth_enabled)
|
||||
adb_auth_init();
|
||||
|
||||
// Our external storage path may be different than apps, since
|
||||
// we aren't able to bind mount after dropping root.
|
||||
const char* adb_external_storage = getenv("ADB_EXTERNAL_STORAGE");
|
||||
if (NULL != adb_external_storage) {
|
||||
setenv("EXTERNAL_STORAGE", adb_external_storage, 1);
|
||||
} else {
|
||||
D("Warning: ADB_EXTERNAL_STORAGE is not set. Leaving EXTERNAL_STORAGE"
|
||||
" unchanged.\n");
|
||||
}
|
||||
|
||||
/* add extra groups:
|
||||
** AID_ADB to access the USB driver
|
||||
** AID_LOG to read system logs (adb logcat)
|
||||
** AID_INPUT to diagnose input issues (getevent)
|
||||
** AID_INET to diagnose network issues (ping)
|
||||
** AID_NET_BT and AID_NET_BT_ADMIN to diagnose bluetooth (hcidump)
|
||||
** AID_SDCARD_R to allow reading from the SD card
|
||||
** AID_SDCARD_RW to allow writing to the SD card
|
||||
** AID_NET_BW_STATS to read out qtaguid statistics
|
||||
*/
|
||||
gid_t groups[] = { AID_ADB, AID_LOG, AID_INPUT, AID_INET, AID_NET_BT,
|
||||
AID_NET_BT_ADMIN, AID_SDCARD_R, AID_SDCARD_RW,
|
||||
AID_NET_BW_STATS };
|
||||
if (setgroups(sizeof(groups)/sizeof(groups[0]), groups) != 0) {
|
||||
exit(1);
|
||||
}
|
||||
|
||||
/* don't listen on a port (default 5037) if running in secure mode */
|
||||
/* don't run as root if we are running in secure mode */
|
||||
if (should_drop_privileges()) {
|
||||
drop_capabilities_bounding_set_if_needed();
|
||||
|
||||
/* then switch user and group to "shell" */
|
||||
if (setgid(AID_SHELL) != 0) {
|
||||
exit(1);
|
||||
}
|
||||
if (setuid(AID_SHELL) != 0) {
|
||||
exit(1);
|
||||
}
|
||||
|
||||
D("Local port disabled\n");
|
||||
} else {
|
||||
char local_name[30];
|
||||
if ((root_seclabel != NULL) && (is_selinux_enabled() > 0)) {
|
||||
// b/12587913: fix setcon to allow const pointers
|
||||
if (setcon((char *)root_seclabel) < 0) {
|
||||
exit(1);
|
||||
}
|
||||
}
|
||||
build_local_name(local_name, sizeof(local_name), server_port);
|
||||
if(install_listener(local_name, "*smartsocket*", NULL, 0)) {
|
||||
exit(1);
|
||||
}
|
||||
}
|
||||
|
||||
int usb = 0;
|
||||
if (access(USB_ADB_PATH, F_OK) == 0 || access(USB_FFS_ADB_EP0, F_OK) == 0) {
|
||||
// listen on USB
|
||||
usb_init();
|
||||
usb = 1;
|
||||
}
|
||||
|
||||
// If one of these properties is set, also listen on that port
|
||||
// If one of the properties isn't set and we couldn't listen on usb,
|
||||
// listen on the default port.
|
||||
property_get("service.adb.tcp.port", value, "");
|
||||
if (!value[0]) {
|
||||
property_get("persist.adb.tcp.port", value, "");
|
||||
}
|
||||
if (sscanf(value, "%d", &port) == 1 && port > 0) {
|
||||
printf("using port=%d\n", port);
|
||||
// listen on TCP port specified by service.adb.tcp.port property
|
||||
local_init(port);
|
||||
} else if (!usb) {
|
||||
// listen on default port
|
||||
local_init(DEFAULT_ADB_LOCAL_TRANSPORT_PORT);
|
||||
}
|
||||
|
||||
D("adb_main(): pre init_jdwp()\n");
|
||||
init_jdwp();
|
||||
D("adb_main(): post init_jdwp()\n");
|
||||
#endif
|
||||
|
||||
if (is_daemon)
|
||||
{
|
||||
// inform our parent that we are up and running.
|
||||
#if defined(_WIN32)
|
||||
DWORD count;
|
||||
WriteFile( GetStdHandle( STD_OUTPUT_HANDLE ), "OK\n", 3, &count, NULL );
|
||||
#else
|
||||
fprintf(stderr, "OK\n");
|
||||
#endif
|
||||
start_logging();
|
||||
}
|
||||
D("Event loop starting\n");
|
||||
|
||||
fdevent_loop();
|
||||
|
||||
usb_cleanup();
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
#if ADB_HOST
|
||||
adb_sysdeps_init();
|
||||
adb_trace_init();
|
||||
D("Handling commandline()\n");
|
||||
return adb_commandline(argc - 1, argv + 1);
|
||||
#else
|
||||
/* If adbd runs inside the emulator this will enable adb tracing via
|
||||
* adb-debug qemud service in the emulator. */
|
||||
adb_qemu_trace_init();
|
||||
while(1) {
|
||||
int c;
|
||||
int option_index = 0;
|
||||
static struct option opts[] = {
|
||||
{"root_seclabel", required_argument, 0, 's' },
|
||||
{"device_banner", required_argument, 0, 'b' }
|
||||
};
|
||||
c = getopt_long(argc, argv, "", opts, &option_index);
|
||||
if (c == -1)
|
||||
break;
|
||||
switch (c) {
|
||||
case 's':
|
||||
root_seclabel = optarg;
|
||||
break;
|
||||
case 'b':
|
||||
adb_device_banner = optarg;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
start_device_log();
|
||||
D("Handling main()\n");
|
||||
return adb_main(0, DEFAULT_ADB_PORT);
|
||||
#endif
|
||||
}
|
Loading…
Reference in a new issue