@stonyx/orm 0.3.2-beta.16 → 0.3.2-beta.160
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/README.md +1409 -11
- package/config/environment.js +99 -12
- package/dist/access-verdict.d.ts +85 -0
- package/dist/access-verdict.js +284 -0
- package/dist/commands.js +34 -0
- package/dist/dynamodb/connection.d.ts +31 -0
- package/dist/dynamodb/connection.js +28 -0
- package/dist/dynamodb/dynamodb-db.d.ts +142 -0
- package/dist/dynamodb/dynamodb-db.js +596 -0
- package/dist/dynamodb/operation-builder.d.ts +76 -0
- package/dist/dynamodb/operation-builder.js +116 -0
- package/dist/dynamodb/type-map.d.ts +31 -0
- package/dist/dynamodb/type-map.js +48 -0
- package/dist/hooks.d.ts +15 -1
- package/dist/index.d.ts +3 -0
- package/dist/index.js +8 -0
- package/dist/main.d.ts +116 -0
- package/dist/main.js +129 -0
- package/dist/manage-record.js +268 -12
- package/dist/mysql/connection.d.ts +1 -0
- package/dist/mysql/mysql-db.d.ts +8 -0
- package/dist/mysql/mysql-db.js +44 -10
- package/dist/orm-request.d.ts +274 -3
- package/dist/orm-request.js +1259 -65
- package/dist/postgres/connection.d.ts +1 -0
- package/dist/postgres/connection.js +8 -6
- package/dist/postgres/postgres-db.d.ts +8 -0
- package/dist/postgres/postgres-db.js +44 -10
- package/dist/record.d.ts +16 -0
- package/dist/record.js +154 -6
- package/dist/relationships.js +1 -1
- package/dist/serializer.js +38 -2
- package/dist/setup-rest-server.js +51 -5
- package/dist/standalone-db.js +17 -5
- package/dist/store.d.ts +13 -1
- package/dist/store.js +65 -6
- package/dist/types/orm-types.d.ts +260 -0
- package/dist/utils.d.ts +44 -0
- package/dist/utils.js +47 -0
- package/package.json +16 -7
- package/src/access-verdict.ts +312 -0
- package/src/commands.ts +43 -0
- package/src/dynamodb/connection.ts +50 -0
- package/src/dynamodb/dynamodb-db.ts +811 -0
- package/src/dynamodb/operation-builder.ts +202 -0
- package/src/dynamodb/type-map.ts +54 -0
- package/src/hooks.ts +15 -1
- package/src/index.ts +10 -0
- package/src/main.ts +133 -0
- package/src/manage-record.ts +294 -18
- package/src/mysql/connection.ts +1 -0
- package/src/mysql/mysql-db.ts +44 -12
- package/src/orm-request.ts +1281 -67
- package/src/postgres/connection.ts +10 -6
- package/src/postgres/postgres-db.ts +44 -12
- package/src/record.ts +182 -6
- package/src/relationships.ts +1 -1
- package/src/serializer.ts +39 -2
- package/src/setup-rest-server.ts +59 -6
- package/src/standalone-db.ts +17 -6
- package/src/store.ts +68 -6
- package/src/types/orm-types.ts +268 -1
- package/src/types/stonyx-rest-server.d.ts +14 -1
- package/src/types/stonyx.d.ts +7 -1
- package/src/utils.ts +50 -0
- package/config/environment.ts +0 -91
package/config/environment.js
CHANGED
|
@@ -1,12 +1,99 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
1
|
+
const {
|
|
2
|
+
ORM_ACCESS_PATH,
|
|
3
|
+
ORM_MODEL_PATH,
|
|
4
|
+
ORM_REST_ROUTE,
|
|
5
|
+
ORM_SERIALIZER_PATH,
|
|
6
|
+
ORM_TRANSFORM_PATH,
|
|
7
|
+
ORM_VIEW_PATH,
|
|
8
|
+
ORM_USE_REST_SERVER,
|
|
9
|
+
DB_AUTO_SAVE,
|
|
10
|
+
DB_FILE,
|
|
11
|
+
DB_MODE,
|
|
12
|
+
DB_DIRECTORY,
|
|
13
|
+
DB_SCHEMA_PATH,
|
|
14
|
+
DB_SAVE_INTERVAL,
|
|
15
|
+
MYSQL_HOST,
|
|
16
|
+
MYSQL_PORT,
|
|
17
|
+
MYSQL_USER,
|
|
18
|
+
MYSQL_PASSWORD,
|
|
19
|
+
MYSQL_DATABASE,
|
|
20
|
+
MYSQL_CONNECTION_LIMIT,
|
|
21
|
+
MYSQL_MIGRATIONS_DIR,
|
|
22
|
+
PG_HOST,
|
|
23
|
+
PG_PORT,
|
|
24
|
+
PG_USER,
|
|
25
|
+
PG_PASSWORD,
|
|
26
|
+
PG_DATABASE,
|
|
27
|
+
PG_CONNECTION_LIMIT,
|
|
28
|
+
PG_MIGRATIONS_DIR,
|
|
29
|
+
TIMESCALE_HOST,
|
|
30
|
+
TIMESCALE_PORT,
|
|
31
|
+
TIMESCALE_USER,
|
|
32
|
+
TIMESCALE_PASSWORD,
|
|
33
|
+
TIMESCALE_DATABASE,
|
|
34
|
+
TIMESCALE_CONNECTION_LIMIT,
|
|
35
|
+
TIMESCALE_MIGRATIONS_DIR,
|
|
36
|
+
DYNAMODB_REGION,
|
|
37
|
+
DYNAMODB_ENDPOINT,
|
|
38
|
+
DYNAMODB_TABLE_PREFIX,
|
|
39
|
+
} = process.env;
|
|
40
|
+
|
|
41
|
+
export default {
|
|
42
|
+
logColor: 'white',
|
|
43
|
+
logMethod: 'db',
|
|
44
|
+
|
|
45
|
+
db: {
|
|
46
|
+
autosave: DB_AUTO_SAVE ?? 'false', // 'true' (cron interval), 'false' (disabled), 'onUpdate' (save after each write op)
|
|
47
|
+
file: DB_FILE ?? 'db.json',
|
|
48
|
+
mode: DB_MODE ?? 'file', // 'file' (single db.json) or 'directory' (one file per collection)
|
|
49
|
+
directory: DB_DIRECTORY ?? 'db', // directory name for collection files when mode is 'directory'
|
|
50
|
+
saveInterval: DB_SAVE_INTERVAL ?? 60 * 60, // 1 hour
|
|
51
|
+
schema: DB_SCHEMA_PATH ?? './config/db-schema.js'
|
|
52
|
+
},
|
|
53
|
+
paths: {
|
|
54
|
+
access: ORM_ACCESS_PATH ?? './access', // Optional for restServer access hooks
|
|
55
|
+
model: ORM_MODEL_PATH ?? './models',
|
|
56
|
+
serializer: ORM_SERIALIZER_PATH ?? './serializers',
|
|
57
|
+
transform: ORM_TRANSFORM_PATH ?? './transforms',
|
|
58
|
+
view: ORM_VIEW_PATH ?? './views'
|
|
59
|
+
},
|
|
60
|
+
mysql: MYSQL_HOST ? {
|
|
61
|
+
host: MYSQL_HOST ?? 'localhost',
|
|
62
|
+
port: parseInt(MYSQL_PORT ?? '3306'),
|
|
63
|
+
user: MYSQL_USER ?? 'root',
|
|
64
|
+
password: MYSQL_PASSWORD ?? '',
|
|
65
|
+
database: MYSQL_DATABASE ?? 'stonyx',
|
|
66
|
+
connectionLimit: parseInt(MYSQL_CONNECTION_LIMIT ?? '10'),
|
|
67
|
+
migrationsDir: MYSQL_MIGRATIONS_DIR ?? 'migrations',
|
|
68
|
+
migrationsTable: '__migrations',
|
|
69
|
+
} : undefined,
|
|
70
|
+
postgres: PG_HOST ? {
|
|
71
|
+
host: PG_HOST ?? 'localhost',
|
|
72
|
+
port: parseInt(PG_PORT ?? '5432'),
|
|
73
|
+
user: PG_USER ?? 'postgres',
|
|
74
|
+
password: PG_PASSWORD ?? '',
|
|
75
|
+
database: PG_DATABASE ?? 'stonyx',
|
|
76
|
+
connectionLimit: parseInt(PG_CONNECTION_LIMIT ?? '10'),
|
|
77
|
+
migrationsDir: PG_MIGRATIONS_DIR ?? 'migrations',
|
|
78
|
+
migrationsTable: '__migrations',
|
|
79
|
+
} : undefined,
|
|
80
|
+
timescale: TIMESCALE_HOST ? {
|
|
81
|
+
host: TIMESCALE_HOST ?? 'localhost',
|
|
82
|
+
port: parseInt(TIMESCALE_PORT ?? '5432'),
|
|
83
|
+
user: TIMESCALE_USER ?? 'postgres',
|
|
84
|
+
password: TIMESCALE_PASSWORD ?? '',
|
|
85
|
+
database: TIMESCALE_DATABASE ?? 'stonyx',
|
|
86
|
+
connectionLimit: parseInt(TIMESCALE_CONNECTION_LIMIT ?? '10'),
|
|
87
|
+
migrationsDir: TIMESCALE_MIGRATIONS_DIR ?? 'migrations',
|
|
88
|
+
migrationsTable: '__migrations',
|
|
89
|
+
} : undefined,
|
|
90
|
+
dynamodb: DYNAMODB_REGION ? {
|
|
91
|
+
region: DYNAMODB_REGION,
|
|
92
|
+
endpoint: DYNAMODB_ENDPOINT || undefined,
|
|
93
|
+
tablePrefix: DYNAMODB_TABLE_PREFIX || '',
|
|
94
|
+
} : undefined,
|
|
95
|
+
restServer: {
|
|
96
|
+
enabled: ORM_USE_REST_SERVER ?? 'true', // Whether to load restServer for automatic route setup or
|
|
97
|
+
route: ORM_REST_ROUTE ?? '/',
|
|
98
|
+
}
|
|
99
|
+
}
|
|
@@ -0,0 +1,85 @@
|
|
|
1
|
+
import type { AccessMethod, AccessOperation, LinkageFilter } from './types/orm-types.js';
|
|
2
|
+
/**
|
|
3
|
+
* The classified reading of one `access()` return value.
|
|
4
|
+
*
|
|
5
|
+
* `granted: false` is a total denial. `granted: true` with no `filter` is an
|
|
6
|
+
* unconditional grant. `granted: true` WITH a filter means "grant, subject to
|
|
7
|
+
* this per-record predicate" -- the function return shape, which is the
|
|
8
|
+
* per-record hook `AccessContext` deliberately does not provide.
|
|
9
|
+
*/
|
|
10
|
+
export interface AccessVerdict {
|
|
11
|
+
granted: boolean;
|
|
12
|
+
filter?: (record: unknown) => boolean;
|
|
13
|
+
}
|
|
14
|
+
/**
|
|
15
|
+
* Classify one `access()` return value. Extracted verbatim from `auth()`, which
|
|
16
|
+
* now calls this; the branch ORDER is load-bearing and is preserved exactly.
|
|
17
|
+
*
|
|
18
|
+
* `operation` is the verb being authorised. `undefined` -- reachable, because
|
|
19
|
+
* express delivers HEAD to the GET handler and `methodAccessMap` has no entry
|
|
20
|
+
* for it -- falls through `permitted.includes(undefined)` to a denial, which is
|
|
21
|
+
* the same answer `auth()` gave before the extraction.
|
|
22
|
+
*/
|
|
23
|
+
export declare function interpretAccess(access: AccessMethod, operation: AccessOperation | undefined): AccessVerdict;
|
|
24
|
+
/**
|
|
25
|
+
* Build a request-scoped linkage filter.
|
|
26
|
+
*
|
|
27
|
+
* TWO CACHES, AND BOTH ARE LOAD-BEARING RATHER THAN AN OPTIMISATION:
|
|
28
|
+
*
|
|
29
|
+
* - one verdict per TYPE. Resolving means CALLING the consumer's `access()`,
|
|
30
|
+
* which is arbitrary code with arbitrary cost and which the module has
|
|
31
|
+
* already had to guard for throwing.
|
|
32
|
+
* - one decision per `(type, id)`. `included` is deduplicated by
|
|
33
|
+
* `buildResponse`; LINKAGE is not deduplicated at all, so it re-asks once
|
|
34
|
+
* per record. Measured on a bare `GET /animals` with no `include=`:
|
|
35
|
+
* 48 linkage entries -> 7 distinct `(type, id)` pairs (owner 20, trait 28),
|
|
36
|
+
* a 6.9x reduction and 41 predicate calls saved.
|
|
37
|
+
*
|
|
38
|
+
* The `(type, id)` cache is a `Map` per type keyed on the RAW id, not on a
|
|
39
|
+
* template-string composite. `Map` compares with SameValueZero, so the numeric
|
|
40
|
+
* id `1` and the string id `'1'` stay DISTINCT, where `` `${type}:${id}` `` --
|
|
41
|
+
* or a bare `String(id)` -- collapses them onto one entry and answers the second
|
|
42
|
+
* record with the first record's verdict.
|
|
43
|
+
*
|
|
44
|
+
* WHAT THAT DOES AND DOES NOT PROTECT. It cannot cross MODELS. `decisions` is
|
|
45
|
+
* already partitioned per type by `byType`, so a composite key inside a per-type
|
|
46
|
+
* map is one-to-one with the raw one and no owner's verdict could ever answer
|
|
47
|
+
* for an animal -- the claim that once stood here. The real exposure is narrower
|
|
48
|
+
* and entirely WITHIN one model: two records of the same type whose ids differ
|
|
49
|
+
* only by JavaScript type, which a per-record predicate may legitimately answer
|
|
50
|
+
* differently about (an id read off a JSON body is a string; the same id
|
|
51
|
+
* assigned by the server is a number). Pinned by unit assertion, because this
|
|
52
|
+
* fixture cannot produce the collision on its own -- `owner` ids are strings and
|
|
53
|
+
* `animal` ids are numbers.
|
|
54
|
+
*
|
|
55
|
+
* SCOPE IS ONE REQUEST. The filter closes over the request and must not outlive
|
|
56
|
+
* it -- a verdict cached across requests would answer a second caller with the
|
|
57
|
+
* first caller's authorization.
|
|
58
|
+
*
|
|
59
|
+
* A REQUEST IS REQUIRED, AND ITS ABSENCE IS CHECKED HERE RATHER THAN DELEGATED.
|
|
60
|
+
* This function is EXPORTED (src/index.ts), and the README's Consumer Contracts
|
|
61
|
+
* section points consumers at exactly the contexts that have no live request --
|
|
62
|
+
* a queue payload, a websocket frame, a custom route. Without one there is no
|
|
63
|
+
* caller to authorise against, and this file's header already says so: the
|
|
64
|
+
* shipped sample reads `request.path` and fail-closes when it is absent, so
|
|
65
|
+
* `getAccess('owner')(undefined, ...)` is `false`, while
|
|
66
|
+
* `getAccess('animal')(undefined, ...)` returns a per-record predicate and
|
|
67
|
+
* GRANTS. Measured on this repo's own fixture before this guard existed:
|
|
68
|
+
*
|
|
69
|
+
* createLinkageFilter(undefined | null | {} | 'x' | 0)
|
|
70
|
+
* -> owner=false animal=TRUE trait=TRUE category=TRUE phone-number=TRUE
|
|
71
|
+
*
|
|
72
|
+
* Four of five claimed models granted, with no log, because whether an absent
|
|
73
|
+
* request fails closed was left ENTIRELY to consumer predicates -- and a
|
|
74
|
+
* predicate that ignores its request cannot fail closed on one that is missing.
|
|
75
|
+
* A nullish or primitive `request` therefore denies every model outright and
|
|
76
|
+
* says so once, at construction, so the signal exists even for a caller that
|
|
77
|
+
* goes on to serialize nothing.
|
|
78
|
+
*
|
|
79
|
+
* WHAT THIS CANNOT CHECK: `{}` is an object and passes. There is no request
|
|
80
|
+
* contract this module owns -- `auth()` reads `.method`, the shipped sample
|
|
81
|
+
* reads `.path`, a consumer's reads whatever it likes -- so anything past
|
|
82
|
+
* "is it an object" would be this module inventing a shape for someone else's
|
|
83
|
+
* framework. The residual is documented in the README under Consumer Contracts.
|
|
84
|
+
*/
|
|
85
|
+
export declare function createLinkageFilter(request: unknown): LinkageFilter;
|
|
@@ -0,0 +1,284 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The shared access-verdict primitive (abofs/stonyx-orm#234).
|
|
3
|
+
*
|
|
4
|
+
* ---------------------------------------------------------------------------
|
|
5
|
+
* WHY THIS FILE EXISTS: ONE INTERPRETER, NOT TWO
|
|
6
|
+
* ---------------------------------------------------------------------------
|
|
7
|
+
* A consumer `access()` may return six differently-shaped things -- `false`, a
|
|
8
|
+
* bare permission string, a permission array, `true`, a per-record function, or
|
|
9
|
+
* something the contract does not define at all -- and the reading of each one
|
|
10
|
+
* is a security decision. `auth()` has held that reading inline since #190.
|
|
11
|
+
* Every surface that needs to ask "may this caller see model X's record?" needs
|
|
12
|
+
* the SAME reading, or the second copy becomes an unreviewed second
|
|
13
|
+
* authorization vocabulary that answers differently about the same value.
|
|
14
|
+
*
|
|
15
|
+
* So `interpretAccess` is extracted here and `auth()` now calls it. It is the
|
|
16
|
+
* only place a return shape is classified, and abofs/stonyx-orm#232 and #233
|
|
17
|
+
* rebase onto it rather than re-deriving it.
|
|
18
|
+
*
|
|
19
|
+
* ---------------------------------------------------------------------------
|
|
20
|
+
* WHAT A LINKAGE FILTER IS, AND WHY THE CALLER BUILDS IT
|
|
21
|
+
* ---------------------------------------------------------------------------
|
|
22
|
+
* `Record.toJSON()` APPLIES a verdict; it never RESOLVES one. That is not a
|
|
23
|
+
* style choice, it is forced, and it was measured before it was decided:
|
|
24
|
+
*
|
|
25
|
+
* INPUT: origin/dev @ c5f7907, unpatched -> 967 pass / 0 fail
|
|
26
|
+
* INPUT: same + fail-closed resolution INSIDE toJSON() -> 964 pass / 3 fail
|
|
27
|
+
*
|
|
28
|
+
* and all three reds were over-denial of PERMITTED records, not the leak. Two
|
|
29
|
+
* independent reasons:
|
|
30
|
+
*
|
|
31
|
+
* 1. `toJSON()` has no request. The shipped, documented sample reads
|
|
32
|
+
* `request.path` for its `/archived` sub-path rule -- the one read of
|
|
33
|
+
* argument one the README sanctions -- and fail-closes when it is absent.
|
|
34
|
+
* Measured against the live registry:
|
|
35
|
+
*
|
|
36
|
+
* getAccess('owner')(undefined, { model:'owner', operation:'read' }) -> false
|
|
37
|
+
* getAccess('animal')(undefined,{ model:'animal', operation:'read' }) -> [Function]
|
|
38
|
+
*
|
|
39
|
+
* Same predicate object, two models, two different degradation modes,
|
|
40
|
+
* chosen by the consumer. Without a request there is no trustworthy
|
|
41
|
+
* answer to get.
|
|
42
|
+
*
|
|
43
|
+
* 2. `toJSON` is also the `JSON.stringify` hook, so `JSON.stringify({data:
|
|
44
|
+
* record})` calls `record.toJSON('data')` -- a STRING in the options slot.
|
|
45
|
+
* An implicit caller has no syntactic place to pass anything
|
|
46
|
+
* (abofs/stonyx-orm#230). The no-argument document must therefore stay
|
|
47
|
+
* byte-identical to what shipped, which also rules out fail-closed by
|
|
48
|
+
* default: `Orm.instance.accessFunctions` is `{}` in any process that
|
|
49
|
+
* never ran `setup-rest-server` (CLI, SQL-only, unit tests), so a
|
|
50
|
+
* fail-closed default would empty every relationship on every document in
|
|
51
|
+
* processes that have no REST surface to protect.
|
|
52
|
+
*
|
|
53
|
+
* The caller -- which still holds the request -- resolves the predicate,
|
|
54
|
+
* interprets it here, caches the answer, and hands `toJSON()` an already-decided
|
|
55
|
+
* `(type, record) => boolean`.
|
|
56
|
+
*/
|
|
57
|
+
import Orm from '@stonyx/orm';
|
|
58
|
+
import log from 'stonyx/log';
|
|
59
|
+
const DENIED = Object.freeze({ granted: false });
|
|
60
|
+
const GRANTED = Object.freeze({ granted: true });
|
|
61
|
+
/**
|
|
62
|
+
* Classify one `access()` return value. Extracted verbatim from `auth()`, which
|
|
63
|
+
* now calls this; the branch ORDER is load-bearing and is preserved exactly.
|
|
64
|
+
*
|
|
65
|
+
* `operation` is the verb being authorised. `undefined` -- reachable, because
|
|
66
|
+
* express delivers HEAD to the GET handler and `methodAccessMap` has no entry
|
|
67
|
+
* for it -- falls through `permitted.includes(undefined)` to a denial, which is
|
|
68
|
+
* the same answer `auth()` gave before the extraction.
|
|
69
|
+
*/
|
|
70
|
+
export function interpretAccess(access, operation) {
|
|
71
|
+
if (!access)
|
|
72
|
+
return DENIED;
|
|
73
|
+
// The function return shape IS the per-record hook. Grant the request and
|
|
74
|
+
// carry the predicate; the caller applies it per record.
|
|
75
|
+
if (typeof access === 'function')
|
|
76
|
+
return { granted: true, filter: access };
|
|
77
|
+
if (access === true)
|
|
78
|
+
return GRANTED;
|
|
79
|
+
// `AccessMethod` declares `string` legal and it fell through every branch
|
|
80
|
+
// above. A bare string is ONE permission, not a grant of all four -- reading
|
|
81
|
+
// it as a full grant is what once let `return 'read'` authorise DELETE.
|
|
82
|
+
const permitted = typeof access === 'string' ? [access] : access;
|
|
83
|
+
// Anything that is not a permission array by this point -- an object, a
|
|
84
|
+
// number, a Symbol -- is a consumer mistake, and the only safe reading of a
|
|
85
|
+
// shape the contract does not define is a denial. Fail CLOSED.
|
|
86
|
+
if (!Array.isArray(permitted))
|
|
87
|
+
return DENIED;
|
|
88
|
+
if (!permitted.includes(operation))
|
|
89
|
+
return DENIED;
|
|
90
|
+
return GRANTED;
|
|
91
|
+
}
|
|
92
|
+
/**
|
|
93
|
+
* Resolve model `type`'s verdict for a read, against the live `request`.
|
|
94
|
+
*
|
|
95
|
+
* Fails closed on both ambiguous inputs:
|
|
96
|
+
*
|
|
97
|
+
* - `getAccess(type)` -> `undefined`. That is NOT "this model is
|
|
98
|
+
* unrestricted". `setup-rest-server` catches an access-class load failure,
|
|
99
|
+
* warns, and publishes whatever PARTIAL map it had, so `undefined` covers
|
|
100
|
+
* both "no access class claims this model" and "the class that claims it
|
|
101
|
+
* failed to load" -- and the caller cannot tell them apart. Deny.
|
|
102
|
+
* - the predicate THROWS. Same reading `auth()` and `isDenied` already use:
|
|
103
|
+
* a throw is a denial, logged, never a 500 and never a grant.
|
|
104
|
+
*
|
|
105
|
+
* NOTE ON CROSS-MODEL ASKS -- READ THIS BEFORE REBASING #232 OR #233 ONTO IT.
|
|
106
|
+
* The predicate is asked about `type` while the request in hand was dispatched
|
|
107
|
+
* to a DIFFERENT model's route. This function makes another model's class
|
|
108
|
+
* REACHABLE and asks it the model-correct question (`{ model: type }`); whether
|
|
109
|
+
* the ANSWER is model-correct is the CONSUMER's, because only a predicate that
|
|
110
|
+
* READS `context.model` can give one. Since #222 this repo's fixture does. A
|
|
111
|
+
* consumer's arity-1 predicate does not, and there is no supported way to tell
|
|
112
|
+
* which kind was resolved (the boot-time arity warning is
|
|
113
|
+
* abofs/stonyx-orm#213/#221, unshipped).
|
|
114
|
+
*
|
|
115
|
+
* BOTH DEGRADATION DIRECTIONS ARE REACHABLE, AND THE SECOND ONE GRANTS. This is
|
|
116
|
+
* measured, not reasoned:
|
|
117
|
+
*
|
|
118
|
+
* - CLOSED. The migrated fixture's surviving `request.path` read means asking
|
|
119
|
+
* the OWNER predicate on a request dispatched to `GET /animals/archived`
|
|
120
|
+
* returns a bare `false` -- a whole-request deny bleeding across models,
|
|
121
|
+
* treated here as "deny this linkage", not as an error. That over-denies a
|
|
122
|
+
* PERMITTED record.
|
|
123
|
+
* - OPEN. An arity-1 predicate -- the shape `setup-rest-server.ts:15-18`
|
|
124
|
+
* still declares valid and the README calls the default in every consumer
|
|
125
|
+
* tree -- identifies its collection from the request, so asked about
|
|
126
|
+
* `owner` on a request dispatched to `/animals` it answers about ANIMALS.
|
|
127
|
+
* Measured against this repo's own fixture with `reg.owner` replaced by an
|
|
128
|
+
* arity-1 predicate that hides angela on `/owners`:
|
|
129
|
+
*
|
|
130
|
+
* GET /owners -> ["gina","michael","bob"] angela hidden, correctly
|
|
131
|
+
* GET /animals -> owners named: [angela, ...] LEAK
|
|
132
|
+
* GET /animals/1 -> owner.data {"type":"owner","id":"angela"}
|
|
133
|
+
*
|
|
134
|
+
* That is byte-for-byte the abofs/stonyx-orm#234 defect, on the surface
|
|
135
|
+
* #234 was filed for, AFTER this fix. It is not a regression -- dev
|
|
136
|
+
* published the same id unconditionally -- and this file cannot close it,
|
|
137
|
+
* because the arity signal is #213/#221. Do NOT write, here or anywhere
|
|
138
|
+
* else, that the cross-model ask degrades closed. The standing rule this
|
|
139
|
+
* paragraph is held to is in docs/project-structure.md.
|
|
140
|
+
*/
|
|
141
|
+
function resolveVerdict(request, type) {
|
|
142
|
+
const predicate = Orm.instance?.getAccess?.(type);
|
|
143
|
+
if (typeof predicate !== 'function')
|
|
144
|
+
return DENIED;
|
|
145
|
+
let access;
|
|
146
|
+
try {
|
|
147
|
+
// `recordId: null`, AND NOT `request.params.id`. THE TEMPTING WRONG ANSWER
|
|
148
|
+
// IS RIGHT THERE, so this is pinned by assertion as well as by comment --
|
|
149
|
+
// test/unit/linkage-verdict-test.ts, `#234 + #241 -- recordId is null`.
|
|
150
|
+
//
|
|
151
|
+
// `AccessContext.recordId` (src/types/orm-types.ts, abofs/stonyx-orm#236 /
|
|
152
|
+
// #241) means "the record THIS ROUTE WAS ADDRESSED TO, as the store key of
|
|
153
|
+
// the model being authorised", and `null` means "addressed to no record".
|
|
154
|
+
// The id sitting on the request in hand names the PRIMARY record, which
|
|
155
|
+
// belongs to a DIFFERENT model -- `GET /owners/gina` carries
|
|
156
|
+
// `params.id === 'gina'`, and the ask being made HERE is about `animal` or
|
|
157
|
+
// `trait`. Filling this in from the request would hand the related model's
|
|
158
|
+
// predicate an id belonging to another model, which is byte-for-byte the
|
|
159
|
+
// cross-model confusion abofs/stonyx-orm#202 introduced this context to
|
|
160
|
+
// eliminate: the predicate would compare an owner's id against its own
|
|
161
|
+
// records and answer a question nobody asked. There is no record of THIS
|
|
162
|
+
// model addressed by this request, so `null` is the honest value -- the
|
|
163
|
+
// same spelling `auth()` uses for a collection route.
|
|
164
|
+
//
|
|
165
|
+
// NOR ANY RECORD'S OWN ID, WHICH IS THE SECOND-MOST TEMPTING ANSWER. This
|
|
166
|
+
// verdict is resolved ONCE PER TYPE and cached in `byType` below, before
|
|
167
|
+
// any record has been looked at; there is no per-record `AccessContext`
|
|
168
|
+
// built anywhere on this path. Seeding it from the first record of a type
|
|
169
|
+
// would let that record's identity answer for every later record of the
|
|
170
|
+
// same type -- the same "one record's verdict answers for another" defect
|
|
171
|
+
// the `decisions` raw-key argument below exists to prevent, just one level
|
|
172
|
+
// coarser. And it is unnecessary: `AccessContext` deliberately carries no
|
|
173
|
+
// `record` because auth-time and record-time are separate decision points,
|
|
174
|
+
// and the per-record point already receives the WHOLE record, id included,
|
|
175
|
+
// through `verdict.filter(record)`. A predicate that wants a record's id
|
|
176
|
+
// has the contract's own channel for it.
|
|
177
|
+
access = predicate(request, { model: type, operation: 'read', recordId: null });
|
|
178
|
+
}
|
|
179
|
+
catch (error) {
|
|
180
|
+
log.error?.(`[@stonyx/orm] access() threw while resolving linkage for model "${type}" -- denying. ${error instanceof Error ? error.message : String(error)}`);
|
|
181
|
+
return DENIED;
|
|
182
|
+
}
|
|
183
|
+
return interpretAccess(access, 'read');
|
|
184
|
+
}
|
|
185
|
+
/**
|
|
186
|
+
* Build a request-scoped linkage filter.
|
|
187
|
+
*
|
|
188
|
+
* TWO CACHES, AND BOTH ARE LOAD-BEARING RATHER THAN AN OPTIMISATION:
|
|
189
|
+
*
|
|
190
|
+
* - one verdict per TYPE. Resolving means CALLING the consumer's `access()`,
|
|
191
|
+
* which is arbitrary code with arbitrary cost and which the module has
|
|
192
|
+
* already had to guard for throwing.
|
|
193
|
+
* - one decision per `(type, id)`. `included` is deduplicated by
|
|
194
|
+
* `buildResponse`; LINKAGE is not deduplicated at all, so it re-asks once
|
|
195
|
+
* per record. Measured on a bare `GET /animals` with no `include=`:
|
|
196
|
+
* 48 linkage entries -> 7 distinct `(type, id)` pairs (owner 20, trait 28),
|
|
197
|
+
* a 6.9x reduction and 41 predicate calls saved.
|
|
198
|
+
*
|
|
199
|
+
* The `(type, id)` cache is a `Map` per type keyed on the RAW id, not on a
|
|
200
|
+
* template-string composite. `Map` compares with SameValueZero, so the numeric
|
|
201
|
+
* id `1` and the string id `'1'` stay DISTINCT, where `` `${type}:${id}` `` --
|
|
202
|
+
* or a bare `String(id)` -- collapses them onto one entry and answers the second
|
|
203
|
+
* record with the first record's verdict.
|
|
204
|
+
*
|
|
205
|
+
* WHAT THAT DOES AND DOES NOT PROTECT. It cannot cross MODELS. `decisions` is
|
|
206
|
+
* already partitioned per type by `byType`, so a composite key inside a per-type
|
|
207
|
+
* map is one-to-one with the raw one and no owner's verdict could ever answer
|
|
208
|
+
* for an animal -- the claim that once stood here. The real exposure is narrower
|
|
209
|
+
* and entirely WITHIN one model: two records of the same type whose ids differ
|
|
210
|
+
* only by JavaScript type, which a per-record predicate may legitimately answer
|
|
211
|
+
* differently about (an id read off a JSON body is a string; the same id
|
|
212
|
+
* assigned by the server is a number). Pinned by unit assertion, because this
|
|
213
|
+
* fixture cannot produce the collision on its own -- `owner` ids are strings and
|
|
214
|
+
* `animal` ids are numbers.
|
|
215
|
+
*
|
|
216
|
+
* SCOPE IS ONE REQUEST. The filter closes over the request and must not outlive
|
|
217
|
+
* it -- a verdict cached across requests would answer a second caller with the
|
|
218
|
+
* first caller's authorization.
|
|
219
|
+
*
|
|
220
|
+
* A REQUEST IS REQUIRED, AND ITS ABSENCE IS CHECKED HERE RATHER THAN DELEGATED.
|
|
221
|
+
* This function is EXPORTED (src/index.ts), and the README's Consumer Contracts
|
|
222
|
+
* section points consumers at exactly the contexts that have no live request --
|
|
223
|
+
* a queue payload, a websocket frame, a custom route. Without one there is no
|
|
224
|
+
* caller to authorise against, and this file's header already says so: the
|
|
225
|
+
* shipped sample reads `request.path` and fail-closes when it is absent, so
|
|
226
|
+
* `getAccess('owner')(undefined, ...)` is `false`, while
|
|
227
|
+
* `getAccess('animal')(undefined, ...)` returns a per-record predicate and
|
|
228
|
+
* GRANTS. Measured on this repo's own fixture before this guard existed:
|
|
229
|
+
*
|
|
230
|
+
* createLinkageFilter(undefined | null | {} | 'x' | 0)
|
|
231
|
+
* -> owner=false animal=TRUE trait=TRUE category=TRUE phone-number=TRUE
|
|
232
|
+
*
|
|
233
|
+
* Four of five claimed models granted, with no log, because whether an absent
|
|
234
|
+
* request fails closed was left ENTIRELY to consumer predicates -- and a
|
|
235
|
+
* predicate that ignores its request cannot fail closed on one that is missing.
|
|
236
|
+
* A nullish or primitive `request` therefore denies every model outright and
|
|
237
|
+
* says so once, at construction, so the signal exists even for a caller that
|
|
238
|
+
* goes on to serialize nothing.
|
|
239
|
+
*
|
|
240
|
+
* WHAT THIS CANNOT CHECK: `{}` is an object and passes. There is no request
|
|
241
|
+
* contract this module owns -- `auth()` reads `.method`, the shipped sample
|
|
242
|
+
* reads `.path`, a consumer's reads whatever it likes -- so anything past
|
|
243
|
+
* "is it an object" would be this module inventing a shape for someone else's
|
|
244
|
+
* framework. The residual is documented in the README under Consumer Contracts.
|
|
245
|
+
*/
|
|
246
|
+
export function createLinkageFilter(request) {
|
|
247
|
+
if (typeof request !== 'object' || request === null) {
|
|
248
|
+
log.error?.(`[@stonyx/orm] createLinkageFilter() was called with no request (received ${request === null ? 'null' : typeof request}) -- there is no caller to authorise against, so ALL relationship linkage it is asked about is denied.`);
|
|
249
|
+
return function isLinkable(_type, _record) {
|
|
250
|
+
return false;
|
|
251
|
+
};
|
|
252
|
+
}
|
|
253
|
+
const byType = new Map();
|
|
254
|
+
return function isLinkable(type, record) {
|
|
255
|
+
let entry = byType.get(type);
|
|
256
|
+
if (!entry) {
|
|
257
|
+
entry = { verdict: resolveVerdict(request, type), decisions: new Map() };
|
|
258
|
+
byType.set(type, entry);
|
|
259
|
+
}
|
|
260
|
+
const { verdict, decisions } = entry;
|
|
261
|
+
if (!verdict.granted)
|
|
262
|
+
return false;
|
|
263
|
+
if (!verdict.filter)
|
|
264
|
+
return true;
|
|
265
|
+
const id = record?.id;
|
|
266
|
+
const cached = decisions.get(id);
|
|
267
|
+
if (cached !== undefined)
|
|
268
|
+
return cached;
|
|
269
|
+
let allowed;
|
|
270
|
+
try {
|
|
271
|
+
allowed = Boolean(verdict.filter(record));
|
|
272
|
+
}
|
|
273
|
+
catch (error) {
|
|
274
|
+
// A predicate that throws is a denial -- the same reading `isDenied` uses
|
|
275
|
+
// one layer down. Logged, because a predicate that throws on every record
|
|
276
|
+
// empties every relationship and, silently, that is indistinguishable
|
|
277
|
+
// from a database with no relationships in it.
|
|
278
|
+
log.error?.(`[@stonyx/orm] access filter threw while filtering linkage for model "${type}" -- denying. ${error instanceof Error ? error.message : String(error)}`);
|
|
279
|
+
allowed = false;
|
|
280
|
+
}
|
|
281
|
+
decisions.set(id, allowed);
|
|
282
|
+
return allowed;
|
|
283
|
+
};
|
|
284
|
+
}
|
package/dist/commands.js
CHANGED
|
@@ -20,6 +20,11 @@ const commands = {
|
|
|
20
20
|
description: 'Generate a MySQL migration from current model schemas',
|
|
21
21
|
bootstrap: true,
|
|
22
22
|
run: async (args) => {
|
|
23
|
+
const config = (await import('stonyx/config')).default;
|
|
24
|
+
if (config.orm.dynamodb) {
|
|
25
|
+
console.log('DynamoDB does not use file-based migrations. Use db:sync to provision tables.');
|
|
26
|
+
return;
|
|
27
|
+
}
|
|
23
28
|
const description = args?.join(' ') || 'migration';
|
|
24
29
|
const { generateMigration } = await import('./mysql/migration-generator.js');
|
|
25
30
|
const result = await generateMigration(description);
|
|
@@ -31,12 +36,33 @@ const commands = {
|
|
|
31
36
|
}
|
|
32
37
|
}
|
|
33
38
|
},
|
|
39
|
+
'db:sync': {
|
|
40
|
+
description: 'Provision DynamoDB tables and GSIs from current model schemas',
|
|
41
|
+
bootstrap: true,
|
|
42
|
+
run: async () => {
|
|
43
|
+
const config = (await import('stonyx/config')).default;
|
|
44
|
+
if (!config.orm.dynamodb) {
|
|
45
|
+
console.error('DynamoDB is not configured. Set DYNAMODB_REGION (and optionally DYNAMODB_ENDPOINT) to enable DynamoDB mode.');
|
|
46
|
+
process.exit(1);
|
|
47
|
+
}
|
|
48
|
+
const { default: DynamoDBDB } = await import('./dynamodb/dynamodb-db.js');
|
|
49
|
+
const db = new DynamoDBDB();
|
|
50
|
+
await db.init();
|
|
51
|
+
await db.startup();
|
|
52
|
+
await db.shutdown();
|
|
53
|
+
console.log('DynamoDB tables synced successfully.');
|
|
54
|
+
}
|
|
55
|
+
},
|
|
34
56
|
'db:migrate': {
|
|
35
57
|
description: 'Apply pending MySQL migrations',
|
|
36
58
|
bootstrap: true,
|
|
37
59
|
run: async () => {
|
|
38
60
|
const config = (await import('stonyx/config')).default;
|
|
39
61
|
const mysqlConfig = config.orm.mysql;
|
|
62
|
+
if (config.orm.dynamodb) {
|
|
63
|
+
console.log('DynamoDB does not use file-based migrations. Use db:sync to provision tables.');
|
|
64
|
+
return;
|
|
65
|
+
}
|
|
40
66
|
if (!mysqlConfig) {
|
|
41
67
|
console.error('MySQL is not configured. Set MYSQL_HOST to enable MySQL mode.');
|
|
42
68
|
process.exit(1);
|
|
@@ -75,6 +101,10 @@ const commands = {
|
|
|
75
101
|
bootstrap: true,
|
|
76
102
|
run: async () => {
|
|
77
103
|
const config = (await import('stonyx/config')).default;
|
|
104
|
+
if (config.orm.dynamodb) {
|
|
105
|
+
console.log('DynamoDB does not support migration rollback. Manage table changes via the AWS console or db:sync.');
|
|
106
|
+
return;
|
|
107
|
+
}
|
|
78
108
|
const mysqlConfig = config.orm.mysql;
|
|
79
109
|
if (!mysqlConfig) {
|
|
80
110
|
console.error('MySQL is not configured. Set MYSQL_HOST to enable MySQL mode.');
|
|
@@ -113,6 +143,10 @@ const commands = {
|
|
|
113
143
|
bootstrap: true,
|
|
114
144
|
run: async () => {
|
|
115
145
|
const config = (await import('stonyx/config')).default;
|
|
146
|
+
if (config.orm.dynamodb) {
|
|
147
|
+
console.log('DynamoDB does not use file-based migrations. Use db:sync to provision tables.');
|
|
148
|
+
return;
|
|
149
|
+
}
|
|
116
150
|
const mysqlConfig = config.orm.mysql;
|
|
117
151
|
if (!mysqlConfig) {
|
|
118
152
|
console.error('MySQL is not configured. Set MYSQL_HOST to enable MySQL mode.');
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* DynamoDB connection factory.
|
|
3
|
+
*
|
|
4
|
+
* Dynamically imports @aws-sdk/client-dynamodb and @aws-sdk/lib-dynamodb
|
|
5
|
+
* so these are optional peerDependencies (matching the pg/mysql2 pattern).
|
|
6
|
+
*/
|
|
7
|
+
export interface DynamoDBConfig {
|
|
8
|
+
region?: string;
|
|
9
|
+
endpoint?: string;
|
|
10
|
+
tablePrefix?: string;
|
|
11
|
+
[key: string]: unknown;
|
|
12
|
+
}
|
|
13
|
+
export type DocumentClient = {
|
|
14
|
+
send(command: unknown): Promise<unknown>;
|
|
15
|
+
};
|
|
16
|
+
export type DynamoDBClientConstructor = new (options: unknown) => {
|
|
17
|
+
config: unknown;
|
|
18
|
+
};
|
|
19
|
+
export type DocumentClientFromFn = {
|
|
20
|
+
from(client: unknown): DocumentClient;
|
|
21
|
+
};
|
|
22
|
+
/**
|
|
23
|
+
* Create a DynamoDBDocumentClient from the given config.
|
|
24
|
+
* Uses dynamic import so @aws-sdk/* are optional peer deps.
|
|
25
|
+
*/
|
|
26
|
+
export declare function createDocumentClient(dbConfig: DynamoDBConfig): Promise<DocumentClient>;
|
|
27
|
+
/**
|
|
28
|
+
* Nullify the document client reference (DynamoDB connections are HTTP-based
|
|
29
|
+
* and stateless — no explicit pool close needed, but we clear the reference).
|
|
30
|
+
*/
|
|
31
|
+
export declare function destroyDocumentClient(_client: DocumentClient | null): null;
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* DynamoDB connection factory.
|
|
3
|
+
*
|
|
4
|
+
* Dynamically imports @aws-sdk/client-dynamodb and @aws-sdk/lib-dynamodb
|
|
5
|
+
* so these are optional peerDependencies (matching the pg/mysql2 pattern).
|
|
6
|
+
*/
|
|
7
|
+
/**
|
|
8
|
+
* Create a DynamoDBDocumentClient from the given config.
|
|
9
|
+
* Uses dynamic import so @aws-sdk/* are optional peer deps.
|
|
10
|
+
*/
|
|
11
|
+
export async function createDocumentClient(dbConfig) {
|
|
12
|
+
const { DynamoDBClient } = await import('@aws-sdk/client-dynamodb');
|
|
13
|
+
const { DynamoDBDocumentClient } = await import('@aws-sdk/lib-dynamodb');
|
|
14
|
+
const clientOptions = {};
|
|
15
|
+
if (dbConfig.region)
|
|
16
|
+
clientOptions.region = dbConfig.region;
|
|
17
|
+
if (dbConfig.endpoint)
|
|
18
|
+
clientOptions.endpoint = dbConfig.endpoint;
|
|
19
|
+
const rawClient = new DynamoDBClient(clientOptions);
|
|
20
|
+
return DynamoDBDocumentClient.from(rawClient);
|
|
21
|
+
}
|
|
22
|
+
/**
|
|
23
|
+
* Nullify the document client reference (DynamoDB connections are HTTP-based
|
|
24
|
+
* and stateless — no explicit pool close needed, but we clear the reference).
|
|
25
|
+
*/
|
|
26
|
+
export function destroyDocumentClient(_client) {
|
|
27
|
+
return null;
|
|
28
|
+
}
|