From e2d55b45ba64a7e12fa8d49cd46369745945bbee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20Astori?= Date: Mon, 27 Jun 2016 13:50:47 -0400 Subject: [PATCH] Fix compare page not accessible in no-edit mode Permission checking was spread across `post` action handlers instead of inside the `before` to normalize between `get` and `post` action handlers and be more explicit. --- lib/gollum/app.rb | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/lib/gollum/app.rb b/lib/gollum/app.rb index 5be0e43b..c266e19d 100644 --- a/lib/gollum/app.rb +++ b/lib/gollum/app.rb @@ -97,7 +97,6 @@ module Precious before do settings.wiki_options[:allow_editing] = settings.wiki_options.fetch(:allow_editing, true) @allow_editing = settings.wiki_options[:allow_editing] - forbid unless @allow_editing || request.request_method == "GET" Precious::App.set(:mustache, {:templates => settings.wiki_options[:template_dir]}) if settings.wiki_options[:template_dir] @base_url = url('/', false).chomp('/') @page_dir = settings.wiki_options[:page_file_dir].to_s @@ -182,6 +181,8 @@ module Precious end post '/uploadFile' do + forbid unless @allow_editing + wiki = wiki_new unless wiki.allow_uploads @@ -244,6 +245,8 @@ module Precious end post '/rename/*' do + forbid unless @allow_editing + wikip = wiki_page(params[:splat].first) halt 500 if wikip.nil? wiki = wikip.wiki @@ -280,6 +283,8 @@ module Precious end post '/edit/*' do + forbid unless @allow_editing + path = '/' + clean_url(sanitize_empty_params(params[:path])).to_s page_name = CGI.unescape(params[:page]) wiki = wiki_new @@ -339,6 +344,8 @@ module Precious end post '/create' do + forbid unless @allow_editing + name = params[:page].to_url path = sanitize_empty_params(params[:path]) || '' format = params[:format].intern @@ -358,6 +365,8 @@ module Precious end post '/revert/*/:sha1/:sha2' do + forbid unless @allow_editing + wikip = wiki_page(params[:splat].first) @path = wikip.path @name = wikip.name @@ -381,6 +390,8 @@ module Precious end post '/preview' do + forbid unless @allow_editing + wiki = wiki_new @name = params[:page] || "Preview" @page = wiki.preview_page(@name, params[:content], params[:format])