Merge pull request #262 from bcgov/child-bucket

allow forward slashes in child bucket sub-path
bcgov · May 29, 2024 · 3154930 · 3154930
2 parents 5b74516 + 9f7d1d4
commit 3154930
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 21 deletions.
diff --git a/app/src/controllers/invite.js b/app/src/controllers/invite.js
@@ -31,8 +31,8 @@ const controller = {
     let resource, type;
 
     try {
-      // Reject if expiresAt is more than 7 days away
-      const maxExpiresAt = Math.floor(Date.now() / 1000) + 691199;
+      // Reject if expiresAt is more than 30 days away
+      const maxExpiresAt = Math.floor(Date.now() / 1000) + 2592000;
       if (req.body.expiresAt && req.body.expiresAt > maxExpiresAt) {
         const limit = new Date(maxExpiresAt * 1000).toISOString();
         const msg = `"expiresAt" must be less than "${limit}"`;

diff --git a/app/src/docs/v1.api-spec.yaml b/app/src/docs/v1.api-spec.yaml
@@ -2411,9 +2411,9 @@ components:
               example: Geospatial Maps
             subKey:
               type: string
-              description: The desired S3 child directory name. Must not include `/`.
+              description: a path relative to the parent bucket to the 'directory' you are mounting
               maxLength: 255
-              example: child
+              example: canada/bc/maps
     Request-CreateInvite:
       title: Request Create Invite
       type: object
@@ -2437,7 +2437,7 @@ components:
           type: integer
           description: >-
             Optional desired unix epoch time for when this invitation should
-            expire. Defaults to 24 hours from now if unspecified.
+            expire. Defaults to 24 hours from now if unspecified. Maximum of 30 days from now.
           example: 1710000000
         objectId:
           type: string

diff --git a/app/src/validators/bucket.js b/app/src/validators/bucket.js
@@ -20,7 +20,7 @@ const schema = {
   createBucketChild: {
     body: Joi.object().keys({
       bucketName: Joi.string().max(255).required(),
-      subKey: Joi.string().max(255).trim().strict().pattern(/^[^/]+$/).required()
+      subKey: Joi.string().max(255).trim().strict().required()
     }).required(),
     params: Joi.object({
       bucketId: type.uuidv4

diff --git a/app/tests/unit/validators/bucket.spec.js b/app/tests/unit/validators/bucket.spec.js
@@ -157,7 +157,7 @@ describe('createBucketChild', () => {
 
       it('trims whitespace', () => {
         expect(Array.isArray(subKey.rules)).toBeTruthy();
-        expect(subKey.rules).toHaveLength(3);
+        expect(subKey.rules).toHaveLength(2);
         expect(subKey.rules).toEqual(expect.arrayContaining([
           expect.objectContaining({
             args: {
@@ -170,7 +170,7 @@ describe('createBucketChild', () => {
 
       it('has a max length of 255', () => {
         expect(Array.isArray(subKey.rules)).toBeTruthy();
-        expect(subKey.rules).toHaveLength(3);
+        expect(subKey.rules).toHaveLength(2);
         expect(subKey.rules).toEqual(expect.arrayContaining([
           expect.objectContaining({
             args: {
@@ -181,19 +181,6 @@ describe('createBucketChild', () => {
         ]));
       });
 
-      it('has a regex', () => {
-        expect(Array.isArray(subKey.rules)).toBeTruthy();
-        expect(subKey.rules).toHaveLength(3);
-        expect(subKey.rules).toEqual(expect.arrayContaining([
-          expect.objectContaining({
-            args: {
-              regex: '/^[^/]+$/'
-            },
-            name: 'pattern'
-          }),
-        ]));
-      });
-
       it('is strict', () => {
         expect(subKey.preferences).toBeTruthy();
         expect(subKey.preferences.convert).toBeFalsy();