fix: include static s3 loader

Author: tripodsan

.npmignore

@@ -1,20 +1,10 @@
-*.tgz
-.circleci/
-.eslintignore
-.eslintrc.js
-.github/
-.idea
-.jsdoc.json
-.nyc_output/
-.releaserc.js
-.renovaterc.json
-.snyk
-.tidelift.yml
+.*
 build
 coverage
 junit
 logs
 node_modules/
 snykmocha.js
-test
+test/*
 test-results.xml
+!test/StaticS3Loader.js

src/html-pipe.js

@@ -33,6 +33,7 @@ import splitSections from './steps/split-sections.js';
 import tohtml from './steps/stringify-response.js';
 import { PipelineStatusError } from './PipelineStatusError.js';
 import { PipelineResponse } from './PipelineResponse.js';
+import { validatePathInfo } from './utils/path.js';
 
 /**
  * Runs the default pipeline and returns the response.
@@ -43,6 +44,15 @@ import { PipelineResponse } from './PipelineResponse.js';
 export async function htmlPipe(state, req) {
   const { log } = state;
 
+  if (!validatePathInfo(state.info)) {
+    return new PipelineResponse('', {
+      status: 404,
+      headers: {
+        'x-error': 'invalid path',
+      },
+    });
+  }
+
   /** @type PipelineResponse */
   const res = new PipelineResponse();
 

src/steps/fetch-content.js

@@ -26,7 +26,7 @@ export default async function fetchContent(state, req, res) {
 
   const isCode = state.content.sourceBus === 'code';
   const key = isCode
-    ? `${owner}/${repo}/${ref}/${info.resourcePath}`
+    ? `${owner}/${repo}/${ref}${info.resourcePath}`
     : `${contentBusId}/${partition}${info.resourcePath}`;
   const bucketId = isCode ? 'helix-code-bus' : 'helix-content-bus';
 
@@ -55,12 +55,12 @@ export default async function fetchContent(state, req, res) {
     // (https://github.com/adobe/helix-pipeline-service/issues/290)
     if (state.info.originalFilename === 'index') {
       res.status = 404;
-      res.error = `request to ${info.path} not allowed (no-index).`;
+      res.error = `request to ${info.resourcePath} not allowed (no-index).`;
     }
   } else {
     // keep 404, but propagate others as 502
     res.status = ret.status === 404 ? 404 : 502;
-    res.error = `failed to load ${info.path} from ${state.content.sourceBus}-bus: ${ret.status}`;
+    res.error = `failed to load ${info.resourcePath} from ${state.content.sourceBus}-bus: ${ret.status}`;
   }
 
   if (res.status === 404) {

src/steps/folder-mapping.js

@@ -53,9 +53,9 @@ export default function folderMapping(state) {
       // special case: use code-bus
       state.content.sourceBus = 'code';
       state.info.resourcePath = mapped;
-      state.log.info(`mapped ${path} to ${state.info.resourcePath} (${state.content.sourceBus}-bus)`);
+      state.log.info(`mapped ${path} to ${state.info.resourcePath} (code-bus)`);
     } else {
-      state.log.info(`mapped ${path} to ${state.info.path} (${state.content.sourceBus}-bus)`);
+      state.log.info(`mapped ${path} to ${state.info.path} (content-bus)`);
     }
   }
 }

test/html-pipe.test.js

@@ -14,18 +14,27 @@
 import assert from 'assert';
 import esmock from 'esmock';
 import { FileS3Loader } from './FileS3Loader.js';
-import { PipelineRequest, PipelineState } from '../src/index.js';
+import { htmlPipe, PipelineRequest, PipelineState } from '../src/index.js';
 
 describe('Index Tests', () => {
+  it('responds with 404 for invalid path', async () => {
+    const resp = await htmlPipe(
+      new PipelineState({ path: '/foo.hidden.html' }),
+      new PipelineRequest(new URL('https://www.hlx.live/')),
+    );
+    assert.strictEqual(resp.status, 404);
+    assert.strictEqual(resp.headers.get('x-error'), 'invalid path');
+  });
+
   it('responds with 500 for pipeline errors', async () => {
     /** @type htmlPipe */
-    const { htmlPipe } = await esmock('../src/html-pipe.js', {
+    const { htmlPipe: mockPipe } = await esmock('../src/html-pipe.js', {
       '../src/steps/fetch-config.js': () => {
         throw Error('kaputt');
       },
     });
 
-    const resp = await htmlPipe(
+    const resp = await mockPipe(
       new PipelineState({ s3Loader: new FileS3Loader() }),
       new PipelineRequest(new URL('https://www.hlx.live/')),
     );

test/rendering.test.js

@@ -272,7 +272,7 @@ describe('Rendering', () => {
         'content-type': 'text/html; charset=utf-8',
         'last-modified': 'Wed, 12 Oct 2009 17:50:00 GMT',
         'x-surrogate-key': 'super-test--helix-pages--adobe_404',
-        'x-error': 'failed to load /not-found-with-handler from content-bus: 404',
+        'x-error': 'failed to load /not-found-with-handler.md from content-bus: 404',
       });
     });
 

test/steps/fetch-content.test.js

@@ -37,6 +37,6 @@ describe('Fetch Content', () => {
 
     await fetchContent(state, {}, res);
     assert.strictEqual(res.status, 502);
-    assert.strictEqual(res.error, 'failed to load undefined from undefined-bus: 500');
+    assert.strictEqual(res.error, 'failed to load /index.md from undefined-bus: 500');
   });
 });