Merge pull request #315 from xibosignage/develop

Release 1.8.5

docker-compose.yml

@@ -34,8 +34,7 @@ services:
 
   swagger:
       image: swaggerapi/swagger-ui:latest
-      restart: always
       ports:
-       - "8080:80"
+       - "8080:8080"
       environment:
         - API_URL=http://localhost/swagger.json

lib/Helper/XiboUploadHandler.php

@@ -7,6 +7,7 @@
 use Xibo\Entity\Permission;
 use Xibo\Entity\Widget;
 use Xibo\Exception\AccessDeniedException;
+use Xibo\Exception\InvalidArgumentException;
 use Xibo\Exception\LibraryFullException;
 use Xibo\Exception\NotFoundException;
 
@@ -266,6 +267,10 @@ protected function handle_form_data($file, $index)
             $file->fileSize = $media->fileSize;
             $file->md5 = $media->md5;
 
+            // Test to ensure the final file size is the same as the file size we're expecting
+            if ($file->fileSize != $file->size)
+                throw new InvalidArgumentException(__('Sorry this is a corrupted upload, the file size doesn\'t match what we\'re expecting.'), 'size');
+
             // Fonts, then install
             if ($module->getModuleType() == 'font') {
                 $controller->installFonts();