Skip to content

Run a virtual iPhone on an Apple Silicon Mac.

Swift

Test firmware patch pipeline data flow

xiahouzhenc2e290e5a54d
diff --git a/sources/FirmwarePatcher/IBoot/IBootPatcher.swift b/sources/FirmwarePatcher/IBoot/IBootPatcher.swift
index 9a9bb919..fdd2daeb 100644
--- a/sources/FirmwarePatcher/IBoot/IBootPatcher.swift
+++ b/sources/FirmwarePatcher/IBoot/IBootPatcher.swift
@@ -202,13 +202,8 @@ public class IBootPatcher: Patcher {
}
guard let labelBytes = labelStr.data(using: .ascii) else { return }
- let raw = buffer.original
- if raw.range(of: labelBytes) != nil {
- if verbose { print(" [*] serial labels: already present, skipping") }
- return
- }
-
// Collect all runs of '=' (>=20 chars) — same logic as Python.
+ let raw = buffer.original
var eqRuns: [Int] = []
var i = raw.startIndex
@@ -228,6 +223,16 @@ public class IBootPatcher: Patcher {
}
if eqRuns.count < 2 {
+ var labelCount = 0
+ var searchStart = raw.startIndex
+ while let range = raw.range(of: labelBytes, in: searchStart ..< raw.endIndex) {
+ labelCount += 1
+ searchStart = range.upperBound
+ }
+ if labelCount >= 2 {
+ if verbose { print(" [*] serial labels: already present, skipping") }
+ return
+ }
if verbose { print(" [-] serial labels: <2 banner runs found") }
return
}
diff --git a/sources/FirmwarePatcher/Pipeline/FirmwarePipeline.swift b/sources/FirmwarePatcher/Pipeline/FirmwarePipeline.swift
index 03cc19a3..268300f0 100644
--- a/sources/FirmwarePatcher/Pipeline/FirmwarePipeline.swift
+++ b/sources/FirmwarePatcher/Pipeline/FirmwarePipeline.swift
@@ -129,24 +129,11 @@ public final class FirmwarePipeline {
let rawData = try loader.load(from: fileURL)
log(" format: \(rawData.count) bytes")
- // Patch
- var currentData = rawData
- var componentRecords: [PatchRecord] = []
-
- for makePatcher in component.patcherFactories {
- let patcher = makePatcher(currentData, verbose)
- let records = try patcher.findAll()
-
- guard !records.isEmpty else {
- throw PatcherError.patchSiteNotFound("\(component.name): no patches found")
- }
-
- let count = try patcher.apply()
- log(" [+] \(count) \(component.name) patches applied")
-
- componentRecords.append(contentsOf: records)
- currentData = extractPatchedData(from: patcher, fallback: currentData, records: records)
- }
+ let (currentData, componentRecords) = try patchData(
+ rawData,
+ componentName: component.name,
+ patcherFactories: component.patcherFactories
+ )
try loader.save(currentData, to: fileURL)
log(" [+] saved")
@@ -161,6 +148,32 @@ public final class FirmwarePipeline {
return allRecords
}
+ func patchData(
+ _ rawData: Data,
+ componentName: String,
+ patcherFactories: [(Data, Bool) -> any Patcher]
+ ) throws -> (Data, [PatchRecord]) {
+ var currentData = rawData
+ var componentRecords: [PatchRecord] = []
+
+ for makePatcher in patcherFactories {
+ let patcher = makePatcher(currentData, verbose)
+ let records = try patcher.findAll()
+
+ guard !records.isEmpty else {
+ throw PatcherError.patchSiteNotFound("\(componentName): no patches found")
+ }
+
+ let count = try patcher.apply()
+ log(" [+] \(count) \(componentName) patches applied")
+
+ componentRecords.append(contentsOf: records)
+ currentData = extractPatchedData(from: patcher, fallback: currentData, records: records)
+ }
+
+ return (currentData, componentRecords)
+ }
+
// MARK: - Component List Builder
/// Build the ordered component list based on the variant.
diff --git a/tests/FirmwarePatcherTests/FirmwarePatcherTests.swift b/tests/FirmwarePatcherTests/FirmwarePatcherTests.swift
index b9042dfb..7fee3681 100644
--- a/tests/FirmwarePatcherTests/FirmwarePatcherTests.swift
+++ b/tests/FirmwarePatcherTests/FirmwarePatcherTests.swift
@@ -298,6 +298,65 @@ struct BinaryBufferTests {
}
}
+final class BytePatchPatcher: Patcher {
+ let component = "test"
+ let verbose = false
+ let data: Data
+ let offset: Int
+ let byte: UInt8
+ let id: String
+
+ init(data: Data, offset: Int, byte: UInt8, id: String) {
+ self.data = data
+ self.offset = offset
+ self.byte = byte
+ self.id = id
+ }
+
+ func findAll() throws -> [PatchRecord] {
+ [
+ PatchRecord(
+ patchID: id,
+ component: component,
+ fileOffset: offset,
+ originalBytes: Data([data[offset]]),
+ patchedBytes: Data([byte]),
+ description: id
+ ),
+ ]
+ }
+
+ func apply() throws -> Int { 1 }
+}
+
+struct FirmwarePipelineDataFlowTests {
+ @Test func chainedPatchersReceivePreviousPatchedBytes() throws {
+ let pipeline = FirmwarePipeline(
+ vmDirectory: URL(fileURLWithPath: NSTemporaryDirectory()),
+ verbose: false
+ )
+ var secondInput = Data()
+
+ let (patched, records) = try pipeline.patchData(
+ Data([0x00, 0x00]),
+ componentName: "test",
+ patcherFactories: [
+ { data, _ in
+ BytePatchPatcher(data: data, offset: 0, byte: 0xAA, id: "first")
+ },
+ { data, _ in
+ secondInput = data
+ return BytePatchPatcher(data: data, offset: 1, byte: 0xBB, id: "second")
+ },
+ ]
+ )
+
+ #expect(secondInput == Data([0xAA, 0x00]))
+ #expect(patched == Data([0xAA, 0xBB]))
+ #expect(records.map(\.patchID) == ["first", "second"])
+ }
+}
+
struct IBootPatcherIdempotencyTests {
@Test func serialLabelsPatchTwoBannerRunsWhenLabelAbsent() {
let banner = String(repeating: "=", count: 32)
@@ -313,13 +372,22 @@ struct IBootPatcherIdempotencyTests {
}
@Test func serialLabelsSkipWhenLabelAlreadyPresent() {
+ let payload = Data("Loaded iBSS\0 middle Loaded iBSS\0 suffix".utf8)
+ let patcher = IBootPatcher(data: payload, mode: .ibss, verbose: false)
+
+ patcher.patchSerialLabels()
+
+ #expect(patcher.patches.isEmpty)
+ }
+
+ @Test func serialLabelsDoNotSkipForUnrelatedSingleLabel() {
let banner = String(repeating: "=", count: 32)
let payload = Data("Loaded iBSS\0 prefix \(banner) middle \(banner) suffix".utf8)
let patcher = IBootPatcher(data: payload, mode: .ibss, verbose: false)
patcher.patchSerialLabels()
- #expect(patcher.patches.isEmpty)
+ #expect(patcher.patches.count == 2)
}
}