arocapi 5.0.0-beta.7 → 5.0.0-beta.9
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 +10 -10
- package/dist/app.d.ts +1 -1
- package/dist/app.js.map +1 -1
- package/dist/routes/entities.js +1 -2
- package/dist/routes/entities.js.map +1 -1
- package/dist/routes/entity.js +1 -2
- package/dist/routes/entity.js.map +1 -1
- package/dist/routes/files.js +2 -2
- package/dist/routes/files.js.map +1 -1
- package/dist/routes/search.js +5 -6
- package/dist/routes/search.js.map +1 -1
- package/dist/storage/deliver.js +3 -3
- package/dist/storage/deliver.js.map +1 -1
- package/dist/transformers/default.d.ts +8 -11
- package/dist/transformers/default.js +3 -3
- package/dist/transformers/default.js.map +1 -1
- package/dist/types/access.d.ts +2 -2
- package/dist/types/transformers.d.ts +3 -3
- package/dist/utils/access.d.ts +2 -2
- package/dist/utils/access.js.map +1 -1
- package/dist/utils/headers.d.ts +1 -1
- package/dist/utils/headers.js +10 -1
- package/dist/utils/headers.js.map +1 -1
- package/package.json +7 -7
- package/src/app.ts +2 -0
- package/src/routes/entities.ts +1 -2
- package/src/routes/entity.ts +1 -2
- package/src/routes/files.ts +2 -2
- package/src/routes/search.ts +5 -6
- package/src/storage/deliver.ts +3 -3
- package/src/transformers/default.ts +23 -13
- package/src/types/access.ts +8 -3
- package/src/types/transformers.ts +5 -3
- package/src/utils/access.ts +2 -2
- package/src/utils/headers.ts +22 -2
package/README.md
CHANGED
|
@@ -38,16 +38,16 @@ pnpm dev # build and serve src/index.dev.ts on http://localhost:90
|
|
|
38
38
|
|
|
39
39
|
`.env` holds the local connection URLs and is committed, so don't put secrets in it.
|
|
40
40
|
|
|
41
|
-
| Command | What it does
|
|
42
|
-
| ----------------------------- |
|
|
43
|
-
| `pnpm lint` | Biome, type checking, the docs examples type check and knip
|
|
44
|
-
| `pnpm test` | Start the test containers, apply migrations and run every test
|
|
45
|
-
| `pnpm test src/app.test.ts` | Run one test file
|
|
46
|
-
| `pnpm test:watch` | Run the tests in watch mode
|
|
47
|
-
| `pnpm test:coverage` | Run the tests with an HTML coverage report
|
|
48
|
-
| `pnpm dbconsole` | Open a psql console on the development database
|
|
49
|
-
| `pnpm --filter website dev` | Run the documentation site locally
|
|
50
|
-
| `pnpm --filter website build` | Build the documentation site, checking its diagrams and every link
|
|
41
|
+
| Command | What it does |
|
|
42
|
+
| ----------------------------- | ------------------------------------------------------------------ |
|
|
43
|
+
| `pnpm lint` | Biome, type checking, the docs examples type check and knip |
|
|
44
|
+
| `pnpm test` | Start the test containers, apply migrations and run every test |
|
|
45
|
+
| `pnpm test src/app.test.ts` | Run one test file |
|
|
46
|
+
| `pnpm test:watch` | Run the tests in watch mode |
|
|
47
|
+
| `pnpm test:coverage` | Run the tests with an HTML coverage report |
|
|
48
|
+
| `pnpm dbconsole` | Open a psql console on the development database |
|
|
49
|
+
| `pnpm --filter website dev` | Run the documentation site locally |
|
|
50
|
+
| `pnpm --filter website build` | Build the documentation site, checking its diagrams and every link |
|
|
51
51
|
|
|
52
52
|
Commit messages follow [Conventional Commits](https://www.conventionalcommits.org/); they decide the next version.
|
|
53
53
|
See [TESTING.md](TESTING.md) for the test setup and [RELEASING.md](RELEASING.md) for releases.
|
package/dist/app.d.ts
CHANGED
|
@@ -13,7 +13,7 @@ export { capabilitiesFromFields } from './search/fields.js';
|
|
|
13
13
|
export type { SearchVisibilityWhere, VisibilityCondition } from './search/visibility.js';
|
|
14
14
|
export { checkSearchVisibility } from './search/visibility.js';
|
|
15
15
|
export type { ContentContext, ContentDelivery, ContentSource, DeliveryHeaders, DirectoryStorageMeta, JsonDelivery, MetadataDelivery, MetadataSource, OcflLocation, OcflStorageMeta, PathDelivery, RedirectDelivery, S3StorageMeta, StorageBackend, StorageLocate, StreamDelivery, } from './storage/backend.js';
|
|
16
|
-
export type { AuthorisedEntity, AuthorisedFile, BaseEntity, StandardEntity, StandardFile, } from './transformers/default.js';
|
|
16
|
+
export type { AuthorisedEntity, AuthorisedFile, BaseEntity, EntityRow, FileRow, StandardEntity, StandardFile, } from './transformers/default.js';
|
|
17
17
|
export type { AccessFunction, AccessInfo } from './types/access.js';
|
|
18
18
|
export type { IsAuthenticated, RequestContext } from './types/context.js';
|
|
19
19
|
export type { EntityTransformer, FileTransformer } from './types/transformers.js';
|
package/dist/app.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app.js","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,mBAAmB,CAAC;AAGzC,OAAO,YAAY,MAAM,0BAA0B,CAAC;AACpD,OAAO,QAAQ,MAAM,sBAAsB,CAAC;AAC5C,OAAO,MAAM,MAAM,oBAAoB,CAAC;AACxC,OAAO,IAAI,MAAM,kBAAkB,CAAC;AACpC,OAAO,KAAK,MAAM,mBAAmB,CAAC;AACtC,OAAO,QAAQ,MAAM,sBAAsB,CAAC;AAC5C,OAAO,MAAM,MAAM,oBAAoB,CAAC;AAQxC,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAcxD,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAQvD,OAAO,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAE5D,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"app.js","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":"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"}
|
package/dist/routes/entities.js
CHANGED
|
@@ -38,7 +38,6 @@ const entities = async (fastify, opts) => {
|
|
|
38
38
|
const [dbEntities, total] = await Promise.all([
|
|
39
39
|
prisma.entity.findMany({
|
|
40
40
|
where: visibleWhere,
|
|
41
|
-
include: { file: { select: { id: true } } },
|
|
42
41
|
orderBy: {
|
|
43
42
|
[sort]: order,
|
|
44
43
|
},
|
|
@@ -48,7 +47,7 @@ const entities = async (fastify, opts) => {
|
|
|
48
47
|
prisma.entity.count({ where: visibleWhere }),
|
|
49
48
|
]);
|
|
50
49
|
const authorisedEntities = await authoriseEntities(dbEntities, prisma, access, context);
|
|
51
|
-
const entities = await Promise.all(authorisedEntities.map((entity) => applyTransformers(entity, entityTransformers, context)));
|
|
50
|
+
const entities = await Promise.all(authorisedEntities.map((entity, i) => applyTransformers(entity, entityTransformers, context, dbEntities[i])));
|
|
52
51
|
return {
|
|
53
52
|
total,
|
|
54
53
|
entities,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entities.js","sourceRoot":"","sources":["../../src/routes/entities.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAKlF,MAAM,WAAW,GAAG,CAAC,CAAC,MAAM,CAAC;IAC3B,QAAQ,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE;IAC5B,UAAU,EAAE,CAAC;SACV,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;SACxC,OAAO,CAAC,EAAE,CAAC;SACX,SAAS,CAAC,CAAC,GAAG,EAAE,EAAE,CACjB,CAAC,GAAG,CAAC;SACF,IAAI,EAAE;SACN,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;SAC5B,MAAM,CAAC,OAAO,CAAC,CACnB;SACA,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;IACzB,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC;IAC5D,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;IACjD,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC;IACpE,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC;CAC9C,CAAC,CAAC;AASH,MAAM,QAAQ,GAA6C,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;IACjF,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,kBAAkB,GAAG,EAAE,EAAE,sBAAsB,EAAE,GAAG,IAAI,CAAC;IACjF,OAAO,CAAC,gBAAgB,EAAmB,CAAC,GAAG,CAC7C,WAAW,EACX;QACE,MAAM,EAAE;YACN,WAAW,EAAE,WAAW;SACzB;KACF,EACD,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,KAAK,CAAC;QAE3E,MAAM,KAAK,GAAuE,EAAE,CAAC;QAErF,IAAI,QAAQ,EAAE,CAAC;YACb,KAAK,CAAC,QAAQ,GAAG,QAAQ,CAAC;QAC5B,CAAC;QAED,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC1B,KAAK,CAAC,UAAU,GAAG;gBACjB,EAAE,EAAE,UAAU;aACf,CAAC;QACJ,CAAC;QAED,MAAM,OAAO,GAAG,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC;QACrC,MAAM,eAAe,GAAG,MAAM,sBAAsB,CAAC,OAAO,CAAC,CAAC;QAC9D,MAAM,YAAY,GAAG,EAAE,GAAG,EAAE,CAAC,KAAK,EAAE,eAAe,CAAC,EAAE,CAAC;QAEvD,MAAM,CAAC,UAAU,EAAE,KAAK,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YAC5C,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC;gBACrB,KAAK,EAAE,YAAY;gBACnB,OAAO,EAAE
|
|
1
|
+
{"version":3,"file":"entities.js","sourceRoot":"","sources":["../../src/routes/entities.ts"],"names":[],"mappings":"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"}
|
package/dist/routes/entity.js
CHANGED
|
@@ -17,13 +17,12 @@ const entity = async (fastify, opts) => {
|
|
|
17
17
|
const visibilityWhere = await entityVisibilityFilter(context);
|
|
18
18
|
const entity = await prisma.entity.findFirst({
|
|
19
19
|
where: { AND: [{ id }, visibilityWhere] },
|
|
20
|
-
include: { file: { select: { id: true } } },
|
|
21
20
|
});
|
|
22
21
|
if (!entity) {
|
|
23
22
|
return sendEntityNotVisible(reply, id, context);
|
|
24
23
|
}
|
|
25
24
|
const [authorisedEntity] = await authoriseEntities([entity], prisma, access, context);
|
|
26
|
-
return applyTransformers(authorisedEntity, entityTransformers, context);
|
|
25
|
+
return applyTransformers(authorisedEntity, entityTransformers, context, entity);
|
|
27
26
|
});
|
|
28
27
|
};
|
|
29
28
|
export default entity;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entity.js","sourceRoot":"","sources":["../../src/routes/entity.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAIlF,OAAO,EAAE,+BAA+B,EAAuB,MAAM,wBAAwB,CAAC;AAE9F,MAAM,YAAY,GAAG,CAAC,CAAC,MAAM,CAAC;IAC5B,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE;CACZ,CAAC,CAAC;AAUH,MAAM,MAAM,GAA2C,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;IAC7E,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,kBAAkB,GAAG,EAAE,EAAE,sBAAsB,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;IAC1F,MAAM,oBAAoB,GAAG,+BAA+B,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAE9E,OAAO,CAAC,gBAAgB,EAAmB,CAAC,GAAG,CAC7C,aAAa,EACb;QACE,MAAM,EAAE;YACN,MAAM,EAAE,YAAY;SACrB;KACF,EACD,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE;QACvB,MAAM,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC;QAE9B,MAAM,OAAO,GAAG,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC;QACrC,MAAM,eAAe,GAAG,MAAM,sBAAsB,CAAC,OAAO,CAAC,CAAC;QAC9D,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC;YAC3C,KAAK,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,eAAe,CAAC,EAAE;
|
|
1
|
+
{"version":3,"file":"entity.js","sourceRoot":"","sources":["../../src/routes/entity.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAIlF,OAAO,EAAE,+BAA+B,EAAuB,MAAM,wBAAwB,CAAC;AAE9F,MAAM,YAAY,GAAG,CAAC,CAAC,MAAM,CAAC;IAC5B,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE;CACZ,CAAC,CAAC;AAUH,MAAM,MAAM,GAA2C,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;IAC7E,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,kBAAkB,GAAG,EAAE,EAAE,sBAAsB,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;IAC1F,MAAM,oBAAoB,GAAG,+BAA+B,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAE9E,OAAO,CAAC,gBAAgB,EAAmB,CAAC,GAAG,CAC7C,aAAa,EACb;QACE,MAAM,EAAE;YACN,MAAM,EAAE,YAAY;SACrB;KACF,EACD,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE;QACvB,MAAM,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC;QAE9B,MAAM,OAAO,GAAG,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC;QACrC,MAAM,eAAe,GAAG,MAAM,sBAAsB,CAAC,OAAO,CAAC,CAAC;QAC9D,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC;YAC3C,KAAK,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,eAAe,CAAC,EAAE;SAC1C,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,OAAO,oBAAoB,CAAC,KAAK,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC;QAClD,CAAC;QAED,MAAM,CAAC,gBAAgB,CAAC,GAAG,MAAM,iBAAiB,CAAC,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;QAEtF,OAAO,iBAAiB,CAAC,gBAAgB,EAAE,kBAAkB,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;IAClF,CAAC,CACF,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,MAAM,CAAC"}
|
package/dist/routes/files.js
CHANGED
|
@@ -21,7 +21,7 @@ const files = async (fastify, opts) => {
|
|
|
21
21
|
const [dbFiles, total] = await Promise.all([
|
|
22
22
|
prisma.file.findMany({
|
|
23
23
|
where,
|
|
24
|
-
include: { entity:
|
|
24
|
+
include: { entity: true },
|
|
25
25
|
orderBy: {
|
|
26
26
|
[sort]: order,
|
|
27
27
|
},
|
|
@@ -31,7 +31,7 @@ const files = async (fastify, opts) => {
|
|
|
31
31
|
prisma.file.count({ where }),
|
|
32
32
|
]);
|
|
33
33
|
const authorisedFiles = await authoriseFiles(dbFiles, access, context);
|
|
34
|
-
const filesWithAccess = await Promise.all(authorisedFiles.map((file) => applyTransformers(file, fileTransformers, context)));
|
|
34
|
+
const filesWithAccess = await Promise.all(authorisedFiles.map((file, i) => applyTransformers(file, fileTransformers, context, dbFiles[i])));
|
|
35
35
|
return {
|
|
36
36
|
total,
|
|
37
37
|
files: filesWithAccess,
|
package/dist/routes/files.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"files.js","sourceRoot":"","sources":["../../src/routes/files.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAK/E,MAAM,WAAW,GAAG,CAAC,CAAC,MAAM,CAAC;IAC3B,QAAQ,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE;IAC5B,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC;IAC5D,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;IACjD,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,UAAU,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC;IACxE,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC;CAC9C,CAAC,CAAC;AASH,MAAM,KAAK,GAA0C,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;IAC3E,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,gBAAgB,GAAG,EAAE,EAAE,sBAAsB,EAAE,GAAG,IAAI,CAAC;IAE/E,OAAO,CAAC,gBAAgB,EAAmB,CAAC,GAAG,CAC7C,QAAQ,EACR;QACE,MAAM,EAAE;YACN,WAAW,EAAE,WAAW;SACzB;KACF,EACD,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,KAAK,CAAC;QAE/D,MAAM,OAAO,GAAG,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC;QACrC,MAAM,eAAe,GAAG,MAAM,sBAAsB,CAAC,OAAO,CAAC,CAAC;QAC9D,MAAM,KAAK,GAAG,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,QAAQ,EAAE,EAAE,eAAe,CAAC,EAAE,EAAE,CAAC;QAEnE,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YACzC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC;gBACnB,KAAK;gBACL,OAAO,EAAE,EAAE,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"files.js","sourceRoot":"","sources":["../../src/routes/files.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAK/E,MAAM,WAAW,GAAG,CAAC,CAAC,MAAM,CAAC;IAC3B,QAAQ,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE;IAC5B,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC;IAC5D,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;IACjD,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,UAAU,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC;IACxE,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC;CAC9C,CAAC,CAAC;AASH,MAAM,KAAK,GAA0C,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;IAC3E,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,gBAAgB,GAAG,EAAE,EAAE,sBAAsB,EAAE,GAAG,IAAI,CAAC;IAE/E,OAAO,CAAC,gBAAgB,EAAmB,CAAC,GAAG,CAC7C,QAAQ,EACR;QACE,MAAM,EAAE;YACN,WAAW,EAAE,WAAW;SACzB;KACF,EACD,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,KAAK,CAAC;QAE/D,MAAM,OAAO,GAAG,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC;QACrC,MAAM,eAAe,GAAG,MAAM,sBAAsB,CAAC,OAAO,CAAC,CAAC;QAC9D,MAAM,KAAK,GAAG,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,QAAQ,EAAE,EAAE,eAAe,CAAC,EAAE,EAAE,CAAC;QAEnE,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YACzC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC;gBACnB,KAAK;gBACL,OAAO,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE;gBACzB,OAAO,EAAE;oBACP,CAAC,IAAI,CAAC,EAAE,KAAK;iBACd;gBACD,IAAI,EAAE,MAAM;gBACZ,IAAI,EAAE,KAAK;aACZ,CAAC;YACF,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,CAAC;SAC7B,CAAC,CAAC;QAEH,MAAM,eAAe,GAAG,MAAM,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;QACvE,MAAM,eAAe,GAAG,MAAM,OAAO,CAAC,GAAG,CACvC,eAAe,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,IAAI,EAAE,gBAAgB,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CACjG,CAAC;QAEF,OAAO;YACL,KAAK;YACL,KAAK,EAAE,eAAe;SACvB,CAAC;IACJ,CAAC,CACF,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,KAAK,CAAC"}
|
package/dist/routes/search.js
CHANGED
|
@@ -89,18 +89,17 @@ const search = async (fastify, opts) => {
|
|
|
89
89
|
where: {
|
|
90
90
|
AND: [{ id: { in: result.hits.map(({ id }) => id) } }, await visibilityWhere],
|
|
91
91
|
},
|
|
92
|
-
include: { file: { select: { id: true } } },
|
|
93
92
|
});
|
|
94
93
|
const authorisedEntities = await authoriseEntities(dbEntities, prisma, access, context);
|
|
95
|
-
const entityMap = new Map(authorisedEntities.map((entity) => [entity.id, entity]));
|
|
94
|
+
const entityMap = new Map(authorisedEntities.map((entity, i) => [entity.id, { entity, row: dbEntities[i] }]));
|
|
96
95
|
const entities = await Promise.all(result.hits.map(async ({ id, searchExtra }) => {
|
|
97
|
-
const
|
|
98
|
-
if (!
|
|
96
|
+
const found = entityMap.get(id);
|
|
97
|
+
if (!found) {
|
|
99
98
|
fastify.log.warn(`Entity ${id} found by the search backend but missing or not visible in database`);
|
|
100
99
|
return null;
|
|
101
100
|
}
|
|
102
|
-
const transformed = await applyTransformers(
|
|
103
|
-
const extra = visibleExtra(searchExtra,
|
|
101
|
+
const transformed = await applyTransformers(found.entity, entityTransformers, context, found.row);
|
|
102
|
+
const extra = visibleExtra(searchExtra, found.entity.access);
|
|
104
103
|
return extra === undefined ? transformed : { ...transformed, searchExtra: extra };
|
|
105
104
|
})).then((results) => results.filter((entity) => entity !== null));
|
|
106
105
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"search.js","sourceRoot":"","sources":["../../src/routes/search.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"search.js","sourceRoot":"","sources":["../../src/routes/search.ts"],"names":[],"mappings":"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"}
|
package/dist/storage/deliver.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { createHash } from 'node:crypto';
|
|
2
2
|
import { open } from 'node:fs/promises';
|
|
3
|
-
import {
|
|
3
|
+
import { setDeliveryHeaders } from '../utils/headers.js';
|
|
4
4
|
export const sendDelivery = async (request, reply, delivery, { contentDisposition, noRedirect = false, json = false } = {}) => {
|
|
5
5
|
if (delivery.type === 'redirect') {
|
|
6
6
|
return noRedirect ? reply.code(200).send({ location: delivery.url }) : reply.redirect(delivery.url, 302);
|
|
@@ -9,7 +9,7 @@ export const sendDelivery = async (request, reply, delivery, { contentDispositio
|
|
|
9
9
|
if (delivery.type === 'json' && json) {
|
|
10
10
|
const body = Buffer.from(JSON.stringify(delivery.value));
|
|
11
11
|
const etag = `"${createHash('sha256').update(body).digest('base64url')}"`;
|
|
12
|
-
|
|
12
|
+
setDeliveryHeaders(reply, { contentType: delivery.contentType, contentLength: body.length, etag });
|
|
13
13
|
return reply.code(200).send(head ? undefined : body);
|
|
14
14
|
}
|
|
15
15
|
if (delivery.type !== 'stream' && delivery.type !== 'path') {
|
|
@@ -20,7 +20,7 @@ export const sendDelivery = async (request, reply, delivery, { contentDispositio
|
|
|
20
20
|
body = delivery.type === 'stream' ? await delivery.open() : (await open(delivery.path)).createReadStream();
|
|
21
21
|
}
|
|
22
22
|
try {
|
|
23
|
-
|
|
23
|
+
setDeliveryHeaders(reply, delivery);
|
|
24
24
|
}
|
|
25
25
|
catch (error) {
|
|
26
26
|
body?.destroy();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deliver.js","sourceRoot":"","sources":["../../src/storage/deliver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAGxC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"deliver.js","sourceRoot":"","sources":["../../src/storage/deliver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAGxC,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAiBzD,MAAM,CAAC,MAAM,YAAY,GAAG,KAAK,EAC/B,OAAuB,EACvB,KAAmB,EACnB,QAAuB,EACvB,EAAE,kBAAkB,EAAE,UAAU,GAAG,KAAK,EAAE,IAAI,GAAG,KAAK,EAAE,GAAgB,EAAE,EAC1E,EAAE;IACF,IAAI,QAAQ,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;QACjC,OAAO,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,QAAQ,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IAC3G,CAAC;IAED,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,KAAK,MAAM,CAAC;IAEvC,IAAI,QAAQ,CAAC,IAAI,KAAK,MAAM,IAAI,IAAI,EAAE,CAAC;QACrC,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;QACzD,MAAM,IAAI,GAAG,IAAI,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC;QAC1E,kBAAkB,CAAC,KAAK,EAAE,EAAE,WAAW,EAAE,QAAQ,CAAC,WAAW,EAAE,aAAa,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;QAEnG,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IACvD,CAAC;IAED,IAAI,QAAQ,CAAC,IAAI,KAAK,QAAQ,IAAI,QAAQ,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;QAC3D,MAAM,IAAI,KAAK,CACb,uCAAuC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,+BAA+B,CACpG,CAAC;IACJ,CAAC;IAGD,IAAI,IAA0B,CAAC;IAC/B,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,IAAI,GAAG,QAAQ,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAC7G,CAAC;IAED,IAAI,CAAC;QACH,kBAAkB,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;IACtC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,EAAE,OAAO,EAAE,CAAC;QAChB,MAAM,KAAK,CAAC;IACd,CAAC;IACD,IAAI,kBAAkB,EAAE,CAAC;QACvB,KAAK,CAAC,MAAM,CAAC,qBAAqB,EAAE,kBAAkB,CAAC,CAAC;IAC1D,CAAC;IAED,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACpC,CAAC,CAAC"}
|
|
@@ -1,10 +1,9 @@
|
|
|
1
1
|
import type { Entity, File, PrismaClient } from '../generated/prisma/client.js';
|
|
2
2
|
import type { AccessFunction, AccessInfo } from '../types/access.js';
|
|
3
3
|
import type { RequestContext } from '../types/context.js';
|
|
4
|
-
export type
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
} | null;
|
|
4
|
+
export type EntityRow = Entity;
|
|
5
|
+
export type FileRow = File & {
|
|
6
|
+
entity: EntityRow;
|
|
8
7
|
};
|
|
9
8
|
type EntityReference = {
|
|
10
9
|
id: string;
|
|
@@ -43,11 +42,9 @@ export type StandardFile = {
|
|
|
43
42
|
export type AuthorisedFile = StandardFile & {
|
|
44
43
|
access: FileAccessInfo;
|
|
45
44
|
};
|
|
46
|
-
export declare const baseEntityTransformer: (entity:
|
|
47
|
-
export declare const decideAccess: (entities:
|
|
48
|
-
export declare const authoriseEntities: (entities:
|
|
49
|
-
export declare const authoriseFiles: (files:
|
|
50
|
-
|
|
51
|
-
}>, access: AccessFunction, context: RequestContext) => Promise<AuthorisedFile[]>;
|
|
52
|
-
export declare const applyTransformers: <T>(item: T, transformers: Array<(item: T, context: RequestContext) => Promise<T> | T>, context: RequestContext) => Promise<T>;
|
|
45
|
+
export declare const baseEntityTransformer: (entity: EntityRow) => BaseEntity;
|
|
46
|
+
export declare const decideAccess: (entities: EntityRow[], access: AccessFunction, context: RequestContext) => Promise<AccessInfo[]>;
|
|
47
|
+
export declare const authoriseEntities: (entities: EntityRow[], prisma: PrismaClient, access: AccessFunction, context: RequestContext) => Promise<AuthorisedEntity[]>;
|
|
48
|
+
export declare const authoriseFiles: (files: FileRow[], access: AccessFunction, context: RequestContext) => Promise<AuthorisedFile[]>;
|
|
49
|
+
export declare const applyTransformers: <T, R>(item: T, transformers: Array<(item: T, context: RequestContext, row: R) => Promise<T> | T>, context: RequestContext, row: R) => Promise<T>;
|
|
53
50
|
export {};
|
|
@@ -53,7 +53,7 @@ const pickAccess = ({ metadata, content, metadataAuthorizationUrl, contentAuthor
|
|
|
53
53
|
...(metadataAuthorizationUrl && { metadataAuthorizationUrl }),
|
|
54
54
|
...(contentAuthorizationUrl && { contentAuthorizationUrl }),
|
|
55
55
|
});
|
|
56
|
-
export const decideAccess = async (entities, access, context) => Promise.all(entities.map(async (entity) => pickAccess(await access(baseEntityTransformer(entity), context))));
|
|
56
|
+
export const decideAccess = async (entities, access, context) => Promise.all(entities.map(async (entity) => pickAccess(await access(baseEntityTransformer(entity), context, entity))));
|
|
57
57
|
export const authoriseEntities = async (entities, prisma, access, context) => {
|
|
58
58
|
const [standardEntities, entityAccess] = await Promise.all([
|
|
59
59
|
toStandardEntities(entities, prisma),
|
|
@@ -68,10 +68,10 @@ export const authoriseFiles = async (files, access, context) => {
|
|
|
68
68
|
return { ...baseFileTransformer(file), access: fileAccess };
|
|
69
69
|
});
|
|
70
70
|
};
|
|
71
|
-
export const applyTransformers = async (item, transformers, context) => {
|
|
71
|
+
export const applyTransformers = async (item, transformers, context, row) => {
|
|
72
72
|
let result = item;
|
|
73
73
|
for (const transformer of transformers) {
|
|
74
|
-
result = await transformer(result, context);
|
|
74
|
+
result = await transformer(result, context, row);
|
|
75
75
|
}
|
|
76
76
|
return result;
|
|
77
77
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"default.js","sourceRoot":"","sources":["../../src/transformers/default.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"default.js","sourceRoot":"","sources":["../../src/transformers/default.ts"],"names":[],"mappings":"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"}
|
package/dist/types/access.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { BaseEntity } from '../transformers/default.js';
|
|
1
|
+
import type { BaseEntity, EntityRow } from '../transformers/default.js';
|
|
2
2
|
import type { RequestContext } from './context.js';
|
|
3
3
|
export type AccessInfo = {
|
|
4
4
|
metadata: boolean;
|
|
@@ -6,4 +6,4 @@ export type AccessInfo = {
|
|
|
6
6
|
metadataAuthorizationUrl?: string;
|
|
7
7
|
contentAuthorizationUrl?: string;
|
|
8
8
|
};
|
|
9
|
-
export type AccessFunction = (entity: BaseEntity, context: RequestContext) => Promise<AccessInfo> | AccessInfo;
|
|
9
|
+
export type AccessFunction = (entity: BaseEntity, context: RequestContext, row: EntityRow) => Promise<AccessInfo> | AccessInfo;
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { AuthorisedEntity, AuthorisedFile } from '../transformers/default.js';
|
|
1
|
+
import type { AuthorisedEntity, AuthorisedFile, EntityRow, FileRow } from '../transformers/default.js';
|
|
2
2
|
import type { RequestContext } from './context.js';
|
|
3
|
-
export type EntityTransformer<TInput = AuthorisedEntity, TOutput = TInput> = (entity: TInput, context: RequestContext) => Promise<TOutput> | TOutput;
|
|
4
|
-
export type FileTransformer<TInput = AuthorisedFile, TOutput = TInput> = (file: TInput, context: RequestContext) => Promise<TOutput> | TOutput;
|
|
3
|
+
export type EntityTransformer<TInput = AuthorisedEntity, TOutput = TInput> = (entity: TInput, context: RequestContext, row: EntityRow) => Promise<TOutput> | TOutput;
|
|
4
|
+
export type FileTransformer<TInput = AuthorisedFile, TOutput = TInput> = (file: TInput, context: RequestContext, row: FileRow) => Promise<TOutput> | TOutput;
|
package/dist/utils/access.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { FastifyReply } from 'fastify';
|
|
2
|
-
import { type
|
|
2
|
+
import { type EntityRow } from '../transformers/default.js';
|
|
3
3
|
import type { AccessFunction } from '../types/access.js';
|
|
4
4
|
import type { IsAuthenticated, RequestContext } from '../types/context.js';
|
|
5
5
|
export declare const AllPublicAccess: AccessFunction;
|
|
@@ -13,5 +13,5 @@ type AccessGuardOptions = {
|
|
|
13
13
|
isAuthenticated?: IsAuthenticated;
|
|
14
14
|
level: 'metadata' | 'content';
|
|
15
15
|
};
|
|
16
|
-
export declare const createAccessGuard: ({ access, isAuthenticated, level }: AccessGuardOptions) => (reply: FastifyReply, entity:
|
|
16
|
+
export declare const createAccessGuard: ({ access, isAuthenticated, level }: AccessGuardOptions) => (reply: FastifyReply, entity: EntityRow, context: RequestContext) => Promise<boolean>;
|
|
17
17
|
export {};
|
package/dist/utils/access.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"access.js","sourceRoot":"","sources":["../../src/utils/access.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,
|
|
1
|
+
{"version":3,"file":"access.js","sourceRoot":"","sources":["../../src/utils/access.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAkB,MAAM,4BAA4B,CAAC;AAG1E,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAO9C,MAAM,CAAC,MAAM,eAAe,GAAmB,GAAG,EAAE,CAAC,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;AAYzF,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,EAAE,UAAU,EAAE,gBAAgB,EAAwB,EAAkB,EAAE;IACtG,MAAM,eAAe,GAAG,IAAI,OAAO,EAAiD,CAAC;IAErF,MAAM,KAAK,GAAG,CAAC,SAAiB,EAAE,OAAuB,EAAE,EAAE;QAC3D,IAAI,MAAM,GAAG,eAAe,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAClD,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,GAAG,IAAI,GAAG,EAAE,CAAC;YACnB,eAAe,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QAC/C,CAAC;QAED,IAAI,IAAI,GAAG,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACjC,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,CAAC;YACvD,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;QAC9B,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;IAEF,OAAO,KAAK,EAAE,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,EAAE,OAAO,EAAE,EAAE;QAChE,MAAM,CAAC,QAAQ,EAAE,OAAO,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YAC5C,KAAK,CAAC,iBAAiB,EAAE,OAAO,CAAC;YACjC,KAAK,CAAC,gBAAgB,EAAE,OAAO,CAAC;SACjC,CAAC,CAAC;QAEH,OAAO;YACL,QAAQ;YACR,OAAO;YACP,GAAG,CAAC,CAAC,QAAQ,IAAI,gBAAgB,IAAI,EAAE,wBAAwB,EAAE,gBAAgB,CAAC,iBAAiB,CAAC,EAAE,CAAC;YACvG,GAAG,CAAC,CAAC,OAAO,IAAI,gBAAgB,IAAI,EAAE,uBAAuB,EAAE,gBAAgB,CAAC,gBAAgB,CAAC,EAAE,CAAC;SACrG,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC,CAAC;AAYF,MAAM,CAAC,MAAM,iBAAiB,GAC5B,CAAC,EAAE,MAAM,EAAE,eAAe,EAAE,KAAK,EAAsB,EAAE,EAAE,CAC3D,KAAK,EAAE,KAAmB,EAAE,MAAiB,EAAE,OAAuB,EAAE,EAAE;IACxE,MAAM,CAAC,YAAY,CAAC,GAAG,MAAM,YAAY,CAAC,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;IACrE,IAAI,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC;QACxB,OAAO,KAAK,CAAC;IACf,CAAC;IAED,WAAW,CAAC,KAAK,EAAE,MAAM,WAAW,CAAC,eAAe,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC;IAE3E,OAAO,IAAI,CAAC;AACd,CAAC,CAAC"}
|
package/dist/utils/headers.d.ts
CHANGED
package/dist/utils/headers.js
CHANGED
|
@@ -1,4 +1,9 @@
|
|
|
1
|
-
|
|
1
|
+
const contentSecurityPolicy = "default-src 'none'; style-src 'unsafe-inline'; sandbox";
|
|
2
|
+
const token = "[!#$%&'*+\\-.^_`|~0-9a-z]+";
|
|
3
|
+
const quotedString = '"(?:[^"\\\\]|\\\\.)*"';
|
|
4
|
+
const mediaType = new RegExp(`^(?:audio|video)/${token}(?:[ \\t]*;[ \\t]*${token}=(?:${token}|${quotedString}))*[ \\t]*$`, 'i');
|
|
5
|
+
const isMedia = (contentType) => mediaType.test(contentType);
|
|
6
|
+
export const setDeliveryHeaders = (reply, metadata) => {
|
|
2
7
|
reply.header('Content-Type', metadata.contentType);
|
|
3
8
|
reply.header('Content-Length', metadata.contentLength.toString());
|
|
4
9
|
if (metadata.etag) {
|
|
@@ -7,5 +12,9 @@ export const setFileHeaders = (reply, metadata) => {
|
|
|
7
12
|
if (metadata.lastModified) {
|
|
8
13
|
reply.header('Last-Modified', metadata.lastModified.toUTCString());
|
|
9
14
|
}
|
|
15
|
+
reply.header('X-Content-Type-Options', 'nosniff');
|
|
16
|
+
if (!isMedia(metadata.contentType)) {
|
|
17
|
+
reply.header('Content-Security-Policy', contentSecurityPolicy);
|
|
18
|
+
}
|
|
10
19
|
};
|
|
11
20
|
//# sourceMappingURL=headers.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"headers.js","sourceRoot":"","sources":["../../src/utils/headers.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"headers.js","sourceRoot":"","sources":["../../src/utils/headers.ts"],"names":[],"mappings":"AAGA,MAAM,qBAAqB,GAAG,wDAAwD,CAAC;AAEvF,MAAM,KAAK,GAAG,4BAA4B,CAAC;AAC3C,MAAM,YAAY,GAAG,uBAAuB,CAAC;AAC7C,MAAM,SAAS,GAAG,IAAI,MAAM,CAC1B,oBAAoB,KAAK,qBAAqB,KAAK,OAAO,KAAK,IAAI,YAAY,aAAa,EAC5F,GAAG,CACJ,CAAC;AAKF,MAAM,OAAO,GAAG,CAAC,WAAmB,EAAE,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;AAErE,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAChC,KAAmB,EACnB,QAA4F,EAC5F,EAAE;IACF,KAAK,CAAC,MAAM,CAAC,cAAc,EAAE,QAAQ,CAAC,WAAW,CAAC,CAAC;IACnD,KAAK,CAAC,MAAM,CAAC,gBAAgB,EAAE,QAAQ,CAAC,aAAa,CAAC,QAAQ,EAAE,CAAC,CAAC;IAClE,IAAI,QAAQ,CAAC,IAAI,EAAE,CAAC;QAClB,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;IACtC,CAAC;IACD,IAAI,QAAQ,CAAC,YAAY,EAAE,CAAC;QAC1B,KAAK,CAAC,MAAM,CAAC,eAAe,EAAE,QAAQ,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC,CAAC;IACrE,CAAC;IAGD,KAAK,CAAC,MAAM,CAAC,wBAAwB,EAAE,SAAS,CAAC,CAAC;IAClD,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;QACnC,KAAK,CAAC,MAAM,CAAC,yBAAyB,EAAE,qBAAqB,CAAC,CAAC;IACjE,CAAC;AACH,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"type": "module",
|
|
3
3
|
"name": "arocapi",
|
|
4
|
-
"version": "5.0.0-beta.
|
|
4
|
+
"version": "5.0.0-beta.9",
|
|
5
5
|
"description": "An RO-Crate API",
|
|
6
6
|
"main": "dist/app.js",
|
|
7
7
|
"exports": {
|
|
@@ -26,9 +26,9 @@
|
|
|
26
26
|
"zod": "^4.6.7"
|
|
27
27
|
},
|
|
28
28
|
"devDependencies": {
|
|
29
|
-
"@aws-sdk/client-s3": "^3.
|
|
30
|
-
"@aws-sdk/s3-request-presigner": "^3.
|
|
31
|
-
"@biomejs/biome": "^2.
|
|
29
|
+
"@aws-sdk/client-s3": "^3.1157.0",
|
|
30
|
+
"@aws-sdk/s3-request-presigner": "^3.1157.0",
|
|
31
|
+
"@biomejs/biome": "^2.6.3",
|
|
32
32
|
"@commitlint/cli": "^21.2.4",
|
|
33
33
|
"@commitlint/config-conventional": "^21.2.4",
|
|
34
34
|
"@ocfl/ocfl-fs": "^0.4.0",
|
|
@@ -44,10 +44,10 @@
|
|
|
44
44
|
"@vitest/ui": "^5.0.5",
|
|
45
45
|
"concurrently": "^10.0.6",
|
|
46
46
|
"conventional-changelog-conventionalcommits": "^9.3.1",
|
|
47
|
-
"dotenv": "^18.0.
|
|
47
|
+
"dotenv": "^18.0.9",
|
|
48
48
|
"fastify": "^5.12.7",
|
|
49
49
|
"fastify-tsconfig": "^3.0.0",
|
|
50
|
-
"knip": "^6.
|
|
50
|
+
"knip": "^6.43.0",
|
|
51
51
|
"lefthook": "^2.2.2",
|
|
52
52
|
"prisma": "^7.10.1",
|
|
53
53
|
"semantic-release": "^25.0.9",
|
|
@@ -114,7 +114,7 @@
|
|
|
114
114
|
"registry": "https://registry.npmjs.org/",
|
|
115
115
|
"provenance": true
|
|
116
116
|
},
|
|
117
|
-
"packageManager": "pnpm@12.
|
|
117
|
+
"packageManager": "pnpm@12.15.0",
|
|
118
118
|
"peerDependenciesMeta": {
|
|
119
119
|
"@aws-sdk/client-s3": {
|
|
120
120
|
"optional": true
|
package/src/app.ts
CHANGED
package/src/routes/entities.ts
CHANGED
|
@@ -63,7 +63,6 @@ const entities: FastifyPluginAsync<EntitiesRouteOptions> = async (fastify, opts)
|
|
|
63
63
|
const [dbEntities, total] = await Promise.all([
|
|
64
64
|
prisma.entity.findMany({
|
|
65
65
|
where: visibleWhere,
|
|
66
|
-
include: { file: { select: { id: true } } },
|
|
67
66
|
orderBy: {
|
|
68
67
|
[sort]: order,
|
|
69
68
|
},
|
|
@@ -75,7 +74,7 @@ const entities: FastifyPluginAsync<EntitiesRouteOptions> = async (fastify, opts)
|
|
|
75
74
|
|
|
76
75
|
const authorisedEntities = await authoriseEntities(dbEntities, prisma, access, context);
|
|
77
76
|
const entities = await Promise.all(
|
|
78
|
-
authorisedEntities.map((entity) => applyTransformers(entity, entityTransformers, context)),
|
|
77
|
+
authorisedEntities.map((entity, i) => applyTransformers(entity, entityTransformers, context, dbEntities[i])),
|
|
79
78
|
);
|
|
80
79
|
|
|
81
80
|
return {
|
package/src/routes/entity.ts
CHANGED
|
@@ -38,7 +38,6 @@ const entity: FastifyPluginAsync<EntityRouteOptions> = async (fastify, opts) =>
|
|
|
38
38
|
const visibilityWhere = await entityVisibilityFilter(context);
|
|
39
39
|
const entity = await prisma.entity.findFirst({
|
|
40
40
|
where: { AND: [{ id }, visibilityWhere] },
|
|
41
|
-
include: { file: { select: { id: true } } },
|
|
42
41
|
});
|
|
43
42
|
|
|
44
43
|
if (!entity) {
|
|
@@ -47,7 +46,7 @@ const entity: FastifyPluginAsync<EntityRouteOptions> = async (fastify, opts) =>
|
|
|
47
46
|
|
|
48
47
|
const [authorisedEntity] = await authoriseEntities([entity], prisma, access, context);
|
|
49
48
|
|
|
50
|
-
return applyTransformers(authorisedEntity, entityTransformers, context);
|
|
49
|
+
return applyTransformers(authorisedEntity, entityTransformers, context, entity);
|
|
51
50
|
},
|
|
52
51
|
);
|
|
53
52
|
};
|
package/src/routes/files.ts
CHANGED
|
@@ -42,7 +42,7 @@ const files: FastifyPluginAsync<FilesRouteOptions> = async (fastify, opts) => {
|
|
|
42
42
|
const [dbFiles, total] = await Promise.all([
|
|
43
43
|
prisma.file.findMany({
|
|
44
44
|
where,
|
|
45
|
-
include: { entity:
|
|
45
|
+
include: { entity: true },
|
|
46
46
|
orderBy: {
|
|
47
47
|
[sort]: order,
|
|
48
48
|
},
|
|
@@ -54,7 +54,7 @@ const files: FastifyPluginAsync<FilesRouteOptions> = async (fastify, opts) => {
|
|
|
54
54
|
|
|
55
55
|
const authorisedFiles = await authoriseFiles(dbFiles, access, context);
|
|
56
56
|
const filesWithAccess = await Promise.all(
|
|
57
|
-
authorisedFiles.map((file) => applyTransformers(file, fileTransformers, context)),
|
|
57
|
+
authorisedFiles.map((file, i) => applyTransformers(file, fileTransformers, context, dbFiles[i])),
|
|
58
58
|
);
|
|
59
59
|
|
|
60
60
|
return {
|
package/src/routes/search.ts
CHANGED
|
@@ -146,23 +146,22 @@ const search: FastifyPluginAsync<SearchRouteOptions> = async (fastify, opts) =>
|
|
|
146
146
|
where: {
|
|
147
147
|
AND: [{ id: { in: result.hits.map(({ id }) => id) } }, await visibilityWhere],
|
|
148
148
|
},
|
|
149
|
-
include: { file: { select: { id: true } } },
|
|
150
149
|
});
|
|
151
150
|
|
|
152
151
|
const authorisedEntities = await authoriseEntities(dbEntities, prisma, access, context);
|
|
153
|
-
const entityMap = new Map(authorisedEntities.map((entity) => [entity.id, entity]));
|
|
152
|
+
const entityMap = new Map(authorisedEntities.map((entity, i) => [entity.id, { entity, row: dbEntities[i] }]));
|
|
154
153
|
|
|
155
154
|
const entities = await Promise.all(
|
|
156
155
|
result.hits.map(async ({ id, searchExtra }) => {
|
|
157
|
-
const
|
|
158
|
-
if (!
|
|
156
|
+
const found = entityMap.get(id);
|
|
157
|
+
if (!found) {
|
|
159
158
|
fastify.log.warn(`Entity ${id} found by the search backend but missing or not visible in database`);
|
|
160
159
|
|
|
161
160
|
return null;
|
|
162
161
|
}
|
|
163
162
|
|
|
164
|
-
const transformed = await applyTransformers(
|
|
165
|
-
const extra = visibleExtra(searchExtra,
|
|
163
|
+
const transformed = await applyTransformers(found.entity, entityTransformers, context, found.row);
|
|
164
|
+
const extra = visibleExtra(searchExtra, found.entity.access);
|
|
166
165
|
|
|
167
166
|
return extra === undefined ? transformed : { ...(transformed as object), searchExtra: extra };
|
|
168
167
|
}),
|
package/src/storage/deliver.ts
CHANGED
|
@@ -2,7 +2,7 @@ import { createHash } from 'node:crypto';
|
|
|
2
2
|
import { open } from 'node:fs/promises';
|
|
3
3
|
import type { Readable } from 'node:stream';
|
|
4
4
|
import type { FastifyReply, FastifyRequest } from 'fastify';
|
|
5
|
-
import {
|
|
5
|
+
import { setDeliveryHeaders } from '../utils/headers.js';
|
|
6
6
|
import type { ContentDelivery, JsonDelivery } from './backend.js';
|
|
7
7
|
|
|
8
8
|
type SendOptions = {
|
|
@@ -34,7 +34,7 @@ export const sendDelivery = async (
|
|
|
34
34
|
if (delivery.type === 'json' && json) {
|
|
35
35
|
const body = Buffer.from(JSON.stringify(delivery.value));
|
|
36
36
|
const etag = `"${createHash('sha256').update(body).digest('base64url')}"`;
|
|
37
|
-
|
|
37
|
+
setDeliveryHeaders(reply, { contentType: delivery.contentType, contentLength: body.length, etag });
|
|
38
38
|
|
|
39
39
|
return reply.code(200).send(head ? undefined : body);
|
|
40
40
|
}
|
|
@@ -52,7 +52,7 @@ export const sendDelivery = async (
|
|
|
52
52
|
}
|
|
53
53
|
|
|
54
54
|
try {
|
|
55
|
-
|
|
55
|
+
setDeliveryHeaders(reply, delivery);
|
|
56
56
|
} catch (error) {
|
|
57
57
|
body?.destroy();
|
|
58
58
|
throw error;
|
|
@@ -2,7 +2,17 @@ import type { Entity, File, PrismaClient } from '../generated/prisma/client.js';
|
|
|
2
2
|
import type { AccessFunction, AccessInfo } from '../types/access.js';
|
|
3
3
|
import type { RequestContext } from '../types/context.js';
|
|
4
4
|
|
|
5
|
-
|
|
5
|
+
/**
|
|
6
|
+
* An entity's stored database row: its Record fields, `meta`, `createdAt` and `updatedAt`
|
|
7
|
+
* Never sent as-is; `meta` can be large
|
|
8
|
+
*/
|
|
9
|
+
export type EntityRow = Entity;
|
|
10
|
+
|
|
11
|
+
/**
|
|
12
|
+
* A file's stored database row with its file entity's row
|
|
13
|
+
* Never sent as-is; `meta` can be large
|
|
14
|
+
*/
|
|
15
|
+
export type FileRow = File & { entity: EntityRow };
|
|
6
16
|
|
|
7
17
|
/**
|
|
8
18
|
* Entity reference - used for memberOf and rootCollection
|
|
@@ -72,9 +82,8 @@ export type AuthorisedFile = StandardFile & {
|
|
|
72
82
|
/**
|
|
73
83
|
* Base entity transformer - always applied first
|
|
74
84
|
* Transforms raw database entity to base entity shape with unresolved references
|
|
75
|
-
* Accepts Entity with optional file relation included
|
|
76
85
|
*/
|
|
77
|
-
export const baseEntityTransformer = (entity:
|
|
86
|
+
export const baseEntityTransformer = (entity: EntityRow): BaseEntity => {
|
|
78
87
|
const base: BaseEntity = {
|
|
79
88
|
id: entity.id,
|
|
80
89
|
name: entity.name,
|
|
@@ -139,7 +148,7 @@ const resolveEntityReferences = async (
|
|
|
139
148
|
/**
|
|
140
149
|
* Transform database entities to standard entities, resolving their references in one query
|
|
141
150
|
*/
|
|
142
|
-
const toStandardEntities = async (entities:
|
|
151
|
+
const toStandardEntities = async (entities: EntityRow[], prisma: PrismaClient): Promise<StandardEntity[]> => {
|
|
143
152
|
const refMap = await resolveEntityReferences(entities, prisma);
|
|
144
153
|
|
|
145
154
|
return entities.map((entity) => {
|
|
@@ -169,17 +178,17 @@ const pickAccess = ({
|
|
|
169
178
|
* Decide access to database entities with the access function
|
|
170
179
|
*/
|
|
171
180
|
export const decideAccess = async (
|
|
172
|
-
entities:
|
|
181
|
+
entities: EntityRow[],
|
|
173
182
|
access: AccessFunction,
|
|
174
183
|
context: RequestContext,
|
|
175
184
|
): Promise<AccessInfo[]> =>
|
|
176
|
-
Promise.all(entities.map(async (entity) => pickAccess(await access(baseEntityTransformer(entity), context))));
|
|
185
|
+
Promise.all(entities.map(async (entity) => pickAccess(await access(baseEntityTransformer(entity), context, entity))));
|
|
177
186
|
|
|
178
187
|
/**
|
|
179
|
-
* Transform database entities to standard entities with the access function's result attached
|
|
188
|
+
* Transform database entities to standard entities with the access function's result attached, in input order
|
|
180
189
|
*/
|
|
181
190
|
export const authoriseEntities = async (
|
|
182
|
-
entities:
|
|
191
|
+
entities: EntityRow[],
|
|
183
192
|
prisma: PrismaClient,
|
|
184
193
|
access: AccessFunction,
|
|
185
194
|
context: RequestContext,
|
|
@@ -193,10 +202,10 @@ export const authoriseEntities = async (
|
|
|
193
202
|
};
|
|
194
203
|
|
|
195
204
|
/**
|
|
196
|
-
* Transform database files to standard files with their file entity's Content access attached
|
|
205
|
+
* Transform database files to standard files with their file entity's Content access attached, in input order
|
|
197
206
|
*/
|
|
198
207
|
export const authoriseFiles = async (
|
|
199
|
-
files:
|
|
208
|
+
files: FileRow[],
|
|
200
209
|
access: AccessFunction,
|
|
201
210
|
context: RequestContext,
|
|
202
211
|
): Promise<AuthorisedFile[]> => {
|
|
@@ -216,14 +225,15 @@ export const authoriseFiles = async (
|
|
|
216
225
|
/**
|
|
217
226
|
* Apply consumer transformers in order, each receiving the previous one's output
|
|
218
227
|
*/
|
|
219
|
-
export const applyTransformers = async <T>(
|
|
228
|
+
export const applyTransformers = async <T, R>(
|
|
220
229
|
item: T,
|
|
221
|
-
transformers: Array<(item: T, context: RequestContext) => Promise<T> | T>,
|
|
230
|
+
transformers: Array<(item: T, context: RequestContext, row: R) => Promise<T> | T>,
|
|
222
231
|
context: RequestContext,
|
|
232
|
+
row: R,
|
|
223
233
|
): Promise<T> => {
|
|
224
234
|
let result = item;
|
|
225
235
|
for (const transformer of transformers) {
|
|
226
|
-
result = await transformer(result, context);
|
|
236
|
+
result = await transformer(result, context, row);
|
|
227
237
|
}
|
|
228
238
|
|
|
229
239
|
return result;
|
package/src/types/access.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { BaseEntity } from '../transformers/default.js';
|
|
1
|
+
import type { BaseEntity, EntityRow } from '../transformers/default.js';
|
|
2
2
|
import type { RequestContext } from './context.js';
|
|
3
3
|
|
|
4
4
|
/**
|
|
@@ -14,7 +14,12 @@ export type AccessInfo = {
|
|
|
14
14
|
|
|
15
15
|
/**
|
|
16
16
|
* Access function - required
|
|
17
|
-
* Decides access to an entity for this request
|
|
17
|
+
* Decides access to an entity for this request from its Record fields and its stored row (e.g. a value the indexer kept in `meta`).
|
|
18
|
+
* A file's access is its file entity's access, decided with the file entity's row.
|
|
18
19
|
* The library attaches the result to responses and enforces it on the Metadata and Content routes.
|
|
19
20
|
*/
|
|
20
|
-
export type AccessFunction = (
|
|
21
|
+
export type AccessFunction = (
|
|
22
|
+
entity: BaseEntity,
|
|
23
|
+
context: RequestContext,
|
|
24
|
+
row: EntityRow,
|
|
25
|
+
) => Promise<AccessInfo> | AccessInfo;
|
|
@@ -1,24 +1,26 @@
|
|
|
1
|
-
import type { AuthorisedEntity, AuthorisedFile } from '../transformers/default.js';
|
|
1
|
+
import type { AuthorisedEntity, AuthorisedFile, EntityRow, FileRow } from '../transformers/default.js';
|
|
2
2
|
import type { RequestContext } from './context.js';
|
|
3
3
|
|
|
4
4
|
/**
|
|
5
5
|
* Entity transformer function
|
|
6
6
|
* Receives AuthorisedEntity and transforms it further
|
|
7
7
|
* Transformers are applied as a pipeline, with each transformer receiving
|
|
8
|
-
* the output of the previous one
|
|
8
|
+
* the output of the previous one, and every transformer receiving the entity's row
|
|
9
9
|
*/
|
|
10
10
|
export type EntityTransformer<TInput = AuthorisedEntity, TOutput = TInput> = (
|
|
11
11
|
entity: TInput,
|
|
12
12
|
context: RequestContext,
|
|
13
|
+
row: EntityRow,
|
|
13
14
|
) => Promise<TOutput> | TOutput;
|
|
14
15
|
|
|
15
16
|
/**
|
|
16
17
|
* File transformer function
|
|
17
18
|
* Receives AuthorisedFile and transforms it further
|
|
18
19
|
* Transformers are applied as a pipeline, with each transformer receiving
|
|
19
|
-
* the output of the previous one
|
|
20
|
+
* the output of the previous one, and every transformer receiving the file's row
|
|
20
21
|
*/
|
|
21
22
|
export type FileTransformer<TInput = AuthorisedFile, TOutput = TInput> = (
|
|
22
23
|
file: TInput,
|
|
23
24
|
context: RequestContext,
|
|
25
|
+
row: FileRow,
|
|
24
26
|
) => Promise<TOutput> | TOutput;
|
package/src/utils/access.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { FastifyReply, FastifyRequest } from 'fastify';
|
|
2
|
-
import { decideAccess, type
|
|
2
|
+
import { decideAccess, type EntityRow } from '../transformers/default.js';
|
|
3
3
|
import type { AccessFunction } from '../types/access.js';
|
|
4
4
|
import type { IsAuthenticated, RequestContext } from '../types/context.js';
|
|
5
5
|
import { sendRefusal } from './errors.js';
|
|
@@ -68,7 +68,7 @@ type AccessGuardOptions = {
|
|
|
68
68
|
*/
|
|
69
69
|
export const createAccessGuard =
|
|
70
70
|
({ access, isAuthenticated, level }: AccessGuardOptions) =>
|
|
71
|
-
async (reply: FastifyReply, entity:
|
|
71
|
+
async (reply: FastifyReply, entity: EntityRow, context: RequestContext) => {
|
|
72
72
|
const [entityAccess] = await decideAccess([entity], access, context);
|
|
73
73
|
if (entityAccess[level]) {
|
|
74
74
|
return false;
|
package/src/utils/headers.ts
CHANGED
|
@@ -1,16 +1,36 @@
|
|
|
1
1
|
import type { FastifyReply } from 'fastify';
|
|
2
2
|
|
|
3
|
-
|
|
3
|
+
/** Sandboxes deposited bytes; see docs/adr/0005-library-sandboxes-delivered-bytes.md */
|
|
4
|
+
const contentSecurityPolicy = "default-src 'none'; style-src 'unsafe-inline'; sandbox";
|
|
5
|
+
|
|
6
|
+
const token = "[!#$%&'*+\\-.^_`|~0-9a-z]+";
|
|
7
|
+
const quotedString = '"(?:[^"\\\\]|\\\\.)*"';
|
|
8
|
+
const mediaType = new RegExp(
|
|
9
|
+
`^(?:audio|video)/${token}(?:[ \\t]*;[ \\t]*${token}=(?:${token}|${quotedString}))*[ \\t]*$`,
|
|
10
|
+
'i',
|
|
11
|
+
);
|
|
12
|
+
|
|
13
|
+
// Chrome won't play media opened directly under this CSP, and a media document can't run script.
|
|
14
|
+
// RFC 9110 grammar, so no comma outside quotes: browsers split the header as a list, respecting
|
|
15
|
+
// quotes, and take the last type, so `audio/mpeg, text/html` is HTML
|
|
16
|
+
const isMedia = (contentType: string) => mediaType.test(contentType);
|
|
17
|
+
|
|
18
|
+
export const setDeliveryHeaders = (
|
|
4
19
|
reply: FastifyReply,
|
|
5
20
|
metadata: { contentType: string; contentLength: number; etag?: string; lastModified?: Date },
|
|
6
21
|
) => {
|
|
7
22
|
reply.header('Content-Type', metadata.contentType);
|
|
8
23
|
reply.header('Content-Length', metadata.contentLength.toString());
|
|
9
|
-
|
|
10
24
|
if (metadata.etag) {
|
|
11
25
|
reply.header('ETag', metadata.etag);
|
|
12
26
|
}
|
|
13
27
|
if (metadata.lastModified) {
|
|
14
28
|
reply.header('Last-Modified', metadata.lastModified.toUTCString());
|
|
15
29
|
}
|
|
30
|
+
|
|
31
|
+
// Last, so a throw above can't leave them on the 500
|
|
32
|
+
reply.header('X-Content-Type-Options', 'nosniff');
|
|
33
|
+
if (!isMedia(metadata.contentType)) {
|
|
34
|
+
reply.header('Content-Security-Policy', contentSecurityPolicy);
|
|
35
|
+
}
|
|
16
36
|
};
|