@adobe/helix-html-pipeline 4.1.1 → 4.1.3

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [4.1.3](https://github.com/adobe/helix-html-pipeline/compare/v4.1.2...v4.1.3) (2023-08-04)
+
+
+### Bug Fixes
+
+* respond with 401 for invalid auth config ([#375](https://github.com/adobe/helix-html-pipeline/issues/375)) ([84db035](https://github.com/adobe/helix-html-pipeline/commit/84db035f00d648d4daac99249978a6fb4d3d83f0)), closes [#374](https://github.com/adobe/helix-html-pipeline/issues/374)
+
+## [4.1.2](https://github.com/adobe/helix-html-pipeline/compare/v4.1.1...v4.1.2) (2023-08-02)
+
+
+### Bug Fixes
+
+* remove legacy loading of metadata.json ([#373](https://github.com/adobe/helix-html-pipeline/issues/373)) ([90b665f](https://github.com/adobe/helix-html-pipeline/commit/90b665f18128a7924b32ea3526ccb24342a09a41))
+
 ## [4.1.1](https://github.com/adobe/helix-html-pipeline/compare/v4.1.0...v4.1.1) (2023-07-27)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-html-pipeline",
-  "version": "4.1.1",
+  "version": "4.1.3",
   "description": "Helix HTML Pipeline",
   "main": "src/index.js",
   "types": "src/index.d.ts",
@@ -72,12 +72,12 @@
     "@semantic-release/changelog": "6.0.3",
     "@semantic-release/git": "10.0.1",
     "@semantic-release/npm": "10.0.4",
-    "c8": "8.0.0",
-    "eslint": "8.45.0",
+    "c8": "8.0.1",
+    "eslint": "8.46.0",
     "eslint-import-resolver-exports": "1.0.0-beta.5",
     "eslint-plugin-header": "3.1.1",
-    "eslint-plugin-import": "2.27.5",
-    "esmock": "2.3.2",
+    "eslint-plugin-import": "2.28.0",
+    "esmock": "2.3.5",
     "husky": "8.0.3",
     "js-yaml": "4.1.0",
     "jsdom": "22.1.0",

package/src/steps/fetch-config-all.js

@@ -12,60 +12,9 @@
 
 import { PipelineStatusError } from '../PipelineStatusError.js';
 import { extractLastModified, updateLastModified } from '../utils/last-modified.js';
-import { ALLOWED_RESPONSE_HEADERS, globToRegExp, Modifiers } from '../utils/modifiers.js';
+import { globToRegExp, Modifiers } from '../utils/modifiers.js';
 import { getOriginalHost } from './utils.js';
 
-/**
- * Loads the metadata.json from the content-bus and stores it in `state.metadata` and
- * `state.headers` in modifier form.
- * this is to be backward compatible and can be removed in the future.
- *
- * @type PipelineStep
- * @param {PipelineState} state
- * @param {PipelineRequest} req
- * @param {PipelineResponse} res
- * @returns {Promise<void>}
- */
-async function fetchMetadata(state, req, res) {
-  const { contentBusId, partition } = state;
-  const key = `${contentBusId}/${partition}/metadata.json`;
-  const ret = await state.s3Loader.getObject('helix-content-bus', key);
-  if (ret.status === 200) {
-    let json;
-    try {
-      json = JSON.parse(ret.body);
-    } catch (e) {
-      throw new PipelineStatusError(500, `failed parsing of /metadata.json: ${e.message}`);
-    }
-
-    const { data } = json.default ?? json;
-    if (!Array.isArray(data)) {
-      throw new PipelineStatusError(500, 'failed loading of /metadata.json: data must be an array');
-    }
-
-    state.metadata = Modifiers.fromModifierSheet(
-      data,
-      (name) => !ALLOWED_RESPONSE_HEADERS.includes(name),
-    );
-    state.headers = Modifiers.fromModifierSheet(
-      data,
-      (name) => ALLOWED_RESPONSE_HEADERS.includes(name),
-    );
-
-    if (state.type === 'html' && state.info.selector !== 'plain') {
-      // also update last-modified (only for extensionless html pipeline)
-      updateLastModified(state, res, extractLastModified(ret.headers));
-    }
-    return;
-  }
-
-  if (ret.status !== 404) {
-    throw new PipelineStatusError(502, `failed to load /metadata.json: ${ret.status}`);
-  }
-
-  // ignore 404
-}
-
 /**
  * Computes the routes from the given config value.
  * @param {string|string[]|undefined} value
@@ -129,11 +78,12 @@ export default async function fetchConfigAll(state, req, res) {
     // set custom preview and live hosts
     state.previewHost = replaceParams(state.config.cdn?.preview?.host, state);
     state.liveHost = replaceParams(state.config.cdn?.live?.host, state);
-  } else if (ret.status !== 404) {
-    throw new PipelineStatusError(502, `failed to load /.helix/config-all.json: ${ret.status}`);
+  } else if (ret.status === 404) {
+    state.config = {};
+    state.metadata = new Modifiers({});
+    state.headers = new Modifiers({});
   } else {
-    // fallback to old metadata loading
-    await fetchMetadata(state, req, res);
+    throw new PipelineStatusError(502, `failed to load /.helix/config-all.json: ${ret.status}`);
   }
 
   // compute host and routes

package/src/utils/auth.js

@@ -221,7 +221,7 @@ export class AuthInfo {
     const { clientId, clientSecret } = idp.client(state);
     if (!clientId || !clientSecret) {
       log.error('[auth] unable to create login redirect: missing client_id or client_secret');
-      res.status = 500;
+      res.status = 401;
       res.error = 'invalid auth config.';
       return;
     }