Files
usb-server/internal/usb/external.go
duffyduckandClaude Opus 5 9ed473a965 Fix HID transfers, harden the tunnel, add E2E crypto and direct peers
The HID failure came down to the endpoint type map being indexed by
endpoint number without the direction bit. A composite device can have
endpoint 1 as both interrupt IN (0x81) and bulk OUT (0x01); the last one
read won, so interrupt URBs were submitted as bulk and the kernel rejected
them. The device attached and stayed silent.

Endpoint data now comes from the raw descriptors read from /dev/bus/usb
rather than sysfs, which only ever exposes the active alternate setting —
a webcam's isochronous endpoints are invisible there because they only
exist after SET_INTERFACE. Two sysfs parsing bugs fell out of that too:
the numeric endpoint attributes are hex without a prefix (wMaxPacketSize
"0040" was read as 40, not 64), and bInterval was never read at all.

Reliability: three places could freeze the whole process. The share path
fed io.Pipe from the WebSocket read loop, so one slow USB transfer stalled
every tunnel and the keepalives with them. The relay wrote to client
sockets while holding the hub lock, so one peer that stopped reading
blocked routing and registration for everyone. Control transfers ran
inline in the protocol loop behind a 5s timeout. Also fixed: a use-after-
free where a discarded URB's memory could be collected while the kernel
still owned it, a reap loop that spun at 100% CPU on ioctl errors, a
missing attach timeout, a double close(done) panic, and Hash[:8] in the
relay's log line, which let a client with a short hash take the server
down.

Adds mode "both", so one client can offer and consume devices at once.
The tunnel and client-left callbacks became multicast for it: as plain
fields the second manager to register silently unhooked the first.

Tunnel traffic is now AES-256-GCM end to end, on the relay path as well
as directly. The key is derived from the three tokens, not from the group
hash — the relay is told the hash, so a key derived from it would protect
nothing from the one party in the middle. Group IDs are unchanged, so
existing setups keep working; only clients configured without the tokens
drop to unencrypted, relay-only operation.

Peers now try to connect directly, with the relay supplying the public
address neither side can determine for itself. Candidates are raced
because an unreachable address hangs until timeout rather than refusing.
Falling back to the relay is not an error.

Platform reach: cross-compiled targets for ARM, MIPS and RISC-V (the
Linux client needed no code changes — usbdevfs is not architecture
specific), multi-arch Docker images, an Android bridge that accepts
devices over SCM_RIGHTS because apps cannot open /dev/bus/usb, and macOS
builds via system_profiler enumeration.

Adds a Windows KMDF filter driver under driver/windows with its Go side.
UNTESTED: it has never been compiled or run, needs the WDK to build and
an EV certificate to distribute. Treat it as a starting point.

Adds "usb-client diag": says per machine whether sharing and using are
possible, what stands in the way, and what fixes it. Reports can be
uploaded to a relay to get them off machines that are awkward to copy
from.

96 tests, all green under -race. Builds for linux, windows and darwin on
amd64 and arm64.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
2026-08-11 22:02:04 +02:00

128 lines
3.6 KiB
Go

package usb
import (
"fmt"
"sync"
)
// Externally registered devices.
//
// Normally devices are found by walking sysfs. That is not available to an
// unprivileged Android app, which must go through the framework: it enumerates
// devices itself, asks the user for permission, and receives an already-open
// file descriptor plus the raw descriptor blob. Those devices are registered
// here and merged into the enumeration, so everything above this layer works
// the same whether a device came from sysfs or from outside.
var (
externalMu sync.RWMutex
externalDevices = make(map[string]Device)
)
// RegisterExternalDevice adds a device that was discovered outside this
// process. descriptors is the raw blob (device descriptor followed by
// configuration descriptors), exactly what a usbdevfs file read returns and
// what Android's UsbDeviceConnection.getRawDescriptors() provides.
func RegisterExternalDevice(busID string, descriptors []byte, meta ExternalDeviceMeta) error {
if busID == "" {
return fmt.Errorf("bus ID is required")
}
parsed, err := ParseDescriptors(descriptors)
if err != nil {
return fmt.Errorf("parsing descriptors for %s: %w", busID, err)
}
cfg := parsed.FindConfig(meta.ConfigValue)
if cfg == nil {
cfg = &parsed.Configs[0]
}
dev := Device{
BusID: busID,
BusNum: meta.BusNum,
DevNum: meta.DevNum,
Speed: meta.Speed,
VendorID: parsed.VendorID,
ProductID: parsed.ProductID,
BcdDevice: parsed.BcdDevice,
DeviceClass: parsed.DeviceClass,
DeviceSubClass: parsed.DeviceSubClass,
DeviceProtocol: parsed.DeviceProtocol,
ConfigValue: cfg.Value,
NumConfigs: parsed.NumConfigs,
Manufacturer: meta.Manufacturer,
Product: meta.Product,
Serial: meta.Serial,
Interfaces: cfg.ActiveInterfaces(),
Endpoints: cfg.AllEndpoints(),
}
externalMu.Lock()
externalDevices[busID] = dev
externalMu.Unlock()
return nil
}
// ExternalDeviceMeta carries the fields that cannot be read from the
// descriptor blob because they describe the device's place on the bus or come
// from string descriptors the caller already resolved.
type ExternalDeviceMeta struct {
BusNum uint32
DevNum uint32
Speed uint32
ConfigValue uint8
Manufacturer string
Product string
Serial string
}
// UnregisterExternalDevice removes a device registered from outside.
func UnregisterExternalDevice(busID string) {
externalMu.Lock()
delete(externalDevices, busID)
externalMu.Unlock()
}
// ExternalDevices returns a snapshot of the externally registered devices.
func ExternalDevices() []Device {
externalMu.RLock()
defer externalMu.RUnlock()
result := make([]Device, 0, len(externalDevices))
for _, dev := range externalDevices {
result = append(result, dev)
}
return result
}
// HasExternalDevices reports whether any device came from outside.
func HasExternalDevices() bool {
externalMu.RLock()
defer externalMu.RUnlock()
return len(externalDevices) > 0
}
// mergeExternal appends externally registered devices to a list from sysfs,
// letting the external entry win on a bus ID collision — it carries a file
// descriptor we can actually use, which the sysfs entry may not.
func mergeExternal(devices []Device) []Device {
externalMu.RLock()
defer externalMu.RUnlock()
if len(externalDevices) == 0 {
return devices
}
result := make([]Device, 0, len(devices)+len(externalDevices))
for _, dev := range devices {
if _, overridden := externalDevices[dev.BusID]; !overridden {
result = append(result, dev)
}
}
for _, dev := range externalDevices {
result = append(result, dev)
}
return result
}