Merge branch 'main' into postdeploy

Author: kptdobe

CHANGELOG.md

@@ -1,3 +1,17 @@
+## [1.0.2](https://github.com/adobe/da-admin/compare/v1.0.1...v1.0.2) (2025-12-15)
+
+
+### Bug Fixes
+
+* exception when no path ([#223](https://github.com/adobe/da-admin/issues/223)) ([cb97c95](https://github.com/adobe/da-admin/commit/cb97c95c87ef019448b18c56b358aa27e0d31f73))
+
+## [1.0.1](https://github.com/adobe/da-admin/compare/v1.0.0...v1.0.1) (2025-12-10)
+
+
+### Bug Fixes
+
+* capture failing version requests ([#220](https://github.com/adobe/da-admin/issues/220)) ([729c8f5](https://github.com/adobe/da-admin/commit/729c8f5cc85573cd0dd2f761eb6ab8d471a820cb))
+
 # 1.0.0 (2025-12-04)
 
 

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "da-admin",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "",
   "main": "index.js",
   "type": "module",
@@ -51,6 +51,7 @@
     "*.cjs": "eslint"
   },
   "dependencies": {
+    "@adobe/helix-shared-process-queue": "3.1.3",
     "@aws-sdk/client-s3": "3.726.1",
     "@aws-sdk/s3-request-presigner": "^3.468.0",
     "@cloudflare/workers-types": "4.20251205.0",

package.json

@@ -9,21 +9,36 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
+import processQueue from '@adobe/helix-shared-process-queue';
 import getObject from '../object/get.js';
 import listObjects from '../object/list.js';
 
+const MAX_VERSIONS = 500;
+const CONCURRENCY = 50;
+
 export async function listObjectVersions(env, { bucket, org, key }) {
   const current = await getObject(env, { bucket, org, key }, true);
   if (current.status === 404 || !current.metadata.id) {
     return 404;
   }
-  const resp = await listObjects(env, { bucket, org, key: `.da-versions/${current.metadata.id}` }, 500);
-  const promises = await Promise.all(JSON.parse(resp.body).map(async (entry) => {
+  const resp = await listObjects(env, { bucket, org, key: `.da-versions/${current.metadata.id}` }, MAX_VERSIONS);
+  if (resp.status !== 200) {
+    return resp;
+  }
+  const list = JSON.parse(resp.body);
+
+  const versions = await processQueue(list, async (entry) => {
     const entryResp = await getObject(env, {
       bucket,
       org,
       key: `.da-versions/${current.metadata.id}/${entry.name}.${entry.ext}`,
     }, true);
+
+    if (entryResp.status !== 200 || !entryResp.metadata) {
+      // Some requests might fail for unknown reasons (system busy, etc.)
+      return undefined;
+    }
+
     const timestamp = parseInt(entryResp.metadata.timestamp || '0', 10);
     const users = JSON.parse(entryResp.metadata.users || '[{"email":"anonymous"}]');
     const { label, path } = entryResp.metadata;
@@ -38,11 +53,14 @@ export async function listObjectVersions(env, { bucket, org, key }) {
       };
     }
     return { users, timestamp, path };
-  }));
+  }, CONCURRENCY);
+
+  // Filter out undefined entries (failed requests)
+  const filteredVersions = versions.filter((version) => version !== undefined);
 
   return {
     status: resp.status,
     contentType: resp.contentType,
-    body: JSON.stringify(promises),
+    body: JSON.stringify(filteredVersions),
   };
 }

src/storage/version/list.js

@@ -372,6 +372,7 @@ export function getChildRules(daCtx) {
 }
 
 export function hasPermission(daCtx, path, action, keywordPath = false) {
+  if (path === null || path === undefined) return false;
   if (daCtx.aclCtx.pathLookup.size === 0) {
     return true;
   }

src/utils/auth.js

@@ -155,59 +155,4 @@ describe('Conditional Headers End-to-End', () => {
     // Should have CORS headers even for error responses
     assert.strictEqual(resp.headers.get('Access-Control-Allow-Origin'), '*');
   });
-
-  it('versionsource GET with conditionals works correctly', async () => {
-    const etag = '"version-etag"';
-    s3Mock
-      .on(GetObjectCommand)
-      .rejects({ $metadata: { httpStatusCode: 304 }, ETag: etag });
-
-    const versionHandler = await esmock(
-      '../../src/index.js',
-      {
-        '../../src/utils/daCtx.js': {
-          default: async (req) => ({
-            path: '/versionsource/org/doc-id/version-id.html',
-            api: 'versionsource',
-            bucket: 'test-bucket',
-            org: 'org',
-            key: 'doc-id/version-id.html',
-            ext: 'html',
-            users: [{ email: '[email protected]' }],
-            authorized: true,
-            conditionalHeaders: {
-              ifMatch: req.headers?.get('if-match') || null,
-              ifNoneMatch: req.headers?.get('if-none-match') || null,
-            },
-            aclCtx: {
-              actionSet: new Set(['read']),
-              pathLookup: new Map(),
-            },
-            method: req.method,
-          }),
-        },
-        '../../src/storage/utils/object.js': {
-          invalidateCollab: async () => {},
-        },
-      },
-    );
-
-    const req = {
-      method: 'GET',
-      url: 'http://localhost:8787/versionsource/org/doc-id/version-id.html',
-      headers: {
-        get: (name) => {
-          if (name === 'if-none-match') return etag;
-          return null;
-        },
-      },
-    };
-
-    const env = { AEM_BUCKET_NAME: 'test-bucket' };
-    const resp = await versionHandler.default.fetch(req, env);
-
-    // Versionsource should support conditionals
-    assert.strictEqual(resp.status, 304);
-    assert.strictEqual(resp.headers.get('ETag'), etag);
-  });
 });

test/integration/conditional-e2e.test.js

@@ -26,7 +26,7 @@ describe('Source Route', () => {
       DA_COLLAB: 'http://localhost:4444',
     };
 
-    const daCtx = { aclCtx: { pathLookup: new Map() } };
+    const daCtx = { key: '/somedoc.html', aclCtx: { pathLookup: new Map() } };
     const putResp = async (e, c) => {
       if (e === env && c === daCtx) {
         return { status: 200 };
@@ -76,7 +76,7 @@ describe('Source Route', () => {
       };
 
       const env = { DA_COLLAB: 'http://localhost:1234' };
-      const daCtx = { aclCtx: { pathLookup: new Map() } };
+      const daCtx = { key: '/a/b/mydoc.html', aclCtx: { pathLookup: new Map() } };
 
       const resp = await postSource({ req, env, daCtx });
       assert.equal(201, resp.status);
@@ -109,7 +109,7 @@ describe('Source Route', () => {
       };
 
       const env = { DA_COLLAB: 'http://localhost:1234' };
-      const daCtx = { aclCtx: { pathLookup: new Map() } };
+      const daCtx = { key: '/a/b/mydoc.html', aclCtx: { pathLookup: new Map() } };
 
       const resp = await postSource({ req, env, daCtx });
       assert.equal(500, resp.status);
@@ -121,7 +121,7 @@ describe('Source Route', () => {
 
   it('Test getSource', async () => {
     const env = {};
-    const daCtx = { aclCtx: { pathLookup: new Map() } };
+    const daCtx = { key: '/test.html', aclCtx: { pathLookup: new Map() } };
 
     const called = [];
     const getResp = async (e, c) => {
@@ -143,7 +143,7 @@ describe('Source Route', () => {
 
   it('Test getSource with 204', async () => {
     const env = {};
-    const daCtx = { aclCtx: { pathLookup: new Map() } };
+    const daCtx = { key: '/test.html', aclCtx: { pathLookup: new Map() } };
 
     const deleteResp = async (e, c) => {
       if (e === env && c === daCtx) {