@getstrata/core 2.2.60 → 3.0.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +22 -0
- package/dist/core/audit/exportAuditLogs.d.ts +12 -3
- package/dist/core/audit/exportStore.d.ts +6 -2
- package/dist/core/audit/siemFormatter.d.ts +2 -2
- package/dist/core/auth/abilityCatalog.d.ts +1 -9
- package/dist/core/auth/authContext.d.ts +2 -0
- package/dist/core/auth/authOutcome.d.ts +32 -0
- package/dist/core/auth/authReader.d.ts +22 -0
- package/dist/core/auth/basicAuthGuard.d.ts +19 -3
- package/dist/core/auth/emailVerification.d.ts +1 -1
- package/dist/core/auth/guard.d.ts +27 -6
- package/dist/core/auth/intendedUrlCookie.d.ts +13 -7
- package/dist/core/auth/jwt.d.ts +5 -4
- package/dist/core/auth/jwtGuard.d.ts +7 -6
- package/dist/core/auth/membershipContext.d.ts +10 -7
- package/dist/core/auth/membershipContextMiddleware.d.ts +3 -3
- package/dist/core/auth/membershipMiddleware.d.ts +1 -2
- package/dist/core/auth/membershipServiceImplementation.d.ts +1 -1
- package/dist/core/auth/oauth/oidcIdToken.d.ts +25 -16
- package/dist/core/auth/oauth/oidcProvider.d.ts +6 -4
- package/dist/core/auth/oauth/providers.d.ts +3 -1
- package/dist/core/auth/oneTimeToken.d.ts +2 -3
- package/dist/core/auth/passwordConfirmCookie.d.ts +15 -6
- package/dist/core/auth/passwordLogin.d.ts +5 -5
- package/dist/core/auth/pendingMfaCookie.d.ts +2 -2
- package/dist/core/auth/policy.d.ts +23 -10
- package/dist/core/auth/requireAuthCapability.d.ts +3 -0
- package/dist/core/auth/resolveMembershipService.d.ts +3 -2
- package/dist/core/auth/saml/samlAssertionReplay.d.ts +4 -4
- package/dist/core/auth/saml/samlServiceProvider.d.ts +11 -7
- package/dist/core/auth/scimAuthMiddleware.d.ts +10 -3
- package/dist/core/auth/sessionCookie.d.ts +20 -9
- package/dist/core/auth/sessionGuard.d.ts +14 -3
- package/dist/core/cache/createCacheStore.d.ts +6 -3
- package/dist/core/cache/redisCacheStore.d.ts +5 -1
- package/dist/core/cache/repository.d.ts +5 -1
- package/dist/core/cache/simpleCache.d.ts +2 -1
- package/dist/core/cache/tokens.d.ts +8 -0
- package/dist/core/config/applicationConfig.d.ts +21 -0
- package/dist/core/config/configSnapshot.d.ts +3 -0
- package/dist/core/config/envSchema.d.ts +3 -2
- package/dist/core/contracts/application.d.ts +153 -0
- package/dist/core/contracts/authUserDirectory.d.ts +24 -7
- package/dist/core/contracts/container.d.ts +20 -23
- package/dist/core/contracts/di.d.ts +4 -2
- package/dist/core/contracts/executionContext.d.ts +5 -0
- package/dist/core/contracts/executionOperations.d.ts +10 -0
- package/dist/core/contracts/executionOwnership.d.ts +38 -0
- package/dist/core/contracts/persistence.d.ts +20 -0
- package/dist/core/contracts/serviceTokens.d.ts +32 -18
- package/dist/core/contracts/services.d.ts +63 -0
- package/dist/core/contracts/token.d.ts +19 -0
- package/dist/core/crypto/fieldEncryption.d.ts +19 -7
- package/dist/core/crypto/fieldEncryptionRotation.d.ts +21 -5
- package/dist/core/crypto/mfaSecret.d.ts +10 -3
- package/dist/core/database/baseRepository.d.ts +14 -10
- package/dist/core/database/bindings.d.ts +6 -0
- package/dist/core/database/bunSql.d.ts +3 -12
- package/dist/core/database/definitions.d.ts +209 -0
- package/dist/core/database/dialect.d.ts +5 -24
- package/dist/core/database/driverPorts.d.ts +116 -0
- package/dist/core/database/errors.d.ts +47 -7
- package/dist/core/database/factory.d.ts +51 -31
- package/dist/core/database/index.d.ts +9 -10
- package/dist/core/database/keyset.d.ts +2 -1
- package/dist/core/database/legacyNativeTransaction.d.ts +5 -0
- package/dist/core/database/manager.d.ts +12 -0
- package/dist/core/database/model.d.ts +91 -97
- package/dist/core/database/modelQuery.d.ts +9 -5
- package/dist/core/database/modelRegistry.d.ts +52 -33
- package/dist/core/database/mysqlConnection.d.ts +1 -19
- package/dist/core/database/mysqlNative.d.ts +38 -0
- package/dist/core/database/nativeTransactions.d.ts +16 -0
- package/dist/core/database/ormInternal.d.ts +85 -0
- package/dist/core/database/ormRuntime.d.ts +4 -0
- package/dist/core/database/ownedReadOnlyObservation.d.ts +16 -0
- package/dist/core/database/postgresNative.d.ts +11 -0
- package/dist/core/database/query.d.ts +24 -23
- package/dist/core/database/queryPlanSnapshot.d.ts +7 -0
- package/dist/core/database/rawMysql.d.ts +7 -0
- package/dist/core/database/rawPostgres.d.ts +23 -0
- package/dist/core/database/rawSqlite.d.ts +6 -0
- package/dist/core/database/relationQueries.d.ts +3 -2
- package/dist/core/database/relationQuery.d.ts +24 -6
- package/dist/core/database/repositoryQuery.d.ts +6 -1
- package/dist/core/database/schema/driver.d.ts +1 -1
- package/dist/core/database/seeders/types.d.ts +1 -1
- package/dist/core/database/session.d.ts +13 -0
- package/dist/core/database/sessionFactory.d.ts +9 -0
- package/dist/core/database/sqlDialects.d.ts +22 -0
- package/dist/core/database/tokens.d.ts +7 -0
- package/dist/core/database/transactionSession.d.ts +43 -0
- package/dist/core/errors/http.d.ts +4 -1
- package/dist/core/events/{eventBus.d.ts → eventBusClass.d.ts} +1 -3
- package/dist/core/events/index.d.ts +2 -3
- package/dist/core/events/outbox/index.d.ts +44 -13
- package/dist/core/events/outbox/metrics.d.ts +4 -4
- package/dist/core/events/outbox/workerTransport.d.ts +17 -0
- package/dist/core/http/authMiddleware.d.ts +2 -2
- package/dist/core/http/authorizeMiddleware.d.ts +2 -2
- package/dist/core/http/bodySizeLimitMiddleware.d.ts +1 -1
- package/dist/core/http/conditionalResponse.d.ts +7 -2
- package/dist/core/http/contentSecurityPolicy.d.ts +4 -3
- package/dist/core/http/corsMiddleware.d.ts +2 -1
- package/dist/core/http/csrfMiddleware.d.ts +6 -1
- package/dist/core/http/csrfToken.d.ts +17 -7
- package/dist/core/http/databaseError.d.ts +4 -0
- package/dist/core/http/etag.d.ts +5 -2
- package/dist/core/http/flashMiddleware.d.ts +1 -1
- package/dist/core/http/flashSession.d.ts +13 -7
- package/dist/core/http/index.d.ts +1 -1
- package/dist/core/http/loginThrottleMiddleware.d.ts +3 -3
- package/dist/core/http/memoryThrottleMiddleware.d.ts +2 -2
- package/dist/core/http/parseMultipartUpload.d.ts +3 -2
- package/dist/core/http/requestMetaContext.d.ts +5 -0
- package/dist/core/http/requireAbilityMiddleware.d.ts +1 -1
- package/dist/core/http/requireAuthMiddleware.d.ts +2 -2
- package/dist/core/http/requirePasswordConfirmMiddleware.d.ts +2 -1
- package/dist/core/http/requireVerifiedMiddleware.d.ts +2 -2
- package/dist/core/http/requireWebAuthMiddleware.d.ts +2 -2
- package/dist/core/http/response.d.ts +4 -3
- package/dist/core/http/scimThrottleMiddleware.d.ts +4 -3
- package/dist/core/http/securedRouteModelBinding.d.ts +10 -3
- package/dist/core/http/securityHeadersMiddleware.d.ts +1 -2
- package/dist/core/http/signedUrl.d.ts +8 -6
- package/dist/core/http/throttleMiddleware.d.ts +9 -5
- package/dist/core/http/uploads.d.ts +9 -3
- package/dist/core/http/webErrorResponse.d.ts +8 -2
- package/dist/core/jobs/exportAuditLogsJob.d.ts +5 -2
- package/dist/core/jobs/invalidateCacheTagsJob.d.ts +5 -4
- package/dist/core/lifecycle/gracefulShutdown.d.ts +2 -5
- package/dist/core/logging/requestLoggingMiddleware.d.ts +1 -1
- package/dist/core/mail/mailer.d.ts +7 -5
- package/dist/core/openapi/generator.d.ts +12 -4
- package/dist/core/openapi/registeredRoute.d.ts +4 -4
- package/dist/core/queue/createAppQueue.d.ts +9 -4
- package/dist/core/queue/failedJobMetrics.d.ts +11 -2
- package/dist/core/queue/failedJobRepository.d.ts +6 -3
- package/dist/core/queue/failedJobService.d.ts +1 -0
- package/dist/core/queue/index.d.ts +16 -6
- package/dist/core/queue/jobRegistry.d.ts +3 -2
- package/dist/core/queue/jobRunner.d.ts +10 -4
- package/dist/core/queue/publicQueue.d.ts +18 -9
- package/dist/core/queue/queueConfig.d.ts +20 -10
- package/dist/core/queue/queueHandoff.d.ts +31 -0
- package/dist/core/queue/queueMetrics.d.ts +10 -3
- package/dist/core/queue/queueServices.d.ts +28 -0
- package/dist/core/queue/queueWorkerTransport.d.ts +28 -0
- package/dist/core/queue/redisQueue.d.ts +19 -10
- package/dist/core/queue/redisQueueKeys.d.ts +5 -5
- package/dist/core/queue/redisStreams.d.ts +17 -10
- package/dist/core/queue/resilientQueue.d.ts +10 -4
- package/dist/core/queue/types.d.ts +1 -0
- package/dist/core/runtime/appKeyPrefix.d.ts +5 -5
- package/dist/core/runtime/application.d.ts +7 -0
- package/dist/core/runtime/executionContext.d.ts +9 -0
- package/dist/core/runtime/executionTasks.d.ts +49 -0
- package/dist/core/runtime/resourceJournal.d.ts +67 -0
- package/dist/core/runtime/serviceGraph.d.ts +14 -0
- package/dist/core/security/oauthState.d.ts +13 -9
- package/dist/core/security/publicReads.d.ts +2 -2
- package/dist/core/security/safeFetch.d.ts +1 -0
- package/dist/core/security/safeUrl.d.ts +3 -0
- package/dist/core/security/scimTenantTokens.d.ts +1 -1
- package/dist/core/security/tokenExpiry.d.ts +1 -1
- package/dist/core/security/webhookSignature.d.ts +1 -1
- package/dist/core/storage/storage.d.ts +24 -16
- package/dist/core/tenant/databaseTenantContext.d.ts +5 -7
- package/dist/core/tenant/resolveTenant.d.ts +2 -2
- package/dist/core/tenant/scopedDatabasePolicy.d.ts +8 -0
- package/dist/core/tenant/tenantDatabaseScope.d.ts +3 -7
- package/dist/core/tenant/tenantMiddleware.d.ts +15 -4
- package/dist/core/tracing/otel.d.ts +4 -6
- package/dist/core/tracing/tracingMiddleware.d.ts +3 -3
- package/dist/core/view/etaViewEngine.d.ts +1 -1
- package/dist/core/view/index.d.ts +5 -4
- package/dist/core/view/tokens.d.ts +8 -0
- package/dist/core/view/viewRenderer.d.ts +2 -2
- package/dist/core/view/webErrorView.d.ts +8 -7
- package/dist/core/view/webLayoutData.d.ts +6 -4
- package/dist/entries/audit/exportAuditLogs.js +87 -1024
- package/dist/entries/audit/siemFormatter.js +4 -90
- package/dist/entries/auth/abilityCatalog.js +28 -0
- package/dist/entries/auth/accessControl.js +5 -16
- package/dist/entries/auth/accountStateMigration.js +216 -236
- package/dist/entries/auth/authOutcome.js +80 -0
- package/dist/entries/auth/authReader.js +68 -0
- package/dist/entries/auth/basicAuthGuard.js +144 -1249
- package/dist/entries/auth/emailVerification.js +2 -2
- package/dist/entries/auth/intendedUrlCookie.js +35 -59
- package/dist/entries/auth/jwt.js +22 -47
- package/dist/entries/auth/jwtGuard.js +99 -231
- package/dist/entries/auth/membershipMiddleware.js +71 -10
- package/dist/entries/auth/membershipScope.js +16 -22
- package/dist/entries/auth/membershipService.js +11 -28
- package/dist/entries/auth/oauth/oidcProvider.js +59 -64
- package/dist/entries/auth/oauth/providers.js +12 -95
- package/dist/entries/auth/oauth/samlProvider.js +53 -1080
- package/dist/entries/auth/oneTimeToken.js +27 -289
- package/dist/entries/auth/passwordConfirmCookie.js +40 -63
- package/dist/entries/auth/passwordLogin.js +94 -399
- package/dist/entries/auth/pendingMfaCookie.js +6 -6
- package/dist/entries/auth/policy.js +22 -56
- package/dist/entries/auth/saml/samlServiceProvider.js +55 -1084
- package/dist/entries/auth/scimAuthMiddleware.js +16 -3358
- package/dist/entries/auth/sessionCookie.js +58 -73
- package/dist/entries/auth/sessionGuard.js +95 -248
- package/dist/entries/auth/tokenHash.js +11 -43
- package/dist/entries/cache/createCacheStore.js +126 -117
- package/dist/entries/cache/repository.js +25 -0
- package/dist/entries/cache/simpleCache.js +12 -7
- package/dist/entries/cache/tokens.js +9 -0
- package/dist/entries/config/applicationConfig.js +163 -0
- package/dist/entries/config/envSchema.js +21 -4
- package/dist/entries/contracts/application.js +1 -0
- package/dist/entries/contracts/authUserDirectory.js +10 -0
- package/dist/entries/contracts/container.js +99 -26
- package/dist/entries/contracts/di.js +3 -0
- package/dist/entries/contracts/executionContext.js +7 -0
- package/dist/entries/contracts/executionOperations.js +7 -0
- package/dist/entries/contracts/executionOwnership.js +7 -0
- package/dist/entries/contracts/membership.js +1 -0
- package/dist/entries/contracts/persistence.js +1 -0
- package/dist/entries/contracts/serviceTokens.js +26 -116
- package/dist/entries/contracts/services.js +98 -0
- package/dist/entries/contracts/token.js +41 -0
- package/dist/entries/crypto/fieldEncryption.js +49 -50
- package/dist/entries/crypto/mfaSecret.js +86 -82
- package/dist/entries/database/acquisitionMetrics.js +107 -0
- package/dist/entries/database/baseRepository.d.ts +2 -0
- package/dist/entries/database/bindings.js +2082 -0
- package/dist/entries/database/definitions.js +175 -0
- package/dist/entries/database/errors.js +114 -89
- package/dist/entries/database/factory.js +67 -28
- package/dist/entries/database/migrations.js +172 -224
- package/dist/entries/database/model.d.ts +1 -0
- package/dist/entries/database/ownedReadOnlyObservation.js +1282 -0
- package/dist/entries/database/query.js +159 -161
- package/dist/entries/database/repositoryQuery.d.ts +1 -0
- package/dist/entries/database/repositoryQuery.js +1 -1373
- package/dist/entries/database/schema.js +216 -236
- package/dist/entries/database/session.js +1 -0
- package/dist/entries/database/sqliteConnection.js +525 -83
- package/dist/entries/database/tokens.js +9 -0
- package/dist/entries/errors/http.js +118 -1
- package/dist/entries/http/authMiddleware.js +8 -5
- package/dist/entries/http/authorizeMiddleware.js +1 -1
- package/dist/entries/http/bodySizeLimitMiddleware.js +2 -2
- package/dist/entries/http/clientIp.js +2 -2
- package/dist/entries/http/conditionalResponse.js +19 -7
- package/dist/entries/http/corsMiddleware.js +6 -101
- package/dist/entries/http/csrfMiddleware.js +92 -106
- package/dist/entries/http/csrfToken.js +58 -94
- package/dist/entries/http/etag.js +7 -4
- package/dist/entries/http/flashMiddleware.js +57 -99
- package/dist/entries/http/flashSession.js +41 -68
- package/dist/entries/http/memoryThrottleMiddleware.js +43 -186
- package/dist/entries/http/metricsMiddleware.js +2 -16
- package/dist/entries/http/parseMultipartUpload.js +15 -29
- package/dist/entries/http/requireAbilityMiddleware.js +2 -2
- package/dist/entries/http/requirePasswordConfirmMiddleware.js +19 -31
- package/dist/entries/http/requireVerifiedMiddleware.js +4 -7
- package/dist/entries/http/requireWebAuthMiddleware.js +2 -2
- package/dist/entries/http/response.js +67 -233
- package/dist/entries/http/routeMiddleware.js +0 -14
- package/dist/entries/http/scimThrottleMiddleware.js +43 -237
- package/dist/entries/http/securedRouteModelBinding.js +37 -25
- package/dist/entries/http/securityHeadersMiddleware.js +8 -25
- package/dist/entries/http/signedUrl.js +20 -110
- package/dist/entries/http/throttleMiddleware.js +41 -185
- package/dist/entries/http/uploads.js +9 -24
- package/dist/entries/jobs/exportAuditLogsJob.js +17 -1498
- package/dist/entries/jobs/invalidateCacheTagsJob.js +12 -47
- package/dist/entries/logging/requestLoggingMiddleware.js +4 -4
- package/dist/entries/mail/mailer.js +68 -78
- package/dist/entries/openapi/generator.js +33 -100
- package/dist/entries/queue/createAppQueue.js +416 -256
- package/dist/entries/queue/failedJobRepository.js +17 -8
- package/dist/entries/queue/failedJobService.js +1 -0
- package/dist/entries/queue/jobRunner.js +141 -66
- package/dist/entries/queue/publicQueue.js +411 -257
- package/dist/entries/queue/queueConfig.js +61 -0
- package/dist/entries/queue/queueHandoff.js +318 -0
- package/dist/entries/queue/queueMetrics.js +989 -1386
- package/dist/entries/queue/queueServices.js +133 -0
- package/dist/entries/queue/queueWorkerTransport.js +1703 -0
- package/dist/entries/queue/redisQueue.js +282 -180
- package/dist/entries/queue.js +6 -45
- package/dist/entries/runtime/application.js +1585 -0
- package/dist/entries/runtime/asyncContextStore.js +0 -16
- package/dist/entries/security/oauthState.js +35 -67
- package/dist/entries/security/publicReads.js +4 -4
- package/dist/entries/security/safeFetch.js +1 -0
- package/dist/entries/security/scimTenantTokens.js +3 -3
- package/dist/entries/security/tokenExpiry.js +2 -2
- package/dist/entries/security/totp.js +1 -87
- package/dist/entries/security/webhookSignature.js +2 -90
- package/dist/entries/storage/storage.js +120 -45
- package/dist/entries/tenant/databaseTenantContext.js +6 -907
- package/dist/entries/tenant/publicTenantHost.js +78 -0
- package/dist/entries/tenant/resolveTenant.js +14 -0
- package/dist/entries/tenant/scopedDatabasePolicy.js +75 -0
- package/dist/entries/tenant/tenancyConfig.js +1 -19
- package/dist/entries/tenant/tenantDatabaseScope.js +3 -892
- package/dist/entries/tracing/tracingMiddleware.js +104 -173
- package/dist/entries/view/tokens.js +11 -0
- package/dist/framework/public-api.d.ts +62 -44
- package/dist/index.js +10435 -11351
- package/dist/internal/ormInternal.js +117 -0
- package/dist/internal/ormRuntime.js +5000 -0
- package/package.json +158 -46
- package/dist/core/database/bindConnection.d.ts +0 -1
- package/dist/core/database/boundConnection.d.ts +0 -5
- package/dist/core/database/defaultConnection.d.ts +0 -7
- package/dist/core/database/namedConnections.d.ts +0 -15
- package/dist/core/database/readOnlyCollector.d.ts +0 -7
- package/dist/core/database/repositoryConnection.d.ts +0 -4
- package/dist/core/database/transaction.d.ts +0 -23
- package/dist/core/database/transactionControl.d.ts +0 -6
- package/dist/core/events/deferredModelEvents.d.ts +0 -7
- package/dist/core/facades/index.d.ts +0 -10
- package/dist/core/runtime/applicationRegistry.d.ts +0 -18
- package/dist/entries/database/bindConnection.js +0 -1
- package/dist/entries/database/boundConnection.js +0 -1
- package/dist/entries/database/defaultConnection.js +0 -1
- package/dist/entries/database/namedConnections.js +0 -1
- package/dist/entries/database/repositoryConnection.js +0 -1
- package/dist/entries/database/transaction.js +0 -1
- package/dist/entries/facades.js +0 -711
- package/dist/entries/runtime/applicationRegistry.js +0 -1
|
@@ -1,35 +1,8 @@
|
|
|
1
1
|
// @bun
|
|
2
|
-
var __esm = (fn, res, err) => () => {
|
|
3
|
-
if (fn)
|
|
4
|
-
try {
|
|
5
|
-
res = fn(fn = 0);
|
|
6
|
-
} catch (e) {
|
|
7
|
-
err = [e];
|
|
8
|
-
}
|
|
9
|
-
if (err)
|
|
10
|
-
throw err[0];
|
|
11
|
-
return res;
|
|
12
|
-
};
|
|
13
|
-
|
|
14
|
-
// ../../src/core/runtime/asyncContextStore.ts
|
|
15
|
-
import { AsyncLocalStorage } from "async_hooks";
|
|
16
|
-
function createAsyncContextStore(key) {
|
|
17
|
-
const symbol = Symbol.for(key);
|
|
18
|
-
const globalRecord = globalThis;
|
|
19
|
-
const existing = globalRecord[symbol];
|
|
20
|
-
if (existing) {
|
|
21
|
-
return existing;
|
|
22
|
-
}
|
|
23
|
-
const store = new AsyncLocalStorage;
|
|
24
|
-
globalRecord[symbol] = store;
|
|
25
|
-
return store;
|
|
26
|
-
}
|
|
27
|
-
var init_asyncContextStore = () => {};
|
|
28
|
-
|
|
29
2
|
// ../../src/core/http/csrfMiddleware.ts
|
|
30
3
|
import { currentAuthUser, currentCredentialSource } from "@getstrata/core/auth/authContext";
|
|
31
4
|
import { ForbiddenError as ForbiddenError2 } from "@getstrata/core/errors/http";
|
|
32
|
-
import { envFlagEnabled as envFlagEnabled2
|
|
5
|
+
import { envFlagEnabled as envFlagEnabled2 } from "@getstrata/core/runtime/appEnv";
|
|
33
6
|
|
|
34
7
|
// ../../src/core/http/csrfOriginPolicy.ts
|
|
35
8
|
import { isIP } from "net";
|
|
@@ -104,14 +77,14 @@ function envFlagEnabled(value) {
|
|
|
104
77
|
}
|
|
105
78
|
|
|
106
79
|
// ../../src/core/runtime/appKeyPrefix.ts
|
|
107
|
-
function appKeyPrefix() {
|
|
108
|
-
return
|
|
80
|
+
function appKeyPrefix(env = process.env) {
|
|
81
|
+
return env.APP_KEY_PREFIX?.trim() || "strata";
|
|
109
82
|
}
|
|
110
|
-
function appCookieName(kind) {
|
|
111
|
-
return `${appKeyPrefix()}_${kind}`;
|
|
83
|
+
function appCookieName(kind, env = process.env) {
|
|
84
|
+
return `${appKeyPrefix(env)}_${kind}`;
|
|
112
85
|
}
|
|
113
|
-
function appDevSecret(kind) {
|
|
114
|
-
return `${appKeyPrefix()}-dev-${kind}`;
|
|
86
|
+
function appDevSecret(kind, env = process.env) {
|
|
87
|
+
return `${appKeyPrefix(env)}-dev-${kind}`;
|
|
115
88
|
}
|
|
116
89
|
function requireConfiguredSecret(names, devKind, env = process.env) {
|
|
117
90
|
for (const name of names) {
|
|
@@ -123,50 +96,18 @@ function requireConfiguredSecret(names, devKind, env = process.env) {
|
|
|
123
96
|
if (isProductionEnv(env)) {
|
|
124
97
|
throw new Error(`${names[0]} must be set outside development. Do not derive secrets from the app name.`);
|
|
125
98
|
}
|
|
126
|
-
return appDevSecret(devKind);
|
|
99
|
+
return appDevSecret(devKind, env);
|
|
127
100
|
}
|
|
128
101
|
function namespacedRedisKey(kind) {
|
|
129
102
|
return `${appKeyPrefix()}:${kind}`;
|
|
130
103
|
}
|
|
131
|
-
function smtpEhloHost() {
|
|
132
|
-
const raw =
|
|
104
|
+
function smtpEhloHost(env = process.env) {
|
|
105
|
+
const raw = env.MAIL_EHLO?.trim() || `${appKeyPrefix(env)}.local`;
|
|
133
106
|
const safe = raw.replace(/[^a-zA-Z0-9.-]/g, "");
|
|
134
107
|
return safe || "strata.local";
|
|
135
108
|
}
|
|
136
|
-
function
|
|
137
|
-
return
|
|
138
|
-
}
|
|
139
|
-
function appUserAgent() {
|
|
140
|
-
return process.env.APP_USER_AGENT?.trim() || appKeyPrefix();
|
|
141
|
-
}
|
|
142
|
-
function otelServiceName() {
|
|
143
|
-
return process.env.OTEL_SERVICE_NAME?.trim() || `${appKeyPrefix()}-api`;
|
|
144
|
-
}
|
|
145
|
-
function webhookSignatureHeader() {
|
|
146
|
-
return process.env.WEBHOOK_SIGNATURE_HEADER?.trim() || `x-${appKeyPrefix()}-signature`;
|
|
147
|
-
}
|
|
148
|
-
function appDisplayName() {
|
|
149
|
-
return process.env.APP_NAME?.trim() || "Strata";
|
|
150
|
-
}
|
|
151
|
-
function appEnv() {
|
|
152
|
-
return process.env.APP_ENV?.trim() || "local";
|
|
153
|
-
}
|
|
154
|
-
function appUrl() {
|
|
155
|
-
return (process.env.APP_URL?.trim() || "http://localhost:3000").replace(/\/$/, "");
|
|
156
|
-
}
|
|
157
|
-
function apiPrefix() {
|
|
158
|
-
const raw = process.env.API_PREFIX?.trim() || "/api/v1";
|
|
159
|
-
const withSlash = raw.startsWith("/") ? raw : `/${raw}`;
|
|
160
|
-
const trimmed = withSlash.replace(/\/+$/, "");
|
|
161
|
-
return trimmed || "/api/v1";
|
|
162
|
-
}
|
|
163
|
-
function sdkClientClassName() {
|
|
164
|
-
const override = process.env.APP_SDK_CLASS?.trim();
|
|
165
|
-
if (override && /^[A-Za-z_][A-Za-z0-9_]*$/.test(override)) {
|
|
166
|
-
return override;
|
|
167
|
-
}
|
|
168
|
-
const fromName = appDisplayName().replace(/[^A-Za-z0-9]/g, "");
|
|
169
|
-
return fromName ? `${fromName}Client` : "AppClient";
|
|
109
|
+
function otelServiceName(env = process.env) {
|
|
110
|
+
return env.OTEL_SERVICE_NAME?.trim() || `${appKeyPrefix(env)}-api`;
|
|
170
111
|
}
|
|
171
112
|
|
|
172
113
|
// ../../src/core/http/cookies.ts
|
|
@@ -201,8 +142,21 @@ function readBunRequestCookie(request, name) {
|
|
|
201
142
|
return request.cookies.get(name) ?? readRequestCookie(request, name);
|
|
202
143
|
}
|
|
203
144
|
|
|
145
|
+
// ../../src/core/runtime/asyncContextStore.ts
|
|
146
|
+
import { AsyncLocalStorage } from "async_hooks";
|
|
147
|
+
function createAsyncContextStore(key) {
|
|
148
|
+
const symbol = Symbol.for(key);
|
|
149
|
+
const globalRecord = globalThis;
|
|
150
|
+
const existing = globalRecord[symbol];
|
|
151
|
+
if (existing) {
|
|
152
|
+
return existing;
|
|
153
|
+
}
|
|
154
|
+
const store = new AsyncLocalStorage;
|
|
155
|
+
globalRecord[symbol] = store;
|
|
156
|
+
return store;
|
|
157
|
+
}
|
|
158
|
+
|
|
204
159
|
// ../../src/core/http/requestMetaContext.ts
|
|
205
|
-
init_asyncContextStore();
|
|
206
160
|
var requestMetaContext = createAsyncContextStore("@getstrata/requestMetaContext");
|
|
207
161
|
function runWithRequestMeta(meta, callback) {
|
|
208
162
|
return requestMetaContext.run(meta, callback);
|
|
@@ -215,16 +169,23 @@ function currentRequestMeta() {
|
|
|
215
169
|
}
|
|
216
170
|
|
|
217
171
|
// ../../src/core/http/csrfToken.ts
|
|
218
|
-
var CSRF_COOKIE =
|
|
172
|
+
var CSRF_COOKIE = "strata_csrf";
|
|
219
173
|
var CSRF_TTL_MS = 60 * 60 * 1000;
|
|
220
|
-
function
|
|
221
|
-
return
|
|
174
|
+
function csrfTokenOptionsFromEnvironment(env) {
|
|
175
|
+
return Object.freeze({
|
|
176
|
+
secret: requireConfiguredSecret(["SESSION_SECRET", "CSRF_SECRET"], "csrf-secret", env),
|
|
177
|
+
cookieName: env.CSRF_COOKIE_NAME?.trim() || appCookieName("csrf", env),
|
|
178
|
+
production: isProductionEnv(env)
|
|
179
|
+
});
|
|
180
|
+
}
|
|
181
|
+
function csrfCookieName(options) {
|
|
182
|
+
return options.cookieName;
|
|
222
183
|
}
|
|
223
|
-
function
|
|
224
|
-
return
|
|
184
|
+
function csrfVerifyOptions(options) {
|
|
185
|
+
return { secret: options.secret, maxAge: CSRF_TTL_MS };
|
|
225
186
|
}
|
|
226
|
-
function
|
|
227
|
-
return
|
|
187
|
+
function verifyCsrfTokenValue(token, options) {
|
|
188
|
+
return Bun.CSRF.verify(token, csrfVerifyOptions(options));
|
|
228
189
|
}
|
|
229
190
|
function tokensMatch(left, right) {
|
|
230
191
|
const leftBuffer = Buffer.from(left);
|
|
@@ -234,20 +195,20 @@ function tokensMatch(left, right) {
|
|
|
234
195
|
}
|
|
235
196
|
return timingSafeEqual(leftBuffer, rightBuffer);
|
|
236
197
|
}
|
|
237
|
-
function createCsrfTokenCookie() {
|
|
238
|
-
const token = Bun.CSRF.generate(
|
|
239
|
-
const secure =
|
|
198
|
+
function createCsrfTokenCookie(options) {
|
|
199
|
+
const token = Bun.CSRF.generate(options.secret, { expiresIn: CSRF_TTL_MS });
|
|
200
|
+
const secure = options.production ? "; Secure" : "";
|
|
240
201
|
return {
|
|
241
202
|
token,
|
|
242
|
-
cookie: `${csrfCookieName()}=${encodeURIComponent(token)}; Path=/; HttpOnly; SameSite=Lax; Max-Age=${Math.floor(CSRF_TTL_MS / 1000)}${secure}`
|
|
203
|
+
cookie: `${csrfCookieName(options)}=${encodeURIComponent(token)}; Path=/; HttpOnly; SameSite=Lax; Max-Age=${Math.floor(CSRF_TTL_MS / 1000)}${secure}`
|
|
243
204
|
};
|
|
244
205
|
}
|
|
245
|
-
function resolveCsrfToken(request) {
|
|
246
|
-
const cookieValue = readRequestCookie(request, csrfCookieName());
|
|
247
|
-
if (cookieValue &&
|
|
206
|
+
function resolveCsrfToken(request, options) {
|
|
207
|
+
const cookieValue = readRequestCookie(request, csrfCookieName(options));
|
|
208
|
+
if (cookieValue && verifyCsrfTokenValue(cookieValue, options)) {
|
|
248
209
|
return { token: cookieValue };
|
|
249
210
|
}
|
|
250
|
-
return createCsrfTokenCookie();
|
|
211
|
+
return createCsrfTokenCookie(options);
|
|
251
212
|
}
|
|
252
213
|
function readSubmittedCsrfToken(request) {
|
|
253
214
|
const headerToken = request.headers.get("x-csrf-token")?.trim();
|
|
@@ -275,31 +236,32 @@ async function readSubmittedCsrfTokenFromBody(request) {
|
|
|
275
236
|
}
|
|
276
237
|
return null;
|
|
277
238
|
}
|
|
278
|
-
function verifyCsrfToken(request, submittedToken) {
|
|
239
|
+
function verifyCsrfToken(request, submittedToken, options) {
|
|
279
240
|
if (!submittedToken) {
|
|
280
241
|
return false;
|
|
281
242
|
}
|
|
282
|
-
const cookieValue = readRequestCookie(request, csrfCookieName());
|
|
243
|
+
const cookieValue = readRequestCookie(request, csrfCookieName(options));
|
|
283
244
|
if (!cookieValue) {
|
|
284
245
|
return false;
|
|
285
246
|
}
|
|
286
247
|
if (!tokensMatch(submittedToken, cookieValue)) {
|
|
287
248
|
return false;
|
|
288
249
|
}
|
|
289
|
-
return
|
|
250
|
+
return verifyCsrfTokenValue(submittedToken, options);
|
|
290
251
|
}
|
|
291
|
-
function resolveCsrfTokenForRequest(request) {
|
|
292
|
-
const
|
|
293
|
-
|
|
252
|
+
function resolveCsrfTokenForRequest(request, options) {
|
|
253
|
+
const meta = currentRequestMeta();
|
|
254
|
+
const metaToken = meta.request === request ? meta.csrfToken : undefined;
|
|
255
|
+
if (metaToken && verifyCsrfTokenValue(metaToken, options)) {
|
|
294
256
|
return metaToken;
|
|
295
257
|
}
|
|
296
|
-
return resolveCsrfToken(request).token;
|
|
258
|
+
return resolveCsrfToken(request, options).token;
|
|
297
259
|
}
|
|
298
260
|
|
|
299
261
|
// ../../src/core/http/csrfMiddleware.ts
|
|
300
262
|
var MUTATING_METHODS = new Set(["POST", "PUT", "PATCH", "DELETE"]);
|
|
301
|
-
function samlAcsPathname() {
|
|
302
|
-
const configured =
|
|
263
|
+
function samlAcsPathname(value) {
|
|
264
|
+
const configured = value?.trim();
|
|
303
265
|
if (!configured) {
|
|
304
266
|
return "/auth/saml/acs";
|
|
305
267
|
}
|
|
@@ -309,8 +271,8 @@ function samlAcsPathname() {
|
|
|
309
271
|
return "/auth/saml/acs";
|
|
310
272
|
}
|
|
311
273
|
}
|
|
312
|
-
function skipsCsrfPath(pathname) {
|
|
313
|
-
return pathname ===
|
|
274
|
+
function skipsCsrfPath(pathname, samlPathname) {
|
|
275
|
+
return pathname === samlPathname || pathname.startsWith("/scim/") || pathname.startsWith("/billing/webhooks/");
|
|
314
276
|
}
|
|
315
277
|
function appendSetCookie(response, cookie) {
|
|
316
278
|
const headers = new Headers(response.headers);
|
|
@@ -321,33 +283,56 @@ function appendSetCookie(response, cookie) {
|
|
|
321
283
|
headers
|
|
322
284
|
});
|
|
323
285
|
}
|
|
324
|
-
function
|
|
286
|
+
function csrfMiddlewareOptionsFromEnvironment(env) {
|
|
287
|
+
return Object.freeze({
|
|
288
|
+
token: csrfTokenOptionsFromEnvironment(env),
|
|
289
|
+
allowDevelopmentHeaders: envFlagEnabled2(env.AUTH_DEV_HEADERS),
|
|
290
|
+
samlAcsUrl: env.SAML_ACS_URL
|
|
291
|
+
});
|
|
292
|
+
}
|
|
293
|
+
function createCsrfMiddleware(options) {
|
|
294
|
+
const tokenOptions = options.token ? Object.freeze({ ...options.token }) : undefined;
|
|
295
|
+
const capturedToken = () => {
|
|
296
|
+
if (!tokenOptions)
|
|
297
|
+
throw new TypeError("Explicit CSRF token configuration is required.");
|
|
298
|
+
return tokenOptions;
|
|
299
|
+
};
|
|
300
|
+
const production = tokenOptions?.production ?? true;
|
|
301
|
+
const allowDevelopmentHeaders = options.allowDevelopmentHeaders ?? false;
|
|
302
|
+
const samlPathname = samlAcsPathname(options.samlAcsUrl);
|
|
325
303
|
const targetOrigin = options.targetOrigin;
|
|
326
304
|
const policy = targetOrigin === undefined ? undefined : createCsrfOriginPolicy(targetOrigin);
|
|
327
305
|
return async (request, next) => {
|
|
328
306
|
policy?.assertHost(request);
|
|
329
307
|
const credentialSource = currentCredentialSource();
|
|
330
|
-
const developmentHeaderProof = credentialSource === "guest" && currentAuthUser() !== null &&
|
|
308
|
+
const developmentHeaderProof = credentialSource === "guest" && currentAuthUser() !== null && allowDevelopmentHeaders && !production;
|
|
331
309
|
if (credentialSource === "bearer" || credentialSource === "basic" || developmentHeaderProof) {
|
|
332
310
|
return await next();
|
|
333
311
|
}
|
|
334
312
|
const pathname = new URL(request.url).pathname;
|
|
335
|
-
if (skipsCsrfPath(pathname)) {
|
|
313
|
+
if (skipsCsrfPath(pathname, samlPathname)) {
|
|
336
314
|
return await next();
|
|
337
315
|
}
|
|
338
316
|
const method = request.method.toUpperCase();
|
|
339
317
|
if (!MUTATING_METHODS.has(method)) {
|
|
340
318
|
const meta = currentRequestMeta();
|
|
341
|
-
const csrf = meta.csrfToken ? { token: meta.csrfToken } : resolveCsrfToken(request);
|
|
342
|
-
meta.
|
|
343
|
-
|
|
319
|
+
const csrf = meta.request === request && meta.csrfToken && verifyCsrfTokenValue(meta.csrfToken, capturedToken()) ? { token: meta.csrfToken } : resolveCsrfToken(request, capturedToken());
|
|
320
|
+
const scopedMeta = meta.request === request ? meta : {
|
|
321
|
+
ipAddress: null,
|
|
322
|
+
userAgent: request.headers.get("user-agent"),
|
|
323
|
+
errorFormat: meta.errorFormat,
|
|
324
|
+
webErrorView: meta.webErrorView,
|
|
325
|
+
viewsEnabled: meta.viewsEnabled,
|
|
326
|
+
webErrorsProduction: meta.webErrorsProduction
|
|
327
|
+
};
|
|
328
|
+
const response = await runWithRequestMeta({ ...scopedMeta, request, csrfToken: csrf.token }, next);
|
|
344
329
|
if (!csrf.cookie) {
|
|
345
330
|
return response;
|
|
346
331
|
}
|
|
347
332
|
return appendSetCookie(response, csrf.cookie);
|
|
348
333
|
}
|
|
349
334
|
const submitted = await readSubmittedCsrfTokenFromBody(request);
|
|
350
|
-
if (!verifyCsrfToken(request, submitted)) {
|
|
335
|
+
if (!verifyCsrfToken(request, submitted, capturedToken())) {
|
|
351
336
|
throw new ForbiddenError2("Invalid or missing CSRF token.");
|
|
352
337
|
}
|
|
353
338
|
const originHeader = request.headers.get("origin");
|
|
@@ -366,5 +351,6 @@ function createCsrfMiddleware(options = {}) {
|
|
|
366
351
|
};
|
|
367
352
|
}
|
|
368
353
|
export {
|
|
369
|
-
createCsrfMiddleware
|
|
354
|
+
createCsrfMiddleware,
|
|
355
|
+
csrfMiddlewareOptionsFromEnvironment
|
|
370
356
|
};
|
|
@@ -1,31 +1,4 @@
|
|
|
1
1
|
// @bun
|
|
2
|
-
var __esm = (fn, res, err) => () => {
|
|
3
|
-
if (fn)
|
|
4
|
-
try {
|
|
5
|
-
res = fn(fn = 0);
|
|
6
|
-
} catch (e) {
|
|
7
|
-
err = [e];
|
|
8
|
-
}
|
|
9
|
-
if (err)
|
|
10
|
-
throw err[0];
|
|
11
|
-
return res;
|
|
12
|
-
};
|
|
13
|
-
|
|
14
|
-
// ../../src/core/runtime/asyncContextStore.ts
|
|
15
|
-
import { AsyncLocalStorage } from "async_hooks";
|
|
16
|
-
function createAsyncContextStore(key) {
|
|
17
|
-
const symbol = Symbol.for(key);
|
|
18
|
-
const globalRecord = globalThis;
|
|
19
|
-
const existing = globalRecord[symbol];
|
|
20
|
-
if (existing) {
|
|
21
|
-
return existing;
|
|
22
|
-
}
|
|
23
|
-
const store = new AsyncLocalStorage;
|
|
24
|
-
globalRecord[symbol] = store;
|
|
25
|
-
return store;
|
|
26
|
-
}
|
|
27
|
-
var init_asyncContextStore = () => {};
|
|
28
|
-
|
|
29
2
|
// ../../src/core/http/csrfToken.ts
|
|
30
3
|
import { timingSafeEqual } from "crypto";
|
|
31
4
|
|
|
@@ -50,14 +23,14 @@ function envFlagEnabled(value) {
|
|
|
50
23
|
}
|
|
51
24
|
|
|
52
25
|
// ../../src/core/runtime/appKeyPrefix.ts
|
|
53
|
-
function appKeyPrefix() {
|
|
54
|
-
return
|
|
26
|
+
function appKeyPrefix(env = process.env) {
|
|
27
|
+
return env.APP_KEY_PREFIX?.trim() || "strata";
|
|
55
28
|
}
|
|
56
|
-
function appCookieName(kind) {
|
|
57
|
-
return `${appKeyPrefix()}_${kind}`;
|
|
29
|
+
function appCookieName(kind, env = process.env) {
|
|
30
|
+
return `${appKeyPrefix(env)}_${kind}`;
|
|
58
31
|
}
|
|
59
|
-
function appDevSecret(kind) {
|
|
60
|
-
return `${appKeyPrefix()}-dev-${kind}`;
|
|
32
|
+
function appDevSecret(kind, env = process.env) {
|
|
33
|
+
return `${appKeyPrefix(env)}-dev-${kind}`;
|
|
61
34
|
}
|
|
62
35
|
function requireConfiguredSecret(names, devKind, env = process.env) {
|
|
63
36
|
for (const name of names) {
|
|
@@ -69,50 +42,18 @@ function requireConfiguredSecret(names, devKind, env = process.env) {
|
|
|
69
42
|
if (isProductionEnv(env)) {
|
|
70
43
|
throw new Error(`${names[0]} must be set outside development. Do not derive secrets from the app name.`);
|
|
71
44
|
}
|
|
72
|
-
return appDevSecret(devKind);
|
|
45
|
+
return appDevSecret(devKind, env);
|
|
73
46
|
}
|
|
74
47
|
function namespacedRedisKey(kind) {
|
|
75
48
|
return `${appKeyPrefix()}:${kind}`;
|
|
76
49
|
}
|
|
77
|
-
function smtpEhloHost() {
|
|
78
|
-
const raw =
|
|
50
|
+
function smtpEhloHost(env = process.env) {
|
|
51
|
+
const raw = env.MAIL_EHLO?.trim() || `${appKeyPrefix(env)}.local`;
|
|
79
52
|
const safe = raw.replace(/[^a-zA-Z0-9.-]/g, "");
|
|
80
53
|
return safe || "strata.local";
|
|
81
54
|
}
|
|
82
|
-
function
|
|
83
|
-
return
|
|
84
|
-
}
|
|
85
|
-
function appUserAgent() {
|
|
86
|
-
return process.env.APP_USER_AGENT?.trim() || appKeyPrefix();
|
|
87
|
-
}
|
|
88
|
-
function otelServiceName() {
|
|
89
|
-
return process.env.OTEL_SERVICE_NAME?.trim() || `${appKeyPrefix()}-api`;
|
|
90
|
-
}
|
|
91
|
-
function webhookSignatureHeader() {
|
|
92
|
-
return process.env.WEBHOOK_SIGNATURE_HEADER?.trim() || `x-${appKeyPrefix()}-signature`;
|
|
93
|
-
}
|
|
94
|
-
function appDisplayName() {
|
|
95
|
-
return process.env.APP_NAME?.trim() || "Strata";
|
|
96
|
-
}
|
|
97
|
-
function appEnv() {
|
|
98
|
-
return process.env.APP_ENV?.trim() || "local";
|
|
99
|
-
}
|
|
100
|
-
function appUrl() {
|
|
101
|
-
return (process.env.APP_URL?.trim() || "http://localhost:3000").replace(/\/$/, "");
|
|
102
|
-
}
|
|
103
|
-
function apiPrefix() {
|
|
104
|
-
const raw = process.env.API_PREFIX?.trim() || "/api/v1";
|
|
105
|
-
const withSlash = raw.startsWith("/") ? raw : `/${raw}`;
|
|
106
|
-
const trimmed = withSlash.replace(/\/+$/, "");
|
|
107
|
-
return trimmed || "/api/v1";
|
|
108
|
-
}
|
|
109
|
-
function sdkClientClassName() {
|
|
110
|
-
const override = process.env.APP_SDK_CLASS?.trim();
|
|
111
|
-
if (override && /^[A-Za-z_][A-Za-z0-9_]*$/.test(override)) {
|
|
112
|
-
return override;
|
|
113
|
-
}
|
|
114
|
-
const fromName = appDisplayName().replace(/[^A-Za-z0-9]/g, "");
|
|
115
|
-
return fromName ? `${fromName}Client` : "AppClient";
|
|
55
|
+
function otelServiceName(env = process.env) {
|
|
56
|
+
return env.OTEL_SERVICE_NAME?.trim() || `${appKeyPrefix(env)}-api`;
|
|
116
57
|
}
|
|
117
58
|
|
|
118
59
|
// ../../src/core/http/cookies.ts
|
|
@@ -147,8 +88,21 @@ function readBunRequestCookie(request, name) {
|
|
|
147
88
|
return request.cookies.get(name) ?? readRequestCookie(request, name);
|
|
148
89
|
}
|
|
149
90
|
|
|
91
|
+
// ../../src/core/runtime/asyncContextStore.ts
|
|
92
|
+
import { AsyncLocalStorage } from "async_hooks";
|
|
93
|
+
function createAsyncContextStore(key) {
|
|
94
|
+
const symbol = Symbol.for(key);
|
|
95
|
+
const globalRecord = globalThis;
|
|
96
|
+
const existing = globalRecord[symbol];
|
|
97
|
+
if (existing) {
|
|
98
|
+
return existing;
|
|
99
|
+
}
|
|
100
|
+
const store = new AsyncLocalStorage;
|
|
101
|
+
globalRecord[symbol] = store;
|
|
102
|
+
return store;
|
|
103
|
+
}
|
|
104
|
+
|
|
150
105
|
// ../../src/core/http/requestMetaContext.ts
|
|
151
|
-
init_asyncContextStore();
|
|
152
106
|
var requestMetaContext = createAsyncContextStore("@getstrata/requestMetaContext");
|
|
153
107
|
function runWithRequestMeta(meta, callback) {
|
|
154
108
|
return requestMetaContext.run(meta, callback);
|
|
@@ -161,16 +115,23 @@ function currentRequestMeta() {
|
|
|
161
115
|
}
|
|
162
116
|
|
|
163
117
|
// ../../src/core/http/csrfToken.ts
|
|
164
|
-
var CSRF_COOKIE =
|
|
118
|
+
var CSRF_COOKIE = "strata_csrf";
|
|
165
119
|
var CSRF_TTL_MS = 60 * 60 * 1000;
|
|
166
|
-
function
|
|
167
|
-
return
|
|
120
|
+
function csrfTokenOptionsFromEnvironment(env) {
|
|
121
|
+
return Object.freeze({
|
|
122
|
+
secret: requireConfiguredSecret(["SESSION_SECRET", "CSRF_SECRET"], "csrf-secret", env),
|
|
123
|
+
cookieName: env.CSRF_COOKIE_NAME?.trim() || appCookieName("csrf", env),
|
|
124
|
+
production: isProductionEnv(env)
|
|
125
|
+
});
|
|
126
|
+
}
|
|
127
|
+
function csrfCookieName(options) {
|
|
128
|
+
return options.cookieName;
|
|
168
129
|
}
|
|
169
|
-
function
|
|
170
|
-
return
|
|
130
|
+
function csrfVerifyOptions(options) {
|
|
131
|
+
return { secret: options.secret, maxAge: CSRF_TTL_MS };
|
|
171
132
|
}
|
|
172
|
-
function
|
|
173
|
-
return
|
|
133
|
+
function verifyCsrfTokenValue(token, options) {
|
|
134
|
+
return Bun.CSRF.verify(token, csrfVerifyOptions(options));
|
|
174
135
|
}
|
|
175
136
|
function tokensMatch(left, right) {
|
|
176
137
|
const leftBuffer = Buffer.from(left);
|
|
@@ -180,20 +141,20 @@ function tokensMatch(left, right) {
|
|
|
180
141
|
}
|
|
181
142
|
return timingSafeEqual(leftBuffer, rightBuffer);
|
|
182
143
|
}
|
|
183
|
-
function createCsrfTokenCookie() {
|
|
184
|
-
const token = Bun.CSRF.generate(
|
|
185
|
-
const secure =
|
|
144
|
+
function createCsrfTokenCookie(options) {
|
|
145
|
+
const token = Bun.CSRF.generate(options.secret, { expiresIn: CSRF_TTL_MS });
|
|
146
|
+
const secure = options.production ? "; Secure" : "";
|
|
186
147
|
return {
|
|
187
148
|
token,
|
|
188
|
-
cookie: `${csrfCookieName()}=${encodeURIComponent(token)}; Path=/; HttpOnly; SameSite=Lax; Max-Age=${Math.floor(CSRF_TTL_MS / 1000)}${secure}`
|
|
149
|
+
cookie: `${csrfCookieName(options)}=${encodeURIComponent(token)}; Path=/; HttpOnly; SameSite=Lax; Max-Age=${Math.floor(CSRF_TTL_MS / 1000)}${secure}`
|
|
189
150
|
};
|
|
190
151
|
}
|
|
191
|
-
function resolveCsrfToken(request) {
|
|
192
|
-
const cookieValue = readRequestCookie(request, csrfCookieName());
|
|
193
|
-
if (cookieValue &&
|
|
152
|
+
function resolveCsrfToken(request, options) {
|
|
153
|
+
const cookieValue = readRequestCookie(request, csrfCookieName(options));
|
|
154
|
+
if (cookieValue && verifyCsrfTokenValue(cookieValue, options)) {
|
|
194
155
|
return { token: cookieValue };
|
|
195
156
|
}
|
|
196
|
-
return createCsrfTokenCookie();
|
|
157
|
+
return createCsrfTokenCookie(options);
|
|
197
158
|
}
|
|
198
159
|
function readSubmittedCsrfToken(request) {
|
|
199
160
|
const headerToken = request.headers.get("x-csrf-token")?.trim();
|
|
@@ -221,33 +182,36 @@ async function readSubmittedCsrfTokenFromBody(request) {
|
|
|
221
182
|
}
|
|
222
183
|
return null;
|
|
223
184
|
}
|
|
224
|
-
function verifyCsrfToken(request, submittedToken) {
|
|
185
|
+
function verifyCsrfToken(request, submittedToken, options) {
|
|
225
186
|
if (!submittedToken) {
|
|
226
187
|
return false;
|
|
227
188
|
}
|
|
228
|
-
const cookieValue = readRequestCookie(request, csrfCookieName());
|
|
189
|
+
const cookieValue = readRequestCookie(request, csrfCookieName(options));
|
|
229
190
|
if (!cookieValue) {
|
|
230
191
|
return false;
|
|
231
192
|
}
|
|
232
193
|
if (!tokensMatch(submittedToken, cookieValue)) {
|
|
233
194
|
return false;
|
|
234
195
|
}
|
|
235
|
-
return
|
|
196
|
+
return verifyCsrfTokenValue(submittedToken, options);
|
|
236
197
|
}
|
|
237
|
-
function resolveCsrfTokenForRequest(request) {
|
|
238
|
-
const
|
|
239
|
-
|
|
198
|
+
function resolveCsrfTokenForRequest(request, options) {
|
|
199
|
+
const meta = currentRequestMeta();
|
|
200
|
+
const metaToken = meta.request === request ? meta.csrfToken : undefined;
|
|
201
|
+
if (metaToken && verifyCsrfTokenValue(metaToken, options)) {
|
|
240
202
|
return metaToken;
|
|
241
203
|
}
|
|
242
|
-
return resolveCsrfToken(request).token;
|
|
204
|
+
return resolveCsrfToken(request, options).token;
|
|
243
205
|
}
|
|
244
206
|
export {
|
|
245
207
|
CSRF_COOKIE,
|
|
246
208
|
createCsrfTokenCookie,
|
|
247
209
|
csrfCookieName,
|
|
210
|
+
csrfTokenOptionsFromEnvironment,
|
|
248
211
|
readSubmittedCsrfToken,
|
|
249
212
|
readSubmittedCsrfTokenFromBody,
|
|
250
213
|
resolveCsrfToken,
|
|
251
214
|
resolveCsrfTokenForRequest,
|
|
252
|
-
verifyCsrfToken
|
|
215
|
+
verifyCsrfToken,
|
|
216
|
+
verifyCsrfTokenValue
|
|
253
217
|
};
|
|
@@ -8,8 +8,8 @@ function nonCryptographicDigest(input) {
|
|
|
8
8
|
}
|
|
9
9
|
|
|
10
10
|
// ../../src/core/http/etag.ts
|
|
11
|
-
function isEtagEnabled() {
|
|
12
|
-
return
|
|
11
|
+
function isEtagEnabled(value) {
|
|
12
|
+
return value !== "false";
|
|
13
13
|
}
|
|
14
14
|
function formatWeakEtag(digest) {
|
|
15
15
|
return `W/"${digest}"`;
|
|
@@ -82,8 +82,11 @@ function notModifiedResponse(etag) {
|
|
|
82
82
|
headers: applyEtagHeaders(new Headers, etag)
|
|
83
83
|
});
|
|
84
84
|
}
|
|
85
|
-
function applyConditionalGet(request, response, etag) {
|
|
86
|
-
|
|
85
|
+
function applyConditionalGet(request, response, etag, policy) {
|
|
86
|
+
const enabled = policy === undefined ? isEtagEnabled() : policy.etagEnabled;
|
|
87
|
+
if (typeof enabled !== "boolean")
|
|
88
|
+
throw new TypeError("Conditional GET requires a boolean ETag policy.");
|
|
89
|
+
if (!enabled) {
|
|
87
90
|
return response;
|
|
88
91
|
}
|
|
89
92
|
if (ifNoneMatchSatisfied(request, etag)) {
|