meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2026-03-11 03:33:07 +00:00
Code Issues Releases Wiki Activity

Merged r20959 from trunk to 4.2-stable (#35100).

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/branches/4.2-stable@20960 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA 2021-04-22 03:44:28 +00:00
parent 188e27dc78
commit 2a3a997968
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/mail_handler.rb
View File

@ -227,7 +227,7 @@ class MailHandler < ActionMailer::Base
unless handler_options[:no_permission_check]
unless user.allowed_to?(:add_issue_notes, issue.project) ||
user.allowed_to?(:edit_issues, issue.project)
raise UnauthorizedAction, "not allowed to add notes on issues to project [#{project.name}]"
raise UnauthorizedAction, "not allowed to add notes on issues to project [#{issue.project.name}]"
end
end
@ -276,7 +276,7 @@ class MailHandler < ActionMailer::Base
end
unless handler_options[:no_permission_check]
raise UnauthorizedAction, "not allowed to add messages to project [#{project.name}]" unless user.allowed_to?(:add_messages, message.project)
raise UnauthorizedAction, "not allowed to add messages to project [#{message.project.name}]" unless user.allowed_to?(:add_messages, message.project)
end
if !message.locked?

17
test/unit/mail_handler_test.rb
View File

@ -1051,6 +1051,16 @@ class MailHandlerTest < ActiveSupport::TestCase
end
end
def test_reply_to_a_issue_without_permission
set_tmp_attachments_directory
Role.all.each {|r| r.remove_permission! :add_issue_notes, :edit_issues}
assert_no_difference 'Issue.count' do
assert_no_difference 'Journal.count' do
assert_not submit_email('ticket_reply_with_status.eml')
end
end
end
def test_reply_to_a_nonexitent_journal
journal_id = Issue.find(2).journals.last.id
Journal.destroy(journal_id)
@ -1102,6 +1112,13 @@ class MailHandlerTest < ActiveSupport::TestCase
end
end
def test_reply_to_a_topic_without_permission
Role.all.each {|r| r.remove_permission! :add_messages}
assert_no_difference('Message.count') do
assert_not submit_email('message_reply_by_subject.eml')
end
end
def test_should_convert_tags_of_html_only_emails
with_settings :text_formatting => 'textile' do
issue = submit_email('ticket_html_only.eml', :issue => {:project => 'ecookbook'})