more explicit error messages for file uploads

2 files changed, 27 insertions, 14 deletions

diff --git a/support/doc/api/openapi.yaml b/support/doc/api/openapi.yaml
index 6dd51ec7c..4f9bca729 100644
--- a/support/doc/api/openapi.yaml
+++ b/support/doc/api/openapi.yaml
@@ -972,6 +972,14 @@ paths:
             application/json:
               schema:
                 $ref: '#/components/schemas/Avatar'
+        '413':
+          description: image file too large
+          headers:
+            X-File-Maximum-Size:
+              schema:
+                type: string
+                format: Nginx size
+              description: Maximum file size for the avatar
       requestBody:
         content:
           multipart/form-data:
@@ -1308,6 +1316,14 @@ paths:
           description: user video quota is exceeded with this video
         '408':
           description: upload has timed out
+        '413':
+          description: video file too large
+          headers:
+            X-File-Maximum-Size:
+              schema:
+                type: string
+                format: Nginx size
+              description: Maximum file size for the video
         '422':
           description: invalid input file
       requestBody:
diff --git a/support/nginx/peertube b/support/nginx/peertube
index f1ef4ccd1..641d254af 100644
--- a/support/nginx/peertube
+++ b/support/nginx/peertube
@@ -62,9 +62,9 @@ server {
   ##
 
   location @api {
-    proxy_set_header X-Forwarded-For   $proxy_add_x_forwarded_for;
-    proxy_set_header Host              $host;
-    proxy_set_header X-Real-IP         $remote_addr;
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header Host            $host;
+    proxy_set_header X-Real-IP       $remote_addr;
 
     client_max_body_size  100k; # default is 1M
 
@@ -81,26 +81,23 @@ server {
   }
 
   location = /api/v1/users/me/avatar/pick {
-    limit_except POST { deny all; }
+    limit_except POST HEAD { deny all; }
 
-    client_max_body_size  2M; # default is 1M
+    client_max_body_size                      2M; # default is 1M
+    add_header            X-File-Maximum-Size 2M always; # inform backend of the set value in bytes
 
     try_files /dev/null @api;
   }
 
   location = /api/v1/videos/upload {
-    limit_except POST { deny all; }
-
-    # This is the maximum upload size, which roughly matches the maximum size of a video file
-    # you can send via the API or the web interface. By default we set it to 8GB, but administrators
-    # can increase or decrease the limit. Currently there's no way to communicate this limit
-    # to users automatically, so you may want to leave a note in your instance 'about' page if
-    # you change this.
-    #
+    limit_except POST HEAD { deny all; }
+
+    # This is the maximum upload size, which roughly matches the maximum size of a video file.
     # Note that temporary space is needed equal to the total size of all concurrent uploads.
     # This data gets stored in /var/lib/nginx by default, so you may want to put this directory
     # on a dedicated filesystem.
-    client_max_body_size  8G; # default is 1M
+    client_max_body_size                      8G; # default is 1M
+    add_header            X-File-Maximum-Size 8G always; # inform backend of the set value in bytes
 
     try_files /dev/null @api;
   }