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>
171 lines
4.6 KiB
Go
171 lines
4.6 KiB
Go
//go:build linux
|
|
|
|
package diag
|
|
|
|
import (
|
|
"fmt"
|
|
"os"
|
|
"strings"
|
|
|
|
"github.com/duffy/usb-server/internal/usb"
|
|
"golang.org/x/sys/unix"
|
|
)
|
|
|
|
func isPrivileged() bool { return os.Geteuid() == 0 }
|
|
|
|
func collectPlatform(r *Report) {
|
|
r.System.KernelVersion = kernelVersion()
|
|
|
|
checkUsbdevfs(r)
|
|
checkVHCI(r)
|
|
collectLinuxDevices(r)
|
|
assessLinuxCapabilities(r)
|
|
}
|
|
|
|
func kernelVersion() string {
|
|
var uname unix.Utsname
|
|
if err := unix.Uname(&uname); err != nil {
|
|
return ""
|
|
}
|
|
return fmt.Sprintf("%s %s",
|
|
nullTerminated(uname.Sysname[:]), nullTerminated(uname.Release[:]))
|
|
}
|
|
|
|
func nullTerminated(b []byte) string {
|
|
if i := strings.IndexByte(string(b), 0); i >= 0 {
|
|
return string(b[:i])
|
|
}
|
|
return string(b)
|
|
}
|
|
|
|
// checkUsbdevfs verifies that device nodes exist and are usable.
|
|
//
|
|
// Being able to list devices through sysfs proves nothing: sharing needs to
|
|
// open the node under /dev/bus/usb, and that is where permissions bite.
|
|
func checkUsbdevfs(r *Report) {
|
|
if _, err := os.Stat("/dev/bus/usb"); err != nil {
|
|
detail := "/dev/bus/usb is missing"
|
|
fix := "check that usbcore is loaded and devtmpfs is mounted"
|
|
if r.System.Container {
|
|
detail += " — this is a container, so it was probably not passed through"
|
|
fix = "add - /dev/bus/usb:/dev/bus/usb to the container's volumes, and run it privileged"
|
|
}
|
|
r.addCheck("usbdevfs device nodes", false, detail, fix)
|
|
return
|
|
}
|
|
|
|
if _, err := os.Stat("/sys/bus/usb/devices"); err != nil {
|
|
r.addCheck("usbdevfs device nodes", false,
|
|
"/sys/bus/usb is not mounted, so devices cannot be enumerated",
|
|
"mount sysfs, or in a container add - /sys/bus/usb:/sys/bus/usb")
|
|
return
|
|
}
|
|
|
|
r.addCheck("usbdevfs device nodes", true, "/dev/bus/usb and /sys/bus/usb are present", "")
|
|
|
|
if !isPrivileged() {
|
|
r.addCheck("privileges", false,
|
|
"not running as root — devices can be listed but not claimed",
|
|
"run the client with sudo, or install it as a system service")
|
|
} else {
|
|
r.addCheck("privileges", true, "running as root", "")
|
|
}
|
|
}
|
|
|
|
// checkVHCI verifies the kernel module needed to receive remote devices.
|
|
func checkVHCI(r *Report) {
|
|
if _, err := os.Stat("/sys/devices/platform/vhci_hcd.0"); err == nil {
|
|
r.addCheck("vhci-hcd module", true, "loaded — remote devices can be attached", "")
|
|
return
|
|
}
|
|
|
|
detail := "not loaded — remote devices cannot be attached"
|
|
if r.System.Container {
|
|
detail += " (a container cannot load modules; this must happen on the host)"
|
|
}
|
|
|
|
r.addCheck("vhci-hcd module", false, detail,
|
|
"sudo modprobe vhci-hcd (persist with: echo vhci-hcd | sudo tee /etc/modules-load.d/vhci-hcd.conf)")
|
|
}
|
|
|
|
func collectLinuxDevices(r *Report) {
|
|
devices, err := usb.Enumerate()
|
|
if err != nil {
|
|
r.note("device enumeration failed: %v", err)
|
|
return
|
|
}
|
|
|
|
for _, dev := range devices {
|
|
info := DeviceInfo{
|
|
BusID: dev.BusID,
|
|
VendorID: fmt.Sprintf("%04x", dev.VendorID),
|
|
ProductID: fmt.Sprintf("%04x", dev.ProductID),
|
|
Name: dev.DisplayName(),
|
|
Class: fmt.Sprintf("%02x", dev.DeviceClass),
|
|
Speed: speedName(dev.Speed),
|
|
}
|
|
|
|
if len(dev.Interfaces) > 0 {
|
|
info.Driver = dev.Interfaces[0].Driver
|
|
}
|
|
|
|
// Sharing needs write access to the node, so test exactly that.
|
|
if err := unix.Access(dev.DevPath, unix.R_OK|unix.W_OK); err != nil {
|
|
info.Shareable = false
|
|
info.Blocker = fmt.Sprintf("no write access to %s (%v)", dev.DevPath, err)
|
|
} else {
|
|
info.Shareable = true
|
|
}
|
|
|
|
for _, ep := range dev.Endpoints {
|
|
info.Endpoints = append(info.Endpoints, endpointInfo(ep))
|
|
}
|
|
|
|
// An empty endpoint map means the raw descriptors could not be read,
|
|
// which is what makes transfer types guesswork later.
|
|
if len(dev.Endpoints) == 0 {
|
|
r.note("no endpoint descriptors for %s — could not read %s; "+
|
|
"transfer types will be guessed from the request interval",
|
|
dev.BusID, dev.DevPath)
|
|
}
|
|
|
|
r.Devices = append(r.Devices, info)
|
|
}
|
|
}
|
|
|
|
func assessLinuxCapabilities(r *Report) {
|
|
shareable := 0
|
|
for _, d := range r.Devices {
|
|
if d.Shareable {
|
|
shareable++
|
|
}
|
|
}
|
|
|
|
switch {
|
|
case shareable > 0:
|
|
r.Sharing = Capability{Available: true, Mechanism: "usbdevfs"}
|
|
case len(r.Devices) > 0:
|
|
r.Sharing = Capability{
|
|
Available: false,
|
|
Reason: "devices found, but none can be opened (permissions)",
|
|
Mechanism: "usbdevfs",
|
|
}
|
|
default:
|
|
r.Sharing = Capability{
|
|
Available: false,
|
|
Reason: "no USB devices found",
|
|
Mechanism: "usbdevfs",
|
|
}
|
|
}
|
|
|
|
if _, err := os.Stat("/sys/devices/platform/vhci_hcd.0"); err == nil {
|
|
r.Using = Capability{Available: true, Mechanism: "vhci-hcd"}
|
|
} else {
|
|
r.Using = Capability{
|
|
Available: false,
|
|
Reason: "vhci-hcd is not loaded",
|
|
Mechanism: "vhci-hcd",
|
|
}
|
|
}
|
|
}
|