@actuate-media/cms-core 0.2.3 → 0.3.1

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.
Files changed (81) hide show
  1. package/LICENSE +21 -21
  2. package/dist/__tests__/auth/session.test.js +1 -1
  3. package/dist/__tests__/auth/session.test.js.map +1 -1
  4. package/dist/api/handler-factory.d.ts.map +1 -1
  5. package/dist/api/handler-factory.js +85 -68
  6. package/dist/api/handler-factory.js.map +1 -1
  7. package/dist/api/handlers.d.ts +1 -1
  8. package/dist/api/handlers.d.ts.map +1 -1
  9. package/dist/api/handlers.js +212 -31
  10. package/dist/api/handlers.js.map +1 -1
  11. package/dist/api/index.d.ts +2 -19
  12. package/dist/api/index.d.ts.map +1 -1
  13. package/dist/api/index.js +1 -54
  14. package/dist/api/index.js.map +1 -1
  15. package/dist/api/router.d.ts +20 -0
  16. package/dist/api/router.d.ts.map +1 -0
  17. package/dist/api/router.js +55 -0
  18. package/dist/api/router.js.map +1 -0
  19. package/dist/config/index.d.ts.map +1 -1
  20. package/dist/config/index.js +2 -0
  21. package/dist/config/index.js.map +1 -1
  22. package/dist/i18n/index.js +8 -8
  23. package/dist/media/optimize.d.ts +2 -3
  24. package/dist/media/optimize.d.ts.map +1 -1
  25. package/dist/media/optimize.js +10 -1
  26. package/dist/media/optimize.js.map +1 -1
  27. package/dist/next.d.ts +3 -3
  28. package/dist/next.d.ts.map +1 -1
  29. package/dist/next.js +8 -8
  30. package/dist/next.js.map +1 -1
  31. package/dist/search/index.js +22 -22
  32. package/dist/security/anomaly-detection.d.ts +1 -1
  33. package/dist/security/anomaly-detection.d.ts.map +1 -1
  34. package/dist/security/anomaly-detection.js +27 -5
  35. package/dist/security/anomaly-detection.js.map +1 -1
  36. package/dist/security/reauth.d.ts +1 -1
  37. package/dist/security/reauth.d.ts.map +1 -1
  38. package/dist/security/reauth.js +12 -4
  39. package/dist/security/reauth.js.map +1 -1
  40. package/dist/security/sanitize.d.ts +1 -1
  41. package/dist/security/sanitize.d.ts.map +1 -1
  42. package/dist/security/sanitize.js +9 -11
  43. package/dist/security/sanitize.js.map +1 -1
  44. package/dist/security/webhook.d.ts +1 -1
  45. package/dist/security/webhook.d.ts.map +1 -1
  46. package/dist/security/webhook.js +24 -3
  47. package/dist/security/webhook.js.map +1 -1
  48. package/package.json +3 -2
  49. package/prisma/cms-schema.prisma +237 -237
  50. package/prisma/migrations/0001_init/migration.sql +384 -384
  51. package/prisma/migrations/0002_folders/migration.sql +39 -39
  52. package/prisma/migrations/0003_search_and_webhooks/migration.sql +50 -50
  53. package/prisma/migrations/migration_lock.toml +3 -3
  54. package/prisma/schema.prisma +485 -485
  55. package/prisma/seed.ts +82 -82
  56. package/generated/browser.ts +0 -109
  57. package/generated/client.ts +0 -133
  58. package/generated/commonInputTypes.ts +0 -709
  59. package/generated/enums.ts +0 -125
  60. package/generated/internal/class.ts +0 -376
  61. package/generated/internal/prismaNamespace.ts +0 -2617
  62. package/generated/internal/prismaNamespaceBrowser.ts +0 -611
  63. package/generated/models/ApiKey.ts +0 -1550
  64. package/generated/models/AuditLog.ts +0 -1206
  65. package/generated/models/BackupRecord.ts +0 -1250
  66. package/generated/models/ContentLock.ts +0 -1472
  67. package/generated/models/ContentTemplate.ts +0 -1416
  68. package/generated/models/Document.ts +0 -3005
  69. package/generated/models/Folder.ts +0 -1904
  70. package/generated/models/FormSubmission.ts +0 -1200
  71. package/generated/models/InAppNotification.ts +0 -1457
  72. package/generated/models/Media.ts +0 -2340
  73. package/generated/models/MediaUsage.ts +0 -1472
  74. package/generated/models/OAuthAccount.ts +0 -1463
  75. package/generated/models/Redirect.ts +0 -1284
  76. package/generated/models/Session.ts +0 -1492
  77. package/generated/models/Site.ts +0 -1206
  78. package/generated/models/User.ts +0 -3513
  79. package/generated/models/Version.ts +0 -1511
  80. package/generated/models/WorkflowState.ts +0 -1514
  81. package/generated/models.ts +0 -29
@@ -0,0 +1,55 @@
1
+ /** Create a public REST API router for Actuate CMS content. */
2
+ export function createApiRouter() {
3
+ const routes = [];
4
+ const globalMiddleware = [];
5
+ function addRoute(method, path, handler) {
6
+ routes.push({ method, path, handler });
7
+ }
8
+ return {
9
+ routes,
10
+ use(middleware) {
11
+ globalMiddleware.push(middleware);
12
+ },
13
+ get(path, handler) { addRoute("GET", path, handler); },
14
+ post(path, handler) { addRoute("POST", path, handler); },
15
+ put(path, handler) { addRoute("PUT", path, handler); },
16
+ patch(path, handler) { addRoute("PATCH", path, handler); },
17
+ delete(path, handler) { addRoute("DELETE", path, handler); },
18
+ async handle(request) {
19
+ const url = new URL(request.url);
20
+ const method = request.method.toUpperCase();
21
+ const matched = routes.find((r) => r.method === method && matchPath(r.path, url.pathname));
22
+ if (!matched) {
23
+ return new Response(JSON.stringify({ error: "Not Found" }), {
24
+ status: 404,
25
+ headers: { "Content-Type": "application/json" },
26
+ });
27
+ }
28
+ const params = extractParams(matched.path, url.pathname);
29
+ const allMiddleware = [...globalMiddleware, ...(matched.middleware ?? [])];
30
+ let index = 0;
31
+ const next = async () => {
32
+ if (index < allMiddleware.length) {
33
+ return allMiddleware[index++](request, next);
34
+ }
35
+ return matched.handler(request, params);
36
+ };
37
+ return next();
38
+ },
39
+ };
40
+ }
41
+ function matchPath(pattern, pathname) {
42
+ const regex = new RegExp("^" + pattern.replace(/:([^/]+)/g, "([^/]+)") + "$");
43
+ return regex.test(pathname);
44
+ }
45
+ function extractParams(pattern, pathname) {
46
+ const paramNames = [];
47
+ const regex = new RegExp("^" + pattern.replace(/:([^/]+)/g, (_, name) => { paramNames.push(name); return "([^/]+)"; }) + "$");
48
+ const match = pathname.match(regex);
49
+ if (!match)
50
+ return {};
51
+ const params = {};
52
+ paramNames.forEach((name, i) => { params[name] = match[i + 1]; });
53
+ return params;
54
+ }
55
+ //# sourceMappingURL=router.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"router.js","sourceRoot":"","sources":["../../src/api/router.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAEnD,YAAY,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AACnD,cAAc,YAAY,CAAC;AAuE3B,wDAAwD;AACxD,wBAAgB,YAAY,CAAC,MAAM,EAAE,gBAAgB,GAAG,gBAAgB,CAGvE"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAEnD,YAAY,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AACnD,cAAc,YAAY,CAAC;AA0E3B,wDAAwD;AACxD,wBAAgB,YAAY,CAAC,MAAM,EAAE,gBAAgB,GAAG,gBAAgB,CAGvE"}
@@ -29,7 +29,9 @@ const collectionSchema = z.object({
29
29
  icon: z.string().optional(),
30
30
  }).optional(),
31
31
  }).passthrough();
32
+ const secretSchema = z.string().min(32, 'CMS secret must be at least 32 characters').optional();
32
33
  const configSchema = z.object({
34
+ secret: secretSchema,
33
35
  platform: z.object({
34
36
  database: z.any(),
35
37
  storage: z.any(),
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":"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"}
@@ -11,14 +11,14 @@ export function buildLocaleFilter(query) {
11
11
  /** Build a query that returns documents with a fallback to another locale. */
12
12
  export function buildLocaleFallbackQuery(collection, locale, fallbackLocale) {
13
13
  return {
14
- sql: `
15
- SELECT DISTINCT ON ("localeGroupId") *
16
- FROM actuate_documents
17
- WHERE collection = $1
18
- AND "deletedAt" IS NULL
19
- AND locale IN ($2, $3)
20
- ORDER BY "localeGroupId",
21
- CASE WHEN locale = $2 THEN 0 ELSE 1 END
14
+ sql: `
15
+ SELECT DISTINCT ON ("localeGroupId") *
16
+ FROM actuate_documents
17
+ WHERE collection = $1
18
+ AND "deletedAt" IS NULL
19
+ AND locale IN ($2, $3)
20
+ ORDER BY "localeGroupId",
21
+ CASE WHEN locale = $2 THEN 0 ELSE 1 END
22
22
  `,
23
23
  params: [collection, locale, fallbackLocale],
24
24
  };
@@ -1,4 +1,3 @@
1
- import sharp from 'sharp';
2
1
  export interface OptimizationResult {
3
2
  buffer: Buffer;
4
3
  width: number;
@@ -31,10 +30,10 @@ export declare function optimizeImage(input: Buffer | ArrayBuffer | Uint8Array,
31
30
  export declare function getImageMetadata(input: Buffer | ArrayBuffer | Uint8Array): Promise<{
32
31
  width: number;
33
32
  height: number;
34
- format: keyof sharp.FormatEnum;
33
+ format: keyof import("sharp").FormatEnum;
35
34
  hasAlpha: boolean;
36
35
  isAnimated: boolean;
37
- space: keyof sharp.ColourspaceEnum;
36
+ space: keyof import("sharp").ColourspaceEnum;
38
37
  } | null>;
39
38
  export declare function formatBytes(bytes: number): string;
40
39
  //# sourceMappingURL=optimize.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"optimize.d.ts","sourceRoot":"","sources":["../../src/media/optimize.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,MAAM,WAAW,kBAAkB;IACjC,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,GAAG,UAAU,CAAC;IAC5B,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,eAAe;IAC9B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,gDAAgD;IAChD,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;CAC5B;AAmBD;;;;GAIG;AACH,wBAAsB,aAAa,CACjC,KAAK,EAAE,MAAM,GAAG,WAAW,GAAG,UAAU,EACxC,gBAAgB,EAAE,MAAM,EACxB,QAAQ,EAAE,MAAM,EAChB,IAAI,GAAE,eAAoB,GACzB,OAAO,CAAC,kBAAkB,CAAC,CA+F7B;AAED;;;GAGG;AACH,wBAAsB,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,WAAW,GAAG,UAAU;;;;;;;UAe9E;AAED,wBAAgB,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAIjD"}
1
+ {"version":3,"file":"optimize.d.ts","sourceRoot":"","sources":["../../src/media/optimize.ts"],"names":[],"mappings":"AAYA,MAAM,WAAW,kBAAkB;IACjC,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,GAAG,UAAU,CAAC;IAC5B,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,eAAe;IAC9B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,gDAAgD;IAChD,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;CAC5B;AAmBD;;;;GAIG;AACH,wBAAsB,aAAa,CACjC,KAAK,EAAE,MAAM,GAAG,WAAW,GAAG,UAAU,EACxC,gBAAgB,EAAE,MAAM,EACxB,QAAQ,EAAE,MAAM,EAChB,IAAI,GAAE,eAAoB,GACzB,OAAO,CAAC,kBAAkB,CAAC,CAiG7B;AAED;;;GAGG;AACH,wBAAsB,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,WAAW,GAAG,UAAU;;;;;;;UAgB9E;AAED,wBAAgB,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAIjD"}
@@ -1,4 +1,11 @@
1
- import sharp from 'sharp';
1
+ let _sharp = null;
2
+ async function getSharp() {
3
+ if (!_sharp) {
4
+ const mod = await import(/* webpackIgnore: true */ 'sharp');
5
+ _sharp = (mod.default ?? mod);
6
+ }
7
+ return _sharp;
8
+ }
2
9
  const DEFAULT_OPTIONS = {
3
10
  quality: 82,
4
11
  maxWidth: 4096,
@@ -23,6 +30,7 @@ export async function optimizeImage(input, originalFilename, mimeType, opts = {}
23
30
  const options = { ...DEFAULT_OPTIONS, ...opts };
24
31
  const inputBuffer = input instanceof Buffer ? input : Buffer.from(new Uint8Array(input instanceof ArrayBuffer ? input : input.buffer));
25
32
  const originalSize = inputBuffer.length;
33
+ const sharp = await getSharp();
26
34
  if (!OPTIMIZABLE_TYPES.has(mimeType) || options.preserveFormats.includes(mimeType)) {
27
35
  let width = 0;
28
36
  let height = 0;
@@ -113,6 +121,7 @@ export async function optimizeImage(input, originalFilename, mimeType, opts = {}
113
121
  export async function getImageMetadata(input) {
114
122
  const buffer = input instanceof Buffer ? input : Buffer.from(new Uint8Array(input instanceof ArrayBuffer ? input : input.buffer));
115
123
  try {
124
+ const sharp = await getSharp();
116
125
  const meta = await sharp(buffer).metadata();
117
126
  return {
118
127
  width: meta.width ?? null,
@@ -1 +1 @@
1
- {"version":3,"file":"optimize.js","sourceRoot":"","sources":["../../src/media/optimize.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAuB1B,MAAM,eAAe,GAA8B;IACjD,OAAO,EAAE,EAAE;IACX,QAAQ,EAAE,IAAI;IACd,SAAS,EAAE,IAAI;IACf,eAAe,EAAE,CAAC,eAAe,EAAE,WAAW,CAAC;CAChD,CAAC;AAEF,MAAM,iBAAiB,GAAG,IAAI,GAAG,CAAC;IAChC,YAAY;IACZ,WAAW;IACX,WAAW;IACX,YAAY;IACZ,YAAY;IACZ,YAAY;IACZ,WAAW;CACZ,CAAC,CAAC;AAEH;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,KAAwC,EACxC,gBAAwB,EACxB,QAAgB,EAChB,OAAwB,EAAE;IAE1B,MAAM,OAAO,GAAG,EAAE,GAAG,eAAe,EAAE,GAAG,IAAI,EAAE,CAAC;IAChD,MAAM,WAAW,GAAG,KAAK,YAAY,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,UAAU,CAAC,KAAK,YAAY,WAAW,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC;IACvI,MAAM,YAAY,GAAG,WAAW,CAAC,MAAM,CAAC;IAExC,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,OAAO,CAAC,eAAe,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;QACnF,IAAI,KAAK,GAAG,CAAC,CAAC;QACd,IAAI,MAAM,GAAG,CAAC,CAAC;QACf,IAAI,CAAC;YACH,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,WAAW,CAAC,CAAC,QAAQ,EAAE,CAAC;YACjD,KAAK,GAAG,IAAI,CAAC,KAAK,IAAI,CAAC,CAAC;YACxB,MAAM,GAAG,IAAI,CAAC,MAAM,IAAI,CAAC,CAAC;QAC5B,CAAC;QAAC,MAAM,CAAC;YACP,2CAA2C;QAC7C,CAAC;QAED,OAAO;YACL,MAAM,EAAE,WAAW;YACnB,KAAK;YACL,MAAM;YACN,YAAY;YACZ,aAAa,EAAE,YAAY;YAC3B,OAAO,EAAE,CAAC;YACV,MAAM,EAAE,UAAU;YAClB,QAAQ;YACR,QAAQ,EAAE,gBAAgB;SAC3B,CAAC;IACJ,CAAC;IAED,IAAI,QAAQ,GAAG,KAAK,CAAC,WAAW,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;SACnD,MAAM,EAAE,CAAC,CAAC,4BAA4B;IAEzC,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,WAAW,CAAC,CAAC,QAAQ,EAAE,CAAC;IACrD,IAAI,EAAE,KAAK,GAAG,CAAC,EAAE,MAAM,GAAG,CAAC,EAAE,GAAG,QAAQ,CAAC;IAEzC,IAAI,KAAK,GAAG,OAAO,CAAC,QAAQ,IAAI,MAAM,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;QAC3D,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,SAAS,EAAE;YAC9D,GAAG,EAAE,QAAQ;YACb,kBAAkB,EAAE,IAAI;SACzB,CAAC,CAAC;QACH,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,GAAG,KAAK,EAAE,OAAO,CAAC,SAAS,GAAG,MAAM,CAAC,CAAC;QAC7E,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC,CAAC;QAClC,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,KAAK,CAAC,CAAC;IACtC,CAAC;IAED,MAAM,eAAe,GAAG,MAAM,QAAQ;SACnC,IAAI,CAAC;QACJ,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,MAAM,EAAE,CAAC,EAAE,mCAAmC;QAC9C,cAAc,EAAE,IAAI;KACrB,CAAC;SACD,QAAQ,EAAE,CAAC;IAEd,MAAM,aAAa,GAAG,eAAe,CAAC,MAAM,CAAC;IAE7C,6EAA6E;IAC7E,IAAI,aAAa,IAAI,YAAY,IAAI,QAAQ,KAAK,YAAY,EAAE,CAAC;QAC/D,OAAO;YACL,MAAM,EAAE,WAAW;YACnB,KAAK,EAAE,QAAQ,CAAC,KAAK,IAAI,CAAC;YAC1B,MAAM,EAAE,QAAQ,CAAC,MAAM,IAAI,CAAC;YAC5B,YAAY;YACZ,aAAa,EAAE,YAAY;YAC3B,OAAO,EAAE,CAAC;YACV,MAAM,EAAE,UAAU;YAClB,QAAQ;YACR,QAAQ,EAAE,gBAAgB;SAC3B,CAAC;IACJ,CAAC;IAED,MAAM,YAAY,GAAG,gBAAgB,CAAC,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IAEnE,IAAI,QAA4B,CAAC;IACjC,IAAI,CAAC;QACH,MAAM,WAAW,GAAG,MAAM,KAAK,CAAC,WAAW,CAAC;aACzC,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC;aACjC,IAAI,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;aACrB,QAAQ,EAAE,CAAC;QACd,QAAQ,GAAG,0BAA0B,WAAW,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;IACxE,CAAC;IAAC,MAAM,CAAC;QACP,iCAAiC;IACnC,CAAC;IAED,OAAO;QACL,MAAM,EAAE,eAAe;QACvB,KAAK;QACL,MAAM;QACN,YAAY;QACZ,aAAa;QACb,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,aAAa,GAAG,YAAY,CAAC,GAAG,GAAG,CAAC;QAC7D,MAAM,EAAE,MAAM;QACd,QAAQ,EAAE,YAAY;QACtB,QAAQ,EAAE,YAAY;QACtB,QAAQ;KACT,CAAC;AACJ,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,KAAwC;IAC7E,MAAM,MAAM,GAAG,KAAK,YAAY,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,UAAU,CAAC,KAAK,YAAY,WAAW,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC;IAClI,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,CAAC;QAC5C,OAAO;YACL,KAAK,EAAE,IAAI,CAAC,KAAK,IAAI,IAAI;YACzB,MAAM,EAAE,IAAI,CAAC,MAAM,IAAI,IAAI;YAC3B,MAAM,EAAE,IAAI,CAAC,MAAM,IAAI,IAAI;YAC3B,QAAQ,EAAE,IAAI,CAAC,QAAQ,IAAI,KAAK;YAChC,UAAU,EAAE,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,CAAC,GAAG,CAAC;YACjC,KAAK,EAAE,IAAI,CAAC,KAAK,IAAI,IAAI;SAC1B,CAAC;IACJ,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,KAAa;IACvC,IAAI,KAAK,GAAG,IAAI;QAAE,OAAO,GAAG,KAAK,IAAI,CAAC;IACtC,IAAI,KAAK,GAAG,IAAI,GAAG,IAAI;QAAE,OAAO,GAAG,CAAC,KAAK,GAAG,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC;IAClE,OAAO,GAAG,CAAC,KAAK,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC;AACpD,CAAC"}
1
+ {"version":3,"file":"optimize.js","sourceRoot":"","sources":["../../src/media/optimize.ts"],"names":[],"mappings":"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"}
package/dist/next.d.ts CHANGED
@@ -17,9 +17,9 @@ export interface WithActuateCMSOptions {
17
17
  export interface NextConfigLike {
18
18
  serverExternalPackages?: string[];
19
19
  transpilePackages?: string[];
20
- experimental?: Record<string, unknown>;
21
- images?: Record<string, unknown>;
22
- webpack?: (config: Record<string, unknown>, options: Record<string, unknown>) => Record<string, unknown>;
20
+ experimental?: unknown;
21
+ images?: unknown;
22
+ webpack?: unknown;
23
23
  env?: Record<string, string>;
24
24
  [key: string]: unknown;
25
25
  }
@@ -1 +1 @@
1
- {"version":3,"file":"next.d.ts","sourceRoot":"","sources":["../src/next.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,MAAM,WAAW,qBAAqB;IACpC,KAAK,CAAC,EAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,CAAA;IACzB,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IACrC,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CACvB;AAED;;;GAGG;AACH,MAAM,WAAW,cAAc;IAC7B,sBAAsB,CAAC,EAAE,MAAM,EAAE,CAAA;IACjC,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAA;IAC5B,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IACtC,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAChC,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IACxG,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC5B,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CACvB;AA+BD,8DAA8D;AAC9D,wBAAgB,cAAc,CAC5B,SAAS,EAAE,qBAAqB,EAChC,UAAU,GAAE,cAAmB,GAC9B,cAAc,CAkChB;AAED,qEAAqE;AACrE,wBAAgB,YAAY,IAAI,MAAM,CAErC"}
1
+ {"version":3,"file":"next.d.ts","sourceRoot":"","sources":["../src/next.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,MAAM,WAAW,qBAAqB;IACpC,KAAK,CAAC,EAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,CAAA;IACzB,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IACrC,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CACvB;AAED;;;GAGG;AACH,MAAM,WAAW,cAAc;IAC7B,sBAAsB,CAAC,EAAE,MAAM,EAAE,CAAA;IACjC,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAA;IAC5B,YAAY,CAAC,EAAE,OAAO,CAAA;IACtB,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC5B,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CACvB;AA4BD,8DAA8D;AAC9D,wBAAgB,cAAc,CAC5B,SAAS,EAAE,qBAAqB,EAChC,UAAU,GAAE,cAAmB,GAC9B,cAAc,CAwChB;AAED,qEAAqE;AACrE,wBAAgB,YAAY,IAAI,MAAM,CAErC"}
package/dist/next.js CHANGED
@@ -1,16 +1,13 @@
1
1
  const DEFAULT_ADMIN_PATH = '/admin';
2
2
  const CMS_EXTERNAL_PACKAGES = [
3
- '@actuate-media/cms-core',
4
3
  'sharp',
5
4
  'jose',
6
5
  'pg',
7
6
  '@prisma/client',
8
7
  '@prisma/adapter-pg',
9
8
  ];
10
- /** @actuate-media packages transpiled for Next.js (merged into transpilePackages).
11
- * cms-core is NOT included here because it's in CMS_EXTERNAL_PACKAGES --
12
- * Turbopack forbids a package appearing in both lists. */
13
9
  const ACTUATE_PACKAGES = [
10
+ '@actuate-media/cms-core',
14
11
  '@actuate-media/cms-admin',
15
12
  '@actuate-media/platform-vercel',
16
13
  '@actuate-media/platform-aws',
@@ -32,24 +29,27 @@ export function withActuateCMS(cmsConfig, nextConfig = {}) {
32
29
  const existingTranspile = nextConfig.transpilePackages ?? [];
33
30
  const mergedTranspile = [...new Set([...existingTranspile, ...ACTUATE_PACKAGES])]
34
31
  .filter(pkg => !mergedExternals.includes(pkg));
32
+ const existingExperimental = (nextConfig.experimental ?? {});
33
+ const existingImages = (nextConfig.images ?? {});
34
+ const existingWebpack = nextConfig.webpack;
35
35
  return {
36
36
  ...nextConfig,
37
37
  serverExternalPackages: mergedExternals,
38
38
  transpilePackages: mergedTranspile,
39
39
  experimental: {
40
- ...nextConfig.experimental,
40
+ ...existingExperimental,
41
41
  serverActions: {
42
42
  allowedOrigins: ['localhost:3000'],
43
43
  },
44
44
  },
45
45
  images: {
46
- ...nextConfig.images,
46
+ ...existingImages,
47
47
  remotePatterns: [
48
- ...(nextConfig.images?.remotePatterns ?? []),
48
+ ...(existingImages.remotePatterns ?? []),
49
49
  ],
50
50
  },
51
51
  webpack: (config, options) => {
52
- const resolved = nextConfig.webpack ? nextConfig.webpack(config, options) : config;
52
+ const resolved = existingWebpack ? existingWebpack(config, options) : config;
53
53
  return resolved;
54
54
  },
55
55
  env: {
package/dist/next.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"next.js","sourceRoot":"","sources":["../src/next.ts"],"names":[],"mappings":"AAyBA,MAAM,kBAAkB,GAAG,QAAQ,CAAA;AAEnC,MAAM,qBAAqB,GAAG;IAC5B,yBAAyB;IACzB,OAAO;IACP,MAAM;IACN,IAAI;IACJ,gBAAgB;IAChB,oBAAoB;CACrB,CAAA;AAED;;2DAE2D;AAC3D,MAAM,gBAAgB,GAAG;IACvB,0BAA0B;IAC1B,gCAAgC;IAChC,6BAA6B;IAC7B,2BAA2B;IAC3B,6BAA6B;IAC7B,6BAA6B;IAC7B,6BAA6B;IAC7B,8BAA8B;IAC9B,kCAAkC;IAClC,iCAAiC;IACjC,0BAA0B;IAC1B,gCAAgC;CACjC,CAAA;AAED,8DAA8D;AAC9D,MAAM,UAAU,cAAc,CAC5B,SAAgC,EAChC,aAA6B,EAAE;IAE/B,MAAM,SAAS,GAAG,SAAS,CAAC,KAAK,EAAE,IAAI,IAAI,kBAAkB,CAAA;IAC7D,MAAM,iBAAiB,GAAG,UAAU,CAAC,sBAAsB,IAAI,EAAE,CAAA;IACjE,MAAM,eAAe,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,iBAAiB,EAAE,GAAG,qBAAqB,CAAC,CAAC,CAAC,CAAA;IACtF,MAAM,iBAAiB,GAAG,UAAU,CAAC,iBAAiB,IAAI,EAAE,CAAA;IAC5D,MAAM,eAAe,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,iBAAiB,EAAE,GAAG,gBAAgB,CAAC,CAAC,CAAC;SAC9E,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,eAAe,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAA;IAEhD,OAAO;QACL,GAAG,UAAU;QACb,sBAAsB,EAAE,eAAe;QACvC,iBAAiB,EAAE,eAAe;QAClC,YAAY,EAAE;YACZ,GAAG,UAAU,CAAC,YAAY;YAC1B,aAAa,EAAE;gBACb,cAAc,EAAE,CAAC,gBAAgB,CAAC;aACnC;SACF;QACD,MAAM,EAAE;YACN,GAAG,UAAU,CAAC,MAAM;YACpB,cAAc,EAAE;gBACd,GAAG,CAAE,UAAU,CAAC,MAAgD,EAAE,cAAc,IAAI,EAAE,CAAC;aACxF;SACF;QACD,OAAO,EAAE,CAAC,MAA+B,EAAE,OAAgC,EAAE,EAAE;YAC7E,MAAM,QAAQ,GAAG,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAA;YAClF,OAAO,QAAQ,CAAA;QACjB,CAAC;QACD,GAAG,EAAE;YACH,GAAG,UAAU,CAAC,GAAG;YACjB,kBAAkB,EAAE,SAAS;YAC7B,mBAAmB,EAAE,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;SACxE;KACF,CAAA;AACH,CAAC;AAED,qEAAqE;AACrE,MAAM,UAAU,YAAY;IAC1B,OAAO,OAAO,CAAC,GAAG,CAAC,kBAAkB,IAAI,kBAAkB,CAAA;AAC7D,CAAC"}
1
+ {"version":3,"file":"next.js","sourceRoot":"","sources":["../src/next.ts"],"names":[],"mappings":"AAyBA,MAAM,kBAAkB,GAAG,QAAQ,CAAA;AAEnC,MAAM,qBAAqB,GAAG;IAC5B,OAAO;IACP,MAAM;IACN,IAAI;IACJ,gBAAgB;IAChB,oBAAoB;CACrB,CAAA;AAED,MAAM,gBAAgB,GAAG;IACvB,yBAAyB;IACzB,0BAA0B;IAC1B,gCAAgC;IAChC,6BAA6B;IAC7B,2BAA2B;IAC3B,6BAA6B;IAC7B,6BAA6B;IAC7B,6BAA6B;IAC7B,8BAA8B;IAC9B,kCAAkC;IAClC,iCAAiC;IACjC,0BAA0B;IAC1B,gCAAgC;CACjC,CAAA;AAED,8DAA8D;AAC9D,MAAM,UAAU,cAAc,CAC5B,SAAgC,EAChC,aAA6B,EAAE;IAE/B,MAAM,SAAS,GAAG,SAAS,CAAC,KAAK,EAAE,IAAI,IAAI,kBAAkB,CAAA;IAC7D,MAAM,iBAAiB,GAAG,UAAU,CAAC,sBAAsB,IAAI,EAAE,CAAA;IACjE,MAAM,eAAe,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,iBAAiB,EAAE,GAAG,qBAAqB,CAAC,CAAC,CAAC,CAAA;IACtF,MAAM,iBAAiB,GAAG,UAAU,CAAC,iBAAiB,IAAI,EAAE,CAAA;IAC5D,MAAM,eAAe,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,iBAAiB,EAAE,GAAG,gBAAgB,CAAC,CAAC,CAAC;SAC9E,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,eAAe,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAA;IAEhD,MAAM,oBAAoB,GAAG,CAAC,UAAU,CAAC,YAAY,IAAI,EAAE,CAA4B,CAAA;IACvF,MAAM,cAAc,GAAG,CAAC,UAAU,CAAC,MAAM,IAAI,EAAE,CAA4B,CAAA;IAC3E,MAAM,eAAe,GAAG,UAAU,CAAC,OAEtB,CAAA;IAEb,OAAO;QACL,GAAG,UAAU;QACb,sBAAsB,EAAE,eAAe;QACvC,iBAAiB,EAAE,eAAe;QAClC,YAAY,EAAE;YACZ,GAAG,oBAAoB;YACvB,aAAa,EAAE;gBACb,cAAc,EAAE,CAAC,gBAAgB,CAAC;aACnC;SACF;QACD,MAAM,EAAE;YACN,GAAG,cAAc;YACjB,cAAc,EAAE;gBACd,GAAI,CAAC,cAAc,CAAC,cAAc,IAAI,EAAE,CAAe;aACxD;SACF;QACD,OAAO,EAAE,CAAC,MAA+B,EAAE,OAAgC,EAAE,EAAE;YAC7E,MAAM,QAAQ,GAAG,eAAe,CAAC,CAAC,CAAC,eAAe,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAA;YAC5E,OAAO,QAAQ,CAAA;QACjB,CAAC;QACD,GAAG,EAAE;YACH,GAAG,UAAU,CAAC,GAAG;YACjB,kBAAkB,EAAE,SAAS;YAC7B,mBAAmB,EAAE,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;SACxE;KACF,CAAA;AACH,CAAC;AAED,qEAAqE;AACrE,MAAM,UAAU,YAAY;IAC1B,OAAO,OAAO,CAAC,GAAG,CAAC,kBAAkB,IAAI,kBAAkB,CAAA;AAC7D,CAAC"}
@@ -56,29 +56,29 @@ export async function searchDocuments(query, options = {}) {
56
56
  params.push(pageSize);
57
57
  const offsetParam = `$${paramIdx++}`;
58
58
  params.push(offset);
59
- const sql = `
60
- SELECT
61
- d."id",
62
- d."title",
63
- d."slug",
64
- d."collection",
65
- d."status",
66
- d."updatedAt",
67
- ${rankExpr} AS score,
68
- ${headline} AS headline,
69
- LEFT(COALESCE(d."plainText", ''), 200) AS excerpt
70
- FROM "actuate_documents" d
71
- WHERE ${whereClause}
72
- AND (${ftsCondition} OR ${fallbackCondition})
73
- ORDER BY score DESC, d."updatedAt" DESC
74
- LIMIT ${limitParam}
75
- OFFSET ${offsetParam}
59
+ const sql = `
60
+ SELECT
61
+ d."id",
62
+ d."title",
63
+ d."slug",
64
+ d."collection",
65
+ d."status",
66
+ d."updatedAt",
67
+ ${rankExpr} AS score,
68
+ ${headline} AS headline,
69
+ LEFT(COALESCE(d."plainText", ''), 200) AS excerpt
70
+ FROM "actuate_documents" d
71
+ WHERE ${whereClause}
72
+ AND (${ftsCondition} OR ${fallbackCondition})
73
+ ORDER BY score DESC, d."updatedAt" DESC
74
+ LIMIT ${limitParam}
75
+ OFFSET ${offsetParam}
76
76
  `;
77
- const countSql = `
78
- SELECT COUNT(*)::int AS total
79
- FROM "actuate_documents" d
80
- WHERE ${whereClause}
81
- AND (${ftsCondition} OR ${fallbackCondition})
77
+ const countSql = `
78
+ SELECT COUNT(*)::int AS total
79
+ FROM "actuate_documents" d
80
+ WHERE ${whereClause}
81
+ AND (${ftsCondition} OR ${fallbackCondition})
82
82
  `;
83
83
  const countParams = params.slice(0, -2);
84
84
  try {
@@ -11,7 +11,7 @@ export interface AnomalyResult {
11
11
  riskScore: number;
12
12
  }
13
13
  /** Analyze a login attempt for anomalous behavior. */
14
- export declare function detectLoginAnomaly(attempt: LoginAttempt, _recentAttempts: LoginAttempt[]): Promise<AnomalyResult>;
14
+ export declare function detectLoginAnomaly(attempt: LoginAttempt, recentAttempts: LoginAttempt[]): Promise<AnomalyResult>;
15
15
  /** Check if there are too many failed login attempts for an account. */
16
16
  export declare function checkBruteForce(recentAttempts: LoginAttempt[], maxFailures?: number, windowMs?: number): boolean;
17
17
  //# sourceMappingURL=anomaly-detection.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"anomaly-detection.d.ts","sourceRoot":"","sources":["../../src/security/anomaly-detection.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,IAAI,CAAC;IAChB,OAAO,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,aAAa;IAC5B,UAAU,EAAE,OAAO,CAAC;IACpB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,sDAAsD;AACtD,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,YAAY,EACrB,eAAe,EAAE,YAAY,EAAE,GAC9B,OAAO,CAAC,aAAa,CAAC,CAWxB;AAED,wEAAwE;AACxE,wBAAgB,eAAe,CAC7B,cAAc,EAAE,YAAY,EAAE,EAC9B,WAAW,SAAI,EACf,QAAQ,SAAiB,GACxB,OAAO,CAMT"}
1
+ {"version":3,"file":"anomaly-detection.d.ts","sourceRoot":"","sources":["../../src/security/anomaly-detection.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,IAAI,CAAC;IAChB,OAAO,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,aAAa;IAC5B,UAAU,EAAE,OAAO,CAAC;IACpB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,sDAAsD;AACtD,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,YAAY,EACrB,cAAc,EAAE,YAAY,EAAE,GAC7B,OAAO,CAAC,aAAa,CAAC,CAsCxB;AAED,wEAAwE;AACxE,wBAAgB,eAAe,CAC7B,cAAc,EAAE,YAAY,EAAE,EAC9B,WAAW,SAAI,EACf,QAAQ,SAAiB,GACxB,OAAO,CAMT"}
@@ -1,11 +1,33 @@
1
1
  /** Analyze a login attempt for anomalous behavior. */
2
- export async function detectLoginAnomaly(attempt, _recentAttempts) {
2
+ export async function detectLoginAnomaly(attempt, recentAttempts) {
3
3
  const reasons = [];
4
4
  let riskScore = 0;
5
- // TODO: implement geo-velocity check
6
- // TODO: implement impossible-travel detection
7
- // TODO: implement device fingerprint comparison
8
- void attempt;
5
+ const userAttempts = recentAttempts.filter(a => a.userId === attempt.userId);
6
+ if (userAttempts.length > 0) {
7
+ const knownIPs = new Set(userAttempts.filter(a => a.success).map(a => a.ipAddress));
8
+ if (knownIPs.size > 0 && !knownIPs.has(attempt.ipAddress)) {
9
+ riskScore += 20;
10
+ reasons.push('Login from previously unseen IP address');
11
+ }
12
+ const knownAgents = new Set(userAttempts.filter(a => a.success).map(a => a.userAgent));
13
+ if (knownAgents.size > 0 && !knownAgents.has(attempt.userAgent)) {
14
+ riskScore += 15;
15
+ reasons.push('Login from previously unseen user agent');
16
+ }
17
+ const fiveMinAgo = Date.now() - 5 * 60 * 1000;
18
+ const recentDistinctIPs = new Set(userAttempts
19
+ .filter(a => !a.success && a.timestamp.getTime() > fiveMinAgo)
20
+ .map(a => a.ipAddress));
21
+ if (recentDistinctIPs.size >= 3) {
22
+ riskScore += 30;
23
+ reasons.push(`Failed logins from ${recentDistinctIPs.size} distinct IPs in 5 minutes`);
24
+ }
25
+ }
26
+ const hour = attempt.timestamp.getHours();
27
+ if (hour >= 1 && hour <= 5) {
28
+ riskScore += 10;
29
+ reasons.push('Login attempt during unusual hours (1 AM–5 AM)');
30
+ }
9
31
  return { suspicious: riskScore > 50, reasons, riskScore };
10
32
  }
11
33
  /** Check if there are too many failed login attempts for an account. */
@@ -1 +1 @@
1
- {"version":3,"file":"anomaly-detection.js","sourceRoot":"","sources":["../../src/security/anomaly-detection.ts"],"names":[],"mappings":"AAcA,sDAAsD;AACtD,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,OAAqB,EACrB,eAA+B;IAE/B,MAAM,OAAO,GAAa,EAAE,CAAC;IAC7B,IAAI,SAAS,GAAG,CAAC,CAAC;IAElB,qCAAqC;IACrC,8CAA8C;IAC9C,gDAAgD;IAEhD,KAAK,OAAO,CAAC;IAEb,OAAO,EAAE,UAAU,EAAE,SAAS,GAAG,EAAE,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC;AAC5D,CAAC;AAED,wEAAwE;AACxE,MAAM,UAAU,eAAe,CAC7B,cAA8B,EAC9B,WAAW,GAAG,CAAC,EACf,QAAQ,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI;IAEzB,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,QAAQ,CAAC;IACrC,MAAM,cAAc,GAAG,cAAc,CAAC,MAAM,CAC1C,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,IAAI,CAAC,CAAC,SAAS,CAAC,OAAO,EAAE,GAAG,MAAM,CACpD,CAAC;IACF,OAAO,cAAc,CAAC,MAAM,IAAI,WAAW,CAAC;AAC9C,CAAC"}
1
+ {"version":3,"file":"anomaly-detection.js","sourceRoot":"","sources":["../../src/security/anomaly-detection.ts"],"names":[],"mappings":"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"}
@@ -8,7 +8,7 @@ export interface ReauthContext {
8
8
  }
9
9
  /** Check whether a sensitive action requires re-authentication. */
10
10
  export declare function requiresReauth(context: ReauthContext, config: ReauthConfig): boolean;
11
- /** Verify re-authentication credentials (password). */
11
+ /** Verify re-authentication credentials (password or TOTP). */
12
12
  export declare function verifyReauth(userId: string, credential: string, method: "password" | "totp", db?: any): Promise<boolean>;
13
13
  /** Default configuration for sensitive actions requiring re-auth. */
14
14
  export declare const DEFAULT_REAUTH_CONFIG: ReauthConfig;
@@ -1 +1 @@
1
- {"version":3,"file":"reauth.d.ts","sourceRoot":"","sources":["../../src/security/reauth.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,YAAY;IAC3B,aAAa,EAAE,MAAM,CAAC;IACtB,kBAAkB,EAAE,MAAM,EAAE,CAAC;CAC9B;AAED,MAAM,WAAW,aAAa;IAC5B,UAAU,EAAE,IAAI,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,mEAAmE;AACnE,wBAAgB,cAAc,CAC5B,OAAO,EAAE,aAAa,EACtB,MAAM,EAAE,YAAY,GACnB,OAAO,CAIT;AAED,uDAAuD;AACvD,wBAAsB,YAAY,CAChC,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,UAAU,GAAG,MAAM,EAC3B,EAAE,CAAC,EAAE,GAAG,GACP,OAAO,CAAC,OAAO,CAAC,CAoBlB;AAED,qEAAqE;AACrE,eAAO,MAAM,qBAAqB,EAAE,YASnC,CAAC"}
1
+ {"version":3,"file":"reauth.d.ts","sourceRoot":"","sources":["../../src/security/reauth.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,YAAY;IAC3B,aAAa,EAAE,MAAM,CAAC;IACtB,kBAAkB,EAAE,MAAM,EAAE,CAAC;CAC9B;AAED,MAAM,WAAW,aAAa;IAC5B,UAAU,EAAE,IAAI,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,mEAAmE;AACnE,wBAAgB,cAAc,CAC5B,OAAO,EAAE,aAAa,EACtB,MAAM,EAAE,YAAY,GACnB,OAAO,CAIT;AAED,+DAA+D;AAC/D,wBAAsB,YAAY,CAChC,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,UAAU,GAAG,MAAM,EAC3B,EAAE,CAAC,EAAE,GAAG,GACP,OAAO,CAAC,OAAO,CAAC,CA8BlB;AAED,qEAAqE;AACrE,eAAO,MAAM,qBAAqB,EAAE,YASnC,CAAC"}
@@ -6,15 +6,23 @@ export function requiresReauth(context, config) {
6
6
  const elapsed = (Date.now() - context.lastAuthAt.getTime()) / 1000;
7
7
  return elapsed > config.maxAgeSeconds;
8
8
  }
9
- /** Verify re-authentication credentials (password). */
9
+ /** Verify re-authentication credentials (password or TOTP). */
10
10
  export async function verifyReauth(userId, credential, method, db) {
11
- if (method === 'totp') {
12
- return false;
13
- }
14
11
  if (!db) {
15
12
  const { getDB } = await import('../db.js');
16
13
  db = getDB();
17
14
  }
15
+ if (method === 'totp') {
16
+ const user = await db.user.findUnique({
17
+ where: { id: userId },
18
+ select: { totpEnabled: true, totpSecret: true, isActive: true },
19
+ });
20
+ if (!user || !user.isActive || !user.totpEnabled || !user.totpSecret) {
21
+ return false;
22
+ }
23
+ const { verifyTOTP } = await import('../auth/totp.js');
24
+ return verifyTOTP(credential, user.totpSecret);
25
+ }
18
26
  const user = await db.user.findUnique({
19
27
  where: { id: userId },
20
28
  select: { passwordHash: true, isActive: true },
@@ -1 +1 @@
1
- {"version":3,"file":"reauth.js","sourceRoot":"","sources":["../../src/security/reauth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAYrD,mEAAmE;AACnE,MAAM,UAAU,cAAc,CAC5B,OAAsB,EACtB,MAAoB;IAEpB,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC;QAAE,OAAO,KAAK,CAAC;IACtE,MAAM,OAAO,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,OAAO,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC,GAAG,IAAI,CAAC;IACnE,OAAO,OAAO,GAAG,MAAM,CAAC,aAAa,CAAC;AACxC,CAAC;AAED,uDAAuD;AACvD,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,MAAc,EACd,UAAkB,EAClB,MAA2B,EAC3B,EAAQ;IAER,IAAI,MAAM,KAAK,MAAM,EAAE,CAAC;QACtB,OAAO,KAAK,CAAC;IACf,CAAC;IAED,IAAI,CAAC,EAAE,EAAE,CAAC;QACR,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC,CAAC;QAC3C,EAAE,GAAG,KAAK,EAAE,CAAC;IACf,CAAC;IAED,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC;QACpC,KAAK,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE;QACrB,MAAM,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE;KAC/C,CAAC,CAAC;IAEH,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,QAAQ,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;QAClD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO,cAAc,CAAC,UAAU,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;AACvD,CAAC;AAED,qEAAqE;AACrE,MAAM,CAAC,MAAM,qBAAqB,GAAiB;IACjD,aAAa,EAAE,GAAG;IAClB,kBAAkB,EAAE;QAClB,aAAa;QACb,kBAAkB;QAClB,iBAAiB;QACjB,aAAa;QACb,sBAAsB;KACvB;CACF,CAAC"}
1
+ {"version":3,"file":"reauth.js","sourceRoot":"","sources":["../../src/security/reauth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAYrD,mEAAmE;AACnE,MAAM,UAAU,cAAc,CAC5B,OAAsB,EACtB,MAAoB;IAEpB,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC;QAAE,OAAO,KAAK,CAAC;IACtE,MAAM,OAAO,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,OAAO,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC,GAAG,IAAI,CAAC;IACnE,OAAO,OAAO,GAAG,MAAM,CAAC,aAAa,CAAC;AACxC,CAAC;AAED,+DAA+D;AAC/D,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,MAAc,EACd,UAAkB,EAClB,MAA2B,EAC3B,EAAQ;IAER,IAAI,CAAC,EAAE,EAAE,CAAC;QACR,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC,CAAC;QAC3C,EAAE,GAAG,KAAK,EAAE,CAAC;IACf,CAAC;IAED,IAAI,MAAM,KAAK,MAAM,EAAE,CAAC;QACtB,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC;YACpC,KAAK,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE;YACrB,MAAM,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE;SAChE,CAAC,CAAC;QAEH,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,QAAQ,IAAI,CAAC,IAAI,CAAC,WAAW,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;YACrE,OAAO,KAAK,CAAC;QACf,CAAC;QAED,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,MAAM,CAAC,iBAAiB,CAAC,CAAC;QACvD,OAAO,UAAU,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;IACjD,CAAC;IAED,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC;QACpC,KAAK,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE;QACrB,MAAM,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE;KAC/C,CAAC,CAAC;IAEH,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,QAAQ,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;QAClD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO,cAAc,CAAC,UAAU,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;AACvD,CAAC;AAED,qEAAqE;AACrE,MAAM,CAAC,MAAM,qBAAqB,GAAiB;IACjD,aAAa,EAAE,GAAG;IAClB,kBAAkB,EAAE;QAClB,aAAa;QACb,kBAAkB;QAClB,iBAAiB;QACjB,aAAa;QACb,sBAAsB;KACvB;CACF,CAAC"}
@@ -5,7 +5,7 @@ export interface SanitizeOptions {
5
5
  }
6
6
  declare const DEFAULT_ALLOWED_TAGS: string[];
7
7
  declare const DEFAULT_ALLOWED_ATTRS: Record<string, string[]>;
8
- /** Sanitize HTML content using DOMPurify. Strips dangerous tags/attributes while preserving safe content. */
8
+ /** Sanitize HTML content. Strips dangerous tags/attributes while preserving safe content. */
9
9
  export declare function sanitizeHtml(html: string, options?: SanitizeOptions): string;
10
10
  /** Strip all HTML tags, returning plain text. */
11
11
  export declare function stripHtml(html: string): string;
@@ -1 +1 @@
1
- {"version":3,"file":"sanitize.d.ts","sourceRoot":"","sources":["../../src/security/sanitize.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,eAAe;IAC9B,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,iBAAiB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IAC7C,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,QAAA,MAAM,oBAAoB,UAKzB,CAAC;AAEF,QAAA,MAAM,qBAAqB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAKnD,CAAC;AAEF,6GAA6G;AAC7G,wBAAgB,YAAY,CAC1B,IAAI,EAAE,MAAM,EACZ,OAAO,CAAC,EAAE,eAAe,GACxB,MAAM,CAgBR;AAED,iDAAiD;AACjD,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE9C;AAED,OAAO,EAAE,oBAAoB,EAAE,qBAAqB,EAAE,CAAC"}
1
+ {"version":3,"file":"sanitize.d.ts","sourceRoot":"","sources":["../../src/security/sanitize.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,eAAe;IAC9B,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,iBAAiB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IAC7C,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,QAAA,MAAM,oBAAoB,UAKzB,CAAC;AAEF,QAAA,MAAM,qBAAqB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAKnD,CAAC;AAEF,6FAA6F;AAC7F,wBAAgB,YAAY,CAC1B,IAAI,EAAE,MAAM,EACZ,OAAO,CAAC,EAAE,eAAe,GACxB,MAAM,CAaR;AAED,iDAAiD;AACjD,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE9C;AAED,OAAO,EAAE,oBAAoB,EAAE,qBAAqB,EAAE,CAAC"}
@@ -1,4 +1,4 @@
1
- import DOMPurify from 'isomorphic-dompurify';
1
+ import sanitize from 'sanitize-html';
2
2
  const DEFAULT_ALLOWED_TAGS = [
3
3
  "p", "br", "b", "i", "em", "strong", "a", "ul", "ol", "li",
4
4
  "h1", "h2", "h3", "h4", "h5", "h6", "blockquote", "code", "pre",
@@ -11,24 +11,22 @@ const DEFAULT_ALLOWED_ATTRS = {
11
11
  td: ["colspan", "rowspan"],
12
12
  th: ["colspan", "rowspan", "scope"],
13
13
  };
14
- /** Sanitize HTML content using DOMPurify. Strips dangerous tags/attributes while preserving safe content. */
14
+ /** Sanitize HTML content. Strips dangerous tags/attributes while preserving safe content. */
15
15
  export function sanitizeHtml(html, options) {
16
16
  if (options?.stripAll) {
17
- return DOMPurify.sanitize(html, { ALLOWED_TAGS: [], ALLOWED_ATTR: [] });
17
+ return sanitize(html, { allowedTags: [], allowedAttributes: {} });
18
18
  }
19
19
  const tags = options?.allowedTags ?? DEFAULT_ALLOWED_TAGS;
20
- const attrConfig = options?.allowedAttributes ?? DEFAULT_ALLOWED_ATTRS;
21
- const allAttrs = [...new Set(Object.values(attrConfig).flat())];
22
- return DOMPurify.sanitize(html, {
23
- ALLOWED_TAGS: tags,
24
- ALLOWED_ATTR: allAttrs,
25
- ALLOW_DATA_ATTR: false,
26
- ADD_ATTR: ['target'],
20
+ const attrs = options?.allowedAttributes ?? DEFAULT_ALLOWED_ATTRS;
21
+ return sanitize(html, {
22
+ allowedTags: tags,
23
+ allowedAttributes: attrs,
24
+ disallowedTagsMode: 'discard',
27
25
  });
28
26
  }
29
27
  /** Strip all HTML tags, returning plain text. */
30
28
  export function stripHtml(html) {
31
- return DOMPurify.sanitize(html, { ALLOWED_TAGS: [], ALLOWED_ATTR: [] }).trim();
29
+ return sanitize(html, { allowedTags: [], allowedAttributes: {} }).trim();
32
30
  }
33
31
  export { DEFAULT_ALLOWED_TAGS, DEFAULT_ALLOWED_ATTRS };
34
32
  //# sourceMappingURL=sanitize.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"sanitize.js","sourceRoot":"","sources":["../../src/security/sanitize.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,sBAAsB,CAAC;AAQ7C,MAAM,oBAAoB,GAAG;IAC3B,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI;IAC1D,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,KAAK;IAC/D,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI;IAC1E,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM;CACpD,CAAC;AAEF,MAAM,qBAAqB,GAA6B;IACtD,CAAC,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,KAAK,CAAC;IACrC,GAAG,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC;IAC1D,EAAE,EAAE,CAAC,SAAS,EAAE,SAAS,CAAC;IAC1B,EAAE,EAAE,CAAC,SAAS,EAAE,SAAS,EAAE,OAAO,CAAC;CACpC,CAAC;AAEF,6GAA6G;AAC7G,MAAM,UAAU,YAAY,CAC1B,IAAY,EACZ,OAAyB;IAEzB,IAAI,OAAO,EAAE,QAAQ,EAAE,CAAC;QACtB,OAAO,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,YAAY,EAAE,EAAE,EAAE,YAAY,EAAE,EAAE,EAAE,CAAC,CAAC;IAC1E,CAAC;IAED,MAAM,IAAI,GAAG,OAAO,EAAE,WAAW,IAAI,oBAAoB,CAAC;IAE1D,MAAM,UAAU,GAAG,OAAO,EAAE,iBAAiB,IAAI,qBAAqB,CAAC;IACvE,MAAM,QAAQ,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;IAEhE,OAAO,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE;QAC9B,YAAY,EAAE,IAAI;QAClB,YAAY,EAAE,QAAQ;QACtB,eAAe,EAAE,KAAK;QACtB,QAAQ,EAAE,CAAC,QAAQ,CAAC;KACrB,CAAC,CAAC;AACL,CAAC;AAED,iDAAiD;AACjD,MAAM,UAAU,SAAS,CAAC,IAAY;IACpC,OAAO,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,YAAY,EAAE,EAAE,EAAE,YAAY,EAAE,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;AACjF,CAAC;AAED,OAAO,EAAE,oBAAoB,EAAE,qBAAqB,EAAE,CAAC"}
1
+ {"version":3,"file":"sanitize.js","sourceRoot":"","sources":["../../src/security/sanitize.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,eAAe,CAAC;AAQrC,MAAM,oBAAoB,GAAG;IAC3B,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI;IAC1D,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,KAAK;IAC/D,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI;IAC1E,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM;CACpD,CAAC;AAEF,MAAM,qBAAqB,GAA6B;IACtD,CAAC,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,KAAK,CAAC;IACrC,GAAG,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC;IAC1D,EAAE,EAAE,CAAC,SAAS,EAAE,SAAS,CAAC;IAC1B,EAAE,EAAE,CAAC,SAAS,EAAE,SAAS,EAAE,OAAO,CAAC;CACpC,CAAC;AAEF,6FAA6F;AAC7F,MAAM,UAAU,YAAY,CAC1B,IAAY,EACZ,OAAyB;IAEzB,IAAI,OAAO,EAAE,QAAQ,EAAE,CAAC;QACtB,OAAO,QAAQ,CAAC,IAAI,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE,iBAAiB,EAAE,EAAE,EAAE,CAAC,CAAC;IACpE,CAAC;IAED,MAAM,IAAI,GAAG,OAAO,EAAE,WAAW,IAAI,oBAAoB,CAAC;IAC1D,MAAM,KAAK,GAAG,OAAO,EAAE,iBAAiB,IAAI,qBAAqB,CAAC;IAElE,OAAO,QAAQ,CAAC,IAAI,EAAE;QACpB,WAAW,EAAE,IAAI;QACjB,iBAAiB,EAAE,KAAK;QACxB,kBAAkB,EAAE,SAAS;KAC9B,CAAC,CAAC;AACL,CAAC;AAED,iDAAiD;AACjD,MAAM,UAAU,SAAS,CAAC,IAAY;IACpC,OAAO,QAAQ,CAAC,IAAI,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE,iBAAiB,EAAE,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;AAC3E,CAAC;AAED,OAAO,EAAE,oBAAoB,EAAE,qBAAqB,EAAE,CAAC"}
@@ -4,7 +4,7 @@ export declare function validateWebhookUrl(url: string): {
4
4
  error?: string;
5
5
  };
6
6
  /** Resolve a hostname and verify the resulting IP isn't in a private range. */
7
- export declare function resolveAndCheck(_hostname: string): Promise<{
7
+ export declare function resolveAndCheck(hostname: string): Promise<{
8
8
  safe: boolean;
9
9
  resolvedIp?: string;
10
10
  error?: string;
@@ -1 +1 @@
1
- {"version":3,"file":"webhook.d.ts","sourceRoot":"","sources":["../../src/security/webhook.ts"],"names":[],"mappings":"AAYA,+FAA+F;AAC/F,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG;IAAE,KAAK,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAsBlF;AAED,+EAA+E;AAC/E,wBAAsB,eAAe,CACnC,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAGjE"}
1
+ {"version":3,"file":"webhook.d.ts","sourceRoot":"","sources":["../../src/security/webhook.ts"],"names":[],"mappings":"AAYA,+FAA+F;AAC/F,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG;IAAE,KAAK,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAsBlF;AAED,+EAA+E;AAC/E,wBAAsB,eAAe,CACnC,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CA0BjE"}
@@ -31,8 +31,29 @@ export function validateWebhookUrl(url) {
31
31
  }
32
32
  }
33
33
  /** Resolve a hostname and verify the resulting IP isn't in a private range. */
34
- export async function resolveAndCheck(_hostname) {
35
- // TODO: DNS resolution + private range check
36
- throw new Error("Not implemented");
34
+ export async function resolveAndCheck(hostname) {
35
+ const { resolve4, resolve6 } = await import('node:dns/promises');
36
+ const ips = [];
37
+ try {
38
+ const v4 = await resolve4(hostname);
39
+ ips.push(...v4);
40
+ }
41
+ catch { /* no A records */ }
42
+ try {
43
+ const v6 = await resolve6(hostname);
44
+ ips.push(...v6);
45
+ }
46
+ catch { /* no AAAA records */ }
47
+ if (ips.length === 0) {
48
+ return { safe: false, error: `DNS resolution failed for ${hostname}` };
49
+ }
50
+ for (const ip of ips) {
51
+ for (const range of PRIVATE_RANGES) {
52
+ if (range.test(ip)) {
53
+ return { safe: false, resolvedIp: ip, error: `Resolved IP ${ip} is in a private range` };
54
+ }
55
+ }
56
+ }
57
+ return { safe: true, resolvedIp: ips[0] };
37
58
  }
38
59
  //# sourceMappingURL=webhook.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"webhook.js","sourceRoot":"","sources":["../../src/security/webhook.ts"],"names":[],"mappings":"AAAA,MAAM,cAAc,GAAG;IACrB,OAAO;IACP,4BAA4B;IAC5B,aAAa;IACb,QAAQ;IACR,MAAM;IACN,aAAa;IACb,OAAO;IACP,SAAS;IACT,SAAS;CACV,CAAC;AAEF,+FAA+F;AAC/F,MAAM,UAAU,kBAAkB,CAAC,GAAW;IAC5C,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC;QAE5B,IAAI,CAAC,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;YACnD,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,oCAAoC,EAAE,CAAC;QACvE,CAAC;QAED,IAAI,MAAM,CAAC,QAAQ,KAAK,WAAW,IAAI,MAAM,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;YACrE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,gCAAgC,EAAE,CAAC;QACnE,CAAC;QAED,KAAK,MAAM,KAAK,IAAI,cAAc,EAAE,CAAC;YACnC,IAAI,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;gBAChC,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,+CAA+C,EAAE,CAAC;YAClF,CAAC;QACH,CAAC;QAED,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;IACzB,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,aAAa,EAAE,CAAC;IAChD,CAAC;AACH,CAAC;AAED,+EAA+E;AAC/E,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,SAAiB;IAEjB,6CAA6C;IAC7C,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;AACrC,CAAC"}
1
+ {"version":3,"file":"webhook.js","sourceRoot":"","sources":["../../src/security/webhook.ts"],"names":[],"mappings":"AAAA,MAAM,cAAc,GAAG;IACrB,OAAO;IACP,4BAA4B;IAC5B,aAAa;IACb,QAAQ;IACR,MAAM;IACN,aAAa;IACb,OAAO;IACP,SAAS;IACT,SAAS;CACV,CAAC;AAEF,+FAA+F;AAC/F,MAAM,UAAU,kBAAkB,CAAC,GAAW;IAC5C,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC;QAE5B,IAAI,CAAC,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;YACnD,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,oCAAoC,EAAE,CAAC;QACvE,CAAC;QAED,IAAI,MAAM,CAAC,QAAQ,KAAK,WAAW,IAAI,MAAM,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;YACrE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,gCAAgC,EAAE,CAAC;QACnE,CAAC;QAED,KAAK,MAAM,KAAK,IAAI,cAAc,EAAE,CAAC;YACnC,IAAI,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;gBAChC,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,+CAA+C,EAAE,CAAC;YAClF,CAAC;QACH,CAAC;QAED,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;IACzB,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,aAAa,EAAE,CAAC;IAChD,CAAC;AACH,CAAC;AAED,+EAA+E;AAC/E,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,QAAgB;IAEhB,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,MAAM,MAAM,CAAC,mBAAmB,CAAC,CAAC;IAEjE,MAAM,GAAG,GAAa,EAAE,CAAC;IACzB,IAAI,CAAC;QACH,MAAM,EAAE,GAAG,MAAM,QAAQ,CAAC,QAAQ,CAAC,CAAC;QACpC,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;IAClB,CAAC;IAAC,MAAM,CAAC,CAAC,kBAAkB,CAAC,CAAC;IAC9B,IAAI,CAAC;QACH,MAAM,EAAE,GAAG,MAAM,QAAQ,CAAC,QAAQ,CAAC,CAAC;QACpC,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;IAClB,CAAC;IAAC,MAAM,CAAC,CAAC,qBAAqB,CAAC,CAAC;IAEjC,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACrB,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,6BAA6B,QAAQ,EAAE,EAAE,CAAC;IACzE,CAAC;IAED,KAAK,MAAM,EAAE,IAAI,GAAG,EAAE,CAAC;QACrB,KAAK,MAAM,KAAK,IAAI,cAAc,EAAE,CAAC;YACnC,IAAI,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC;gBACnB,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,UAAU,EAAE,EAAE,EAAE,KAAK,EAAE,eAAe,EAAE,wBAAwB,EAAE,CAAC;YAC3F,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;AAC5C,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@actuate-media/cms-core",
3
- "version": "0.2.3",
3
+ "version": "0.3.1",
4
4
  "repository": {
5
5
  "type": "git",
6
6
  "url": "https://github.com/actuate-media/actuatecms.git",
@@ -62,13 +62,14 @@
62
62
  "arctic": "^3.5.0",
63
63
  "graphql": "^16.13.2",
64
64
  "graphql-yoga": "^5.19.0",
65
- "isomorphic-dompurify": "^3.7.1",
66
65
  "jose": "^6.0.0",
67
66
  "pg": "^8.20.0",
67
+ "sanitize-html": "^2.17.2",
68
68
  "sharp": "^0.34.5",
69
69
  "zod": "^3.23.0"
70
70
  },
71
71
  "devDependencies": {
72
+ "@types/sanitize-html": "^2.16.1",
72
73
  "@types/sharp": "^0.32.0",
73
74
  "dotenv": "^17.3.1",
74
75
  "prisma": "^7.5.0",