Fix EXIF not actually working due to saving the resulting file to the wrong directory

Author: TheReverend403

CHANGELOG.md

@@ -1,7 +1,8 @@
 Please view this file on the master branch, on stable branches it's out of date.
 
-v 1.0.4 (unreleased)
+v 1.0.4
   - Don't call save() after create(), it's redundant.
+  - Actually strip EXIF info from images and save them to the right file.
 
 v 1.0.3
   - Make the example nginx config a little safer.

app/Http/Controllers/Api/UploadController.php

@@ -72,11 +72,9 @@ public function post(Request $request)
             $newName = str_random($randomLen++) . ".$ext";
         } while (Upload::whereName($newName)->first() || $newName === 'index.php');
 
-        $upload = Upload::create([
+        $upload = new Upload([
             'user_id'       => Auth::id(),
-            'hash'          => sha1_file($file),
             'name'          => $newName,
-            'size'          => $file->getSize(),
             'original_name' => $originalName,
             'original_hash' => $originalHash
         ]);
@@ -95,21 +93,33 @@ public function post(Request $request)
                 return response()->json([trans('messages.unsupported_image_type')], StatusCode::INTERNAL_SERVER_ERROR);
             }
 
-            $img->backup();
-            $img->resize(128, 128)->save($upload->getThumbnailPath(true));
-            $img->reset();
+            try {
+                $upload->createDirs();
+                $img->backup();
+                $img->resize(128, 128)->save($upload->getThumbnailPath(true));
+                $img->reset();
+            } catch (NotWritableException $ex) {
+                Log::error($ex);
+                $upload->deleteDirs();
+                return response()->json([trans('messages.could_not_write_image')], StatusCode::INTERNAL_SERVER_ERROR);
+            }
 
             if (Helpers::shouldStripExif($file)) {
                 try {
-                    $img->save($file, 100);
+                    $img->save($upload->getPath(true));
                 } catch (NotWritableException $ex) {
                     Log::error($ex);
+                    $upload->deleteDirs();
                     return response()->json([trans('messages.could_not_write_image')], StatusCode::INTERNAL_SERVER_ERROR);
                 }
             }
             $img->destroy();
         }
 
+        $upload->hash = sha1_file($upload->getPath(true));
+        $upload->size = filesize($upload->getPath(true));
+        $upload->save();
+
         $result = [
             'url'  => route('files.get', $upload)
         ];

app/Models/Upload.php

@@ -40,24 +40,18 @@ class Upload extends Model
      * @var array
      */
     protected $fillable = ['name', 'hash', 'size', 'user_id', 'original_name', 'original_hash', 'downloads', 'views'];
-
     /**
      * The attributes excluded from the model's JSON form.
      *
      * @var array
      */
     protected $hidden = ['user_id', 'id'];
 
-    public function save(array $options = [])
+    public static function create(array $attributes = [])
     {
-        if (!Storage::exists($this->getDir())) {
-            Storage::makeDirectory($this->getDir());
-        }
+        Helpers::invalidateCache();
 
-        if (!Storage::exists($this->getThumbnailDir())) {
-            Storage::makeDirectory($this->getThumbnailDir());
-        }
-        return parent::save($options);
+        return parent::create($attributes);
     }
 
     /**
@@ -68,36 +62,18 @@ public function user()
         return $this->belongsTo('App\Models\User');
     }
 
-    public static function create(array $attributes = [])
+    public function createDirs()
     {
-        Helpers::invalidateCache();
-
-        return parent::create($attributes);
-    }
-
-    public function getDir($fullDir = false) {
-        if ($fullDir) {
-            return storage_path(sprintf('app/uploads/%s/%s/', md5($this->user_id), md5(mb_substr($this->name, 0, 1, 'utf-8'))));
+        if (!Storage::exists($this->getDir())) {
+            Storage::makeDirectory($this->getDir());
         }
-        return sprintf('uploads/%s/%s/', md5($this->user_id), md5(mb_substr($this->name, 0, 1, 'utf-8')));
-    }
-
-    public function getPath($fullPath = false) {
-        return $this->getDir($fullPath) . $this->name;
-    }
 
-    public function getThumbnailDir($fullDir = false) {
-        if ($fullDir) {
-            return storage_path(sprintf('app/thumbnails/%s/%s/', md5($this->user_id), md5(mb_substr($this->name, 0, 1, 'utf-8'))));
+        if (!Storage::exists($this->getThumbnailDir())) {
+            Storage::makeDirectory($this->getThumbnailDir());
         }
-        return sprintf('thumbnails/%s/%s/', md5($this->user_id), md5(mb_substr($this->name, 0, 1, 'utf-8')));
     }
 
-    public function getThumbnailPath($fullPath = false) {
-        return $this->getThumbnailDir($fullPath) . $this->name;
-    }
-
-    public function forceDelete()
+    public function deleteDirs()
     {
         if (Storage::exists($this->getPath())) {
             Storage::delete($this->getPath());
@@ -112,17 +88,50 @@ public function forceDelete()
                 Storage::deleteDir($this->getThumbnailDir());
             }
         }
+    }
+
+    public function getDir($fullDir = false)
+    {
+        if ($fullDir) {
+            return storage_path(sprintf('app/uploads/%s/%s/', md5($this->user_id), md5(mb_substr($this->name, 0, 1, 'utf-8'))));
+        }
+
+        return sprintf('uploads/%s/%s/', md5($this->user_id), md5(mb_substr($this->name, 0, 1, 'utf-8')));
+    }
+
+    public function getThumbnailDir($fullDir = false)
+    {
+        if ($fullDir) {
+            return storage_path(sprintf('app/thumbnails/%s/%s/', md5($this->user_id), md5(mb_substr($this->name, 0, 1, 'utf-8'))));
+        }
 
+        return sprintf('thumbnails/%s/%s/', md5($this->user_id), md5(mb_substr($this->name, 0, 1, 'utf-8')));
+    }
+
+    public function forceDelete()
+    {
+        $this->deleteDirs();
         Helpers::invalidateCache();
 
         return parent::forceDelete();
     }
 
+    public function getPath($fullPath = false)
+    {
+        return $this->getDir($fullPath) . $this->name;
+    }
+
+    public function getThumbnailPath($fullPath = false)
+    {
+        return $this->getThumbnailDir($fullPath) . $this->name;
+    }
+
     /**
      * Migrates files from the old uploads/$filename structure to a more efficient one.
      * Should only be called once from the command line.
      */
-    public function migrate() {
+    public function migrate()
+    {
         if (php_sapi_name() !== 'cli') {
             return;
         }
@@ -149,6 +158,7 @@ public function getThumbnail()
         if (Storage::exists($this->getThumbnailDir() . $this->name)) {
             return route('account.uploads.thumbnail', $this);
         }
+
         return elixir('assets/img/thumbnail.png');
     }