add a tombstone for extra safety

lib/file_store/base_store.rb

@@ -41,6 +41,9 @@ module FileStore
     def absolute_avatar_template(avatar)
     end
 
+    def purge_tombstone(grace_period)
+    end
+
   end
 
 end

lib/file_store/local_store.rb

@@ -55,6 +55,10 @@ module FileStore
       avatar_template(avatar, absolute_base_url)
     end
 
+    def purge_tombstone(grace_period)
+      `find #{tombstone_dir} -mtime +#{grace_period} -type f -delete`
+    end
+
     private
 
     def get_path_for_upload(file, upload)
@@ -105,14 +109,16 @@ module FileStore
     def copy_file(file, path)
       FileUtils.mkdir_p(Pathname.new(path).dirname)
       # move the file to the right location
-      # not using cause mv, cause permissions are no good on move
-      File.open(path, "wb") do |f|
-        f.write(file.read)
-      end
+      # not using mv, cause permissions are no good on move
+      File.open(path, "wb") { |f| f.write(file.read) }
     end
 
     def remove_file(url)
-      File.delete("#{public_dir}#{url}") if is_relative?(url)
+      return unless is_relative?(url)
+      path = public_dir + url
+      tombstone = public_dir + url.gsub("/uploads/", "/tombstone/")
+      FileUtils.mkdir_p(Pathname.new(tombstone).dirname)
+      FileUtils.move(path, tombstone)
     rescue Errno::ENOENT
       # don't care if the file isn't there
     end
@@ -134,6 +140,10 @@ module FileStore
       "#{Rails.root}/public"
     end
 
+    def tombstone_dir
+      public_dir + relative_base_url.gsub("/uploads/", "/tombstone/")
+    end
+
   end
 
 end

lib/file_store/s3_store.rb

@@ -62,6 +62,10 @@ module FileStore
       "#{absolute_base_url}/avatars/#{avatar.sha1}/{size}#{avatar.extension}"
     end
 
+    def purge_tombstone(grace_period)
+      update_tombstone_lifecycle(grace_period)
+    end
+
     private
 
     def get_path_for_upload(file, upload)
@@ -99,16 +103,6 @@ module FileStore
       raise Discourse::SiteSettingMissing.new("s3_secret_access_key") if SiteSetting.s3_secret_access_key.blank?
     end
 
-    def get_or_create_directory(bucket)
-      check_missing_site_settings
-
-      fog = Fog::Storage.new(s3_options)
-
-      directory = fog.directories.get(bucket)
-      directory = fog.directories.create(key: bucket) unless directory
-      directory
-    end
-
     def s3_options
       options = {
         provider: 'AWS',
@@ -119,6 +113,18 @@ module FileStore
       options
     end
 
+    def fog_with_options
+      check_missing_site_settings
+      Fog::Storage.new(s3_options)
+    end
+
+    def get_or_create_directory(bucket)
+      fog = fog_with_options
+      directory = fog.directories.get(bucket)
+      directory = fog.directories.create(key: bucket) unless directory
+      directory
+    end
+
     def upload(file, unique_filename, filename=nil, content_type=nil)
       args = {
         key: unique_filename,
@@ -132,13 +138,32 @@ module FileStore
     end
 
     def remove(unique_filename)
-      check_missing_site_settings
-
-      fog = Fog::Storage.new(s3_options)
-
+      fog = fog_with_options
+      # copy the file in tombstone
+      fog.copy_object(unique_filename, s3_bucket, tombstone_prefix + unique_filename, s3_bucket)
+      # delete the file
       fog.delete_object(s3_bucket, unique_filename)
     end
 
+    def update_tombstone_lifecycle(grace_period)
+      # cf. http://docs.aws.amazon.com/AmazonS3/latest/dev/object-lifecycle-mgmt.html
+      fog_with_options.put_bucket_lifecycle(s3_bucket, lifecycle(grace_period))
+    end
+
+    def lifecycle(grace_period)
+      {
+        "Rules" => [{
+          "Prefix" => tombstone_prefix,
+          "Enabled" => true,
+          "Expiration" => { "Days" => grace_period }
+        }]
+      }
+    end
+
+    def tombstone_prefix
+      "tombstone/"
+    end
+
   end
 
 end