Skip to content

Commit 554f50d

Browse files
committed
Bug 1990581 [wpt PR 55048] - Update JWT contents for DBSC, a=testonly
Automatic update from web-platform-tests Update JWT contents for DBSC This CL splits the header and payload functions in session_binding_utils.h in order to allow for three different JWT schemas for DBSC: - OTFeedback disabled (both registration and refresh) - OTFeedback enabled, registration - OTFeedback enabled, refresh We can clean up the Legacy* functions when removing the OTFeedback flag. Fixed: 442623885 Change-Id: If6700157859aaa669d4fd7a7775687654b6d025a Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6977530 Commit-Queue: Daniel Rubery <druberychromium.org> Reviewed-by: thefrog <thefrogchromium.org> Cr-Commit-Position: refs/heads/main{#1520715} -- wpt-commits: 5ca066a68da1ca0bccbc955d2725d922bb699405 wpt-pr: 55048 UltraBlame original commit: 7bc605a49417ce338e2717352bf664792fe9c1e3
1 parent 591ed6f commit 554f50d

File tree

3 files changed

+246
-28
lines changed

3 files changed

+246
-28
lines changed

testing/web-platform/tests/device-bound-session-credentials/jwt_helper.py

Lines changed: 244 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,12 +91,12 @@
9191

9292
key
9393
=
94-
decoded_payload
94+
decoded_header
9595
.
9696
get
9797
(
9898
'
99-
key
99+
jwk
100100
'
101101
)
102102

@@ -456,3 +456,245 @@
456456
encoded_data
457457
)
458458
)
459+
def
460+
thumbprint_for_jwk
461+
(
462+
jwk
463+
)
464+
:
465+
466+
filtered_jwk
467+
=
468+
None
469+
470+
if
471+
jwk
472+
[
473+
'
474+
kty
475+
'
476+
]
477+
=
478+
=
479+
'
480+
RSA
481+
'
482+
:
483+
484+
filtered_jwk
485+
=
486+
dict
487+
(
488+
)
489+
490+
filtered_jwk
491+
[
492+
'
493+
kty
494+
'
495+
]
496+
=
497+
jwk
498+
[
499+
'
500+
kty
501+
'
502+
]
503+
504+
filtered_jwk
505+
[
506+
'
507+
n
508+
'
509+
]
510+
=
511+
jwk
512+
[
513+
'
514+
n
515+
'
516+
]
517+
518+
filtered_jwk
519+
[
520+
'
521+
e
522+
'
523+
]
524+
=
525+
jwk
526+
[
527+
'
528+
e
529+
'
530+
]
531+
532+
elif
533+
jwk
534+
[
535+
'
536+
kty
537+
'
538+
]
539+
=
540+
=
541+
'
542+
EC
543+
'
544+
:
545+
546+
filtered_jwk
547+
=
548+
dict
549+
(
550+
)
551+
552+
filtered_jwk
553+
[
554+
'
555+
kty
556+
'
557+
]
558+
=
559+
jwk
560+
[
561+
'
562+
kty
563+
'
564+
]
565+
566+
filtered_jwk
567+
[
568+
'
569+
crv
570+
'
571+
]
572+
=
573+
jwk
574+
[
575+
'
576+
crv
577+
'
578+
]
579+
580+
filtered_jwk
581+
[
582+
'
583+
x
584+
'
585+
]
586+
=
587+
jwk
588+
[
589+
'
590+
x
591+
'
592+
]
593+
594+
filtered_jwk
595+
[
596+
'
597+
y
598+
'
599+
]
600+
=
601+
jwk
602+
[
603+
'
604+
y
605+
'
606+
]
607+
608+
else
609+
:
610+
611+
return
612+
None
613+
614+
serialized_jwk
615+
=
616+
json
617+
.
618+
dumps
619+
(
620+
filtered_jwk
621+
sort_keys
622+
=
623+
True
624+
separators
625+
=
626+
(
627+
'
628+
'
629+
'
630+
:
631+
'
632+
)
633+
)
634+
635+
digest
636+
=
637+
hashes
638+
.
639+
Hash
640+
(
641+
hashes
642+
.
643+
SHA256
644+
(
645+
)
646+
)
647+
648+
digest
649+
.
650+
update
651+
(
652+
serialized_jwk
653+
.
654+
encode
655+
(
656+
"
657+
utf
658+
-
659+
8
660+
"
661+
)
662+
)
663+
664+
thumbprint_base64
665+
=
666+
base64
667+
.
668+
b64encode
669+
(
670+
digest
671+
.
672+
finalize
673+
(
674+
)
675+
altchars
676+
=
677+
b
678+
"
679+
-
680+
_
681+
"
682+
)
683+
.
684+
rstrip
685+
(
686+
b
687+
"
688+
=
689+
"
690+
)
691+
692+
return
693+
thumbprint_base64
694+
.
695+
decode
696+
(
697+
'
698+
ascii
699+
'
700+
)

testing/web-platform/tests/device-bound-session-credentials/refresh_session.py

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -341,30 +341,6 @@
341341
challenge
342342
:
343343

344-
return
345-
(
346-
400
347-
response
348-
.
349-
headers
350-
"
351-
"
352-
)
353-
354-
if
355-
jwt_payload
356-
.
357-
get
358-
(
359-
"
360-
sub
361-
"
362-
)
363-
!
364-
=
365-
session_id_header
366-
:
367-
368344
return
369345
(
370346
400

testing/web-platform/tests/device-bound-session-credentials/start_session.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,12 +136,12 @@
136136
set_session_key
137137
(
138138
session_id
139-
jwt_payload
139+
jwt_header
140140
.
141141
get
142142
(
143143
'
144-
key
144+
jwk
145145
'
146146
)
147147
)

0 commit comments

Comments
 (0)