@caelo-cms/shared 0.11.20 → 0.12.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 (109) hide show
  1. package/dist/ai-tools.d.ts +4 -0
  2. package/dist/ai-tools.d.ts.map +1 -1
  3. package/dist/ai-tools.js +6 -0
  4. package/dist/ai-tools.js.map +1 -1
  5. package/dist/bug-intake.d.ts +15 -0
  6. package/dist/bug-intake.d.ts.map +1 -1
  7. package/dist/bug-intake.js +14 -0
  8. package/dist/bug-intake.js.map +1 -1
  9. package/dist/change-journal.d.ts.map +1 -1
  10. package/dist/change-journal.js +1 -0
  11. package/dist/change-journal.js.map +1 -1
  12. package/dist/context.d.ts +26 -0
  13. package/dist/context.d.ts.map +1 -1
  14. package/dist/context.js +2 -1
  15. package/dist/context.js.map +1 -1
  16. package/dist/index.d.ts +2 -0
  17. package/dist/index.d.ts.map +1 -1
  18. package/dist/index.js +2 -0
  19. package/dist/index.js.map +1 -1
  20. package/dist/link-refs.d.ts +18 -2
  21. package/dist/link-refs.d.ts.map +1 -1
  22. package/dist/link-refs.js +24 -6
  23. package/dist/link-refs.js.map +1 -1
  24. package/dist/lists/address.d.ts +6 -0
  25. package/dist/lists/address.d.ts.map +1 -1
  26. package/dist/lists/address.js +9 -1
  27. package/dist/lists/address.js.map +1 -1
  28. package/dist/lists/resolve-values.d.ts +11 -0
  29. package/dist/lists/resolve-values.d.ts.map +1 -1
  30. package/dist/lists/resolve-values.js +19 -0
  31. package/dist/lists/resolve-values.js.map +1 -1
  32. package/dist/lists/resolve.d.ts +5 -0
  33. package/dist/lists/resolve.d.ts.map +1 -1
  34. package/dist/lists/resolve.js +7 -0
  35. package/dist/lists/resolve.js.map +1 -1
  36. package/dist/owner-setup-token.d.ts +28 -0
  37. package/dist/owner-setup-token.d.ts.map +1 -0
  38. package/dist/owner-setup-token.js +41 -0
  39. package/dist/owner-setup-token.js.map +1 -0
  40. package/dist/redirect-emit-front-door.d.ts.map +1 -1
  41. package/dist/redirect-emit-front-door.js +4 -0
  42. package/dist/redirect-emit-front-door.js.map +1 -1
  43. package/dist/redirect-emit-gcp.d.ts +8 -0
  44. package/dist/redirect-emit-gcp.d.ts.map +1 -1
  45. package/dist/redirect-emit-gcp.js +4 -1
  46. package/dist/redirect-emit-gcp.js.map +1 -1
  47. package/dist/redirect-plan.d.ts +2 -2
  48. package/dist/redirect-plan.d.ts.map +1 -1
  49. package/dist/redirect-plan.js +13 -4
  50. package/dist/redirect-plan.js.map +1 -1
  51. package/dist/redirect-target.d.ts +57 -7
  52. package/dist/redirect-target.d.ts.map +1 -1
  53. package/dist/redirect-target.js +130 -8
  54. package/dist/redirect-target.js.map +1 -1
  55. package/dist/seo.d.ts +21 -0
  56. package/dist/seo.d.ts.map +1 -1
  57. package/dist/seo.js +21 -0
  58. package/dist/seo.js.map +1 -1
  59. package/dist/site-security-headers.d.ts +323 -0
  60. package/dist/site-security-headers.d.ts.map +1 -0
  61. package/dist/site-security-headers.js +424 -0
  62. package/dist/site-security-headers.js.map +1 -0
  63. package/dist/staged-site.d.ts +11 -0
  64. package/dist/staged-site.d.ts.map +1 -1
  65. package/dist/staged-site.js +26 -0
  66. package/dist/staged-site.js.map +1 -1
  67. package/dist/template-engine.d.ts +7 -0
  68. package/dist/template-engine.d.ts.map +1 -1
  69. package/dist/template-engine.js +38 -1
  70. package/dist/template-engine.js.map +1 -1
  71. package/dist/template-sections.d.ts +23 -1
  72. package/dist/template-sections.d.ts.map +1 -1
  73. package/dist/template-sections.js +124 -17
  74. package/dist/template-sections.js.map +1 -1
  75. package/dist/version.d.ts +2 -2
  76. package/dist/version.d.ts.map +1 -1
  77. package/dist/version.js +1 -1
  78. package/dist/version.js.map +1 -1
  79. package/package.json +1 -1
  80. package/src/ai-tools.ts +7 -0
  81. package/src/bug-intake.ts +16 -0
  82. package/src/change-journal.ts +1 -0
  83. package/src/context.ts +28 -0
  84. package/src/index.ts +2 -0
  85. package/src/link-refs.test.ts +38 -4
  86. package/src/link-refs.ts +39 -6
  87. package/src/lists/address.ts +16 -1
  88. package/src/lists/lists.test.ts +2 -0
  89. package/src/lists/resolve-values.ts +19 -0
  90. package/src/lists/resolve.test.ts +8 -0
  91. package/src/lists/resolve.ts +8 -0
  92. package/src/owner-setup-token.ts +49 -0
  93. package/src/redirect-emit-front-door.ts +6 -0
  94. package/src/redirect-emit-gcp.ts +12 -1
  95. package/src/redirect-emit.test.ts +44 -0
  96. package/src/redirect-plan.test.ts +57 -0
  97. package/src/redirect-plan.ts +12 -5
  98. package/src/redirect-target.test.ts +110 -4
  99. package/src/redirect-target.ts +142 -8
  100. package/src/seo.test.ts +24 -0
  101. package/src/seo.ts +25 -0
  102. package/src/site-security-headers.test.ts +263 -0
  103. package/src/site-security-headers.ts +509 -0
  104. package/src/staged-site.ts +30 -0
  105. package/src/template-engine-link-field.test.ts +148 -0
  106. package/src/template-engine-lists.test.ts +1 -1
  107. package/src/template-engine.ts +41 -1
  108. package/src/template-sections.ts +136 -20
  109. package/src/version.ts +1 -1
@@ -1,4 +1,5 @@
1
1
  // SPDX-License-Identifier: MPL-2.0
2
+ import { isExternalRedirectTarget } from "./redirect-target.js";
2
3
  /** Rules per rule set / per route on Front Door Standard and Premium. */
3
4
  export const FRONT_DOOR_MAX_RULES = 100;
4
5
  const REDIRECT_TYPE = {
@@ -28,6 +29,9 @@ export function frontDoorRedirectRules(plan) {
28
29
  return plan.redirects.map((r, i) => toRule(r, i + 1));
29
30
  }
30
31
  function toRule(r, order) {
32
+ if (isExternalRedirectTarget(r.location)) {
33
+ throw new Error(`redirect-emit-front-door: the redirect ${r.fromPath} → ${r.location} leaves the site, which this rule shape cannot express. External redirects are refused on azure until its publisher exists (#750); delete the row with bulk_delete_redirects.`);
34
+ }
31
35
  const { path, query, fragment } = splitLocation(r.location);
32
36
  return {
33
37
  // Rule names: letters and digits only, starting with a letter.
@@ -1 +1 @@
1
- {"version":3,"file":"redirect-emit-front-door.js","sourceRoot":"","sources":["../src/redirect-emit-front-door.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"redirect-emit-front-door.js","sourceRoot":"","sources":["../src/redirect-emit-front-door.ts"],"names":[],"mappings":"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"}
@@ -20,6 +20,13 @@
20
20
  * would turn linked URLs into 404s without anyone noticing. Going past the
21
21
  * quota is tracked in #751.
22
22
  *
23
+ * An external target (#1358) is the same rule with a `hostRedirect`, and
24
+ * costs the same budget. `pathRedirect` stays set: without it the load
25
+ * balancer keeps the request's path. `httpsRedirect` stays unset: the API
26
+ * refuses it on a TargetHttpsProxy, and the site's plain-http URL map
27
+ * upgrades to https before a request gets here, so the `Location` scheme is
28
+ * https already.
29
+ *
23
30
  * Rules this module owns are recognised by their `urlRedirect` (the stack's
24
31
  * own rules route to a service), so re-applying a plan replaces exactly the
25
32
  * previous plan's rules and keeps everything else in the path matcher.
@@ -35,6 +42,7 @@ export interface GcpPathRule {
35
42
  readonly paths: readonly string[];
36
43
  readonly service?: string;
37
44
  readonly urlRedirect?: {
45
+ readonly hostRedirect?: string;
38
46
  readonly pathRedirect?: string;
39
47
  readonly redirectResponseCode?: GcpRedirectResponseCode;
40
48
  readonly stripQuery?: boolean;
@@ -1 +1 @@
1
- {"version":3,"file":"redirect-emit-gcp.d.ts","sourceRoot":"","sources":["../src/redirect-emit-gcp.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AAEH,OAAO,KAAK,EAAmB,YAAY,EAAsB,MAAM,oBAAoB,CAAC;AAE5F,wEAAwE;AACxE,eAAO,MAAM,0BAA0B,OAAO,CAAC;AAC/C,iEAAiE;AACjE,eAAO,MAAM,0BAA0B,OAAO,CAAC;AAU/C,MAAM,MAAM,uBAAuB,GAC/B,2BAA2B,GAC3B,OAAO,GACP,WAAW,GACX,oBAAoB,GACpB,oBAAoB,CAAC;AAEzB,kEAAkE;AAClE,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,CAAC;IAClC,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,WAAW,CAAC,EAAE;QACrB,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC;QAC/B,QAAQ,CAAC,oBAAoB,CAAC,EAAE,uBAAuB,CAAC;QACxD,QAAQ,CAAC,UAAU,CAAC,EAAE,OAAO,CAAC;QAC9B,QAAQ,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;KACjC,CAAC;IACF,QAAQ,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACjC;AAED,4EAA4E;AAC5E,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,SAAS,CAAC,EAAE,SAAS,WAAW,EAAE,CAAC;IAC5C,QAAQ,CAAC,UAAU,CAAC,EAAE,SAAS,OAAO,EAAE,CAAC;IACzC,QAAQ,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACjC;AAED,2EAA2E;AAC3E,qBAAa,oBAAqB,SAAQ,KAAK;IAE3C,QAAQ,CAAC,aAAa,EAAE,MAAM;IAC9B,QAAQ,CAAC,gBAAgB,EAAE,MAAM;IACjC,QAAQ,CAAC,WAAW,EAAE,MAAM;gBAFnB,aAAa,EAAE,MAAM,EACrB,gBAAgB,EAAE,MAAM,EACxB,WAAW,EAAE,MAAM;CAO/B;AAED;;;;;;;GAOG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,YAAY,GAAG,WAAW,EAAE,CAEtE;AAwBD,6EAA6E;AAC7E,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,WAAW,GAAG,OAAO,CAE5D;AAED;;;;;;;GAOG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,cAAc,EAAE,IAAI,EAAE,YAAY,GAAG,cAAc,CAc5F;AAED;;;;;;GAMG;AACH,wBAAgB,uBAAuB,CACrC,IAAI,EAAE,YAAY,EAClB,SAAS,EAAE,SAAS,WAAW,EAAE,GAChC,IAAI,CAEN;AAED,qFAAqF;AACrF,eAAO,MAAM,iBAAiB,EAAE,SAAS,MAAM,EAAe,CAAC;AAE/D;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,wBAAwB,EAAE,SAAS,MAAM,EAIrD,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,qBAAqB,EAAE,SAAS,MAAM,EAGlD,CAAC"}
1
+ {"version":3,"file":"redirect-emit-gcp.d.ts","sourceRoot":"","sources":["../src/redirect-emit-gcp.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgCG;AAEH,OAAO,KAAK,EAAmB,YAAY,EAAsB,MAAM,oBAAoB,CAAC;AAG5F,wEAAwE;AACxE,eAAO,MAAM,0BAA0B,OAAO,CAAC;AAC/C,iEAAiE;AACjE,eAAO,MAAM,0BAA0B,OAAO,CAAC;AAU/C,MAAM,MAAM,uBAAuB,GAC/B,2BAA2B,GAC3B,OAAO,GACP,WAAW,GACX,oBAAoB,GACpB,oBAAoB,CAAC;AAEzB,kEAAkE;AAClE,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,CAAC;IAClC,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,WAAW,CAAC,EAAE;QACrB,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC;QAC/B,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC;QAC/B,QAAQ,CAAC,oBAAoB,CAAC,EAAE,uBAAuB,CAAC;QACxD,QAAQ,CAAC,UAAU,CAAC,EAAE,OAAO,CAAC;QAC9B,QAAQ,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;KACjC,CAAC;IACF,QAAQ,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACjC;AAED,4EAA4E;AAC5E,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,SAAS,CAAC,EAAE,SAAS,WAAW,EAAE,CAAC;IAC5C,QAAQ,CAAC,UAAU,CAAC,EAAE,SAAS,OAAO,EAAE,CAAC;IACzC,QAAQ,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACjC;AAED,2EAA2E;AAC3E,qBAAa,oBAAqB,SAAQ,KAAK;IAE3C,QAAQ,CAAC,aAAa,EAAE,MAAM;IAC9B,QAAQ,CAAC,gBAAgB,EAAE,MAAM;IACjC,QAAQ,CAAC,WAAW,EAAE,MAAM;gBAFnB,aAAa,EAAE,MAAM,EACrB,gBAAgB,EAAE,MAAM,EACxB,WAAW,EAAE,MAAM;CAO/B;AAED;;;;;;;GAOG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,YAAY,GAAG,WAAW,EAAE,CAEtE;AA0BD,6EAA6E;AAC7E,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,WAAW,GAAG,OAAO,CAE5D;AAED;;;;;;;GAOG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,cAAc,EAAE,IAAI,EAAE,YAAY,GAAG,cAAc,CAc5F;AAED;;;;;;GAMG;AACH,wBAAgB,uBAAuB,CACrC,IAAI,EAAE,YAAY,EAClB,SAAS,EAAE,SAAS,WAAW,EAAE,GAChC,IAAI,CAEN;AAED,qFAAqF;AACrF,eAAO,MAAM,iBAAiB,EAAE,SAAS,MAAM,EAAe,CAAC;AAE/D;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,wBAAwB,EAAE,SAAS,MAAM,EAIrD,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,qBAAqB,EAAE,SAAS,MAAM,EAGlD,CAAC"}
@@ -1,4 +1,5 @@
1
1
  // SPDX-License-Identifier: MPL-2.0
2
+ import { isExternalRedirectTarget } from "./redirect-target.js";
2
3
  /** Path rules per path matcher (URL map quota, global external ALB). */
3
4
  export const GCP_URL_MAP_MAX_PATH_RULES = 1000;
4
5
  /** Predicates (paths across all path rules) per path matcher. */
@@ -41,10 +42,12 @@ function toPathRule(r) {
41
42
  if (!r.preserveQuery) {
42
43
  throw new Error(`redirect-emit-gcp: the redirect ${r.fromPath} → ${r.location} targets a URL with a query string or fragment, which a GCP URL-map redirect cannot carry. Point it at the page's path with bulk_create_redirects (upsert), then publish again.`);
43
44
  }
45
+ const external = isExternalRedirectTarget(r.location) ? new URL(r.location) : null;
44
46
  return {
45
47
  paths: [...r.matchPaths],
46
48
  urlRedirect: {
47
- pathRedirect: r.location,
49
+ ...(external ? { hostRedirect: external.hostname } : {}),
50
+ pathRedirect: external ? external.pathname : r.location,
48
51
  redirectResponseCode: RESPONSE_CODE[r.statusCode],
49
52
  // The visitor's query string rides along, like on every provider.
50
53
  stripQuery: false,
@@ -1 +1 @@
1
- {"version":3,"file":"redirect-emit-gcp.js","sourceRoot":"","sources":["../src/redirect-emit-gcp.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"redirect-emit-gcp.js","sourceRoot":"","sources":["../src/redirect-emit-gcp.ts"],"names":[],"mappings":"AAAA,mCAAmC;AAqCnC,OAAO,EAAE,wBAAwB,EAAE,MAAM,sBAAsB,CAAC;AAEhE,wEAAwE;AACxE,MAAM,CAAC,MAAM,0BAA0B,GAAG,IAAI,CAAC;AAC/C,iEAAiE;AACjE,MAAM,CAAC,MAAM,0BAA0B,GAAG,IAAI,CAAC;AAE/C,4DAA4D;AAC5D,MAAM,aAAa,GAAwD;IACzE,GAAG,EAAE,2BAA2B;IAChC,GAAG,EAAE,OAAO;IACZ,GAAG,EAAE,oBAAoB;IACzB,GAAG,EAAE,oBAAoB;CAC1B,CAAC;AA+BF,2EAA2E;AAC3E,MAAM,OAAO,oBAAqB,SAAQ,KAAK;IAElC;IACA;IACA;IAHX,YACW,aAAqB,EACrB,gBAAwB,EACxB,WAAmB;QAE5B,KAAK,CACH,wCAAwC,0BAA0B,uBAAuB,0BAA0B,wDAAwD,aAAa,qBAAqB,gBAAgB,cAAc,WAAW,2cAA2c,CAClsB,CAAC;QANO,kBAAa,GAAb,aAAa,CAAQ;QACrB,qBAAgB,GAAhB,gBAAgB,CAAQ;QACxB,gBAAW,GAAX,WAAW,CAAQ;QAK5B,IAAI,CAAC,IAAI,GAAG,sBAAsB,CAAC;IACrC,CAAC;CACF;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,oBAAoB,CAAC,IAAkB;IACrD,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;AACxC,CAAC;AAED,SAAS,UAAU,CAAC,CAAkB;IACpC,IAAI,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;QAC9C,MAAM,IAAI,KAAK,CACb,uCAAuC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,4IAA4I,CAC9M,CAAC;IACJ,CAAC;IACD,IAAI,CAAC,CAAC,CAAC,aAAa,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CACb,mCAAmC,CAAC,CAAC,QAAQ,MAAM,CAAC,CAAC,QAAQ,iLAAiL,CAC/O,CAAC;IACJ,CAAC;IACD,MAAM,QAAQ,GAAG,wBAAwB,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IACnF,OAAO;QACL,KAAK,EAAE,CAAC,GAAG,CAAC,CAAC,UAAU,CAAC;QACxB,WAAW,EAAE;YACX,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACxD,YAAY,EAAE,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ;YACvD,oBAAoB,EAAE,aAAa,CAAC,CAAC,CAAC,UAAU,CAAC;YACjD,kEAAkE;YAClE,UAAU,EAAE,KAAK;SAClB;KACF,CAAC;AACJ,CAAC;AAED,6EAA6E;AAC7E,MAAM,UAAU,iBAAiB,CAAC,IAAiB;IACjD,OAAO,IAAI,CAAC,WAAW,KAAK,SAAS,IAAI,IAAI,CAAC,OAAO,KAAK,SAAS,CAAC;AACtE,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,gBAAgB,CAAC,OAAuB,EAAE,IAAkB;IAC1E,IAAI,OAAO,CAAC,UAAU,IAAI,OAAO,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACxD,MAAM,IAAI,KAAK,CACb,mCAAmC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,2MAA2M,CAC3Q,CAAC;IACJ,CAAC;IACD,MAAM,IAAI,GAAG,CAAC,OAAO,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC;IAC5E,MAAM,SAAS,GAAG,oBAAoB,CAAC,IAAI,CAAC,CAAC;IAC7C,MAAM,SAAS,GAAG,CAAC,GAAG,IAAI,EAAE,GAAG,SAAS,CAAC,CAAC;IAC1C,MAAM,UAAU,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IACrE,IAAI,UAAU,GAAG,0BAA0B,IAAI,SAAS,CAAC,MAAM,GAAG,0BAA0B,EAAE,CAAC;QAC7F,MAAM,IAAI,oBAAoB,CAAC,SAAS,CAAC,MAAM,EAAE,UAAU,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC;IACjF,CAAC;IACD,OAAO,EAAE,GAAG,OAAO,EAAE,SAAS,EAAE,CAAC;AACnC,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,uBAAuB,CACrC,IAAkB,EAClB,SAAiC;IAEjC,gBAAgB,CAAC,EAAE,IAAI,EAAE,cAAc,EAAE,SAAS,EAAE,SAAS,EAAE,EAAE,IAAI,CAAC,CAAC;AACzE,CAAC;AAED,qFAAqF;AACrF,MAAM,CAAC,MAAM,iBAAiB,GAAsB,CAAC,QAAQ,CAAC,CAAC;AAE/D;;;;;;;;;;;GAWG;AACH,MAAM,CAAC,MAAM,wBAAwB,GAAsB;IACzD,YAAY;IACZ,yCAAyC;IACzC,2CAA2C;CAC5C,CAAC;AAEF;;;GAGG;AACH,MAAM,CAAC,MAAM,qBAAqB,GAAsB;IACtD,GAAG,iBAAiB;IACpB,GAAG,wBAAwB;CAC5B,CAAC"}
@@ -14,7 +14,7 @@ export interface PlannedRedirect {
14
14
  readonly fromPath: string;
15
15
  /** Every request path this entry answers, exactly (`/old`, `/old/`). */
16
16
  readonly matchPaths: readonly string[];
17
- /** The Location header value (a same-site path, see module comment). */
17
+ /** The Location header value: a same-site path or an approved https URL. */
18
18
  readonly location: string;
19
19
  readonly statusCode: RedirectStatusCode;
20
20
  /** Append the request's query string to {@link location}. */
@@ -68,7 +68,7 @@ export interface BuildRedirectPlanArgs {
68
68
  export declare function buildRedirectPlan(args: BuildRedirectPlanArgs): RedirectPlan;
69
69
  /**
70
70
  * The planned redirects whose Location is a same-site path the build does
71
- * not serve (#1157). Redirects reach the live site on save, pages only with
71
+ * not serve (#1157; an external address is the destination's business). Redirects reach the live site on save, pages only with
72
72
  * Publish live, so a redirect to a page that is still a draft answers 404 at
73
73
  * its target until that page is published. Callers report these; they are
74
74
  * not an error. Paths under `/api/` are answered by the gateway, not the
@@ -1 +1 @@
1
- {"version":3,"file":"redirect-plan.d.ts","sourceRoot":"","sources":["../src/redirect-plan.ts"],"names":[],"mappings":"AAwCA,sEAAsE;AACtE,MAAM,MAAM,kBAAkB,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,CAAC;AAEvD,sEAAsE;AACtE,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;CAC7B;AAED,2EAA2E;AAC3E,MAAM,MAAM,oBAAoB,GAAG,WAAW,GAAG,cAAc,CAAC;AAEhE,8CAA8C;AAC9C,MAAM,WAAW,eAAe;IAC9B,wEAAwE;IACxE,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,wEAAwE;IACxE,QAAQ,CAAC,UAAU,EAAE,SAAS,MAAM,EAAE,CAAC;IACvC,wEAAwE;IACxE,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,UAAU,EAAE,kBAAkB,CAAC;IACxC,6DAA6D;IAC7D,QAAQ,CAAC,aAAa,EAAE,OAAO,CAAC;CACjC;AAED,uEAAuE;AACvE,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,UAAU,EAAE,SAAS,MAAM,EAAE,CAAC;CACxC;AAED,sEAAsE;AACtE,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,SAAS,EAAE,SAAS,eAAe,EAAE,CAAC;IAC/C,QAAQ,CAAC,IAAI,EAAE,SAAS,WAAW,EAAE,CAAC;IACtC,mEAAmE;IACnE,QAAQ,CAAC,eAAe,EAAE,SAAS,MAAM,EAAE,CAAC;CAC7C;AAKD;;;;;;;;GAQG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,gBAAgB,EAAE,CAgBnE;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,SAAS,gBAAgB,EAAE,GAAG,MAAM,CAM7E;AAED,8CAA8C;AAC9C,MAAM,WAAW,qBAAqB;IACpC,QAAQ,CAAC,IAAI,EAAE,SAAS,gBAAgB,EAAE,CAAC;IAC3C,QAAQ,CAAC,YAAY,EAAE,oBAAoB,CAAC;IAC5C;;;;OAIG;IACH,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;CAC3C;AAQD;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,qBAAqB,GAAG,YAAY,CA+B3E;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,wBAAwB,CACtC,IAAI,EAAE,YAAY,EAClB,WAAW,EAAE,WAAW,CAAC,MAAM,CAAC,GAC/B,eAAe,EAAE,CAOnB;AAED;;;;;;;;;GASG;AACH,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,MAAM,EAAE,CAGzE;AAyHD;;;;;;;;GAQG;AACH,wBAAgB,oBAAoB,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,GAAG,GAAG,GAAG,CAgBjE"}
1
+ {"version":3,"file":"redirect-plan.d.ts","sourceRoot":"","sources":["../src/redirect-plan.ts"],"names":[],"mappings":"AA6CA,sEAAsE;AACtE,MAAM,MAAM,kBAAkB,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,CAAC;AAEvD,sEAAsE;AACtE,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;CAC7B;AAED,2EAA2E;AAC3E,MAAM,MAAM,oBAAoB,GAAG,WAAW,GAAG,cAAc,CAAC;AAEhE,8CAA8C;AAC9C,MAAM,WAAW,eAAe;IAC9B,wEAAwE;IACxE,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,wEAAwE;IACxE,QAAQ,CAAC,UAAU,EAAE,SAAS,MAAM,EAAE,CAAC;IACvC,4EAA4E;IAC5E,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,UAAU,EAAE,kBAAkB,CAAC;IACxC,6DAA6D;IAC7D,QAAQ,CAAC,aAAa,EAAE,OAAO,CAAC;CACjC;AAED,uEAAuE;AACvE,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,UAAU,EAAE,SAAS,MAAM,EAAE,CAAC;CACxC;AAED,sEAAsE;AACtE,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,SAAS,EAAE,SAAS,eAAe,EAAE,CAAC;IAC/C,QAAQ,CAAC,IAAI,EAAE,SAAS,WAAW,EAAE,CAAC;IACtC,mEAAmE;IACnE,QAAQ,CAAC,eAAe,EAAE,SAAS,MAAM,EAAE,CAAC;CAC7C;AAKD;;;;;;;;GAQG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,gBAAgB,EAAE,CAgBnE;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,SAAS,gBAAgB,EAAE,GAAG,MAAM,CAM7E;AAED,8CAA8C;AAC9C,MAAM,WAAW,qBAAqB;IACpC,QAAQ,CAAC,IAAI,EAAE,SAAS,gBAAgB,EAAE,CAAC;IAC3C,QAAQ,CAAC,YAAY,EAAE,oBAAoB,CAAC;IAC5C;;;;OAIG;IACH,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;CAC3C;AAQD;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,qBAAqB,GAAG,YAAY,CA+B3E;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,wBAAwB,CACtC,IAAI,EAAE,YAAY,EAClB,WAAW,EAAE,WAAW,CAAC,MAAM,CAAC,GAC/B,eAAe,EAAE,CAQnB;AAED;;;;;;;;;GASG;AACH,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,MAAM,EAAE,CAGzE;AA0HD;;;;;;;;GAQG;AACH,wBAAgB,oBAAoB,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,GAAG,GAAG,GAAG,CAgBjE"}
@@ -29,11 +29,16 @@
29
29
  * `/`; the Location points there directly (the host would otherwise add
30
30
  * a second hop). The visitor's query string is carried over unless the
31
31
  * target has its own query or fragment.
32
+ * - **External targets** (#1358). An Owner-approved `https` address stays
33
+ * exactly as approved: no trailing slash is added, and a chain ends there.
34
+ * A same-site row pointing at a row with an external target collapses to
35
+ * that address in one hop. The visitor's query string rides along under
36
+ * the same rule as for a path.
32
37
  * - **410.** Rows with status 410 become `gone` entries. Layers that can
33
38
  * answer a bare status (Caddy, CloudFront) send 410; the others answer
34
39
  * the 404 a path without a file gets anyway.
35
40
  */
36
- import { redirectTargetIssue } from "./redirect-target.js";
41
+ import { isExternalRedirectTarget, servableRedirectTargetIssue } from "./redirect-target.js";
37
42
  import { trimTrailingSlashes } from "./url.js";
38
43
  const REDIRECT_STATUSES = new Set([301, 302, 307, 308]);
39
44
  const GONE_STATUS = 410;
@@ -113,7 +118,7 @@ export function buildRedirectPlan(args) {
113
118
  }
114
119
  /**
115
120
  * The planned redirects whose Location is a same-site path the build does
116
- * not serve (#1157). Redirects reach the live site on save, pages only with
121
+ * not serve (#1157; an external address is the destination's business). Redirects reach the live site on save, pages only with
117
122
  * Publish live, so a redirect to a page that is still a draft answers 404 at
118
123
  * its target until that page is published. Callers report these; they are
119
124
  * not an error. Paths under `/api/` are answered by the gateway, not the
@@ -125,6 +130,8 @@ export function buildRedirectPlan(args) {
125
130
  */
126
131
  export function redirectsToUnservedPaths(plan, servedFiles) {
127
132
  return plan.redirects.filter((r) => {
133
+ if (isExternalRedirectTarget(r.location))
134
+ return false;
128
135
  const path = pathBeforeQuery(r.location);
129
136
  if (path === "/api" || path.startsWith("/api/"))
130
137
  return false;
@@ -163,7 +170,7 @@ function normaliseRows(rows) {
163
170
  throw new Error(`redirect-plan: the redirect for ${shown} has status ${statusCode}; the redirects table allows 301, 302, 307, 308 or 410. Fix the row and rebuild.`);
164
171
  }
165
172
  if (statusCode !== GONE_STATUS) {
166
- const targetIssue = redirectTargetIssue(toPath);
173
+ const targetIssue = servableRedirectTargetIssue(toPath);
167
174
  if (targetIssue)
168
175
  throw new Error(`redirect-plan: the redirect for ${shown}: ${targetIssue}`);
169
176
  }
@@ -189,7 +196,7 @@ function collapseChain(row, live) {
189
196
  for (;;) {
190
197
  // A target with its own query or fragment is a different URL than the
191
198
  // path the next row matches; the chain ends there.
192
- if (/[?#]/.test(target))
199
+ if (/[?#]/.test(target) || isExternalRedirectTarget(target))
193
200
  break;
194
201
  const next = live.get(stripTrailingSlash(target));
195
202
  if (!next || next.statusCode === GONE_STATUS)
@@ -245,6 +252,8 @@ function servedByBuild(bare, servedFiles) {
245
252
  * with an extension in its last segment) and URLs with a query or fragment
246
253
  * stay as they are. */
247
254
  function locationFor(toPath, pageUrlStyle) {
255
+ if (isExternalRedirectTarget(toPath))
256
+ return toPath;
248
257
  if (pageUrlStyle !== "directory" || toPath.endsWith("/"))
249
258
  return toPath;
250
259
  if (/[?#]/.test(toPath) || looksLikeFile(toPath))
@@ -1 +1 @@
1
- {"version":3,"file":"redirect-plan.js","sourceRoot":"","sources":["../src/redirect-plan.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"redirect-plan.js","sourceRoot":"","sources":["../src/redirect-plan.ts"],"names":[],"mappings":"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"}
@@ -1,8 +1,7 @@
1
1
  /**
2
- * The one validator for a redirect's TARGET (`toPath`) — issue #657.
2
+ * The validators for a redirect's TARGET (`toPath`) — issues #657, #1358.
3
3
  *
4
- * Caelo redirects only ever point at a path on the same site: the
5
- * `redirects` table has no external-URL field, and every surface that
4
+ * A routine redirect points at a path on the same site. Every surface that
6
5
  * serves the table (the admin's 404 fallback, the generator's
7
6
  * `_redirects` / `_redirects.caddy`, the per-provider emitters) writes
8
7
  * `toPath` verbatim into a `Location` header. "Starts with `/`" is not
@@ -18,12 +17,63 @@
18
17
  * URL, so `/\t/host` collapses to `//host`; the `_redirects` formats
19
18
  * are whitespace-delimited and the emitters already refuse them.
20
19
  *
21
- * Every write path (redirects.create / create_many, page delete with
22
- * `disposition: 'redirect'`, the AI tool schemas, the import composer)
23
- * and every serving path (static generator, admin 404 fallback) calls
24
- * this, so a value rejected at write time can never be served either.
20
+ * Every routine write path (redirects.create / create_many, page delete
21
+ * with `disposition: 'redirect'`, the AI tool schemas, the import composer)
22
+ * calls {@link redirectTargetIssue}, so none of them can store anything but
23
+ * a same-site path.
24
+ *
25
+ * #1358 — the one exception is an `https` address on another domain, written
26
+ * only by `redirects.execute_proposal` after an Owner's approval
27
+ * (CLAUDE.md §11.A). {@link externalRedirectTargetIssue} holds its form: one
28
+ * canonical spelling, so that what the Owner reads is exactly where a
29
+ * browser goes. Serving paths accept both kinds through
30
+ * {@link servableRedirectTargetIssue}, so a value that is neither can never
31
+ * be served.
25
32
  */
26
33
  import { z } from "zod";
34
+ /** True when a stored target is a URL, not a path on this site. */
35
+ export declare function isExternalRedirectTarget(target: string): boolean;
36
+ /**
37
+ * Return why `url` is not a valid external redirect target, or `null` when
38
+ * it is. Only `https`, no credentials, no port, a public host name, and the
39
+ * URL's one canonical spelling: that refuses `https://a.example/x/../y`,
40
+ * `%2e%2e` segments, an upper-case or percent-encoded host and every other
41
+ * form where the text the Owner approves differs from where a browser lands.
42
+ *
43
+ * @example
44
+ * externalRedirectTargetIssue("https://calendar.example/book") // null
45
+ * externalRedirectTargetIssue("https://our.site@evil.example/") // "... credentials ..."
46
+ * externalRedirectTargetIssue("http://calendar.example/") // "... https ..."
47
+ */
48
+ export declare function externalRedirectTargetIssue(url: string): string | null;
49
+ /**
50
+ * Return why an otherwise valid external `url` may not be used on this
51
+ * install: its host is one of the install's own. Compares the parsed,
52
+ * lower-cased host, which is what a browser connects to.
53
+ *
54
+ * @param installHosts lower-case host → what it is ("the Caelo admin", …).
55
+ */
56
+ export declare function externalRedirectHostIssue(url: string, installHosts: ReadonlyMap<string, string>): string | null;
57
+ /**
58
+ * Return why `provider`'s hosting cannot serve this external target, or
59
+ * `null` when it can. Refused at the proposal, because one rule a provider
60
+ * cannot express would stop the sync of the whole table.
61
+ *
62
+ * - `gcp`: the URL map carries a host and a path. It stores a query in
63
+ * `pathRedirect`, but how the load balancer answers one is unverified, so
64
+ * it stays refused like every target with a query there.
65
+ * - `aws`, `azure`: no publisher exists yet (#749, #750). Their redirect
66
+ * writing must add this when it lands.
67
+ *
68
+ * @param provider `CAELO_PROVIDER`; empty = self-hosted.
69
+ */
70
+ export declare function externalRedirectProviderIssue(url: string, provider?: string): string | null;
71
+ /**
72
+ * Return why a stored target cannot be served, or `null` when it can: a
73
+ * same-site path, or an external address in its approved form. What serving
74
+ * layers call; write paths call {@link redirectTargetIssue}.
75
+ */
76
+ export declare function servableRedirectTargetIssue(target: string): string | null;
27
77
  /**
28
78
  * Return why `toPath` is not a safe same-site redirect target, or `null`
29
79
  * when it is. The message is written for the AI: it names the problem
@@ -1 +1 @@
1
- {"version":3,"file":"redirect-target.d.ts","sourceRoot":"","sources":["../src/redirect-target.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AAEH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAgBxB;;;;;;;;;GASG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAyBjE;AAED;;;;GAIG;AACH,eAAO,MAAM,wBAAwB,aAOjC,CAAC"}
1
+ {"version":3,"file":"redirect-target.d.ts","sourceRoot":"","sources":["../src/redirect-target.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AAEH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AA0BxB,mEAAmE;AACnE,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAEhE;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,2BAA2B,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CA+BtE;AAED;;;;;;GAMG;AACH,wBAAgB,yBAAyB,CACvC,GAAG,EAAE,MAAM,EACX,YAAY,EAAE,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,GACxC,MAAM,GAAG,IAAI,CAOf;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,6BAA6B,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAsB3F;AAED;;;;GAIG;AACH,wBAAgB,2BAA2B,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAIzE;AAED;;;;;;;;;GASG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAyBjE;AAED;;;;GAIG;AACH,eAAO,MAAM,wBAAwB,aAOjC,CAAC"}
@@ -1,9 +1,8 @@
1
1
  // SPDX-License-Identifier: MPL-2.0
2
2
  /**
3
- * The one validator for a redirect's TARGET (`toPath`) — issue #657.
3
+ * The validators for a redirect's TARGET (`toPath`) — issues #657, #1358.
4
4
  *
5
- * Caelo redirects only ever point at a path on the same site: the
6
- * `redirects` table has no external-URL field, and every surface that
5
+ * A routine redirect points at a path on the same site. Every surface that
7
6
  * serves the table (the admin's 404 fallback, the generator's
8
7
  * `_redirects` / `_redirects.caddy`, the per-provider emitters) writes
9
8
  * `toPath` verbatim into a `Location` header. "Starts with `/`" is not
@@ -19,10 +18,18 @@
19
18
  * URL, so `/\t/host` collapses to `//host`; the `_redirects` formats
20
19
  * are whitespace-delimited and the emitters already refuse them.
21
20
  *
22
- * Every write path (redirects.create / create_many, page delete with
23
- * `disposition: 'redirect'`, the AI tool schemas, the import composer)
24
- * and every serving path (static generator, admin 404 fallback) calls
25
- * this, so a value rejected at write time can never be served either.
21
+ * Every routine write path (redirects.create / create_many, page delete
22
+ * with `disposition: 'redirect'`, the AI tool schemas, the import composer)
23
+ * calls {@link redirectTargetIssue}, so none of them can store anything but
24
+ * a same-site path.
25
+ *
26
+ * #1358 — the one exception is an `https` address on another domain, written
27
+ * only by `redirects.execute_proposal` after an Owner's approval
28
+ * (CLAUDE.md §11.A). {@link externalRedirectTargetIssue} holds its form: one
29
+ * canonical spelling, so that what the Owner reads is exactly where a
30
+ * browser goes. Serving paths accept both kinds through
31
+ * {@link servableRedirectTargetIssue}, so a value that is neither can never
32
+ * be served.
26
33
  */
27
34
  import { z } from "zod";
28
35
  /** Max length of a stored redirect path (matches the op schemas). */
@@ -33,7 +40,122 @@ const SCHEME_PREFIX = /^([A-Za-z][A-Za-z0-9+.-]*):/;
33
40
  * `/https:/x` (slashes collapsed by a form or a CSV tool) is the same
34
41
  * mistake as `/https://x`, so these are rejected even without `//`. */
35
42
  const WEB_SCHEMES = new Set(["http", "https"]);
36
- const EXTERNAL_NOT_SUPPORTED = "Redirects can only target a path on this site (e.g. '/pricing'); external (other-domain) redirect targets are not supported. If the destination is a page on this site, pass only its path.";
43
+ const EXTERNAL_NOT_SUPPORTED = "This call only takes a path on this site (e.g. '/pricing'). A redirect to another domain needs the Owner's approval: use propose_external_redirect with the https address. If the destination is a page on this site, pass only its path.";
44
+ /** Longest external target: a URL-map `pathRedirect` holds 1024 characters. */
45
+ const EXTERNAL_REDIRECT_MAX_LENGTH = 1000;
46
+ /** Characters no serving layer can carry literally, or that hide a URL's meaning. */
47
+ const EXTERNAL_UNSAFE = /[\s\p{Cc}\\{}"`<>^|]/u;
48
+ /** A host no browser on the internet can reach, or an address instead of a name. */
49
+ const NON_PUBLIC_HOST = /^(\[.*\]|\d{1,3}(\.\d{1,3}){3}|localhost|[^.]+|.+\.(localhost|local|internal))$/i;
50
+ /** True when a stored target is a URL, not a path on this site. */
51
+ export function isExternalRedirectTarget(target) {
52
+ return target.startsWith("https://");
53
+ }
54
+ /**
55
+ * Return why `url` is not a valid external redirect target, or `null` when
56
+ * it is. Only `https`, no credentials, no port, a public host name, and the
57
+ * URL's one canonical spelling: that refuses `https://a.example/x/../y`,
58
+ * `%2e%2e` segments, an upper-case or percent-encoded host and every other
59
+ * form where the text the Owner approves differs from where a browser lands.
60
+ *
61
+ * @example
62
+ * externalRedirectTargetIssue("https://calendar.example/book") // null
63
+ * externalRedirectTargetIssue("https://our.site@evil.example/") // "... credentials ..."
64
+ * externalRedirectTargetIssue("http://calendar.example/") // "... https ..."
65
+ */
66
+ export function externalRedirectTargetIssue(url) {
67
+ const shown = JSON.stringify(url);
68
+ if (url.length > EXTERNAL_REDIRECT_MAX_LENGTH) {
69
+ return `The address is longer than ${EXTERNAL_REDIRECT_MAX_LENGTH} characters, which not every hosting can serve. Use a shorter one.`;
70
+ }
71
+ if (!url.startsWith("https://")) {
72
+ return `${shown} must be a full https address (https://example.com/page); other schemes are refused.`;
73
+ }
74
+ if (EXTERNAL_UNSAFE.test(url)) {
75
+ return `${shown} contains a space, a control character or one of \\ { } " \` < > ^ |. Percent-encode it or remove it.`;
76
+ }
77
+ let parsed;
78
+ try {
79
+ parsed = new URL(url);
80
+ }
81
+ catch {
82
+ return `${shown} is not a valid address.`;
83
+ }
84
+ if (parsed.username !== "" || parsed.password !== "") {
85
+ return `${shown} carries credentials before the host; browsers then go to what follows the '@', not to what the address seems to name. Pass the address without them.`;
86
+ }
87
+ if (parsed.port !== "") {
88
+ return `${shown} names a port, which not every hosting can serve. Use an address on the standard https port.`;
89
+ }
90
+ // A final dot is the same host to DNS, and would pass every host comparison.
91
+ if (parsed.hostname.endsWith(".") || NON_PUBLIC_HOST.test(parsed.hostname)) {
92
+ return `${shown} does not name a public host. Use a domain name; IP addresses and internal names are refused.`;
93
+ }
94
+ if (parsed.href !== url && parsed.href !== `${url}/`) {
95
+ return `${shown} is not in its plain form, so it may lead somewhere else than it reads. A browser reads it as ${parsed.href}: pass that if it is what you mean.`;
96
+ }
97
+ return null;
98
+ }
99
+ /**
100
+ * Return why an otherwise valid external `url` may not be used on this
101
+ * install: its host is one of the install's own. Compares the parsed,
102
+ * lower-cased host, which is what a browser connects to.
103
+ *
104
+ * @param installHosts lower-case host → what it is ("the Caelo admin", …).
105
+ */
106
+ export function externalRedirectHostIssue(url, installHosts) {
107
+ const host = new URL(url).hostname;
108
+ const what = installHosts.get(host);
109
+ if (what === undefined)
110
+ return null;
111
+ return what === "this site"
112
+ ? `${host} is this site. Use bulk_create_redirects with the path only.`
113
+ : `${host} is ${what}, which a redirect may not point at.`;
114
+ }
115
+ /**
116
+ * Return why `provider`'s hosting cannot serve this external target, or
117
+ * `null` when it can. Refused at the proposal, because one rule a provider
118
+ * cannot express would stop the sync of the whole table.
119
+ *
120
+ * - `gcp`: the URL map carries a host and a path. It stores a query in
121
+ * `pathRedirect`, but how the load balancer answers one is unverified, so
122
+ * it stays refused like every target with a query there.
123
+ * - `aws`, `azure`: no publisher exists yet (#749, #750). Their redirect
124
+ * writing must add this when it lands.
125
+ *
126
+ * @param provider `CAELO_PROVIDER`; empty = self-hosted.
127
+ */
128
+ export function externalRedirectProviderIssue(url, provider) {
129
+ switch (provider) {
130
+ case undefined:
131
+ case "":
132
+ case "self-hosted":
133
+ case "gcp-firebase":
134
+ return null;
135
+ case "gcp": {
136
+ // The literal characters, as the plan decides: `/book?` has an empty
137
+ // `URL.search`, and one row the emitter refuses stops the whole sync.
138
+ return !/[?#]/.test(url)
139
+ ? null
140
+ : `The GCP load balancer serves an external redirect without a query string or fragment. Use an address without '?…' and '#…', or a short link at the destination.`;
141
+ }
142
+ case "aws":
143
+ case "azure":
144
+ return `Redirects to another domain are not available on ${provider} yet: Caelo has no publisher there (https://github.com/caelo-cms/caelo-cms/issues/${provider === "aws" ? 749 : 750}).`;
145
+ default:
146
+ throw new Error(`externalRedirectProviderIssue: unknown CAELO_PROVIDER='${provider}'. Expected one of: self-hosted | gcp | gcp-firebase | aws | azure.`);
147
+ }
148
+ }
149
+ /**
150
+ * Return why a stored target cannot be served, or `null` when it can: a
151
+ * same-site path, or an external address in its approved form. What serving
152
+ * layers call; write paths call {@link redirectTargetIssue}.
153
+ */
154
+ export function servableRedirectTargetIssue(target) {
155
+ return isExternalRedirectTarget(target)
156
+ ? externalRedirectTargetIssue(target)
157
+ : redirectTargetIssue(target);
158
+ }
37
159
  /**
38
160
  * Return why `toPath` is not a safe same-site redirect target, or `null`
39
161
  * when it is. The message is written for the AI: it names the problem
@@ -1 +1 @@
1
- {"version":3,"file":"redirect-target.js","sourceRoot":"","sources":["../src/redirect-target.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"redirect-target.js","sourceRoot":"","sources":["../src/redirect-target.ts"],"names":[],"mappings":"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"}
package/dist/seo.d.ts CHANGED
@@ -71,6 +71,27 @@ export declare const siteSeoProposalInputSchema: z.ZodObject<{
71
71
  }, z.core.$strict>>;
72
72
  }, z.core.$strict>;
73
73
  export type SiteSeoProposalInput = z.infer<typeof siteSeoProposalInputSchema>;
74
+ /** Where a page's social-share image comes from (#1452). */
75
+ export declare const SHARE_IMAGE_SOURCES: readonly ["page", "language", "site", "none"];
76
+ export type ShareImageSource = (typeof SHARE_IMAGE_SOURCES)[number];
77
+ /**
78
+ * Which image a page's `og:image` shows (#1452). Its own image always wins,
79
+ * then the default of its language (a plugin's answer), then the site
80
+ * default (the active theme's `socialShare` slot). The defaults are stored
81
+ * data the Owner set, read at render time: nothing is copied onto the page,
82
+ * so a page's stored SEO never changes because a default did.
83
+ *
84
+ * @returns the asset to render and where it came from; `none` when no level
85
+ * holds an image, and the page then ships without `og:image`.
86
+ */
87
+ export declare function pickShareImage(levels: {
88
+ readonly page: string | null;
89
+ readonly language: string | null;
90
+ readonly site: string | null;
91
+ }): {
92
+ readonly source: ShareImageSource;
93
+ readonly assetId: string | null;
94
+ };
74
95
  /** Result of {@link checkPublicSiteBaseUrl}. */
75
96
  export type PublicSiteBaseUrlCheck = {
76
97
  ok: true;
package/dist/seo.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"seo.d.ts","sourceRoot":"","sources":["../src/seo.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"seo.d.ts","sourceRoot":"","sources":["../src/seo.ts"],"names":[],"mappings":"AAEA;;;;;GAKG;AAEH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAIxB,eAAO,MAAM,iBAAiB,gFAQpB,CAAC;AACX,MAAM,MAAM,UAAU,GAAG,CAAC,OAAO,iBAAiB,CAAC,CAAC,MAAM,CAAC,CAAC;AAE5D,6EAA6E;AAC7E,eAAO,MAAM,yBAAyB,KAAK,CAAC;AAC5C,eAAO,MAAM,+BAA+B,MAAM,CAAC;AAEnD,eAAO,MAAM,wBAAwB,MAAM,CAAC;AAC5C,eAAO,MAAM,iBAAiB,OAAO,CAAC;AAEtC,eAAO,MAAM,iBAAiB;;;;;;;;;;;;;;;;kBAUnB,CAAC;AACZ,MAAM,MAAM,WAAW,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAC;AAE5D,eAAO,MAAM,sBAAsB;;;;kBASxB,CAAC;AACZ,MAAM,MAAM,gBAAgB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,sBAAsB,CAAC,CAAC;AAEtE,eAAO,MAAM,sBAAsB;;;;;kBAQxB,CAAC;AACZ,MAAM,MAAM,gBAAgB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,sBAAsB,CAAC,CAAC;AAYtE,eAAO,MAAM,6BAA6B;;;;;;;;;kBAU/B,CAAC;AACZ,MAAM,MAAM,uBAAuB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,6BAA6B,CAAC,CAAC;AAEpF;;;;;GAKG;AACH,eAAO,MAAM,0BAA0B;;;;;;;;;kBAapC,CAAC;AACJ,MAAM,MAAM,oBAAoB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,0BAA0B,CAAC,CAAC;AAE9E,4DAA4D;AAC5D,eAAO,MAAM,mBAAmB,+CAAgD,CAAC;AACjF,MAAM,MAAM,gBAAgB,GAAG,CAAC,OAAO,mBAAmB,CAAC,CAAC,MAAM,CAAC,CAAC;AAEpE;;;;;;;;;GASG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE;IACrC,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;CAC9B,GAAG;IAAE,QAAQ,CAAC,MAAM,EAAE,gBAAgB,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAKzE;AAED,gDAAgD;AAChD,MAAM,MAAM,sBAAsB,GAAG;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;AAOhG;;;;;;;;;;;;;GAaG;AACH,wBAAgB,sBAAsB,CACpC,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,MAAM,GAAG,SAAS,GAC3B,sBAAsB,CAyCxB;AAED,MAAM,WAAW,UAAU;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,eAAe,EAAE,MAAM,CAAC;IACxB,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,EAAE,UAAU,CAAC;IACvB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,eAAe;IAC9B,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,OAAO,CAAC;IACxB;;4EAEwE;IACxE,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE;QACZ,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,GAAG,CAAC,EAAE,MAAM,CAAC;QACb,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;KACnB,CAAC;CACH;AAED;;;;GAIG;AACH,eAAO,MAAM,eAAe,wCAAyC,CAAC;AACtE,MAAM,MAAM,YAAY,GAAG,CAAC,OAAO,eAAe,CAAC,CAAC,MAAM,CAAC,CAAC;AAE5D;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE;IACxC,WAAW,EAAE,MAAM,CAAC;IACpB;iCAC6B;IAC7B,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB;qEACiE;IACjE,YAAY,EAAE,YAAY,CAAC;IAC3B;qEACiE;IACjE,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACtB,GAAG,MAAM,CAST;AAED,MAAM,WAAW,YAAY;IAC3B,KAAK,EAAE,MAAM,CAAC;IACd,eAAe,EAAE,MAAM,CAAC;IACxB;;;;;OAKG;IACH,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,YAAY,EAAE,eAAe,CAAC,cAAc,CAAC,CAAC;IAC9C;;;;;OAKG;IACH,WAAW,CAAC,EAAE,SAAS,oBAAoB,EAAE,GAAG,IAAI,CAAC;CACtD;AAED,8EAA8E;AAC9E,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;CACtB;AAED;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,SAAS,MAAM,EAAE,GAAG,IAAI,EAC/B,MAAM,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,oBAAoB,GAAG,IAAI,GACtD,oBAAoB,EAAE,CAQxB;AAED;;;;;;;;GAQG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,YAAY,GAAG,MAAM,CAsEzD;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,CAazE"}
package/dist/seo.js CHANGED
@@ -88,6 +88,27 @@ export const siteSeoProposalInputSchema = z
88
88
  .refine((v) => v.siteBaseUrl !== undefined ||
89
89
  v.sitemapEnabled !== undefined ||
90
90
  v.organizationJson !== undefined, "pass at least one of `siteBaseUrl`, `sitemapEnabled`, `organizationJson`");
91
+ /** Where a page's social-share image comes from (#1452). */
92
+ export const SHARE_IMAGE_SOURCES = ["page", "language", "site", "none"];
93
+ /**
94
+ * Which image a page's `og:image` shows (#1452). Its own image always wins,
95
+ * then the default of its language (a plugin's answer), then the site
96
+ * default (the active theme's `socialShare` slot). The defaults are stored
97
+ * data the Owner set, read at render time: nothing is copied onto the page,
98
+ * so a page's stored SEO never changes because a default did.
99
+ *
100
+ * @returns the asset to render and where it came from; `none` when no level
101
+ * holds an image, and the page then ships without `og:image`.
102
+ */
103
+ export function pickShareImage(levels) {
104
+ if (levels.page !== null)
105
+ return { source: "page", assetId: levels.page };
106
+ if (levels.language !== null)
107
+ return { source: "language", assetId: levels.language };
108
+ if (levels.site !== null)
109
+ return { source: "site", assetId: levels.site };
110
+ return { source: "none", assetId: null };
111
+ }
91
112
  const LOOPBACK_HOST = /^(localhost|.+\.localhost|127(\.\d{1,3}){3}|\[::1\])$/i;
92
113
  /** Wildcard bind addresses: a server listens on them, no browser can visit them. */
93
114
  const WILDCARD_HOST = /^(0\.0\.0\.0|\[::\])$/;