Add opt-in physical USB device enrollment and remembered choices in 0.2.7

This commit is contained in:
tongtong committed 2026-11-14 04:06:01 +08:00
1 parent dc29a20a41
commit 208d37b7d8
20 files changed
+515 -18

No files matched your search

+24 -1
View File
@@ -45,7 +45,7 @@ pub struct DeviceConfig {
#[serde(default = "yes")]
pub enabled: bool,
}
#[derive(Clone, Serialize, Deserialize, Debug)]
#[derive(Clone, Serialize, Deserialize, Debug, PartialEq, Eq)]
#[serde(deny_unknown_fields)]
pub struct AgentConfig {
#[serde(default = "version")]
@@ -61,6 +61,12 @@ pub struct AgentConfig {
pub adb_server: String,
#[serde(default)]
pub devices: Vec<DeviceConfig>,
#[serde(default)]
pub auto_register_usb: bool,
#[serde(default)]
pub ignored_usb_serials: Vec<String>,
#[serde(default)]
pub usb_device_ids: std::collections::BTreeMap<String, String>,
}
impl AgentConfig {
pub fn network(&self) -> NetworkArgs {
@@ -90,6 +96,21 @@ impl AgentConfig {
if self.devices.len() > 128 {
bail!("at most 128 devices per agent")
}
if self.ignored_usb_serials.len() > 512 || self.usb_device_ids.len() > 512 {
bail!("at most 512 remembered USB devices")
}
for serial in self
.ignored_usb_serials
.iter()
.chain(self.usb_device_ids.keys())
{
if serial.is_empty() || serial.len() > 256 || serial.chars().any(char::is_control) {
bail!("invalid remembered USB serial")
}
}
if self.usb_device_ids.values().any(|id| !valid_device_id(id)) {
bail!("invalid remembered USB ID")
}
let mut ids = HashSet::new();
for device in &self.devices {
if !valid_device_id(&device.id) || !ids.insert(&device.id) || device.device_port == 0 {
@@ -156,6 +177,8 @@ pub enum Request {
ConfigGet,
ConfigSet {
config: AgentConfig,
#[serde(default)]
expected_config: Option<AgentConfig>,
},
Logs {
#[serde(default)]