feat: improve xfh parsing (adobe#594)

fixes adobe#592

Author: tripodsan

.github/workflows/main.yaml

@@ -16,6 +16,7 @@ jobs:
         with:
           node-version: '20.x'
       - run: npm ci
+      - run: npm run lint
       - run: npm test
       - uses: codecov/codecov-action@v4
         with:
@@ -25,12 +26,13 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           NPM_TOKEN: ${{ secrets.ADOBE_BOT_NPM_TOKEN }}
+          CORALOGIX_TAGGER_API_KEY: ${{ secrets.CORALOGIX_TAGGER_API_KEY }}
 
   release:
     name: Release
     runs-on: ubuntu-latest
     needs: test
-    if: github.ref == 'refs/heads/main'
+    if: github.ref == 'refs/heads/5.x' || github.ref == 'refs/heads/main'
     steps:
       - uses: actions/checkout@v4
       - name: Use Node.js 20.x

src/steps/utils.js

@@ -24,7 +24,13 @@ const HELIX_URL_REGEXP = /^https:\/\/(?!admin\.|www\.)[^.]+\.(aem|hlx3?)\.(live|
 export function getOriginalHost(headers) {
   const xfh = headers.get('x-forwarded-host');
   if (xfh) {
-    return xfh.split(',')[0].trim();
+    const segs = xfh.split(',');
+    for (const seg of segs) {
+      const host = seg.trim();
+      if (host) {
+        return host;
+      }
+    }
   }
   return headers.get('host');
 }

test/steps/utils.test.js

@@ -93,6 +93,22 @@ describe('Get Original Host', () => {
     ]);
     assert.strictEqual(getOriginalHost(headers), 'spark.adobe.com');
   });
+
+  it('get correct host for multiple plain xfwd header if first segment is empty', () => {
+    const headers = new Map([
+      ['host', 'blog.adobe.com'],
+      ['x-forwarded-host', '  , spark.adobe.com, cdn1.hlx.page'],
+    ]);
+    assert.strictEqual(getOriginalHost(headers), 'spark.adobe.com');
+  });
+
+  it('get correct host for multiple plain xfwd header if all segments are empty', () => {
+    const headers = new Map([
+      ['host', 'blog.adobe.com'],
+      ['x-forwarded-host', '  ,  ,'],
+    ]);
+    assert.strictEqual(getOriginalHost(headers), 'blog.adobe.com');
+  });
 });
 
 describe('Rewrite URLs test', () => {