Skip to content

Commit 2854867

Browse files
Add logging to AppAttestManager
1 parent 8480842 commit 2854867

File tree

1 file changed

+13
-8
lines changed

1 file changed

+13
-8
lines changed

SignalServiceKit/Subscriptions/Backups/BackupTestFlightEntitlementManager.swift

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -210,13 +210,16 @@ private struct AppAttestManager {
210210
throw .notSupported
211211
}
212212

213+
logger.info("Getting attested key.")
213214
let attestedKey = try await getOrGenerateAttestedKey()
214215

216+
logger.info("Generating assertion.")
215217
let requestAssertion = try await generateAssertionForAction(
216218
action,
217219
attestedKey: attestedKey
218220
)
219221

222+
logger.info("Performing attestation action with assertion.")
220223
try await _performAttestationAction(
221224
keyId: attestedKey.identifier,
222225
requestAssertion: requestAssertion
@@ -237,7 +240,7 @@ private struct AppAttestManager {
237240
} catch where error.isNetworkFailureOrTimeout {
238241
throw .networkError
239242
} catch {
240-
owsFailDebug("Failed to perform attestation action! \(error)", logger: logger)
243+
owsFailDebug("Unexpected error performing attestation action! \(error)", logger: logger)
241244
throw .genericError
242245
}
243246

@@ -257,6 +260,7 @@ private struct AppAttestManager {
257260
/// performed in the past.
258261
private func getOrGenerateAttestedKey() async throws(AttestationError) -> AttestedKey {
259262
if let attestedKeyIdentifier = readAttestedKeyIdentifier() {
263+
logger.info("Using previously-attested key.")
260264
return AttestedKey(identifier: attestedKeyIdentifier)
261265
}
262266

@@ -268,10 +272,11 @@ private struct AppAttestManager {
268272
} catch let dcError as DCError {
269273
throw parseDCError(dcError)
270274
} catch {
271-
owsFailDebug("Unexpected generating key! \(error)", logger: logger)
275+
owsFailDebug("Unexpected error generating key! \(error)", logger: logger)
272276
throw .genericError
273277
}
274278

279+
logger.info("Attesting and registering new key.")
275280
return try await attestAndRegisterKey(newKeyIdentifier: newKeyIdentifier)
276281
}
277282

@@ -337,20 +342,20 @@ private struct AppAttestManager {
337342
} catch where error.isNetworkFailureOrTimeout {
338343
throw .networkError
339344
} catch {
340-
owsFailDebug("Failed to get attestation challenge!", logger: logger)
345+
owsFailDebug("Unexpected error fetching attestation challenge! \(error)", logger: logger)
341346
throw .genericError
342347
}
343348

344349
switch response.responseStatusCode {
345350
case 200:
346351
break
347352
default:
348-
owsFailDebug("Unexpected status code requesting attestation challenge! \(response.responseStatusCode)", logger: logger)
353+
owsFailDebug("Unexpected status code fetching attestation challenge! \(response.responseStatusCode)", logger: logger)
349354
throw .genericError
350355
}
351356

352357
guard let responseBodyData = response.responseBodyData else {
353-
owsFailDebug("Missing response body data requesting attestation challenge!", logger: logger)
358+
owsFailDebug("Missing response body data fetching attestation challenge!", logger: logger)
354359
throw .genericError
355360
}
356361

@@ -364,7 +369,7 @@ private struct AppAttestManager {
364369
from: responseBodyData
365370
)
366371
} catch {
367-
owsFailDebug("Failed to decode response body requesting attestation challenge!", logger: logger)
372+
owsFailDebug("Failed to decode response body fetching attestation challenge! \(error)", logger: logger)
368373
throw .genericError
369374
}
370375

@@ -473,7 +478,7 @@ private struct AppAttestManager {
473478
}
474479

475480
guard let responseBodyData = response.responseBodyData else {
476-
owsFailDebug("Unexpectedly missing response body data fetching assertion challenge!", logger: logger)
481+
owsFailDebug("Missing response body data fetching assertion challenge!", logger: logger)
477482
throw .genericError
478483
}
479484

@@ -487,7 +492,7 @@ private struct AppAttestManager {
487492
from: responseBodyData
488493
)
489494
} catch {
490-
owsFailDebug("Failed to decode response body fetching assertion challenge!", logger: logger)
495+
owsFailDebug("Failed to decode response body fetching assertion challenge! \(error)", logger: logger)
491496
throw .genericError
492497
}
493498

0 commit comments

Comments
 (0)