@@ -395,15 +395,21 @@ final class BuzzDevPushEnrollmentDriverTests: XCTestCase {
395395 func testRejectedEnrollmentReplayIsReplacedOnlyOnTerminalStatus ( ) async throws {
396396 // A journaled request the gateway rejects must not be replayed for its whole
397397 // lifetime, nor replaced (with a fresh App Attest key) on every retry; a
398- // transient failure must keep the journal.
398+ // transient failure must keep the journal. A fresh 409 models a request that
399+ // committed before its response was lost and was rejected once its
400+ // attestation certificate expired: the replacement conflicts with the live
401+ // installation and its consumed challenge then returns 404.
399402 let interval = BuzzDevPushEnrollmentDriver . rejectedEnrollmentReplacementSeconds
400403 let cases : [ ( replay : Int , fresh : Int ? , elapsed : Int64 , legacy : Bool ) ] = [
401404 ( 400 , 201 , interval , false ) , ( 401 , 201 , interval , false ) , ( 404 , 201 , 0 , false ) ,
402405 ( 401 , 201 , 0 , true ) , ( 401 , nil , interval - 1 , false ) , ( 401 , 401 , interval , false ) ,
403- ( 503 , nil , interval , false ) ,
406+ ( 401 , 409 , interval , false ) , ( 503 , nil , interval , false ) ,
404407 ]
405408 for ( replayStatus , freshStatus , elapsed , legacy ) in cases {
406- let label = " replay \( replayStatus ) after \( elapsed ) s, legacy \( legacy ) "
409+ let fresh = freshStatus . map ( String . init ) ?? " none "
410+ let label = " replay \( replayStatus ) , fresh \( fresh ) after \( elapsed ) s, legacy \( legacy ) "
411+ // Status for a later exact replay of a fresh request.
412+ let freshReplayStatus = freshStatus == 409 ? 404 : freshStatus
407413 let store = MemoryGrantStore ( )
408414 let appAttest = RecordingAppAttest ( )
409415 var clock = Self . now
@@ -414,18 +420,27 @@ final class BuzzDevPushEnrollmentDriverTests: XCTestCase {
414420 lifetimeSeconds : 30 * 86_400
415421 )
416422 var challengeCount = 0
423+ var failChallenge = false
417424 var replayRequests = 0
418425 var freshRequests = 0
426+ var sentChallenges = Set < String > ( )
419427 URLProtocolStub . handler = { request in
420428 switch ( request . httpMethod , request . url ? . absoluteString ) {
421429 case ( " GET " , " https://relay.example/ " ) :
422430 return Self . response ( request , status : 200 , json : [
423431 " push " : [ " keys " : [ [ " pubkey " : Self . relayPubkey , " current " : true ] ] ]
424432 ] )
425433 case ( " POST " , " http://push.example/v1/installations/challenges " ) :
434+ if failChallenge {
435+ failChallenge = false
436+ throw URLError ( . notConnectedToInternet )
437+ }
426438 challengeCount += 1
427439 return Self . response ( request , status : 200 , json : [
428- " challenge_id " : challengeCount == 1 ? Self . firstChallengeId : Self . secondChallengeId ,
440+ " challenge_id " : [ Self . firstChallengeId , Self . secondChallengeId ] . indices
441+ . contains ( challengeCount - 1 )
442+ ? [ Self . firstChallengeId , Self . secondChallengeId ] [ challengeCount - 1 ]
443+ : UUID ( ) . uuidString . lowercased ( ) ,
429444 " challenge " : Self . challenge ,
430445 " expires_at " : clock + 300 ,
431446 ] )
@@ -437,7 +452,12 @@ final class BuzzDevPushEnrollmentDriverTests: XCTestCase {
437452 return Self . response ( request , status : replayStatus , json : [ " error " : " rejected " ] )
438453 }
439454 freshRequests += 1
440- let status = try XCTUnwrap ( freshStatus , " \( label ) must keep the journal " )
455+ let challengeId = try XCTUnwrap ( body [ " challenge_id " ] as? String )
456+ let isReplay = ! sentChallenges . insert ( challengeId ) . inserted
457+ let status = try XCTUnwrap (
458+ isReplay ? freshReplayStatus : freshStatus ,
459+ " \( label ) must keep the journal "
460+ )
441461 guard status == 201 else {
442462 return Self . response ( request , status : status , json : [ " error " : " rejected " ] )
443463 }
@@ -469,7 +489,7 @@ final class BuzzDevPushEnrollmentDriverTests: XCTestCase {
469489 clock += elapsed
470490
471491 // Two retries: the second must not replace a journal again.
472- for _ in 0 ..< 2 {
492+ for attempt in 0 ..< 2 {
473493 do {
474494 let grant = try await driver . enroll ( deviceToken : token , relayURL : Self . relayURL )
475495 XCTAssertEqual ( freshStatus , 201 , label )
@@ -479,7 +499,11 @@ final class BuzzDevPushEnrollmentDriverTests: XCTestCase {
479499 route : " v1/installations " , _, let actual , _
480500 ) {
481501 // The failure stays visible and leaves a durable journal to retry.
482- XCTAssertEqual ( actual , freshStatus ?? replayStatus , label )
502+ XCTAssertEqual (
503+ actual ,
504+ ( attempt == 0 ? freshStatus : freshReplayStatus ) ?? replayStatus ,
505+ label
506+ )
483507 XCTAssertEqual (
484508 store . pending . first ? . challengeId ,
485509 freshStatus == nil ? Self . firstChallengeId : Self . secondChallengeId ,
@@ -490,20 +514,51 @@ final class BuzzDevPushEnrollmentDriverTests: XCTestCase {
490514 XCTAssertEqual ( freshRequests , freshStatus == nil ? 0 : freshStatus == 201 ? 1 : 2 , label )
491515 XCTAssertEqual ( appAttest . preparedAttestations . count , freshStatus == nil ? 1 : 2 , label )
492516
493- guard freshStatus == 401 else { continue }
517+ guard let freshStatus , let freshReplayStatus , freshStatus != 201 else { continue }
494518 // Each consecutive replacement doubles the wait before the next one.
495- XCTAssertEqual ( store . pending . first ? . rejectedReplacements , 1 )
496- for ( advance , keys ) in [ ( interval , 2 ) , ( interval , 3 ) ] {
497- clock += advance
498- do {
499- _ = try await driver . enroll ( deviceToken : token , relayURL : Self . relayURL )
500- XCTFail ( " Expected the persistent rejection " )
501- } catch BuzzDevPushEnrollmentError . unexpectedStatus (
502- route : " v1/installations " , _, actual : 401 , _
503- ) { }
504- XCTAssertEqual ( appAttest . preparedAttestations . count , keys )
519+ XCTAssertEqual ( store . pending . first ? . rejectedReplacements , 1 , label )
520+ clock += interval
521+ await Self . assertEnrollmentStatus ( driver , token , freshReplayStatus , label )
522+ XCTAssertEqual ( appAttest . preparedAttestations . count , 2 , label )
523+
524+ // A replacement that fails before its request is durable keeps the
525+ // rejected journal and its count, even across a driver restart.
526+ clock += interval
527+ failChallenge = true
528+ do {
529+ _ = try await driver . enroll ( deviceToken : token , relayURL : Self . relayURL )
530+ XCTFail ( " Expected the simulated challenge failure: \( label ) " )
531+ } catch {
532+ XCTAssertEqual ( ( error as NSError ) . domain , NSURLErrorDomain , label )
505533 }
506- XCTAssertEqual ( store . pending . first ? . rejectedReplacements , 2 )
534+ XCTAssertEqual ( store . pending . first ? . rejectedReplacements , 1 , label )
535+ let restarted = try makeDriver (
536+ store : store ,
537+ appAttest : appAttest ,
538+ now : { Date ( timeIntervalSince1970 : TimeInterval ( clock ) ) } ,
539+ lifetimeSeconds : 30 * 86_400
540+ )
541+ await Self . assertEnrollmentStatus ( restarted , token , freshStatus , label )
542+ XCTAssertEqual ( appAttest . preparedAttestations . count , 3 , label )
543+ XCTAssertEqual ( store . pending . first ? . rejectedReplacements , 2 , label )
544+ }
545+ }
546+
547+ private static func assertEnrollmentStatus (
548+ _ driver : BuzzDevPushEnrollmentDriver ,
549+ _ token : Data ,
550+ _ status : Int ,
551+ _ label : String
552+ ) async {
553+ do {
554+ _ = try await driver . enroll ( deviceToken : token , relayURL : relayURL )
555+ XCTFail ( " Expected gateway status \( status ) : \( label ) " )
556+ } catch BuzzDevPushEnrollmentError . unexpectedStatus (
557+ route : " v1/installations " , _, let actual , _
558+ ) {
559+ XCTAssertEqual ( actual , status , label )
560+ } catch {
561+ XCTFail ( " Unexpected error \( error ) : \( label ) " )
507562 }
508563 }
509564
0 commit comments