@@ -327,7 +327,8 @@ struct BuzzDCAppAttestProvider: BuzzDevAppAttesting {
327327public final class BuzzDevPushEnrollmentDriver {
328328 public static let endpointEpoch : Int64 = 1
329329 /// Minimum age before a journaled installation request the gateway rejected
330- /// is replaced, which bounds fresh App Attest keys while rejections persist.
330+ /// is replaced. It doubles with each consecutive replacement, which bounds
331+ /// fresh App Attest keys while rejections persist.
331332 static let rejectedEnrollmentReplacementSeconds : Int64 = 3_600
332333
333334 private let gatewayBaseURL : URL
@@ -402,6 +403,14 @@ public final class BuzzDevPushEnrollmentDriver {
402403 public func enroll (
403404 deviceToken : Data ,
404405 relayURL : URL
406+ ) async throws -> BuzzPushEndpointGrantRecord {
407+ try await enroll ( deviceToken : deviceToken , relayURL : relayURL , rejectedReplacements : 0 )
408+ }
409+
410+ private func enroll (
411+ deviceToken : Data ,
412+ relayURL : URL ,
413+ rejectedReplacements : Int
405414 ) async throws -> BuzzPushEndpointGrantRecord {
406415 precondition ( ! deviceToken . isEmpty , " The APNs device token must not be empty " )
407416 let relayOrigin = try Self . relayOrigin ( relayURL )
@@ -426,19 +435,26 @@ public final class BuzzDevPushEnrollmentDriver {
426435 // Finish an unexpired request using its exact journaled endpoint before
427436 // replacing it. A token/key change does not make a response-lost request
428437 // safe to discard, nor does it require revoking sibling installations.
438+ var replacements = 0
429439 if pending . expiresAt > nowSeconds {
430- _ = try await resumeEnrollment (
440+ if case . replaced ( let count ) = try await resumeEnrollment (
431441 pending ,
432442 storedRecords : storedRecords ,
433443 relayMetadataPubkey : nil
434- )
444+ ) {
445+ replacements = count
446+ }
435447 } else {
436448 try store . removePendingEnrollment (
437449 gatewayOrigin : gatewayOrigin ,
438450 relayOrigin : relayOrigin . text
439451 )
440452 }
441- return try await enroll ( deviceToken : deviceToken , relayURL : relayURL )
453+ return try await enroll (
454+ deviceToken : deviceToken ,
455+ relayURL : relayURL ,
456+ rejectedReplacements : replacements
457+ )
442458 }
443459 let newestSharedGrant = storedRecords . filter {
444460 $0 . gatewayOrigin == gatewayOrigin && $0 . relayPubkey == relayPubkey
@@ -544,21 +560,28 @@ public final class BuzzDevPushEnrollmentDriver {
544560 challenge : enrollmentChallenge . value ,
545561 keyId : attestation . keyId ,
546562 attestation : attestation . attestation ,
547- preparedAt : nowSeconds
563+ preparedAt : nowSeconds ,
564+ rejectedReplacements : rejectedReplacements
548565 )
549566 // The exact signed request is durable before the first network attempt.
550567 try store . savePendingEnrollment ( pending )
551568 }
552569
553570 if pendingEnrollment != nil {
554- if let record = try await resumeEnrollment (
571+ switch try await resumeEnrollment (
555572 pending ,
556573 storedRecords : storedRecords ,
557574 relayMetadataPubkey : relayKeys . metadataPubkey
558575 ) {
576+ case . completed ( let record ) :
559577 return record
578+ case . replaced ( let count ) :
579+ return try await enroll (
580+ deviceToken : deviceToken ,
581+ relayURL : relayURL ,
582+ rejectedReplacements : count
583+ )
560584 }
561- return try await enroll ( deviceToken : deviceToken , relayURL : relayURL )
562585 }
563586 return try await completeEnrollment (
564587 pending ,
@@ -567,16 +590,24 @@ public final class BuzzDevPushEnrollmentDriver {
567590 )
568591 }
569592
593+ private enum Resumption {
594+ case completed ( BuzzPushEndpointGrantRecord )
595+ /// The journal was discarded; a fresh request carries this rejection count.
596+ case replaced ( rejectedReplacements : Int )
597+ }
598+
570599 private func resumeEnrollment (
571600 _ pending : BuzzPushPendingEnrollmentRecord ,
572601 storedRecords : [ BuzzPushEndpointGrantRecord ] ,
573602 relayMetadataPubkey : String ?
574- ) async throws -> BuzzPushEndpointGrantRecord ? {
603+ ) async throws -> Resumption {
575604 do {
576- return try await completeEnrollment (
577- pending ,
578- storedRecords : storedRecords ,
579- relayMetadataPubkey : relayMetadataPubkey
605+ return . completed (
606+ try await completeEnrollment (
607+ pending ,
608+ storedRecords : storedRecords ,
609+ relayMetadataPubkey : relayMetadataPubkey
610+ )
580611 )
581612 } catch BuzzDevPushEnrollmentError . unexpectedStatus (
582613 route : " v1/installations " , _, let actual , _
@@ -588,15 +619,18 @@ public final class BuzzDevPushEnrollmentDriver {
588619 gatewayOrigin : gatewayOrigin ,
589620 relayOrigin : pending . relayOrigin
590621 )
591- return nil
622+ return . replaced (
623+ rejectedReplacements : actual == 404 ? 0 : ( pending . rejectedReplacements ?? 0 ) + 1
624+ )
592625 }
593626 }
594627
595628 /// 404 means the exact replay found no committed installation and its
596629 /// challenge expired. The gateway returns 400 and 401 before looking up a
597630 /// committed installation, so the same bytes can never recover one; those
598- /// journals are replaced only once old enough, because every replacement
599- /// generates and attests a new App Attest key.
631+ /// journals are replaced only once old enough, with the wait doubling for
632+ /// each consecutive replacement, because every replacement generates and
633+ /// attests a new App Attest key.
600634 private func replacesRejectedJournal (
601635 _ pending : BuzzPushPendingEnrollmentRecord ,
602636 _ status : Int
@@ -607,7 +641,8 @@ public final class BuzzDevPushEnrollmentDriver {
607641 case 400 , 401 :
608642 guard let preparedAt = pending . preparedAt else { return true }
609643 let nowSeconds = Int64 ( now ( ) . timeIntervalSince1970 )
610- return nowSeconds - preparedAt >= Self . rejectedEnrollmentReplacementSeconds
644+ let doublings = min ( pending . rejectedReplacements ?? 0 , 20 )
645+ return nowSeconds - preparedAt >= Self . rejectedEnrollmentReplacementSeconds << doublings
611646 default :
612647 return false
613648 }
@@ -664,7 +699,8 @@ public final class BuzzDevPushEnrollmentDriver {
664699 keyId : pending . keyId ,
665700 attestation : pending . attestation ,
666701 delegationGeneration : pending . delegationGeneration ,
667- preparedAt : pending . preparedAt
702+ preparedAt : pending . preparedAt ,
703+ rejectedReplacements : pending . rejectedReplacements
668704 )
669705 try store . savePendingEnrollment ( pending )
670706 }
@@ -703,7 +739,8 @@ public final class BuzzDevPushEnrollmentDriver {
703739 keyId : pending . keyId ,
704740 attestation : pending . attestation ,
705741 delegationGeneration : generation ,
706- preparedAt : pending . preparedAt
742+ preparedAt : pending . preparedAt ,
743+ rejectedReplacements : pending . rejectedReplacements
707744 )
708745 // Reserve before delegation so a committed delegation followed by a local
709746 // save failure is retried at a strictly higher generation.
0 commit comments