mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-20 09:03:28 +00:00
commit
c904b47f82
12 changed files with 530 additions and 298 deletions
|
|
@ -187,7 +187,7 @@ path = "./svd2utra"
|
||||||
# path = "./api/xous-api-names"
|
# path = "./api/xous-api-names"
|
||||||
# [patch.crates-io.xous-api-susres]
|
# [patch.crates-io.xous-api-susres]
|
||||||
# path = "./api/xous-api-susres"
|
# path = "./api/xous-api-susres"
|
||||||
[patch.crates-io.xous-api-log]
|
# [patch.crates-io.xous-api-log]
|
||||||
path = "./api/xous-api-log"
|
# path = "./api/xous-api-log"
|
||||||
# [patch.crates-io.xous-api-ticktimer]
|
# [patch.crates-io.xous-api-ticktimer]
|
||||||
# path = "./api/xous-api-ticktimer"
|
# path = "./api/xous-api-ticktimer"
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,7 @@ Note that at the moment you can only load apps once each time the device runs si
|
||||||
|
|
||||||
First, add the app loader to your device's image as you would with any other app:
|
First, add the app loader to your device's image as you would with any other app:
|
||||||
```
|
```
|
||||||
$ cargo xtask app-image-xip --app app-loader
|
$ cargo xtask app-image-xip --app app-loader --feature unsafe-app-loading
|
||||||
$ sudo python3 tools/usb_update.py -k target/riscv32imac-unknown-xous-elf/release/xous.img -l target/riscv32imac-unknown-xous-elf/release/loader.bin
|
$ sudo python3 tools/usb_update.py -k target/riscv32imac-unknown-xous-elf/release/xous.img -l target/riscv32imac-unknown-xous-elf/release/loader.bin
|
||||||
```
|
```
|
||||||
Then, compile the apps you would like on your device and start the app server. For example, if you would like to serve the apps `hello`, `ball`, and `vault` on port 8000, run:
|
Then, compile the apps you would like on your device and start the app server. For example, if you would like to serve the apps `hello`, `ball`, and `vault` on port 8000, run:
|
||||||
|
|
|
||||||
|
|
@ -20,7 +20,7 @@ impl From<xous::MessageId> for StartupCommand {
|
||||||
#[panic_handler]
|
#[panic_handler]
|
||||||
fn handle_panic(arg: &core::panic::PanicInfo) -> ! {
|
fn handle_panic(arg: &core::panic::PanicInfo) -> ! {
|
||||||
log::info!("{arg}");
|
log::info!("{arg}");
|
||||||
loop {}
|
xous::terminate_process(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
#[no_mangle]
|
#[no_mangle]
|
||||||
|
|
@ -33,13 +33,22 @@ pub extern "C" fn init(server1: u32, server2: u32, server3: u32, server4: u32) -
|
||||||
None,
|
None,
|
||||||
core::num::NonZeroUsize::new(0x40000000),
|
core::num::NonZeroUsize::new(0x40000000),
|
||||||
0x1000,
|
0x1000,
|
||||||
xous::MemoryFlags::R | xous::MemoryFlags::W
|
xous::MemoryFlags::R | xous::MemoryFlags::W,
|
||||||
).unwrap();
|
)
|
||||||
|
.unwrap();
|
||||||
let connection = core::sync::atomic::AtomicU32::new(0);
|
let connection = core::sync::atomic::AtomicU32::new(0);
|
||||||
let slice = unsafe { core::slice::from_raw_parts(&connection as *const _ as *const u8, core::mem::size_of::<core::sync::atomic::AtomicU32>()) };
|
let slice = unsafe {
|
||||||
|
core::slice::from_raw_parts(
|
||||||
|
&connection as *const _ as *const u8,
|
||||||
|
core::mem::size_of::<core::sync::atomic::AtomicU32>(),
|
||||||
|
)
|
||||||
|
};
|
||||||
|
// safety: memory is freshly allocated by map_memory, should be aligned and init'd to 0
|
||||||
|
unsafe {
|
||||||
for (dest, src) in memory.as_slice_mut::<u8>().iter_mut().skip(8).zip(slice) {
|
for (dest, src) in memory.as_slice_mut::<u8>().iter_mut().skip(8).zip(slice) {
|
||||||
*dest = *src;
|
*dest = *src;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
// everything should drop now
|
// everything should drop now
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -57,7 +66,7 @@ pub extern "C" fn init(server1: u32, server2: u32, server3: u32, server4: u32) -
|
||||||
// destroy the server
|
// destroy the server
|
||||||
xous::destroy_server(server).expect("Couldn't destroy spawn server");
|
xous::destroy_server(server).expect("Couldn't destroy spawn server");
|
||||||
jump(entry_point);
|
jump(entry_point);
|
||||||
},
|
}
|
||||||
StartupCommand::PingResponse => ping_response(envelope),
|
StartupCommand::PingResponse => ping_response(envelope),
|
||||||
_ => panic!("Unsupported"),
|
_ => panic!("Unsupported"),
|
||||||
}
|
}
|
||||||
|
|
@ -80,7 +89,8 @@ fn read_elf(memory: Option<&mut xous::MemoryMessage>) -> usize {
|
||||||
};
|
};
|
||||||
|
|
||||||
// get the elf binary from the message
|
// get the elf binary from the message
|
||||||
let mut bin = memory.buf.as_slice::<u8>();
|
// safety: buf should be aligned and correctly sized inside the MemoryMessage
|
||||||
|
let mut bin = unsafe {memory.buf.as_slice::<u8>()};
|
||||||
|
|
||||||
// go to the beginning of the ELF file using the provided offset
|
// go to the beginning of the ELF file using the provided offset
|
||||||
bin = &bin[memory.offset.and_then(|n| Some(n.get())).unwrap_or(0)..];
|
bin = &bin[memory.offset.and_then(|n| Some(n.get())).unwrap_or(0)..];
|
||||||
|
|
@ -97,10 +107,10 @@ fn read_elf(memory: Option<&mut xous::MemoryMessage>) -> usize {
|
||||||
}
|
}
|
||||||
if size == 2 {
|
if size == 2 {
|
||||||
// assumes little endianness
|
// assumes little endianness
|
||||||
return u16::from_le_bytes(bin[start..start+size].try_into().unwrap()) as usize;
|
return u16::from_le_bytes(bin[start..start + size].try_into().unwrap()) as usize;
|
||||||
}
|
}
|
||||||
if size == 4 {
|
if size == 4 {
|
||||||
return u32::from_le_bytes(bin[start..start+size].try_into().unwrap()) as usize;
|
return u32::from_le_bytes(bin[start..start + size].try_into().unwrap()) as usize;
|
||||||
}
|
}
|
||||||
panic!("Tried to get usize of invalid size!");
|
panic!("Tried to get usize of invalid size!");
|
||||||
};
|
};
|
||||||
|
|
@ -116,38 +126,57 @@ fn read_elf(memory: Option<&mut xous::MemoryMessage>) -> usize {
|
||||||
let start = ph_start + i * ph_size;
|
let start = ph_start + i * ph_size;
|
||||||
// only load PT_LOAD segments
|
// only load PT_LOAD segments
|
||||||
if to_usize(start, 4) == 0x00000001 {
|
if to_usize(start, 4) == 0x00000001 {
|
||||||
let src_addr = to_usize(start+0x04, 4);
|
let src_addr = to_usize(start + 0x04, 4);
|
||||||
let vaddr = to_usize(start+0x08, 4);
|
let vaddr = to_usize(start + 0x08, 4);
|
||||||
let padding = if vaddr & 0xFFF == 0 { 0 } else { vaddr & 0xFFF };
|
let padding = if vaddr & 0xFFF == 0 { 0 } else { vaddr & 0xFFF };
|
||||||
let file_size = to_usize(start+0x10, 4);
|
let file_size = to_usize(start + 0x10, 4);
|
||||||
let mem_size = to_usize(start+0x14, 4);
|
let mem_size = to_usize(start + 0x14, 4);
|
||||||
let mem_size = mem_size + padding;
|
let mem_size = mem_size + padding;
|
||||||
let mem_size = mem_size + if mem_size & 0xFFF == 0 { 0 } else { 0x1000 - (mem_size & 0xFFF) };
|
let mem_size = mem_size
|
||||||
|
+ if mem_size & 0xFFF == 0 {
|
||||||
|
0
|
||||||
|
} else {
|
||||||
|
0x1000 - (mem_size & 0xFFF)
|
||||||
|
};
|
||||||
|
|
||||||
assert_eq!(0, mem_size & 0xFFF);
|
assert_eq!(0, mem_size & 0xFFF);
|
||||||
assert_eq!(0, (vaddr - padding) & 0xFFF);
|
assert_eq!(0, (vaddr - padding) & 0xFFF);
|
||||||
|
|
||||||
log::info!("Loading offset {} to virtual address {} with memory size {}", src_addr, vaddr, mem_size);
|
log::info!(
|
||||||
|
"Loading offset {} to virtual address {} with memory size {}",
|
||||||
|
src_addr,
|
||||||
|
vaddr,
|
||||||
|
mem_size
|
||||||
|
);
|
||||||
let mut target_memory = xous::map_memory(
|
let mut target_memory = xous::map_memory(
|
||||||
None,
|
None,
|
||||||
core::num::NonZeroUsize::new(vaddr-padding),
|
core::num::NonZeroUsize::new(vaddr - padding),
|
||||||
mem_size,
|
mem_size,
|
||||||
xous::MemoryFlags::R | xous::MemoryFlags::W | xous::MemoryFlags::X,
|
xous::MemoryFlags::R | xous::MemoryFlags::W | xous::MemoryFlags::X,
|
||||||
)
|
)
|
||||||
.unwrap();
|
.unwrap();
|
||||||
|
|
||||||
for (dest, src) in target_memory.as_slice_mut().iter_mut().skip(padding)
|
// TODO: rationalize why this is safe
|
||||||
.zip(bin[src_addr..core::cmp::min(max, src_addr+file_size)].iter())
|
unsafe {
|
||||||
|
for (dest, src) in target_memory
|
||||||
|
.as_slice_mut()
|
||||||
|
.iter_mut()
|
||||||
|
.skip(padding)
|
||||||
|
.zip(bin[src_addr..core::cmp::min(max, src_addr + file_size)].iter())
|
||||||
{
|
{
|
||||||
*dest = *src;
|
*dest = *src;
|
||||||
}
|
}
|
||||||
for dest in target_memory.as_slice_mut().iter_mut().skip(padding+file_size)
|
for dest in target_memory
|
||||||
.take(mem_size-file_size-padding)
|
.as_slice_mut()
|
||||||
|
.iter_mut()
|
||||||
|
.skip(padding + file_size)
|
||||||
|
.take(mem_size - file_size - padding)
|
||||||
{
|
{
|
||||||
*dest = 0;
|
*dest = 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
memory.offset = None;
|
memory.offset = None;
|
||||||
log::info!("Finished writing");
|
log::info!("Finished writing");
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,12 @@
|
||||||
use std::io::Read;
|
use crate::SERVER_NAME_APP_LOADER;
|
||||||
use gam::{Gam, MenuItem, UxRegistration, menu_matic, APP_NAME_APP_LOADER, APP_MENU_0_APP_LOADER, APP_MENU_1_APP_LOADER, MenuMatic, TextEntryPayload};
|
use gam::{
|
||||||
|
menu_matic, Gam, MenuItem, MenuMatic, TextEntryPayload, UxRegistration, APP_MENU_0_APP_LOADER,
|
||||||
|
APP_MENU_1_APP_LOADER, APP_NAME_APP_LOADER,
|
||||||
|
};
|
||||||
|
use locales::t;
|
||||||
use modals::Modals;
|
use modals::Modals;
|
||||||
use num_traits::ToPrimitive;
|
use num_traits::ToPrimitive;
|
||||||
use locales::t;
|
use std::io::Read;
|
||||||
use crate::SERVER_NAME_APP_LOADER;
|
|
||||||
|
|
||||||
pub(crate) struct AppLoader {
|
pub(crate) struct AppLoader {
|
||||||
gam: Gam,
|
gam: Gam,
|
||||||
|
|
@ -25,7 +28,8 @@ impl AppLoader {
|
||||||
let gam = Gam::new(xns).expect("can't connect to GAM");
|
let gam = Gam::new(xns).expect("can't connect to GAM");
|
||||||
|
|
||||||
// the gam token
|
// the gam token
|
||||||
let auth = gam.register_ux(UxRegistration {
|
let auth = gam
|
||||||
|
.register_ux(UxRegistration {
|
||||||
app_name: xous_ipc::String::from_str(APP_NAME_APP_LOADER),
|
app_name: xous_ipc::String::from_str(APP_NAME_APP_LOADER),
|
||||||
ux_type: gam::UxType::Modal,
|
ux_type: gam::UxType::Modal,
|
||||||
predictor: None,
|
predictor: None,
|
||||||
|
|
@ -34,92 +38,177 @@ impl AppLoader {
|
||||||
gotinput_id: None,
|
gotinput_id: None,
|
||||||
audioframe_id: None,
|
audioframe_id: None,
|
||||||
focuschange_id: None,
|
focuschange_id: None,
|
||||||
rawkeys_id: None
|
rawkeys_id: None,
|
||||||
}).expect("Couldn't register").expect("Didn't get an auth token");
|
})
|
||||||
|
.expect("Couldn't register")
|
||||||
|
.expect("Didn't get an auth token");
|
||||||
|
|
||||||
let modals = Modals::new(xns).expect("Couldn't get modals");
|
let modals = Modals::new(xns).expect("Couldn't get modals");
|
||||||
|
|
||||||
// a connection to the server
|
// a connection to the server
|
||||||
let conn = xns.request_connection_blocking(SERVER_NAME_APP_LOADER).expect("Couldn't connect to server");
|
let conn = xns
|
||||||
|
.request_connection_blocking(SERVER_NAME_APP_LOADER)
|
||||||
|
.expect("Couldn't connect to server");
|
||||||
|
|
||||||
// the ticktimer
|
// the ticktimer
|
||||||
let ticktimer = ticktimer_server::Ticktimer::new().expect("Couldn't connect to Ticktimer");
|
let ticktimer = ticktimer_server::Ticktimer::new().expect("Couldn't connect to Ticktimer");
|
||||||
|
|
||||||
// the menu
|
// the menu
|
||||||
let set_server_item = MenuItem{ name: xous_ipc::String::from_str(t!("apploader.menu.setserver", locales::LANG)),
|
let set_server_item = MenuItem {
|
||||||
|
name: xous_ipc::String::from_str(t!("apploader.menu.setserver", locales::LANG)),
|
||||||
action_conn: Some(conn),
|
action_conn: Some(conn),
|
||||||
action_opcode: Opcode::SetServer.to_u32().unwrap(),
|
action_opcode: Opcode::SetServer.to_u32().unwrap(),
|
||||||
action_payload: gam::MenuPayload::Scalar([0, 0, 0, 0]),
|
action_payload: gam::MenuPayload::Scalar([0, 0, 0, 0]),
|
||||||
close_on_select: true };
|
close_on_select: true,
|
||||||
let close_item = MenuItem{ name: xous_ipc::String::from_str(t!("apploader.close", locales::LANG)),
|
};
|
||||||
|
let close_item = MenuItem {
|
||||||
|
name: xous_ipc::String::from_str(t!("apploader.close", locales::LANG)),
|
||||||
action_conn: None,
|
action_conn: None,
|
||||||
action_opcode: 0,
|
action_opcode: 0,
|
||||||
action_payload: gam::MenuPayload::Scalar([0, 0, 0, 0]),
|
action_payload: gam::MenuPayload::Scalar([0, 0, 0, 0]),
|
||||||
close_on_select: true };
|
close_on_select: true,
|
||||||
let menu = menu_matic(vec![set_server_item, close_item.clone()], APP_MENU_0_APP_LOADER, Some(xous::create_server().unwrap())).expect("Couldn't create menu");
|
};
|
||||||
let load_menu = menu_matic(vec![close_item.clone()], APP_MENU_1_APP_LOADER, Some(xous::create_server().unwrap())).expect("Couldn't create menu");
|
let menu = menu_matic(
|
||||||
|
vec![set_server_item, close_item.clone()],
|
||||||
|
APP_MENU_0_APP_LOADER,
|
||||||
|
Some(xous::create_server().unwrap()),
|
||||||
|
)
|
||||||
|
.expect("Couldn't create menu");
|
||||||
|
let load_menu = menu_matic(
|
||||||
|
vec![close_item.clone()],
|
||||||
|
APP_MENU_1_APP_LOADER,
|
||||||
|
Some(xous::create_server().unwrap()),
|
||||||
|
)
|
||||||
|
.expect("Couldn't create menu");
|
||||||
|
|
||||||
AppLoader{ gam, modals, auth, conn, ticktimer, menu, load_menu, apps: Vec::new(), possible_apps: Vec::new(), server: None, current_menu: APP_MENU_0_APP_LOADER.to_string() }
|
AppLoader {
|
||||||
|
gam,
|
||||||
|
modals,
|
||||||
|
auth,
|
||||||
|
conn,
|
||||||
|
ticktimer,
|
||||||
|
menu,
|
||||||
|
load_menu,
|
||||||
|
apps: Vec::new(),
|
||||||
|
possible_apps: Vec::new(),
|
||||||
|
server: None,
|
||||||
|
current_menu: APP_MENU_0_APP_LOADER.to_string(),
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub(crate) fn add_app(&mut self, index: usize) {
|
pub(crate) fn add_app(&mut self, index: usize) {
|
||||||
let (name, menus) = self.possible_apps[index];
|
let (name, menus) = self.possible_apps[index];
|
||||||
|
|
||||||
self.modals.start_progress(t!("apploader.addapp.loading", locales::LANG), 0, 3, 0).expect("Couldn't set up progress bar");
|
self.modals
|
||||||
|
.start_progress(t!("apploader.addapp.loading", locales::LANG), 0, 3, 0)
|
||||||
|
.expect("Couldn't set up progress bar");
|
||||||
|
|
||||||
//////////////////////////
|
//////////////////////////
|
||||||
// The downloading part //
|
// The downloading part //
|
||||||
//////////////////////////
|
//////////////////////////
|
||||||
let response = match ureq::get(&format!("{}/{}", self.server.as_ref().expect("AddApp was somehow called without a server!"), name)).call() {
|
let response = match ureq::get(&format!(
|
||||||
|
"{}/{}",
|
||||||
|
self.server
|
||||||
|
.as_ref()
|
||||||
|
.expect("AddApp was somehow called without a server!"),
|
||||||
|
name
|
||||||
|
))
|
||||||
|
.call()
|
||||||
|
{
|
||||||
Ok(response) => response,
|
Ok(response) => response,
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
self.modals.show_notification(&format!("{}{}", t!("apploader.addapp.server_error", locales::LANG), e), None).expect("Couldn't show modal");
|
self.modals
|
||||||
|
.show_notification(
|
||||||
|
&format!(
|
||||||
|
"{}{}",
|
||||||
|
t!("apploader.addapp.server_error", locales::LANG),
|
||||||
|
e
|
||||||
|
),
|
||||||
|
None,
|
||||||
|
)
|
||||||
|
.expect("Couldn't show modal");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
let len = match response.header("Content-Length") {
|
let len = match response.header("Content-Length") {
|
||||||
Some(len) => len.parse::<usize>().expect("Couldn't parse Content-Length header"),
|
Some(len) => len
|
||||||
|
.parse::<usize>()
|
||||||
|
.expect("Couldn't parse Content-Length header"),
|
||||||
None => {
|
None => {
|
||||||
self.modals.show_notification(t!("apploader.addapp.content_length_error", locales::LANG), None).expect("Couldn't show modal");
|
self.modals
|
||||||
|
.show_notification(
|
||||||
|
t!("apploader.addapp.content_length_error", locales::LANG),
|
||||||
|
None,
|
||||||
|
)
|
||||||
|
.expect("Couldn't show modal");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
let mut memory = xous::map_memory(
|
||||||
|
None,
|
||||||
|
None,
|
||||||
|
len + if len & 0xFFF == 0 {
|
||||||
|
0
|
||||||
|
} else {
|
||||||
|
0x1000 - (len & 0xFFF)
|
||||||
|
},
|
||||||
|
xous::MemoryFlags::R | xous::MemoryFlags::W,
|
||||||
|
)
|
||||||
|
.expect("Couldn't map memory");
|
||||||
|
response
|
||||||
|
.into_reader()
|
||||||
|
.read_exact(&mut unsafe { memory.as_slice_mut() }[..len])
|
||||||
|
.expect("Couldn't read");
|
||||||
|
|
||||||
let mut memory = xous::map_memory(None, None, len + if len & 0xFFF == 0 { 0 } else { 0x1000 - (len & 0xFFF) }, xous::MemoryFlags::R | xous::MemoryFlags::W).expect("Couldn't map memory");
|
self.modals
|
||||||
response.into_reader().read_exact(&mut unsafe{ memory.as_slice_mut() }[..len]).expect("Couldn't read");
|
.update_progress(1)
|
||||||
|
.expect("Couldn't update progress");
|
||||||
self.modals.update_progress(1).expect("Couldn't update progress");
|
|
||||||
//////////////////////
|
//////////////////////
|
||||||
// The loading part //
|
// The loading part //
|
||||||
//////////////////////
|
//////////////////////
|
||||||
|
|
||||||
// create the spawn process
|
// create the spawn process
|
||||||
let stub = include_bytes!("spawn.bin");
|
let stub = include_bytes!("spawn.bin");
|
||||||
let args = xous::ProcessArgs::new(stub, xous::MemoryAddress::new(0x2050_1000).unwrap(), xous::MemoryAddress::new(0x2050_1000).unwrap());
|
let args = xous::ProcessArgs::new(
|
||||||
|
stub,
|
||||||
|
xous::MemoryAddress::new(0x2050_1000).unwrap(),
|
||||||
|
xous::MemoryAddress::new(0x2050_1000).unwrap(),
|
||||||
|
);
|
||||||
let spawn = xous::create_process(args).expect("Couldn't create spawn process");
|
let spawn = xous::create_process(args).expect("Couldn't create spawn process");
|
||||||
log::info!("Spawn PID: {}, Spawn CID: {}", spawn.pid, spawn.cid);
|
log::info!("Spawn PID: {}, Spawn CID: {}", spawn.pid, spawn.cid);
|
||||||
|
|
||||||
// perform a ping to make sure that spawn is running
|
// perform a ping to make sure that spawn is running
|
||||||
let result = xous::send_message(
|
let result =
|
||||||
spawn.cid,
|
xous::send_message(spawn.cid, xous::Message::new_blocking_scalar(2, 1, 2, 3, 4))
|
||||||
xous::Message::new_blocking_scalar(2, 1, 2, 3, 4),
|
|
||||||
)
|
|
||||||
.unwrap();
|
.unwrap();
|
||||||
assert_eq!(xous::Result::Scalar1(2), result);
|
assert_eq!(xous::Result::Scalar1(2), result);
|
||||||
|
|
||||||
self.modals.update_progress(2).expect("Couldn't update progress");
|
self.modals
|
||||||
|
.update_progress(2)
|
||||||
|
.expect("Couldn't update progress");
|
||||||
|
|
||||||
// load the app from the binary file
|
// load the app from the binary file
|
||||||
let res = xous::send_message(spawn.cid, xous::Message::new_lend_mut(1, memory, None, None)).expect("Couldn't send a message to spawn");
|
let res = xous::send_message(
|
||||||
|
spawn.cid,
|
||||||
|
xous::Message::new_lend_mut(1, memory, None, None),
|
||||||
|
)
|
||||||
|
.expect("Couldn't send a message to spawn");
|
||||||
// we are just going to do some very basic error handling: if the "offset" is None, we are good, otherwise there was a problem
|
// we are just going to do some very basic error handling: if the "offset" is None, we are good, otherwise there was a problem
|
||||||
// TODO: make this better. Perhaps Buffer::from_raw_parts?
|
// TODO: make this better. Perhaps Buffer::from_raw_parts?
|
||||||
match res {
|
match res {
|
||||||
xous::Result::MemoryReturned(None, _) => self.modals.update_progress(3).expect("Couldn't update progress"),
|
xous::Result::MemoryReturned(None, _) => self
|
||||||
|
.modals
|
||||||
|
.update_progress(3)
|
||||||
|
.expect("Couldn't update progress"),
|
||||||
_ => {
|
_ => {
|
||||||
self.modals.finish_progress().expect("Couldn't close progressbar");
|
self.modals
|
||||||
self.modals.show_notification(t!("apploader.addapp.error", locales::LANG), None).expect("Couldn't show modal");
|
.finish_progress()
|
||||||
|
.expect("Couldn't close progressbar");
|
||||||
|
self.modals
|
||||||
|
.show_notification(t!("apploader.addapp.error", locales::LANG), None)
|
||||||
|
.expect("Couldn't show modal");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -129,45 +218,85 @@ impl AppLoader {
|
||||||
//////////////////////
|
//////////////////////
|
||||||
|
|
||||||
// add its name to GAM
|
// add its name to GAM
|
||||||
self.gam.register_name(name.to_str(), self.auth).expect("Couldn't register name");
|
self.gam
|
||||||
|
.register_name(name.to_str(), self.auth)
|
||||||
|
.expect("Couldn't register name");
|
||||||
for menu in 0..menus {
|
for menu in 0..menus {
|
||||||
self.gam.register_name(&format!("{} Submenu {}", name, menu), self.auth).expect("Couldn't register name");
|
self.gam
|
||||||
|
.register_name(&format!("{} Submenu {}", name, menu), self.auth)
|
||||||
|
.expect("Couldn't register name");
|
||||||
}
|
}
|
||||||
|
|
||||||
// add it to the menu
|
// add it to the menu
|
||||||
self.menu.insert_item(MenuItem { name,
|
self.menu.insert_item(
|
||||||
|
MenuItem {
|
||||||
|
name,
|
||||||
action_conn: Some(self.conn),
|
action_conn: Some(self.conn),
|
||||||
action_opcode: Opcode::DispatchApp.to_u32().unwrap(),
|
action_opcode: Opcode::DispatchApp.to_u32().unwrap(),
|
||||||
action_payload: gam::MenuPayload::Scalar([self.apps.len().try_into().unwrap(), 0, 0, 0]),
|
action_payload: gam::MenuPayload::Scalar([
|
||||||
close_on_select: true }, 0);
|
self.apps.len().try_into().unwrap(),
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
]),
|
||||||
|
close_on_select: true,
|
||||||
|
},
|
||||||
|
0,
|
||||||
|
);
|
||||||
self.apps.push(name);
|
self.apps.push(name);
|
||||||
|
|
||||||
log::info!("Added app `{}'!", name);
|
log::info!("Added app `{}'!", name);
|
||||||
|
|
||||||
self.modals.finish_progress().expect("Couldn't close progressbar");
|
self.modals
|
||||||
|
.finish_progress()
|
||||||
|
.expect("Couldn't close progressbar");
|
||||||
let _ = self.gam.switch_to_app(APP_NAME_APP_LOADER, self.auth); // try to switch back to the menu
|
let _ = self.gam.switch_to_app(APP_NAME_APP_LOADER, self.auth); // try to switch back to the menu
|
||||||
}
|
}
|
||||||
|
|
||||||
pub(crate) fn set_server(&mut self) {
|
pub(crate) fn set_server(&mut self) {
|
||||||
let payload = self.modals.alert_builder("Server Address")
|
let payload = self
|
||||||
.field(Some("e.g. http://ip:port".to_string()), Some(|payload: TextEntryPayload| match url::Url::parse(payload.as_str()) {
|
.modals
|
||||||
|
.alert_builder("Server Address")
|
||||||
|
.field(
|
||||||
|
Some("e.g. http://ip:port".to_string()),
|
||||||
|
Some(
|
||||||
|
|payload: TextEntryPayload| match url::Url::parse(payload.as_str()) {
|
||||||
Ok(_) => None,
|
Ok(_) => None,
|
||||||
Err(e) => Some(xous_ipc::String::from_str(&format!("{}{}", t!("apploader.setserver.error", locales::LANG), e))),
|
Err(e) => Some(xous_ipc::String::from_str(&format!(
|
||||||
}))
|
"{}{}",
|
||||||
|
t!("apploader.setserver.error", locales::LANG),
|
||||||
|
e
|
||||||
|
))),
|
||||||
|
},
|
||||||
|
),
|
||||||
|
)
|
||||||
.build()
|
.build()
|
||||||
.ok();
|
.ok();
|
||||||
|
|
||||||
if self.server.is_none() && payload.is_some() {
|
if self.server.is_none() && payload.is_some() {
|
||||||
self.menu.insert_item(MenuItem { name: xous_ipc::String::from_str(t!("apploader.menu.reloadapplist", locales::LANG)),
|
self.menu.insert_item(
|
||||||
|
MenuItem {
|
||||||
|
name: xous_ipc::String::from_str(t!(
|
||||||
|
"apploader.menu.reloadapplist",
|
||||||
|
locales::LANG
|
||||||
|
)),
|
||||||
action_conn: Some(self.conn),
|
action_conn: Some(self.conn),
|
||||||
action_opcode: Opcode::ReloadAppList.to_u32().unwrap(),
|
action_opcode: Opcode::ReloadAppList.to_u32().unwrap(),
|
||||||
action_payload: gam::MenuPayload::Scalar([0, 0, 0, 0]),
|
action_payload: gam::MenuPayload::Scalar([0, 0, 0, 0]),
|
||||||
close_on_select: true }, 0);
|
close_on_select: true,
|
||||||
self.menu.insert_item(MenuItem { name: xous_ipc::String::from_str(t!("apploader.menu.addapp", locales::LANG)),
|
},
|
||||||
|
0,
|
||||||
|
);
|
||||||
|
self.menu.insert_item(
|
||||||
|
MenuItem {
|
||||||
|
name: xous_ipc::String::from_str(t!("apploader.menu.addapp", locales::LANG)),
|
||||||
action_conn: Some(self.conn),
|
action_conn: Some(self.conn),
|
||||||
action_opcode: Opcode::AddAppMenu.to_u32().unwrap(),
|
action_opcode: Opcode::AddAppMenu.to_u32().unwrap(),
|
||||||
action_payload: gam::MenuPayload::Scalar([0, 0, 0, 0]),
|
action_payload: gam::MenuPayload::Scalar([0, 0, 0, 0]),
|
||||||
close_on_select: true }, 0);
|
close_on_select: true,
|
||||||
|
},
|
||||||
|
0,
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
self.server = payload.and_then(|p| Some(p.first().as_str().to_string()));
|
self.server = payload.and_then(|p| Some(p.first().as_str().to_string()));
|
||||||
|
|
@ -181,24 +310,65 @@ impl AppLoader {
|
||||||
|
|
||||||
pub(crate) fn reload_app_list(&mut self) {
|
pub(crate) fn reload_app_list(&mut self) {
|
||||||
// without a path, the server responds with a JSON list of strings representing the list of app names
|
// without a path, the server responds with a JSON list of strings representing the list of app names
|
||||||
self.modals.start_progress(t!("apploader.reloadapplist.loading", locales::LANG), 0, 3, 0).expect("Couldn't start progressbar");
|
self.modals
|
||||||
|
.start_progress(
|
||||||
|
t!("apploader.reloadapplist.loading", locales::LANG),
|
||||||
|
0,
|
||||||
|
3,
|
||||||
|
0,
|
||||||
|
)
|
||||||
|
.expect("Couldn't start progressbar");
|
||||||
|
|
||||||
let old = self.possible_apps.clone();
|
let old = self.possible_apps.clone();
|
||||||
|
|
||||||
// this... disgusting error handling is so that if there is an error on the server side there isn't a panic
|
// this... disgusting error handling is so that if there is an error on the server side there isn't a panic
|
||||||
self.possible_apps = match
|
self.possible_apps = match match ureq::get(
|
||||||
match ureq::get(&self.server.as_ref().expect("ReloadAppList was somehow called without a server!")).call() {
|
&self
|
||||||
Ok(c) => { self.modals.update_progress(1).expect("Couldn't update progress"); c },
|
.server
|
||||||
|
.as_ref()
|
||||||
|
.expect("ReloadAppList was somehow called without a server!"),
|
||||||
|
)
|
||||||
|
.call()
|
||||||
|
{
|
||||||
|
Ok(c) => {
|
||||||
|
self.modals
|
||||||
|
.update_progress(1)
|
||||||
|
.expect("Couldn't update progress");
|
||||||
|
c
|
||||||
|
}
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
self.modals.show_notification(&format!("{}{}", t!("apploader.reloadapplist.connection_error", locales::LANG), e), None).expect("Couldn't show modal");
|
self.modals
|
||||||
|
.show_notification(
|
||||||
|
&format!(
|
||||||
|
"{}{}",
|
||||||
|
t!("apploader.reloadapplist.connection_error", locales::LANG),
|
||||||
|
e
|
||||||
|
),
|
||||||
|
None,
|
||||||
|
)
|
||||||
|
.expect("Couldn't show modal");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.into_json::<Vec<(String, usize)>>()
|
.into_json::<Vec<(String, usize)>>()
|
||||||
{
|
{
|
||||||
Ok(json) => { self.modals.update_progress(2).expect("Couldn't update progress"); json },
|
Ok(json) => {
|
||||||
|
self.modals
|
||||||
|
.update_progress(2)
|
||||||
|
.expect("Couldn't update progress");
|
||||||
|
json
|
||||||
|
}
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
self.modals.show_notification(&format!("{}{}", t!("apploader.reloadapplist.json_error", locales::LANG), e), None).expect("Couldn't show modal");
|
self.modals
|
||||||
|
.show_notification(
|
||||||
|
&format!(
|
||||||
|
"{}{}",
|
||||||
|
t!("apploader.reloadapplist.json_error", locales::LANG),
|
||||||
|
e
|
||||||
|
),
|
||||||
|
None,
|
||||||
|
)
|
||||||
|
.expect("Couldn't show modal");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -211,13 +381,20 @@ impl AppLoader {
|
||||||
}
|
}
|
||||||
|
|
||||||
for (i, (app, _)) in self.possible_apps.iter().enumerate() {
|
for (i, (app, _)) in self.possible_apps.iter().enumerate() {
|
||||||
self.load_menu.insert_item(MenuItem { name: xous_ipc::String::from_str(app.to_str()),
|
self.load_menu.insert_item(
|
||||||
|
MenuItem {
|
||||||
|
name: xous_ipc::String::from_str(app.to_str()),
|
||||||
action_conn: Some(self.conn),
|
action_conn: Some(self.conn),
|
||||||
action_opcode: Opcode::AddApp.to_u32().unwrap(),
|
action_opcode: Opcode::AddApp.to_u32().unwrap(),
|
||||||
action_payload: gam::MenuPayload::Scalar([i.try_into().unwrap(), 0, 0, 0]),
|
action_payload: gam::MenuPayload::Scalar([i.try_into().unwrap(), 0, 0, 0]),
|
||||||
close_on_select: true }, 0);
|
close_on_select: true,
|
||||||
|
},
|
||||||
|
0,
|
||||||
|
);
|
||||||
}
|
}
|
||||||
self.modals.finish_progress().expect("Couldn't close progress bar");
|
self.modals
|
||||||
|
.finish_progress()
|
||||||
|
.expect("Couldn't close progress bar");
|
||||||
|
|
||||||
let _ = self.gam.switch_to_app(APP_NAME_APP_LOADER, self.auth); // try to switch back to the menu
|
let _ = self.gam.switch_to_app(APP_NAME_APP_LOADER, self.auth); // try to switch back to the menu
|
||||||
}
|
}
|
||||||
|
|
@ -226,7 +403,9 @@ impl AppLoader {
|
||||||
if index < self.apps.len() {
|
if index < self.apps.len() {
|
||||||
let name: xous_ipc::String<64> = self.apps[index];
|
let name: xous_ipc::String<64> = self.apps[index];
|
||||||
log::info!("Switching to app `{}'", name);
|
log::info!("Switching to app `{}'", name);
|
||||||
self.gam.switch_to_app(name.as_ref(), self.auth).expect(&format!("Could not dispatch app `{}'", name));
|
self.gam
|
||||||
|
.switch_to_app(name.as_ref(), self.auth)
|
||||||
|
.expect(&format!("Could not dispatch app `{}'", name));
|
||||||
} else {
|
} else {
|
||||||
panic!("Unrecognized app index");
|
panic!("Unrecognized app index");
|
||||||
}
|
}
|
||||||
|
|
@ -265,5 +444,5 @@ pub(crate) enum Opcode {
|
||||||
DispatchApp,
|
DispatchApp,
|
||||||
|
|
||||||
/// Redraw the UI
|
/// Redraw the UI
|
||||||
Redraw
|
Redraw,
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,9 @@ fn main() -> ! {
|
||||||
log::info!("my PID is {}", xous::process::id());
|
log::info!("my PID is {}", xous::process::id());
|
||||||
|
|
||||||
let xns = xous_names::XousNames::new().unwrap();
|
let xns = xous_names::XousNames::new().unwrap();
|
||||||
let sid = xns.register_name(SERVER_NAME_APP_LOADER, None).expect("Couldn't create server");
|
let sid = xns
|
||||||
|
.register_name(SERVER_NAME_APP_LOADER, None)
|
||||||
|
.expect("Couldn't create server");
|
||||||
|
|
||||||
// start off by adding hello world
|
// start off by adding hello world
|
||||||
let mut app_loader = AppLoader::new(&xns, &sid);
|
let mut app_loader = AppLoader::new(&xns, &sid);
|
||||||
|
|
@ -20,24 +22,24 @@ fn main() -> ! {
|
||||||
match FromPrimitive::from_usize(msg.body.id()).expect("Couldn't load message") {
|
match FromPrimitive::from_usize(msg.body.id()).expect("Couldn't load message") {
|
||||||
Opcode::SetServer => {
|
Opcode::SetServer => {
|
||||||
app_loader.set_server();
|
app_loader.set_server();
|
||||||
},
|
}
|
||||||
Opcode::ReloadAppList => {
|
Opcode::ReloadAppList => {
|
||||||
app_loader.reload_app_list();
|
app_loader.reload_app_list();
|
||||||
},
|
}
|
||||||
Opcode::AddAppMenu => {
|
Opcode::AddAppMenu => {
|
||||||
app_loader.open_load_menu();
|
app_loader.open_load_menu();
|
||||||
},
|
}
|
||||||
Opcode::AddApp => {
|
Opcode::AddApp => {
|
||||||
let index = msg.body.scalar_message().expect("Not a scalar").arg1;
|
let index = msg.body.scalar_message().expect("Not a scalar").arg1;
|
||||||
app_loader.add_app(index);
|
app_loader.add_app(index);
|
||||||
},
|
}
|
||||||
Opcode::DispatchApp => {
|
Opcode::DispatchApp => {
|
||||||
let index = msg.body.scalar_message().expect("Not a scalar").arg1;
|
let index = msg.body.scalar_message().expect("Not a scalar").arg1;
|
||||||
app_loader.dispatch_app(index);
|
app_loader.dispatch_app(index);
|
||||||
},
|
}
|
||||||
Opcode::Redraw => {
|
Opcode::Redraw => {
|
||||||
app_loader.redraw();
|
app_loader.redraw();
|
||||||
},
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Binary file not shown.
|
|
@ -52,3 +52,4 @@ tts = []
|
||||||
# default = ["debugprint"] # "debugprint"
|
# default = ["debugprint"] # "debugprint"
|
||||||
default = []
|
default = []
|
||||||
ditherpunk = []
|
ditherpunk = []
|
||||||
|
unsafe-app-loading = [] # allow new contexts to be registered dynamically - this is unsafe and should not be set for release builds.
|
||||||
|
|
|
||||||
|
|
@ -110,6 +110,7 @@ pub struct UxRegistration {
|
||||||
/// If the LayoutType is not an App, this field is ignored and does nothing
|
/// If the LayoutType is not an App, this field is ignored and does nothing
|
||||||
pub focuschange_id: Option<u32>,
|
pub focuschange_id: Option<u32>,
|
||||||
}
|
}
|
||||||
|
#[cfg(feature="unsafe-app-loading")]
|
||||||
#[derive(Debug, rkyv::Archive, rkyv::Serialize, rkyv::Deserialize, Copy, Clone)]
|
#[derive(Debug, rkyv::Archive, rkyv::Serialize, rkyv::Deserialize, Copy, Clone)]
|
||||||
pub struct NameRegistration {
|
pub struct NameRegistration {
|
||||||
pub name: String::<128>,
|
pub name: String::<128>,
|
||||||
|
|
@ -217,7 +218,8 @@ pub(crate) enum Opcode {
|
||||||
/// This resolves race conditions that depend upon the PDDB configurations.
|
/// This resolves race conditions that depend upon the PDDB configurations.
|
||||||
AllowMainMenu = 33,
|
AllowMainMenu = 33,
|
||||||
|
|
||||||
/// Register a name that can aquire a token. This is only intended to be used with pre-registered apps
|
/// Register a name that can acquire a token. This is only intended to be used with pre-registered apps
|
||||||
|
#[cfg(feature="unsafe-app-loading")]
|
||||||
RegisterName = 34,
|
RegisterName = 34,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -130,6 +130,7 @@ impl ContextManager {
|
||||||
pub(crate) fn claim_token(&mut self, name: &str) -> Option<[u32; 4]> {
|
pub(crate) fn claim_token(&mut self, name: &str) -> Option<[u32; 4]> {
|
||||||
self.tm.claim_token(name)
|
self.tm.claim_token(name)
|
||||||
}
|
}
|
||||||
|
#[cfg(feature="unsafe-app-loading")]
|
||||||
pub(crate) fn register_name(&mut self, name: &str, auth_token: &[u32; 4]) {
|
pub(crate) fn register_name(&mut self, name: &str, auth_token: &[u32; 4]) {
|
||||||
self.tm.register_name(name, auth_token);
|
self.tm.register_name(name, auth_token);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -311,6 +311,7 @@ impl Gam {
|
||||||
|
|
||||||
Ok(returned_claim.token)
|
Ok(returned_claim.token)
|
||||||
}
|
}
|
||||||
|
#[cfg(feature="unsafe-app-loading")]
|
||||||
pub fn register_name(&self, name: &str, auth_token: [u32; 4]) -> Result<(), xous::Error> {
|
pub fn register_name(&self, name: &str, auth_token: [u32; 4]) -> Result<(), xous::Error> {
|
||||||
let name_registration = NameRegistration {
|
let name_registration = NameRegistration {
|
||||||
name: String::<128>::from_str(name),
|
name: String::<128>::from_str(name),
|
||||||
|
|
|
||||||
|
|
@ -567,6 +567,9 @@ fn wrapped_main() -> ! {
|
||||||
// set before the leaving state due to interior-mutability issues (see the block under the debug statement
|
// set before the leaving state due to interior-mutability issues (see the block under the debug statement
|
||||||
// titled "resolving visibility rules"). The fix is to simply not issue a context switch if it's the same app.
|
// titled "resolving visibility rules"). The fix is to simply not issue a context switch if it's the same app.
|
||||||
// It saves CPU thrashing and also works around this problem. (see issue #145)
|
// It saves CPU thrashing and also works around this problem. (see issue #145)
|
||||||
|
#[cfg(not(feature="unsafe-app-loading"))]
|
||||||
|
let authorized_switchers = vec![MAIN_MENU_NAME, ROOTKEY_MODAL_NAME, gam::STATUS_BAR_NAME];
|
||||||
|
#[cfg(feature="unsafe-app-loading")]
|
||||||
let authorized_switchers = [&[MAIN_MENU_NAME, ROOTKEY_MODAL_NAME, gam::STATUS_BAR_NAME], gam::EXPECTED_APP_CONTEXTS].concat().to_vec();
|
let authorized_switchers = [&[MAIN_MENU_NAME, ROOTKEY_MODAL_NAME, gam::STATUS_BAR_NAME], gam::EXPECTED_APP_CONTEXTS].concat().to_vec();
|
||||||
for switchers in authorized_switchers {
|
for switchers in authorized_switchers {
|
||||||
if let Some(auth_token) = context_mgr.find_app_token_by_name(switchers) {
|
if let Some(auth_token) = context_mgr.find_app_token_by_name(switchers) {
|
||||||
|
|
@ -670,9 +673,11 @@ fn wrapped_main() -> ! {
|
||||||
context_mgr.allow_mainmenu();
|
context_mgr.allow_mainmenu();
|
||||||
xous::return_scalar(msg.sender, 0).ok();
|
xous::return_scalar(msg.sender, 0).ok();
|
||||||
}
|
}
|
||||||
|
#[cfg(feature="unsafe-app-loading")]
|
||||||
Some(Opcode::RegisterName) => {
|
Some(Opcode::RegisterName) => {
|
||||||
let buffer = unsafe { Buffer::from_memory_message(msg.body.memory_message().unwrap()) };
|
let buffer = unsafe { Buffer::from_memory_message(msg.body.memory_message().unwrap()) };
|
||||||
let registration = buffer.to_original::<NameRegistration, _>().unwrap();
|
let registration = buffer.to_original::<NameRegistration, _>().unwrap();
|
||||||
|
gfx.set_devboot(); // indicate to users that we are no longer in a codebase that is exclusively trusted code
|
||||||
context_mgr.register_name(registration.name.to_str(), ®istration.auth_token);
|
context_mgr.register_name(registration.name.to_str(), ®istration.auth_token);
|
||||||
}
|
}
|
||||||
Some(Opcode::Quit) => break,
|
Some(Opcode::Quit) => break,
|
||||||
|
|
|
||||||
|
|
@ -18,6 +18,7 @@ pub(crate) struct NamedToken {
|
||||||
}
|
}
|
||||||
pub(crate) struct TokenManager {
|
pub(crate) struct TokenManager {
|
||||||
tokens: Vec::<NamedToken>,
|
tokens: Vec::<NamedToken>,
|
||||||
|
#[cfg(feature="unsafe-app-loading")]
|
||||||
extra_names: Vec<String>,
|
extra_names: Vec<String>,
|
||||||
trng: trng::Trng,
|
trng: trng::Trng,
|
||||||
}
|
}
|
||||||
|
|
@ -25,13 +26,18 @@ impl<'a> TokenManager {
|
||||||
pub(crate) fn new(xns: &xous_names::XousNames) -> TokenManager {
|
pub(crate) fn new(xns: &xous_names::XousNames) -> TokenManager {
|
||||||
TokenManager {
|
TokenManager {
|
||||||
tokens: Vec::new(),
|
tokens: Vec::new(),
|
||||||
|
#[cfg(feature="unsafe-app-loading")]
|
||||||
extra_names: Vec::new(),
|
extra_names: Vec::new(),
|
||||||
trng: trng::Trng::new(&xns).unwrap(),
|
trng: trng::Trng::new(&xns).unwrap(),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
/// checks to see if all the slots have been occupied. We can't allow untrusted code to run until all slots have checked in
|
/// checks to see if all the slots have been occupied. We can't allow untrusted code to run until all slots have checked in
|
||||||
pub(crate) fn allow_untrusted_code(&self) -> bool {
|
pub(crate) fn allow_untrusted_code(&self) -> bool {
|
||||||
if self.tokens.len() == (EXPECTED_BOOT_CONTEXTS.len() + EXPECTED_APP_CONTEXTS.len() + self.extra_names.len()) {
|
#[cfg(feature="unsafe-app-loading")]
|
||||||
|
let expected_len = EXPECTED_BOOT_CONTEXTS.len() + EXPECTED_APP_CONTEXTS.len() + self.extra_names.len();
|
||||||
|
#[cfg(not(feature="unsafe-app-loading"))]
|
||||||
|
let expected_len = EXPECTED_BOOT_CONTEXTS.len() + EXPECTED_APP_CONTEXTS.len();
|
||||||
|
if self.tokens.len() == expected_len {
|
||||||
true
|
true
|
||||||
} else {
|
} else {
|
||||||
// throw a bone to the dev who has to debug this error. This typically only triggers after a major
|
// throw a bone to the dev who has to debug this error. This typically only triggers after a major
|
||||||
|
|
@ -53,6 +59,7 @@ impl<'a> TokenManager {
|
||||||
if EXPECTED_APP_CONTEXTS.iter().find(|&&context| context == name).is_some() {
|
if EXPECTED_APP_CONTEXTS.iter().find(|&&context| context == name).is_some() {
|
||||||
found = true;
|
found = true;
|
||||||
}
|
}
|
||||||
|
#[cfg(feature="unsafe-app-loading")]
|
||||||
if self.extra_names.iter().find(|&context| context == name).is_some() {
|
if self.extra_names.iter().find(|&context| context == name).is_some() {
|
||||||
found = true;
|
found = true;
|
||||||
}
|
}
|
||||||
|
|
@ -96,9 +103,14 @@ impl<'a> TokenManager {
|
||||||
None
|
None
|
||||||
}
|
}
|
||||||
/// Register a new name that can then claim a token. Note that only pre-registered applications are allowed to do this.
|
/// Register a new name that can then claim a token. Note that only pre-registered applications are allowed to do this.
|
||||||
|
#[cfg(feature="unsafe-app-loading")]
|
||||||
pub(crate) fn register_name(&mut self, name: &str, auth_token: &[u32; 4]) {
|
pub(crate) fn register_name(&mut self, name: &str, auth_token: &[u32; 4]) {
|
||||||
if let Some(registrant) = self.lookup_name(auth_token) {
|
if let Some(registrant) = self.lookup_name(auth_token) {
|
||||||
if EXPECTED_BOOT_CONTEXTS.iter().find(|&&context| context == registrant).is_some() || EXPECTED_APP_CONTEXTS.iter().find(|&&context| context == registrant).is_some() {
|
if EXPECTED_BOOT_CONTEXTS.iter()
|
||||||
|
.find(
|
||||||
|
|&&context| context == registrant).is_some()
|
||||||
|
|| EXPECTED_APP_CONTEXTS.iter()
|
||||||
|
.find(|&&context| context == registrant).is_some() {
|
||||||
self.extra_names.push(name.to_string());
|
self.extra_names.push(name.to_string());
|
||||||
} else {
|
} else {
|
||||||
log::error!("`{}' does not have permission to register a new name because it is not pre-registered", registrant);
|
log::error!("`{}' does not have permission to register a new name because it is not pre-registered", registrant);
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue