about summary refs log tree commit diff
path: root/app/controllers
diff options
context:
space:
mode:
authorEugen <eugen@zeonfederated.com>2016-11-24 16:27:32 +0100
committerGitHub <noreply@github.com>2016-11-24 16:27:32 +0100
commit7baca3fe4d4b3279236f0004c867bcd2f5bc8849 (patch)
treebada7e311eab68c2ba1096b7301d9d0da8fdf74a /app/controllers
parentcbc50016eb3d0a46e76aca9ed199b036ce20abdb (diff)
parentcefef2c57197a06d403b9cbe13e969e08aaf5301 (diff)
Merge pull request #242 from TazeTSchnitzel/media_uri_obfuscation
Rename media to avoid exposing filename (fixes #207)
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/api/v1/media_controller.rb3
-rw-r--r--app/controllers/settings/profiles_controller.rb4
2 files changed, 7 insertions, 0 deletions
diff --git a/app/controllers/api/v1/media_controller.rb b/app/controllers/api/v1/media_controller.rb
index bb8e8d9ee..f8139ade7 100644
--- a/app/controllers/api/v1/media_controller.rb
+++ b/app/controllers/api/v1/media_controller.rb
@@ -4,6 +4,9 @@ class Api::V1::MediaController < ApiController
   before_action -> { doorkeeper_authorize! :write }
   before_action :require_user!
 
+  include ObfuscateFilename
+  obfuscate_filename :file
+
   respond_to :json
 
   def create
diff --git a/app/controllers/settings/profiles_controller.rb b/app/controllers/settings/profiles_controller.rb
index 4b2b5a131..21fbba2af 100644
--- a/app/controllers/settings/profiles_controller.rb
+++ b/app/controllers/settings/profiles_controller.rb
@@ -6,6 +6,10 @@ class Settings::ProfilesController < ApplicationController
   before_action :authenticate_user!
   before_action :set_account
 
+  include ObfuscateFilename
+  obfuscate_filename [:account, :avatar]
+  obfuscate_filename [:account, :header]
+
   def show
   end