Fix truncated archives (#2173)

changelog/unreleased/archiver-fix-max-size.md

@@ -0,0 +1,10 @@
+Bugfix: Fix archiver max size reached error
+
+Previously in the total size count of the files being
+archived, the folders were taken into account, and this
+could cause a false max size reached error because the
+size of a directory is recursive-computed, causing the
+archive to be truncated. Now in the size count, the
+directories are skipped.
+
+https://github.com/cs3org/reva/pull/2173

internal/http/services/archiver/manager/archiver.go

@@ -136,13 +136,21 @@ func (a *Archiver) CreateTar(ctx context.Context, dst io.Writer) error {
 				return err
 			}
 
+			isDir := info.Type == provider.ResourceType_RESOURCE_TYPE_CONTAINER
+
 			filesCount++
 			if filesCount > a.config.MaxNumFiles {
 				return ErrMaxFileCount
 			}
-			sizeFiles += int64(info.Size)
-			if sizeFiles > a.config.MaxSize {
-				return ErrMaxSize
+
+			if !isDir {
+				// only add the size if the resource is not a directory
+				// as its size could be resursive-computed, and we would
+				// count the files not only once
+				sizeFiles += int64(info.Size)
+				if sizeFiles > a.config.MaxSize {
+					return ErrMaxSize
+				}
 			}
 
 			// TODO (gdelmont): remove duplicates if the resources requested overlaps
@@ -157,8 +165,6 @@ func (a *Archiver) CreateTar(ctx context.Context, dst io.Writer) error {
 				ModTime: time.Unix(int64(info.Mtime.Seconds), 0),
 			}
 
-			isDir := info.Type == provider.ResourceType_RESOURCE_TYPE_CONTAINER
-
 			if isDir {
 				// the resource is a folder
 				header.Mode = 0755
@@ -204,13 +210,21 @@ func (a *Archiver) CreateZip(ctx context.Context, dst io.Writer) error {
 				return err
 			}
 
+			isDir := info.Type == provider.ResourceType_RESOURCE_TYPE_CONTAINER
+
 			filesCount++
 			if filesCount > a.config.MaxNumFiles {
 				return ErrMaxFileCount
 			}
-			sizeFiles += int64(info.Size)
-			if sizeFiles > a.config.MaxSize {
-				return ErrMaxSize
+
+			if !isDir {
+				// only add the size if the resource is not a directory
+				// as its size could be resursive-computed, and we would
+				// count the files not only once
+				sizeFiles += int64(info.Size)
+				if sizeFiles > a.config.MaxSize {
+					return ErrMaxSize
+				}
 			}
 
 			// TODO (gdelmont): remove duplicates if the resources requested overlaps
@@ -228,8 +242,6 @@ func (a *Archiver) CreateZip(ctx context.Context, dst io.Writer) error {
 				Modified: time.Unix(int64(info.Mtime.Seconds), 0),
 			}
 
-			isDir := info.Type == provider.ResourceType_RESOURCE_TYPE_CONTAINER
-
 			if isDir {
 				header.Name += "/"
 			} else {