Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app/controllers/concerns/uploads_actions.rb')
-rw-r--r--app/controllers/concerns/uploads_actions.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/app/controllers/concerns/uploads_actions.rb b/app/controllers/concerns/uploads_actions.rb
index db756ae336f..0d64a685065 100644
--- a/app/controllers/concerns/uploads_actions.rb
+++ b/app/controllers/concerns/uploads_actions.rb
@@ -10,6 +10,10 @@ module UploadsActions
included do
prepend_before_action :set_request_format_from_path_extension
rescue_from FileUploader::InvalidSecret, with: :render_404
+
+ rescue_from ::Gitlab::Utils::PathTraversalAttackError do
+ head :bad_request
+ end
end
def create
@@ -33,6 +37,8 @@ module UploadsActions
# - or redirect to its URL
#
def show
+ Gitlab::Utils.check_path_traversal!(params[:filename])
+
return render_404 unless uploader&.exists?
ttl, directives = *cache_settings