Files
usb-server/internal/usb/enumerate_darwin.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

120 lines
3.1 KiB
Go

//go:build darwin
package usb
import (
"encoding/json"
"fmt"
"os/exec"
"strconv"
"strings"
)
// Enumerate lists USB devices on macOS via system_profiler.
//
// This is enough to see and report what is attached, which is what the
// diagnostics need. It is not enough to share anything: that requires opening
// devices through IOKit, which has no equivalent here — see the platform
// table in the README.
//
// Going through the command keeps the client cgo-free and therefore
// cross-compilable from any machine.
func Enumerate() ([]Device, error) {
if external := ExternalDevices(); len(external) > 0 {
// Devices handed in from outside are usable; report them first.
return external, nil
}
out, err := exec.Command("system_profiler", "-json", "SPUSBDataType").Output()
if err != nil {
return nil, fmt.Errorf("running system_profiler: %w", err)
}
var report struct {
Items []spUSBItem `json:"SPUSBDataType"`
}
if err := json.Unmarshal(out, &report); err != nil {
return nil, fmt.Errorf("parsing system_profiler output: %w", err)
}
var devices []Device
for _, item := range report.Items {
collectItem(&devices, item)
}
return devices, nil
}
type spUSBItem struct {
Name string `json:"_name"`
VendorID string `json:"vendor_id"`
ProductID string `json:"product_id"`
Speed string `json:"device_speed"`
Manufacturer string `json:"manufacturer"`
SerialNumber string `json:"serial_num"`
LocationID string `json:"location_id"`
Items []spUSBItem `json:"_items"`
}
func collectItem(devices *[]Device, item spUSBItem) {
if item.VendorID != "" {
dev := Device{
BusID: locationToBusID(item.LocationID),
VendorID: parseHexID(item.VendorID),
ProductID: parseHexID(item.ProductID),
Speed: parseSpeedName(item.Speed),
Manufacturer: item.Manufacturer,
Product: item.Name,
Serial: item.SerialNumber,
}
*devices = append(*devices, dev)
}
for _, child := range item.Items {
collectItem(devices, child)
}
}
// parseHexID turns "0x046d (Logitech Inc.)" into 0x046d.
func parseHexID(id string) uint16 {
id = strings.TrimSpace(id)
if i := strings.Index(id, " "); i > 0 {
id = id[:i]
}
id = strings.TrimPrefix(id, "0x")
v, err := strconv.ParseUint(id, 16, 16)
if err != nil {
return 0
}
return uint16(v)
}
// locationToBusID derives an identifier from the location ID, which encodes
// the device's position in the port tree.
func locationToBusID(locationID string) string {
locationID = strings.TrimSpace(locationID)
if i := strings.Index(locationID, " "); i > 0 {
locationID = locationID[:i]
}
return strings.TrimPrefix(locationID, "0x")
}
// parseSpeedName maps system_profiler's wording onto USB/IP speed codes.
func parseSpeedName(speed string) uint32 {
switch {
case strings.Contains(speed, "low_speed"):
return 1
case strings.Contains(speed, "full_speed"):
return 2
case strings.Contains(speed, "high_speed"):
return 3
case strings.Contains(speed, "super_speed_plus"):
return 6
case strings.Contains(speed, "super_speed"):
return 5
default:
return 0
}
}