diff options
author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2015-10-29 18:42:29 -0200 |
---|---|---|
committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2015-10-29 18:42:29 -0200 |
commit | c8fe42151291593f0f43509a70235c46fce169a1 (patch) | |
tree | 3b703558eb8f933f207cda50590406a479d89607 /app/controllers/snippets_controller.rb | |
parent | ead3ffd7a516911458d84311c4f1b4153f1071b5 (diff) | |
download | gitlab-ce-c8fe42151291593f0f43509a70235c46fce169a1.tar.gz |
Improve personal snippet access workflow. Fixes #3258
Diffstat (limited to 'app/controllers/snippets_controller.rb')
-rw-r--r-- | app/controllers/snippets_controller.rb | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/app/controllers/snippets_controller.rb b/app/controllers/snippets_controller.rb index 9f9f9a92f11..8498efc89d0 100644 --- a/app/controllers/snippets_controller.rb +++ b/app/controllers/snippets_controller.rb @@ -1,6 +1,9 @@ class SnippetsController < ApplicationController before_action :snippet, only: [:show, :edit, :destroy, :update, :raw] + # Allow read snippet + before_action :authorize_show_snippet!, only: [:show] + # Allow modify snippet before_action :authorize_update_snippet!, only: [:edit, :update] @@ -79,10 +82,14 @@ class SnippetsController < ApplicationController [Snippet::PUBLIC, Snippet::INTERNAL]). find(params[:id]) else - PersonalSnippet.are_public.find(params[:id]) + PersonalSnippet.find(params[:id]) end end + def authorize_show_snippet! + authenticate_user! unless can?(current_user, :read_personal_snippet, @snippet) + end + def authorize_update_snippet! return render_404 unless can?(current_user, :update_personal_snippet, @snippet) end |