Add screenshot MIME type setting

migueldemoura · Dec 4, 2018 · 9decd32 · 9decd32
1 parent bda1f3d
commit 9decd32
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 16 deletions.
diff --git a/README.md b/README.md
@@ -58,25 +58,26 @@ If an external file is found, Myazo extends the default config with the provided
 * Example Config: `client/config.php.example`
 * Placement Path: `~/.config/myazo/config.ini` (`~` refers to the user directory)
 
-| Key               | Default                                | Description                                         |
-|-------------------|----------------------------------------|-----------------------------------------------------|
-| upload_script     | 'https://myazo.example.com/upload.php' | Full path to the upload.php file                    |
-| secret            | 'hunter2'                              | Secret token                                        |
-| clear_metadata    | True                                   | Controls clearing screenshot metadata before upload |
-| open_browser      | True                                   | Controls open url in default browser after upload   |
-| copy_clipboard    | True                                   | Controls copy url to clipboard after upload         |
-| output_url        | True                                   | Controls print url to stdout after upload           |
+| Key                | Default                                | Description                                         |
+|--------------------|----------------------------------------|-----------------------------------------------------|
+| upload_script      | 'https://myazo.example.com/upload.php' | Full path to the upload.php file                    |
+| secret             | 'hunter2'                              | Secret token                                        |
+| clear_metadata     | True                                   | Controls clearing screenshot metadata before upload |
+| open_browser       | True                                   | Controls open url in default browser after upload   |
+| copy_clipboard     | True                                   | Controls copy url to clipboard after upload         |
+| output_url         | True                                   | Controls print url to stdout after upload           |
 
 ### Server
 
 * Example Config: `server/config.php.example`
 * Placement Path: `config.php` (relative to `upload.php`)
 
-| Key               | Default                                | Description                                         |
-|-------------------|----------------------------------------|-----------------------------------------------------|
-| secretBcrypt      | ''                                     | Bcrypt hashed secret                                |
-| saveDirName       | '/data/'                               | Writable directory where screenshots will be stored |
-| maxScreenshotSize | 2 * 1048576                            | Maximum size in bytes of uploaded screenshot        |
+| Key                | Default                                | Description                                         |
+|--------------------|----------------------------------------|-----------------------------------------------------|
+| secretBcrypt       | ''                                     | Bcrypt hashed secret                                |
+| saveDirName        | '/data/'                               | Writable directory where screenshots will be stored |
+| maxScreenshotSize  | 2 * 1048576                            | Maximum size in bytes of uploaded screenshot        |
+| screenshotMimeType | 'image/png'                            | MIME type of uploaded screenshot                    |
 
 Please note that `maxScreenshotSize` may be capped externally by PHP and the web server.
 

diff --git a/server/config.php.example b/server/config.php.example
@@ -3,5 +3,6 @@
 return [
     'secretBcrypt' => '',
     'saveDirName' => '/data/',
-    'maxScreenshotSize' => 2 * 1048576
+    'maxScreenshotSize' => 2 * 1048576,
+    'screenshotMimeType' => 'image/png'
 ];
diff --git a/server/upload.php b/server/upload.php
@@ -5,7 +5,8 @@
     [
         'secretBcrypt' => '',
         'saveDirName' => '/data/',
-        'maxScreenshotSize' => 2 * 1048576
+        'maxScreenshotSize' => 2 * 1048576,
+        'screenshotMimeType' => 'image/png'
     ],
     file_exists('./config.php') ? include_once('./config.php') : []
 );
@@ -26,7 +27,7 @@
     $screenshot['error'] !== UPLOAD_ERR_OK ||
     // Verify size and mime type
     $screenshot['size'] > $config['maxScreenshotSize'] ||
-    mime_content_type($screenshot['tmp_name']) !== 'image/png'
+    mime_content_type($screenshot['tmp_name']) !== $config['screenshotMimeType']
 ) {
     http_response_code(422);
     exit();