Run executables directly (#645)
- Apps can be launched directly from file paths (including Files app support) - Added executable detection to identify unsupported or invalid binaries before launch. - App startup is now streamlined through separate registered-app and direct-execution interfaces. - Existing app launch points were migrated to the updated startup APIs.
This commit is contained in:
committed by
GitHub
parent
643cbc3806
commit
a0b2ee7ebc
@@ -1,4 +1,5 @@
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
#include <app/elf_check.h>
|
||||
#include <app/loader.h>
|
||||
#include <app/location.h>
|
||||
|
||||
@@ -27,6 +28,36 @@ bool is_regular_file(const std::string& path) {
|
||||
return ::stat(path.c_str(), &path_stat) == 0 && S_ISREG(path_stat.st_mode);
|
||||
}
|
||||
|
||||
#ifndef __APPLE__
|
||||
constexpr ElfRequirements EXECUTABLE_REQUIREMENTS = {
|
||||
.elf_class = ELF_CLASS_64,
|
||||
.data = ELF_DATA_2LSB,
|
||||
.type = ELF_TYPE_DYN,
|
||||
#if defined(__x86_64__)
|
||||
.machine = ELF_MACHINE_X86_64,
|
||||
#elif defined(__aarch64__)
|
||||
.machine = ELF_MACHINE_AARCH64,
|
||||
#else
|
||||
#error "Unsupported POSIX architecture for ELF machine check"
|
||||
#endif
|
||||
};
|
||||
#endif
|
||||
|
||||
// Validates an already-resolved binary path (see resolve_app_path()) before it's handed to
|
||||
// dlopen(): the extension check is a cheap string comparison, so the file is only opened as a
|
||||
// last resort.
|
||||
bool is_executable_file(const std::string& resolved_path) {
|
||||
if (!resolved_path.ends_with(".so")) {
|
||||
return false;
|
||||
}
|
||||
#ifdef __APPLE__
|
||||
// The simulator's app binaries are Mach-O on macOS, not ELF, so there is no header to check.
|
||||
return is_regular_file(resolved_path);
|
||||
#else
|
||||
return elf_check_file(resolved_path.c_str(), &EXECUTABLE_REQUIREMENTS);
|
||||
#endif
|
||||
}
|
||||
|
||||
// location.location can be either an app's install directory or the .so file directly; the
|
||||
// former resolves to the per-architecture binary at {dir}/elf/posix-{TACTILITY_POSIX_ARCH}.so,
|
||||
// mirroring app_esp32_loader_service.cpp's resolve_elf_path().
|
||||
@@ -56,6 +87,11 @@ error_t api_load(AppLocation location, AppRuntime* out_runtime) {
|
||||
return error;
|
||||
}
|
||||
|
||||
if (!is_executable_file(app_path)) {
|
||||
LOG_E(TAG, "Not executable: %s", app_path.c_str());
|
||||
return ERROR_NOT_ALLOWED;
|
||||
}
|
||||
|
||||
LOG_I(TAG, "Loading %s", app_path.c_str());
|
||||
|
||||
// RTLD_NOW: a missing symbol fails here, not mid-run(). RTLD_LOCAL: this app's own exported
|
||||
@@ -100,10 +136,24 @@ void api_unload(AppRuntime runtime_ptr) {
|
||||
delete runtime;
|
||||
}
|
||||
|
||||
bool api_is_executable(AppLocation location) {
|
||||
if (location.type != APP_LOCATION_PATH) {
|
||||
return false;
|
||||
}
|
||||
|
||||
std::string app_path;
|
||||
if (resolve_app_path(static_cast<const char*>(location.location), app_path) != ERROR_NONE) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return is_executable_file(app_path);
|
||||
}
|
||||
|
||||
AppLoaderApi loader_api = {
|
||||
.load = api_load,
|
||||
.run = api_run,
|
||||
.unload = api_unload,
|
||||
.is_executable = api_is_executable,
|
||||
};
|
||||
|
||||
void* create_service(const ServiceManifest*) {
|
||||
|
||||
Reference in New Issue
Block a user