1- import * as Clock from "effect/Clock" ;
21import * as Digest from "effect/crypto/Digest" ;
32import * as SecureRandom from "effect/crypto/SecureRandom" ;
43import * as Data from "effect/Data" ;
@@ -10,7 +9,8 @@ import * as Schema from "effect/Schema";
109import * as ExpoCrypto from "expo-crypto" ;
1110import * as SecureStore from "expo-secure-store" ;
1211import { p256 } from "@noble/curves/nist" ;
13- import { DpopPublicJwk , normalizeDpopHtu } from "@t3tools/shared/dpopCommon" ;
12+ import { DpopProof } from "@t3tools/client-runtime/relay" ;
13+ import { DpopPublicJwk } from "@t3tools/shared/dpopCommon" ;
1414import * as Layer from "effect/Layer" ;
1515
1616export class CloudDpopError extends Data . TaggedError ( "CloudDpopError" ) < {
@@ -31,27 +31,6 @@ const DpopPrivateJwkJson = Schema.fromJsonString(DpopPrivateJwkSchema);
3131const decodeDpopPrivateJwkJson = Schema . decodeUnknownEffect ( DpopPrivateJwkJson ) ;
3232const encodeDpopPrivateJwkJson = Schema . encodeEffect ( DpopPrivateJwkJson ) ;
3333
34- const DpopJwtHeaderJson = Schema . fromJsonString (
35- Schema . Struct ( {
36- typ : Schema . Literal ( "dpop+jwt" ) ,
37- alg : Schema . Literal ( "ES256" ) ,
38- jwk : DpopPublicJwk ,
39- } ) ,
40- ) ;
41-
42- const DpopJwtPayloadJson = Schema . fromJsonString (
43- Schema . Struct ( {
44- htm : Schema . String ,
45- htu : Schema . String ,
46- jti : Schema . String ,
47- iat : Schema . Int ,
48- ath : Schema . optionalKey ( Schema . String ) ,
49- } ) ,
50- ) ;
51-
52- const encodeDpopJwtHeaderJson = Schema . encodeEffect ( DpopJwtHeaderJson ) ;
53- const encodeDpopJwtPayloadJson = Schema . encodeEffect ( DpopJwtPayloadJson ) ;
54-
5534function toExpoDigestAlgorithm ( algorithm : Digest . Algorithm ) : ExpoCrypto . CryptoDigestAlgorithm {
5635 switch ( algorithm . name ) {
5736 case "MD5" :
@@ -91,7 +70,6 @@ type DpopPrivateJwk = typeof DpopPrivateJwkSchema.Type;
9170export interface DpopProofKeyPair {
9271 readonly privateJwk : DpopPrivateJwk ;
9372 readonly publicJwk : DpopPublicJwk ;
94- readonly thumbprint : string ;
9573}
9674
9775const DPOP_PROOF_KEY_STORAGE_KEY = "t3code.cloud.dpop-proof-key" ;
@@ -110,40 +88,6 @@ function sha256Digest(
11088 ) ;
11189}
11290
113- function base64UrlSha256 (
114- data : Uint8Array ,
115- message : string ,
116- ) : Effect . Effect < string , CloudDpopError , Digest . Digest > {
117- return sha256Digest ( data , message ) . pipe ( Effect . map ( Base64Url . encode ) ) ;
118- }
119-
120- function dpopThumbprintInput ( jwk : DpopPublicJwk ) : string {
121- return JSON . stringify ( {
122- crv : jwk . crv ,
123- kty : jwk . kty ,
124- x : jwk . x ,
125- y : jwk . y ,
126- } ) ;
127- }
128-
129- function computeDpopJwkThumbprintEffect (
130- jwk : DpopPublicJwk ,
131- ) : Effect . Effect < string , CloudDpopError , Digest . Digest > {
132- return base64UrlSha256 (
133- new TextEncoder ( ) . encode ( dpopThumbprintInput ( jwk ) ) ,
134- "Could not hash the DPoP public key thumbprint." ,
135- ) ;
136- }
137-
138- function computeDpopAccessTokenHashEffect (
139- accessToken : string ,
140- ) : Effect . Effect < string , CloudDpopError , Digest . Digest > {
141- return base64UrlSha256 (
142- new TextEncoder ( ) . encode ( accessToken ) ,
143- "Could not hash the DPoP access token." ,
144- ) ;
145- }
146-
14791function secureRandomBytes (
14892 byteCount : number ,
14993 message : string ,
@@ -190,12 +134,7 @@ export const generateDpopProofKeyPair = Effect.fn("dpop.generateDpopProofKeyPair
190134 try : ( ) => publicJwkFromUncompressedPublicKey ( p256 . getPublicKey ( privateKey , false ) ) ,
191135 catch : cloudDpopError ( "Generated DPoP public key is invalid." ) ,
192136 } ) ;
193- const thumbprint = yield * computeDpopJwkThumbprintEffect ( publicJwk ) ;
194- return {
195- privateJwk : privateJwkFromPrivateKey ( privateKey , publicJwk ) ,
196- publicJwk,
197- thumbprint,
198- } ;
137+ return { privateJwk : privateJwkFromPrivateKey ( privateKey , publicJwk ) , publicJwk } ;
199138 } ,
200139) ;
201140
@@ -226,11 +165,7 @@ export const loadOrCreateDpopProofKeyPair = Effect.fn("dpop.loadOrCreateDpopProo
226165 } ,
227166 catch : cloudDpopError ( "Stored DPoP proof key is invalid." ) ,
228167 } ) ;
229- const thumbprint = yield * computeDpopJwkThumbprintEffect ( restored . publicJwk ) ;
230- return {
231- ...restored ,
232- thumbprint,
233- } ;
168+ return restored ;
234169 }
235170 const generated = yield * generateDpopProofKeyPair ( ) ;
236171 const encodedPrivateJwk = yield * encodeDpopPrivateJwkJson ( generated . privateJwk ) . pipe (
@@ -244,63 +179,28 @@ export const loadOrCreateDpopProofKeyPair = Effect.fn("dpop.loadOrCreateDpopProo
244179 } ,
245180) ;
246181
247- function normalizeHtu ( url : string ) : Effect . Effect < string , CloudDpopError > {
248- const normalized = normalizeDpopHtu ( url ) ;
249- return normalized
250- ? Effect . succeed ( normalized )
251- : Effect . fail ( new CloudDpopError ( { message : "DPoP URL is invalid." } ) ) ;
252- }
253-
254- export const createDpopProof = Effect . fn ( "dpop.createDpopProof" ) ( function * ( input : {
255- readonly method : string ;
256- readonly url : string ;
257- readonly accessToken ?: string ;
258- readonly proofKey ?: DpopProofKeyPair ;
259- } ) : Effect . fn . Return <
260- { readonly proof : string ; readonly thumbprint : string } ,
261- CloudDpopError ,
262- SecureRandom . SecureRandom | Digest . Digest
263- > {
264- const keyPair = input . proofKey ?? ( yield * generateDpopProofKeyPair ( ) ) ;
182+ /** The installation's DPoP key, signing with @noble/curves over an Expo SHA-256 digest. */
183+ export const loadOrCreateProofKey = Effect . fn ( "dpop.loadOrCreateProofKey" ) ( function * ( ) {
184+ const digest = yield * Digest . Digest ;
185+ const keyPair = yield * loadOrCreateDpopProofKeyPair ( ) ;
265186 const privateKey = yield * Effect . try ( {
266187 try : ( ) => base64UrlToBytes ( keyPair . privateJwk . d ) ,
267188 catch : cloudDpopError ( "Could not import DPoP private key." ) ,
268189 } ) ;
269- const nowMs = yield * Clock . currentTimeMillis ;
270- const jti = yield * SecureRandom . SecureRandom . pipe (
271- Effect . flatMap ( ( random ) => random . uuidV4 ( ) ) ,
272- Effect . mapError ( cloudDpopError ( "Could not generate DPoP proof identifier." ) ) ,
273- ) ;
274- const htu = yield * normalizeHtu ( input . url ) ;
275- const header = yield * encodeDpopJwtHeaderJson ( {
276- typ : "dpop+jwt" ,
277- alg : "ES256" ,
278- jwk : keyPair . publicJwk ,
279- } ) . pipe (
280- Effect . map ( Base64Url . encode ) ,
281- Effect . mapError ( cloudDpopError ( "Could not encode DPoP proof header." ) ) ,
282- ) ;
283- const ath = input . accessToken ? yield * computeDpopAccessTokenHashEffect ( input . accessToken ) : null ;
284- const payload = yield * encodeDpopJwtPayloadJson ( {
285- htm : input . method . toUpperCase ( ) ,
286- htu,
287- jti,
288- iat : Math . floor ( nowMs / 1_000 ) ,
289- ...( ath ? { ath } : { } ) ,
290- } ) . pipe (
291- Effect . map ( Base64Url . encode ) ,
292- Effect . mapError ( cloudDpopError ( "Could not encode DPoP proof payload." ) ) ,
293- ) ;
294- const signatureInputHash = yield * sha256Digest (
295- new TextEncoder ( ) . encode ( `${ header } .${ payload } ` ) ,
296- "Could not hash DPoP signing input." ,
297- ) ;
298- const signature = yield * Effect . try ( {
299- try : ( ) => p256 . sign ( signatureInputHash , privateKey , { prehash : false } ) . toCompactRawBytes ( ) ,
300- catch : cloudDpopError ( "Could not sign DPoP proof." ) ,
301- } ) ;
302190 return {
303- proof : `${ header } .${ payload } .${ Base64Url . encode ( signature ) } ` ,
304- thumbprint : keyPair . thumbprint ,
305- } ;
191+ publicJwk : keyPair . publicJwk ,
192+ sign : ( signingInput ) =>
193+ sha256Digest ( signingInput , "Could not hash DPoP signing input." ) . pipe (
194+ Effect . provideService ( Digest . Digest , digest ) ,
195+ Effect . flatMap ( ( hash ) =>
196+ Effect . try ( {
197+ try : ( ) => p256 . sign ( hash , privateKey , { prehash : false } ) . toCompactRawBytes ( ) ,
198+ catch : cloudDpopError ( "Could not sign DPoP proof." ) ,
199+ } ) ,
200+ ) ,
201+ Effect . mapError (
202+ ( cause ) => new DpopProof . DpopProofError ( { message : "Could not sign DPoP proof." , cause } ) ,
203+ ) ,
204+ ) ,
205+ } satisfies DpopProof . DpopProofKey ;
306206} ) ;
0 commit comments