Commit77dd924eRecorded18 Oct 2026Repositorysigil-quic
Validate QUIC early-data sentinel in discarded TLS tickets
Changed
README.md | 3 ++
scripts/native-tls-tests.mjs | 7 +++-
src/sigil/quic/tls/handshake.sgl | 6 ++++
test/test-ticket-validation.sgl | 284 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 299 insertions(+), 1 deletion(-)Diff
README.mdmodified
@@ -343,6 +343,9 @@ Our send path still pads ack-eliciting server Initials and all client Initials;
343
servers still discard client Initials in datagrams under 1,200 bytes. 344
Well-formed NewSessionTickets are discarded regardless of lifetime without 345
retiring completed TLS. Ticket parsing and the 64-message work limit still apply.+346
The ticket's optional `early_data` extension must contain the four-byte QUIC+347
sentinel `0xffffffff`; another value closes with PROTOCOL_VIOLATION, while a+348
malformed extension length produces TLS decode_error. No ticket enables 0-RTT. 349
350
`QUIC_CONNECTION_RED=1 sigil test test/test-connection.sgl` must fail two 351
completion controls. `QUIC_HP_SABOTAGE=1 sigil test test/test-connection.sgl`scripts/native-tls-tests.mjsmodified
@@ -28,6 +28,7 @@ const files = [
28
'test-closing.sgl', 29
'test-api-validation.sgl', 30
'test-quic-conformance.sgl',+31
'test-ticket-validation.sgl', 32
'test-psk-fallback.sgl', 33
'test-sni-fallback.sgl', 34
'test-tls-identity.sgl',@@ -56,7 +57,8 @@ const cidZero = process.argv.includes('--cid-zero');
57
const cidSequence = process.argv.includes('--cid-sequence'); 58
const handlerReadiness = process.argv.includes('--handler-readiness'); 59
const seenBudget = process.argv.includes('--seen-budget');−59
if ([cleanupFaults, secretCleanup, secretRetention, handshakeCleanup, packetRetention, factoryCleanup, eventCleanup, constructionCleanup, pathResponse, cidZero, cidSequence, handlerReadiness, seenBudget].filter(Boolean).length > 1) {+60
const ticketValidation = process.argv.includes('--ticket-validation');+61
if ([cleanupFaults, secretCleanup, secretRetention, handshakeCleanup, packetRetention, factoryCleanup, eventCleanup, constructionCleanup, pathResponse, cidZero, cidSequence, handlerReadiness, seenBudget, ticketValidation].filter(Boolean).length > 1) { 62
throw new Error('Select one focused test suite'); 63
} 64
if (cleanupFaults) {@@ -98,6 +100,9 @@ if (handlerReadiness) {
100
if (seenBudget) { 101
files.splice(0, files.length, 'test-tls-seen.sgl', '../scripts/seen-budget-tests.sgl'); 102
}+103
if (ticketValidation) {+104
files.splice(0, files.length, 'test-ticket-validation.sgl');+105
} 106
const bodies = files.map(file => { 107
const text = readFileSync(join(root, 'test', file), 'utf8'); 108
const boundary = text.indexOf('\n\n');src/sigil/quic/tls/handshake.sglmodified
@@ -560,6 +560,12 @@
560
;; No lifetime can make this ticket resumable: all tickets are 561
;; discarded. Still validate every field and count the work below. 562
(tls-finish! reader)+563
(let ((early (assoc 42 extensions)))+564
(when early+565
(unless (= (bytevector-length (cdr early)) 4)+566
(raise-tls-alert 50 "TLS: malformed ticket early_data"))+567
(unless (= (tls-read-uint! (make-tls-reader (cdr early)) 4) 4294967295)+568
(raise-quic-error 10 #f "QUIC ticket early_data requires the uint32 sentinel")))) 569
(set-tls-handshake-tickets! engine (+ (tls-handshake-tickets engine) 1))))) 570
571
(define (receive-message! engine wire)test/test-ticket-validation.sgladded
@@ -0,0 +1,284 @@
+1
(import (sigil test)+2
(sigil crypto)+3
(sigil quic bytes)+4
(sigil quic wire)+5
(sigil quic frame)+6
(sigil quic packet)+7
(sigil quic reassembly)+8
(sigil quic connection)+9
(sigil quic stream)+10
(sigil quic error)+11
(sigil quic tls)+12
(sigil quic tls codec))+13
+14
;; A public TLS peer owns its keys. The target connection exposes no secrets.+15
;; Fields: connection/TLS, read/write keys, peer PNs/target largest PNs,+16
;; CRYPTO reassemblers/offsets, observed output/handler frames, time, peer role,+17
;; HANDSHAKE_DONE flag, target CID and peer CID.+18
(define ticket-peer-original #u8(1 2 3 4 5 6 7 8))+19
(define ticket-peer-client-id #u8(11 12 13 14 15 16 17 18))+20
(define ticket-peer-server-id #u8(21 22 23 24 25 26 27 28))+21
+22
(define (ticket-peer-index level)+23
(case level ((initial) 0) ((handshake) 1) ((application) 2)))+24
+25
(define (ticket-peer-wipe! bytes)+26
(when (bytevector? bytes)+27
(do ((i 0 (+ i 1))) ((= i (bytevector-length bytes)))+28
(bytevector-u8-set! bytes i 0))))+29
+30
(define (ticket-peer-build! peer level frames)+31
(let* ((index (ticket-peer-index level)) (numbers (vector-ref peer 4))+32
(number (vector-ref numbers index)) (role (vector-ref peer 11))+33
(destination (if (and (eq? role 'client) (eq? level 'initial)+34
(= -1 (vector-ref (vector-ref peer 5) 0)))+35
ticket-peer-original (vector-ref peer 13)))+36
(source (if (eq? level 'application) #u8() (vector-ref peer 14)))+37
(body (encode-frames frames level role))+38
(header (encode-packet-header level destination source #u8() number 4+39
(+ 16 (bytevector-length body))+40
length-width: (and (not (eq? level 'application)) 2)))+41
(payload (if (eq? level 'initial)+42
(bytes-append body+43
(make-bytevector (- 1200 16 (bytevector-length header) (bytevector-length body)) 0))+44
body)))+45
(vector-set! numbers index (+ number 1))+46
(cons number+47
(seal-quic-packet (vector-ref (vector-ref peer 3) index) level destination source+48
number payload length-width: (and (not (eq? level 'application)) 2)))))+49
+50
(define (ticket-peer-receive! peer packet now)+51
(vector-set! peer 10 now)+52
(quic-receive! (vector-ref peer 0) packet now))+53
+54
(define (ticket-peer-send! peer level frames)+55
(let ((packet (ticket-peer-build! peer level frames)))+56
(ticket-peer-receive! peer (cdr packet) (vector-ref peer 10))+57
packet))+58
+59
(define (ticket-peer-events! peer)+60
(for-each+61
(lambda (event)+62
(let* ((level (tls-event-level event)) (index (ticket-peer-index level))+63
(data (tls-event-data event)))+64
(case (tls-event-kind event)+65
((secrets)+66
(when (car data)+67
(vector-set! (vector-ref peer 2) index (traffic-keys (car data)))+68
(ticket-peer-wipe! (car data)))+69
(when (cdr data)+70
(vector-set! (vector-ref peer 3) index (traffic-keys (cdr data)))+71
(ticket-peer-wipe! (cdr data))))+72
((crypto)+73
(let* ((offsets (vector-ref peer 7)) (offset (vector-ref offsets index)))+74
(ticket-peer-send! peer level+75
(list (make-quic-frame 6 (list (cons 'offset offset) (cons 'data data)))))+76
(vector-set! offsets index (+ offset (bytevector-length data))))))))+77
(tls-take-events! (vector-ref peer 1)))+78
(when (and (eq? (vector-ref peer 11) 'server)+79
(tls-complete? (vector-ref peer 1)) (not (vector-ref peer 12)))+80
(vector-set! peer 12 #t)+81
(ticket-peer-send! peer 'application (list (make-quic-frame 30 '())))))+82
+83
(define (ticket-peer-read! peer packet ack?)+84
(let* ((header (decode-packet-header packet 0 8)) (level (quic-header-kind header))+85
(index (ticket-peer-index level)) (largest (vector-ref peer 5))+86
(opened (open-quic-packet packet 0 8 (vector-ref (vector-ref peer 2) index)+87
(vector-ref largest index))))+88
(unless opened (error "Ticket fixture target packet did not authenticate"))+89
(let* ((number (opened-quic-packet-number opened))+90
(frames (decode-frames (opened-quic-packet-payload opened) level+91
(quic-role (vector-ref peer 0)))))+92
(vector-set! largest index (max number (vector-ref largest index)))+93
(when (eq? level 'application)+94
(vector-set! peer 8 (cons (cons number frames) (vector-ref peer 8))))+95
(for-each+96
(lambda (frame)+97
(when (= (quic-frame-type frame) 6)+98
(let ((receiver (vector-ref (vector-ref peer 6) index)))+99
(reassembler-insert! receiver (frame-ref frame 'offset) (frame-ref frame 'data))+100
(let ((bytes (reassembler-read! receiver)))+101
(when (> (bytevector-length bytes) 0)+102
(tls-input! (vector-ref peer 1) level bytes)+103
;; Install client-side Handshake keys before opening the+104
;; next packet in the server's already returned flight.+105
(ticket-peer-events! peer)))))) frames)+106
(when (and ack? (any frame-ack-eliciting? frames))+107
(ticket-peer-send! peer level+108
(list (make-quic-frame 2+109
(list (cons 'ranges (list (cons number number))) (cons 'delay 0)))))))))+110
+111
(define (ticket-peer-output! peer now (keys: (ack? #t)))+112
(vector-set! peer 10 now)+113
(let ((packets (quic-take-datagrams! (vector-ref peer 0) now)))+114
(for-each (lambda (packet) (ticket-peer-read! peer packet ack?)) packets)+115
packets))+116
+117
(define (ticket-peer-live? peer)+118
(let ((connection (vector-ref peer 0)))+119
(and (quic-confirmed? connection) (not (quic-closed? connection))+120
(not (quic-failure connection)))))+121
+122
(define (ticket-peer-with-peer role procedure)+123
(let ((key (ecdsa-p256-generate-keypair)) (connection #f) (engine #f) (peer #f))+124
(dynamic-wind+125
(lambda () #t)+126
(lambda ()+127
(let* ((client? (eq? role 'client)) (peer-role (if client? 'server 'client))+128
(target-id (if client? ticket-peer-client-id ticket-peer-server-id))+129
(peer-id (if client? ticket-peer-server-id ticket-peer-client-id))+130
(parameters+131
(append (stream-transport-parameters peer-role receive-window: 64)+132
(list (cons 1 (encode-varint 30000)) (cons 15 peer-id))+133
(if client? (list (cons 0 ticket-peer-original)) '()))))+134
(set! connection+135
(if client?+136
(make-quic-client (list #u8(113 49)) 'pinned-key+137
(stream-transport-parameters role receive-window: 64)+138
(make-tls-pin-verifier (cdr key)) local-id: target-id destination-id: ticket-peer-original)+139
(make-quic-server (list #u8(113 49))+140
(stream-transport-parameters role receive-window: 64)+141
(list #u8(48 1 0)) (car key) ticket-peer-original peer-id local-id: target-id)))+142
(set! engine+143
(if client?+144
(make-tls-server (list #u8(113 49)) parameters (list #u8(48 1 0)) (car key))+145
(make-tls-client (list #u8(113 49)) 'pinned-key parameters+146
(make-tls-pin-verifier (cdr key)))))+147
(set! peer+148
(vector connection engine+149
(vector (initial-keys ticket-peer-original role) #f #f)+150
(vector (initial-keys ticket-peer-original peer-role) #f #f)+151
(vector 0 0 0) (vector -1 -1 -1)+152
(vector (make-byte-reassembler 65536) (make-byte-reassembler 65536)+153
(make-byte-reassembler 65536))+154
(vector 0 0 0) '() '() 0 peer-role #f target-id peer-id))+155
(tls-bind-peer! engine ticket-peer-original target-id #f)+156
(if client?+157
(quic-start! connection 0)+158
(begin (tls-start! engine) (ticket-peer-events! peer)))+159
(do ((round 0 (+ round 1))) ((= round 12))+160
(ticket-peer-output! peer 0)+161
(ticket-peer-events! peer))+162
(unless (and (ticket-peer-live? peer) (tls-complete? engine)+163
(vector-ref (vector-ref peer 2) 2) (vector-ref (vector-ref peer 3) 2))+164
(error "Ticket fixture protected handshake did not complete"))+165
(vector-set! peer 8 '())+166
(procedure peer)))+167
(lambda ()+168
(when connection (quic-abort! connection))+169
(when engine (tls-abort! engine))+170
(when peer+171
(for-each+172
(lambda (keys) (when keys (discard-packet-keys! keys)))+173
(append (vector->list (vector-ref peer 2)) (vector->list (vector-ref peer 3))))+174
(for-each reassembler-close! (vector->list (vector-ref peer 6))))+175
(ticket-peer-wipe! (car key))))))+176
+177
(define (ticket-validation-wire early (keys: (lifetime 604800)))+178
(encode-handshake 4+179
(bytes-append+180
(tls-uint lifetime 4)+181
(tls-uint 0 4)+182
(tls-vector #u8() 1 0 255)+183
(tls-vector #u8(42) 2 1 65535)+184
(encode-extensions+185
(append (list (cons 1234 #u8(7 8))) (if early (list (cons 42 early)) '()))))))+186
+187
(define (ticket-validation-send! peer wire (keys: (fragment? #f)))+188
(let ((offsets (vector-ref peer 7)) (number #f))+189
(let loop ((start 0))+190
(when (and (< start (bytevector-length wire)) (ticket-peer-live? peer))+191
(let* ((end (if fragment? (+ start 1) (bytevector-length wire)))+192
(data (bytevector-copy wire start end))+193
(offset (vector-ref offsets 2))+194
(packet (ticket-peer-send! peer 'application+195
(list (make-quic-frame 6+196
(list (cons 'offset offset) (cons 'data data)))))))+197
(set! number (car packet))+198
(vector-set! offsets 2 (+ offset (bytevector-length data)))+199
(loop end))))+200
number))+201
+202
(define (ticket-validation-observed peer type)+203
(filter (lambda (frame) (= type (quic-frame-type frame)))+204
(apply append (map cdr (vector-ref peer 8)))))+205
+206
(define (ticket-validation-close? peer code)+207
(ticket-peer-output! peer 0 ack?: #f)+208
(let ((failure (quic-failure (vector-ref peer 0)))+209
(closes (ticket-validation-observed peer 28)))+210
(and (quic-closed? (vector-ref peer 0))+211
(quic-error? failure)+212
(= code (quic-error-code failure))+213
(= 1 (length closes))+214
(= code (frame-ref (car closes) 'error)))))+215
+216
(define (ticket-validation-reject! wire code (keys: (fragment? #f)))+217
(ticket-peer-with-peer 'client+218
(lambda (peer)+219
(ticket-validation-send! peer wire fragment?: fragment?)+220
(assert-true (ticket-validation-close? peer code)))))+221
+222
(define (ticket-validation-acknowledged? peer number)+223
(ticket-peer-output! peer 0)+224
(and (ticket-peer-live? peer)+225
(any+226
(lambda (frame)+227
(any (lambda (range) (<= (car range) number (cdr range)))+228
(frame-ref frame 'ranges)))+229
(ticket-validation-observed peer 2))))+230
+231
(test-group "QUIC discarded ticket early_data validation"+232
(test "ql6-ticket: zero early-data value is a protected protocol violation"+233
(ticket-validation-reject! (ticket-validation-wire (tls-uint 0 4)) 10))+234
(test "ql6-ticket: one early-data value is a protected protocol violation"+235
(ticket-validation-reject! (ticket-validation-wire (tls-uint 1 4)) 10))+236
(test "ql6-ticket: value below sentinel is a protected protocol violation"+237
(ticket-validation-reject! (ticket-validation-wire (tls-uint 4294967294 4)) 10))+238
(test "ql6-ticket: discarded overlong lifetime cannot bypass sentinel validation"+239
(ticket-validation-reject! (ticket-validation-wire (tls-uint 0 4) lifetime: 4294967295) 10))+240
(test "ql6-ticket: empty early-data extension is a protected decode error"+241
(ticket-validation-reject! (ticket-validation-wire #u8()) 306))+242
(test "ql6-ticket: trailing early-data extension bytes are a protected decode error"+243
(ticket-validation-reject! (ticket-validation-wire #u8(255 255 255 255 0)) 306))+244
(test "ql6-ticket: byte-fragmented short extension is a protected decode error"+245
(ticket-validation-reject! (ticket-validation-wire #u8(255 255 255)) 306 fragment?: #t))+246
(test "ql6-ticket: a valid coalesced prefix cannot hide a nonsentinel ticket"+247
(ticket-validation-reject!+248
(bytes-append (ticket-validation-wire #u8(255 255 255 255))+249
(ticket-validation-wire (tls-uint 0 4))) 10))+250
(test "ql6-ticket-control: sentinel and unknown extension survive any lifetime"+251
(ticket-peer-with-peer 'client+252
(lambda (peer)+253
(for-each+254
(lambda (lifetime)+255
(let ((number (ticket-validation-send! peer+256
(ticket-validation-wire #u8(255 255 255 255) lifetime: lifetime))))+257
(assert-true (ticket-validation-acknowledged? peer number))))+258
'(0 604800 604801 4294967295)))))+259
(test "ql6-ticket-control: omitted early-data extension survives byte fragmentation"+260
(ticket-peer-with-peer 'client+261
(lambda (peer)+262
(let ((number (ticket-validation-send! peer (ticket-validation-wire #f) fragment?: #t)))+263
(assert-true (ticket-validation-acknowledged? peer number))))))+264
(test "ql6-ticket-control: sentinel tickets still obey the sixty-four message cap"+265
(ticket-peer-with-peer 'client+266
(lambda (peer)+267
(let ((wire (ticket-validation-wire #u8(255 255 255 255))))+268
(do ((i 0 (+ i 1))) ((= i 64))+269
(let ((number (ticket-validation-send! peer wire)))+270
(unless (ticket-validation-acknowledged? peer number)+271
(error "Ticket fixture lost a valid ticket before the work cap"))))+272
(ticket-validation-send! peer wire)+273
(assert-true (ticket-validation-close? peer 296))))))+274
(test "ql6-ticket-control: unauthenticated invalid ticket cannot poison CRYPTO offsets"+275
(ticket-peer-with-peer 'client+276
(lambda (peer)+277
(let* ((wire (ticket-validation-wire (tls-uint 0 4)))+278
(packet (ticket-peer-build! peer 'application+279
(list (make-quic-frame 6 (list (cons 'offset 0) (cons 'data wire))))))+280
(protected (cdr packet)))+281
(ticket-peer-receive! peer (flip-byte protected (- (bytevector-length protected) 1)) 0)+282
(assert-true (ticket-peer-live? peer))+283
(let ((number (ticket-validation-send! peer (ticket-validation-wire #u8(255 255 255 255)))))+284
(assert-true (ticket-validation-acknowledged? peer number))))))))