@adobe/helix-config 3.11.1 → 3.13.0

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+# [3.13.0](https://github.com/adobe/helix-config/compare/v3.12.0...v3.13.0) (2024-08-13)
+
+
+### Features
+
+* support content overlay in content schema ([bb45473](https://github.com/adobe/helix-config/commit/bb454730c20a882a9541f5e73a6b05d59391d250))
+
+# [3.12.0](https://github.com/adobe/helix-config/compare/v3.11.1...v3.12.0) (2024-07-31)
+
+
+### Features
+
+* enforce original-site for admin config ([#157](https://github.com/adobe/helix-config/issues/157)) ([366328f](https://github.com/adobe/helix-config/commit/366328f8a918341d61239b7d32205eea1fa09f02))
+
 ## [3.11.1](https://github.com/adobe/helix-config/compare/v3.11.0...v3.11.1) (2024-07-29)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-config",
-  "version": "3.11.1",
+  "version": "3.13.0",
   "description": "Helix Config",
   "main": "src/index.js",
   "types": "src/index.d.ts",
@@ -44,11 +44,11 @@
     "ajv-cli": "5.0.0",
     "c8": "10.1.2",
     "eslint": "8.57.0",
-    "husky": "9.1.3",
+    "husky": "9.1.4",
     "json-schema-to-typescript": "15.0.0",
-    "junit-report-builder": "3.2.1",
-    "lint-staged": "15.2.7",
-    "mocha": "10.7.0",
+    "junit-report-builder": "5.0.0",
+    "lint-staged": "15.2.8",
+    "mocha": "10.7.3",
     "mocha-multi-reporters": "1.5.1",
     "mocha-suppress-logs": "0.5.1",
     "nock": "13.5.4",

package/src/config-view.js

@@ -185,6 +185,23 @@ async function loadMetadata(ctx, config, partition) {
   };
 }
 
+/**
+ * loads the original site information from the `.hlx.json` file
+ * @param ctx the context
+ * @param contentBusId the content bus id
+ * @returns {Promise<string>} the original site.
+ */
+async function fetchOriginalSite(ctx, contentBusId) {
+  const key = `${contentBusId}/.hlx.json`;
+  const res = await ctx.loader.getObject(HELIX_CONTENT_BUS, key);
+  if (res.body) {
+    const json = res.json();
+    return json['original-site'] || json['original-repository'] || '';
+  }
+  ctx.log.error(`failed to load ${key}: ${res.status}`);
+  return '';
+}
+
 async function loadHeadHtml(ctx, config, ref) {
   const key = `${config.code.owner}/${config.code.repo}/${ref}/head.html`;
   const res = await ctx.loader.getObject(HELIX_CODE_BUS, key);
@@ -387,6 +404,24 @@ export async function getConfigResponse(ctx, opts) {
       },
     });
   }
+  // validate original-site
+  if (!config.legacy) {
+    const originalSite = await fetchOriginalSite(ctx, config.content.contentBusId);
+    if (originalSite && originalSite !== `${org}/${site}`) {
+      ctx.log.error(`original site ${originalSite} does not match requested ${org}/${site}.`);
+      if (scope === SCOPE_ADMIN) {
+        return new PipelineResponse('', {
+          status: 403,
+          headers: {
+            'x-error': 'original site mismatch',
+            ...surrogateHeaders,
+          },
+        });
+      }
+      // todo: also send 403 for all scopes....but first observe only
+    }
+  }
+
   if (config.extends && scope !== SCOPE_RAW) {
     delete config.extends;
   }

package/src/schemas/content.schema.json

@@ -15,6 +15,11 @@
         { "$ref": "https://ns.adobe.com/helix/config/content-source/onedrive" },
         { "$ref": "https://ns.adobe.com/helix/config/content-source/markup" }
       ]
+    },
+    "overlay": {
+      "oneOf": [
+        { "$ref": "https://ns.adobe.com/helix/config/content-source/markup" }
+      ]
     }
   },
   "required": [