fix: max expiration gets ignored if expiration is set to "never"

stonith404 · Nov 17, 2023 · 330eef5 · 330eef5
1 parent 2e1a2b6
commit 330eef5
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 7 deletions.
diff --git a/backend/src/share/guard/shareOwner.guard.ts b/backend/src/share/guard/shareOwner.guard.ts
@@ -19,7 +19,6 @@ export class ShareOwnerGuard extends JwtGuard {
   }
 
   async canActivate(context: ExecutionContext) {
-
     const request: Request = context.switchToHttp().getRequest();
     const shareId = Object.prototype.hasOwnProperty.call(
       request.params,

diff --git a/backend/src/share/share.service.ts b/backend/src/share/share.service.ts
@@ -54,10 +54,15 @@ export class ShareService {
     } else {
       const parsedExpiration = parseRelativeDateToAbsolute(share.expiration);
 
+      const expiresNever = moment(0).toDate() == parsedExpiration;
+
       if (
         this.config.get("share.maxExpiration") !== 0 &&
-        parsedExpiration >
-          moment().add(this.config.get("share.maxExpiration"), "hours").toDate()
+        (expiresNever ||
+          parsedExpiration >
+            moment()
+              .add(this.config.get("share.maxExpiration"), "hours")
+              .toDate())
       ) {
         throw new BadRequestException(
           "Expiration date exceeds maximum expiration date",

diff --git a/frontend/src/components/account/showShareInformationsModal.tsx b/frontend/src/components/account/showShareInformationsModal.tsx
@@ -12,7 +12,7 @@ const showShareInformationsModal = (
   modals: ModalsContextProps,
   share: MyShare,
   appUrl: string,
-  maxShareSize: number
+  maxShareSize: number,
 ) => {
   const t = translateOutsideContext();
   const link = `${appUrl}/s/${share.id}`;

diff --git a/frontend/src/components/upload/modals/showCreateUploadModal.tsx b/frontend/src/components/upload/modals/showCreateUploadModal.tsx
@@ -125,11 +125,13 @@ const CreateUploadModalBody = ({
           "",
         ) as moment.unitOfTime.DurationConstructor,
       );
+
       if (
         options.maxExpirationInHours != 0 &&
-        expirationDate.isAfter(
-          moment().add(options.maxExpirationInHours, "hours"),
-        )
+        (form.values.never_expires ||
+          expirationDate.isAfter(
+            moment().add(options.maxExpirationInHours, "hours"),
+          ))
       ) {
         form.setFieldError(
           "expiration_num",