Files
libfreemkv/src/unlock_bridge.rs
T
Matthew Jackson 8c38cb0918 unlock/patch: preserve SCSI sense across the bridge; init aborts on dead bus; slow-retry first patch failure
Audit fixes (v1.1.0..HEAD regressions in the unlock migration + adaptive patch
speed):

- unlock_bridge ScsiAdapter: libfreemkv's transport returns Err on ANY non-zero
  SCSI status (a normal CHECK CONDITION), not only transport faults. The adapter
  was collapsing every such Err to { status: 0xFF, sense: None }, which discarded
  the parsed sense and defeated the AACS handshake's ILLEGAL_REQUEST wedge guard
  (so it kept hammering the drive — hard-rule #2) and inverted its
  transport-vs-rejection diagnosis. Now reconstruct status + the 32-byte sense
  buffer (sense_key@2, asc@12, ascq@13) and only emit 0xFF/None for a genuine
  transport fault.

- Drive::init: a genuine transport fault during the drive-prep unlock means the
  bus is dead — propagate it (the v1.1.0 invariant) instead of silently
  swallowing it via `if let Ok`. Other errors (no matching unlocker) still fall
  through to stock mode. SET CD SPEED max now runs only when the bus is alive.

- disc::patch: on the first read failure in a range, drop to slow recovery speed
  and RE-ATTEMPT the same position at slow speed before marking it. A
  single-sector range's first failing sector was being marked from a MAX-speed
  read it never got to recover.

- docs: lib.rs architecture diagram (handshake → host_certs) and README (stale
  pluggable-unlock-seam / register-unlocker / crates.io / docs.rs references).
2026-06-29 22:16:28 -07:00

111 lines
4.7 KiB
Rust

//! Bridges libfreemkv's drive layer to the `freemkv-unlock` crate: one generic
//! SCSI-transport adapter, identity/host-cert mapping, and the dispatch that
//! news up `all_unlockers()` and runs the first matching one. libfreemkv names
//! no individual unlocker — it only calls this bridge.
use freemkv_unlock as fu;
/// Map libfreemkv's drive identity to the unlock contract's `DriveId`.
fn to_fu_drive_id(drive_id: &crate::identity::DriveId) -> fu::DriveId {
fu::DriveId {
vendor_id: drive_id.vendor_id.clone(),
product_revision: drive_id.product_revision.clone(),
vendor_specific: drive_id.vendor_specific.clone(),
firmware_date: drive_id.firmware_date.clone(),
}
}
/// Name of the unlocker that claims this drive by identity (drive-info "is this
/// drive supported?" display), or `None`. A pure lookup — does NOT touch the
/// drive or unlock anything.
pub(crate) fn unlocker_name(drive_id: &crate::identity::DriveId) -> Option<&'static str> {
fu::unlocker_name(&to_fu_drive_id(drive_id))
}
/// Adapt libfreemkv's `ScsiTransport` to the unlock crate's transport contract.
struct ScsiAdapter<'a>(&'a mut dyn crate::scsi::ScsiTransport);
impl fu::scsi::ScsiTransport for ScsiAdapter<'_> {
fn execute(
&mut self,
cdb: &[u8],
dir: fu::scsi::DataDirection,
data: &mut [u8],
timeout_ms: u32,
) -> fu::scsi::Result<fu::scsi::ScsiResult> {
let d = match dir {
fu::scsi::DataDirection::None => crate::scsi::DataDirection::None,
fu::scsi::DataDirection::FromDevice => crate::scsi::DataDirection::FromDevice,
fu::scsi::DataDirection::ToDevice => crate::scsi::DataDirection::ToDevice,
};
match self.0.execute(cdb, d, data, timeout_ms) {
Ok(r) => Ok(fu::scsi::ScsiResult {
status: r.status,
bytes_transferred: r.bytes_transferred,
sense: r.sense,
}),
// libfreemkv's transport returns Err for ANY non-zero SCSI status —
// i.e. a normal drive CHECK CONDITION (ILLEGAL_REQUEST, etc.), NOT
// only a transport-layer fault. Preserve the real status AND the
// parsed sense across the seam: the AACS handshake's wedge guard
// bails on an ILLEGAL_REQUEST sense (so it stops hammering the drive),
// and its diagnosis distinguishes a cert rejection from a dead bus by
// the same status/sense. Collapsing everything to 0xFF/None defeated
// both. Reconstruct the 32-byte sense buffer at the offsets the
// unlock crate reads (sense_key@2 low-nibble, asc@12, ascq@13); a
// genuine transport fault (status 0xFF, no sense) maps through
// unchanged.
Err(e) => {
let (status, sense) = crate::drive::extract_scsi_context(&e);
let sense_buf = sense.map(|s| {
let mut b = [0u8; 32];
b[2] = s.sense_key & 0x0F;
b[12] = s.asc;
b[13] = s.ascq;
b
});
Err(fu::scsi::ScsiError {
status,
sense: sense_buf,
})
}
}
}
}
/// Map libfreemkv's host certs (keysource-collected) to the unlock contract's.
pub(crate) fn map_host_certs(certs: &[crate::aacs::HostCert]) -> Vec<fu::HostCert> {
certs
.iter()
.map(|c| fu::HostCert {
private_key: c.private_key,
certificate: c.certificate.clone(),
private_key_v2: c.private_key_v2,
certificate_v2: c.certificate_v2.clone(),
})
.collect()
}
/// News up the unlockers, build the context for `kind`, and run the FIRST
/// matching one — returning its `Result` so the caller can both consume what it
/// learned (vid / bus_key / drive_unlocked) AND render the specific failure
/// (the AACS cert path maps the `UnlockError` to its outcome trace). `Err(
/// NotApplicable)` when nothing matched. `host_certs` are collected by the
/// caller — lazily, only for AACS; pass `&[]` for the drive-prep / CSS kinds.
pub(crate) fn run_unlockers(
scsi: &mut dyn crate::scsi::ScsiTransport,
drive_id: &crate::identity::DriveId,
kind: fu::DiscKind,
host_certs: &[fu::HostCert],
) -> std::result::Result<fu::Unlocked, fu::UnlockError> {
let id = to_fu_drive_id(drive_id);
let ctx = fu::UnlockCtx::new(&id, kind, host_certs);
let mut adapter = ScsiAdapter(scsi);
for u in fu::all_unlockers() {
if u.matches(&ctx) {
return u.unlock(&mut adapter, &ctx);
}
}
Err(fu::UnlockError::NotApplicable)
}