@@ -47,13 +47,8 @@ import * as Path from "effect/Path";
4747import * as Schema from "effect/Schema" ;
4848import * as Stream from "effect/Stream" ;
4949
50- import {
51- base64UrlDecodeUtf8 ,
52- base64UrlEncode ,
53- signPayload ,
54- verifyPayloadSignature ,
55- } from "../auth/utils.ts" ;
56- import * as ServerSecretStore from "../auth/ServerSecretStore.ts" ;
50+ import { base64UrlDecodeUtf8 , base64UrlEncode } from "../auth/utils.ts" ;
51+ import * as AssetSigner from "./AssetSigner.ts" ;
5752import { makeIsServerInternalPath } from "../auth/serverInternalPaths.ts" ;
5853import { parseAttachmentFileExtension , resolveAttachmentPathById } from "../attachmentStore.ts" ;
5954import * as ServerConfig from "../config.ts" ;
@@ -70,7 +65,6 @@ import * as HostProcess from "@t3tools/shared/HostProcess";
7065
7166export const ASSET_ROUTE_PREFIX = "/api/assets" ;
7267
73- const SIGNING_SECRET_NAME = "asset-access-signing-key" ;
7468const ASSET_TOKEN_TTL_MS = 60 * 60 * 1000 ;
7569const PROJECT_FAVICON_TOKEN_BUCKET_MS = 30 * 60 * 1000 ;
7670const HTML_ATTACHMENT_TOKEN_BUCKET_MS = 30 * 60 * 1000 ;
@@ -848,16 +842,6 @@ export const issueAssetUrl = Effect.fn("AssetAccess.issueAssetUrl")(function* (i
848842 }
849843 }
850844
851- const secretStore = yield * ServerSecretStore . ServerSecretStore ;
852- const signingSecret = yield * secretStore . getOrCreateRandom ( SIGNING_SECRET_NAME , 32 ) . pipe (
853- Effect . mapError (
854- ( cause ) =>
855- new AssetSigningKeyLoadError ( {
856- resource : input . resource ,
857- cause,
858- } ) ,
859- ) ,
860- ) ;
861845 if ( claims . kind === "project-favicon" || claims . kind === "project-favicon-external" ) {
862846 const issuedAt = yield * Clock . currentTimeMillis ;
863847 expiresAt =
@@ -872,7 +856,13 @@ export const issueAssetUrl = Effect.fn("AssetAccess.issueAssetUrl")(function* (i
872856 claims = { ...claims , expiresAt } ;
873857 }
874858 const encodedPayload = base64UrlEncode ( encodeAssetClaims ( claims ) ) ;
875- const token = `${ encodedPayload } .${ yield * signPayload ( encodedPayload , signingSecret ) } ` ;
859+ const signer = yield * AssetSigner . AssetSigner ;
860+ const signature = yield * signer
861+ . sign ( encodedPayload )
862+ . pipe (
863+ Effect . mapError ( ( cause ) => new AssetSigningKeyLoadError ( { resource : input . resource , cause } ) ) ,
864+ ) ;
865+ const token = `${ encodedPayload } .${ signature } ` ;
876866 return {
877867 relativeUrl : `${ ASSET_ROUTE_PREFIX } /${ token } /${ encodeURIComponent ( fileName ) } ` ,
878868 expiresAt,
@@ -889,13 +879,12 @@ export const resolveAsset = Effect.fn("AssetAccess.resolveAsset")(function* (
889879 const [ encodedPayload , signature ] = token . split ( "." ) ;
890880 if ( ! encodedPayload || ! signature ) return null ;
891881
892- const secretStore = yield * ServerSecretStore . ServerSecretStore ;
893- const signingSecret = yield * secretStore . getOrCreateRandom ( SIGNING_SECRET_NAME , 32 ) . pipe (
882+ const signer = yield * AssetSigner . AssetSigner ;
883+ const verified = yield * signer . verify ( encodedPayload , signature ) . pipe (
894884 Effect . tapError ( ( cause ) => Effect . logError ( "Failed to load the asset signing key." , { cause } ) ) ,
895- Effect . orElseSucceed ( ( ) => null ) ,
885+ Effect . orElseSucceed ( ( ) => false ) ,
896886 ) ;
897- if ( ! signingSecret ) return null ;
898- if ( ! ( yield * verifyPayloadSignature ( encodedPayload , signature , signingSecret ) ) ) return null ;
887+ if ( ! verified ) return null ;
899888
900889 const claims = decodeClaims ( encodedPayload ) ;
901890 if ( ! claims || claims . expiresAt <= ( yield * Clock . currentTimeMillis ) ) return null ;
0 commit comments