@@ -98,10 +98,10 @@ it.layer(NodeServices.layer)("SessionStore.layer", (it) => {
9898 Effect . forkScoped ( { startImmediately : true } ) ,
9999 ) ;
100100 const first = yield * sessions
101- . awaitInvalidation ( client . sessionId )
101+ . awaitInvalidation ( client . sessionId , relaySessionInput . proofKeyThumbprint )
102102 . pipe ( Effect . forkScoped ( { startImmediately : true } ) ) ;
103103 const second = yield * sessions
104- . awaitInvalidation ( client . sessionId )
104+ . awaitInvalidation ( client . sessionId , relaySessionInput . proofKeyThumbprint )
105105 . pipe ( Effect . forkScoped ( { startImmediately : true } ) ) ;
106106 if ( operation === "revoke" ) yield * sessions . revoke ( client . sessionId ) ;
107107 else if ( operation === "revokeAllExcept" ) yield * sessions . revokeAllExcept ( owner . sessionId ) ;
@@ -120,7 +120,7 @@ it.layer(NodeServices.layer)("SessionStore.layer", (it) => {
120120 yield * sessions . markConnected ( client . sessionId ) ;
121121 const invalidated = yield * Deferred . make < void > ( ) ;
122122 const watcher = yield * sessions
123- . awaitInvalidation ( client . sessionId )
123+ . awaitInvalidation ( client . sessionId , relaySessionInput . proofKeyThumbprint )
124124 . pipe (
125125 Effect . andThen ( Deferred . succeed ( invalidated , undefined ) ) ,
126126 Effect . forkScoped ( { startImmediately : true } ) ,
@@ -133,6 +133,102 @@ it.layer(NodeServices.layer)("SessionStore.layer", (it) => {
133133 } ) . pipe ( Effect . scoped , Effect . provide ( Layer . merge ( layerSessionStore ( ) , TestClock . layer ( ) ) ) ) ,
134134 ) ;
135135
136+ it . effect . each ( [
137+ { name : "a renewal for the same key" , renewal : { } , closesAtMinute : 119 } ,
138+ {
139+ name : "a renewal for another key" ,
140+ renewal : { proofKeyThumbprint : "other-proof-key" } ,
141+ closesAtMinute : 60 ,
142+ } ,
143+ {
144+ name : "a renewal with fewer scopes" ,
145+ renewal : { scopes : [ "orchestration:read" ] as const } ,
146+ closesAtMinute : 60 ,
147+ } ,
148+ {
149+ name : "a renewal, until the original is revoked" ,
150+ renewal : { } ,
151+ closesAtMinute : 90 ,
152+ revoke : "original" ,
153+ } ,
154+ {
155+ name : "a renewal, until the renewal is revoked" ,
156+ renewal : { } ,
157+ closesAtMinute : 90 ,
158+ revoke : "renewal" ,
159+ } ,
160+ ] as const ) ( "closes a DPoP socket at minute $closesAtMinute after $name" , ( testCase ) =>
161+ Effect . gen ( function * ( ) {
162+ const sessions = yield * SessionStore . SessionStore ;
163+ const client = yield * sessions . issue ( relaySessionInput ) ;
164+ const invalidated = yield * Deferred . make < void > ( ) ;
165+ const watcher = yield * sessions
166+ . awaitInvalidation ( client . sessionId , relaySessionInput . proofKeyThumbprint )
167+ . pipe (
168+ Effect . andThen ( Deferred . succeed ( invalidated , undefined ) ) ,
169+ Effect . forkScoped ( { startImmediately : true } ) ,
170+ ) ;
171+ yield * TestClock . adjust ( Duration . minutes ( 59 ) ) ;
172+ const renewal = yield * sessions . issue ( { ...relaySessionInput , ...testCase . renewal } ) ;
173+ yield * TestClock . adjust ( Duration . millis ( ( testCase . closesAtMinute - 59 ) * 60_000 - 1 ) ) ;
174+ expect ( yield * Deferred . isDone ( invalidated ) ) . toBe ( false ) ;
175+ yield * TestClock . adjust ( Duration . millis ( 1 ) ) ;
176+ if ( "revoke" in testCase ) {
177+ yield * sessions . revoke (
178+ testCase . revoke === "original" ? client . sessionId : renewal . sessionId ,
179+ ) ;
180+ }
181+ yield * Fiber . join ( watcher ) ;
182+ } ) . pipe ( Effect . scoped , Effect . provide ( Layer . merge ( layerSessionStore ( ) , TestClock . layer ( ) ) ) ) ,
183+ ) ;
184+
185+ it . effect ( "closes a DPoP socket when an earlier renewal in its chain is revoked" , ( ) =>
186+ Effect . gen ( function * ( ) {
187+ const sessions = yield * SessionStore . SessionStore ;
188+ const client = yield * sessions . issue ( relaySessionInput ) ;
189+ const invalidated = yield * Deferred . make < void > ( ) ;
190+ const watcher = yield * sessions
191+ . awaitInvalidation ( client . sessionId , relaySessionInput . proofKeyThumbprint )
192+ . pipe (
193+ Effect . andThen ( Deferred . succeed ( invalidated , undefined ) ) ,
194+ Effect . forkScoped ( { startImmediately : true } ) ,
195+ ) ;
196+ yield * TestClock . adjust ( Duration . minutes ( 59 ) ) ;
197+ const first = yield * sessions . issue ( relaySessionInput ) ;
198+ yield * TestClock . adjust ( Duration . minutes ( 59 ) ) ;
199+ yield * sessions . issue ( relaySessionInput ) ;
200+ // Past the first renewal's expiry, so the socket now follows the second.
201+ yield * TestClock . adjust ( Duration . minutes ( 2 ) ) ;
202+ expect ( yield * Deferred . isDone ( invalidated ) ) . toBe ( false ) ;
203+ yield * sessions . revoke ( first . sessionId ) ;
204+ yield * Fiber . join ( watcher ) ;
205+ } ) . pipe ( Effect . scoped , Effect . provide ( Layer . merge ( layerSessionStore ( ) , TestClock . layer ( ) ) ) ) ,
206+ ) ;
207+
208+ it . effect ( "keeps a renewed DPoP socket when another socket on its expired session closes" , ( ) =>
209+ Effect . gen ( function * ( ) {
210+ const sessions = yield * SessionStore . SessionStore ;
211+ const client = yield * sessions . issue ( relaySessionInput ) ;
212+ yield * sessions . markConnected ( client . sessionId ) ;
213+ const invalidated = yield * Deferred . make < void > ( ) ;
214+ const watcher = yield * sessions
215+ . awaitInvalidation ( client . sessionId , relaySessionInput . proofKeyThumbprint )
216+ . pipe (
217+ Effect . andThen ( Deferred . succeed ( invalidated , undefined ) ) ,
218+ Effect . forkScoped ( { startImmediately : true } ) ,
219+ ) ;
220+ yield * TestClock . adjust ( Duration . minutes ( 59 ) ) ;
221+ yield * sessions . issue ( relaySessionInput ) ;
222+ yield * TestClock . adjust ( Duration . minutes ( 2 ) ) ;
223+ // An expired session that loses its last socket is reported as removed, not revoked.
224+ yield * sessions . markDisconnected ( client . sessionId ) ;
225+ yield * TestClock . adjust ( Duration . millis ( 58 * 60_000 - 1 ) ) ;
226+ expect ( yield * Deferred . isDone ( invalidated ) ) . toBe ( false ) ;
227+ yield * TestClock . adjust ( Duration . millis ( 1 ) ) ;
228+ yield * Fiber . join ( watcher ) ;
229+ } ) . pipe ( Effect . scoped , Effect . provide ( Layer . merge ( layerSessionStore ( ) , TestClock . layer ( ) ) ) ) ,
230+ ) ;
231+
136232 it . effect ( "keys remote cookies by environment identity instead of state directory" , ( ) =>
137233 Effect . gen ( function * ( ) {
138234 const cookieName = ( stateDir : string , environmentId : EnvironmentId ) =>
0 commit comments