jro_apps/redmine Commit - r10986:bb314029391d

Fix 500 error for requests to the settings path for non-configurable plugins (#12911)....

Jean-Philippe Lang -

r10986:bb314029391d

parent child

Context file:

r10986:bb314029391d

Collapse all files

app/controllers/settings_controller.rb +5 0

             # Redmine - project management software
             # Copyright (C) 2006-2013  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class SettingsController < ApplicationController
               layout 'admin'
               menu_item :plugins, :only => :plugin
               before_filter :require_admin
               def index
                 edit
                 render :action => 'edit'
               end
               def edit
                 @notifiables = Redmine::Notifiable.all
                 if request.post? && params[:settings] && params[:settings].is_a?(Hash)
                   settings = (params[:settings] || {}).dup.symbolize_keys
                   settings.each do |name, value|
                     # remove blank values in array settings
                     value.delete_if {|v| v.blank? } if value.is_a?(Array)
                     Setting[name] = value
                   end
                   flash[:notice] = l(:notice_successful_update)
                   redirect_to settings_path(:tab => params[:tab])
                 else
                   @options = {}
                   user_format = User::USER_FORMATS.collect{|key, value| [key, value[:setting_order]]}.sort{|a, b| a[1] <=> b[1]}
                   @options[:user_format] = user_format.collect{|f| [User.current.name(f[0]), f[0].to_s]}
                   @deliveries = ActionMailer::Base.perform_deliveries
                   @guessed_host_and_path = request.host_with_port.dup
                   @guessed_host_and_path << ('/'+ Redmine::Utils.relative_url_root.gsub(%r{^\/}, '')) unless Redmine::Utils.relative_url_root.blank?
                   Redmine::Themes.rescan
                 end
               end
               def plugin
                 @plugin = Redmine::Plugin.find(params[:id])
+                unless @plugin.configurable?
+                  render_404
+                  return
+                end
                 if request.post?
                   Setting.send "plugin_#{@plugin.id}=", params[:settings]
                   flash[:notice] = l(:notice_successful_update)
                   redirect_to plugin_settings_path(@plugin)
                 else
                   @partial = @plugin.settings[:partial]
                   @settings = Setting.send "plugin_#{@plugin.id}"
                 end
               rescue Redmine::PluginNotFound
                 render_404
               end
             end

test/functional/settings_controller_test.rb +21 -1

             # Redmine - project management software
             # Copyright (C) 2006-2013  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require File.expand_path('../../test_helper', __FILE__)
             class SettingsControllerTest < ActionController::TestCase
               fixtures :users
               def setup
                 User.current = nil
                 @request.session[:user_id] = 1 # admin
               end
               def test_index
                 get :index
                 assert_response :success
                 assert_template 'edit'
               end
               def test_get_edit
                 get :edit
                 assert_response :success
                 assert_template 'edit'
                 assert_tag 'input', :attributes => {:name => 'settings[enabled_scm][]', :value => ''}
               end
               def test_get_edit_should_preselect_default_issue_list_columns
                 with_settings :issue_list_default_columns => %w(tracker subject status updated_on) do
                   get :edit
                   assert_response :success
                 end
                 assert_select 'select[id=selected_columns][name=?]', 'settings[issue_list_default_columns][]' do
                   assert_select 'option', 4
                   assert_select 'option[value=tracker]', :text => 'Tracker'
                   assert_select 'option[value=subject]', :text => 'Subject'
                   assert_select 'option[value=status]', :text => 'Status'
                   assert_select 'option[value=updated_on]', :text => 'Updated'
                 end
                 assert_select 'select[id=available_columns]' do
                   assert_select 'option[value=tracker]', 0
                   assert_select 'option[value=priority]', :text => 'Priority'
                 end
               end
               def test_get_edit_without_trackers_should_succeed
                 Tracker.delete_all
                 get :edit
                 assert_response :success
               end
               def test_post_edit_notifications
                 post :edit, :settings => {:mail_from => 'functional@test.foo',
                                           :bcc_recipients  => '0',
                                           :notified_events => %w(issue_added issue_updated news_added),
                                           :emails_footer => 'Test footer'
                                           }
                 assert_redirected_to '/settings'
                 assert_equal 'functional@test.foo', Setting.mail_from
                 assert !Setting.bcc_recipients?
                 assert_equal %w(issue_added issue_updated news_added), Setting.notified_events
                 assert_equal 'Test footer', Setting.emails_footer
                 Setting.clear_cache
               end
               def test_get_plugin_settings
                 Setting.stubs(:plugin_foo).returns({'sample_setting' => 'Plugin setting value'})
                 ActionController::Base.append_view_path(File.join(Rails.root, "test/fixtures/plugins"))
                 Redmine::Plugin.register :foo do
                   settings :partial => "foo_plugin/foo_plugin_settings"
                 end
                 get :plugin, :id => 'foo'
                 assert_response :success
                 assert_template 'plugin'
                 assert_tag 'form', :attributes => {:action => '/settings/plugin/foo'},
                   :descendant => {:tag => 'input', :attributes => {:name => 'settings[sample_setting]', :value => 'Plugin setting value'}}
                 Redmine::Plugin.clear
               end
               def test_get_invalid_plugin_settings
                 get :plugin, :id => 'none'
                 assert_response 404
               end
+              def test_get_non_configurable_plugin_settings
+                Redmine::Plugin.register(:foo) {}
+                get :plugin, :id => 'foo'
+                assert_response 404
+                Redmine::Plugin.clear
+              end
               def test_post_plugin_settings
                 Setting.expects(:plugin_foo=).with({'sample_setting' => 'Value'}).returns(true)
-                Redmine::Plugin.register(:foo) {}
+                Redmine::Plugin.register(:foo) do
+                  settings :partial => 'not blank' # so that configurable? is true
+                end
                 post :plugin, :id => 'foo', :settings => {'sample_setting' => 'Value'}
                 assert_redirected_to '/settings/plugin/foo'
               end
+              def test_post_non_configurable_plugin_settings
+                Redmine::Plugin.register(:foo) {}
+                post :plugin, :id => 'foo', :settings => {'sample_setting' => 'Value'}
+                assert_response 404
+                Redmine::Plugin.clear
+              end
             end

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages