jro_apps/redmine Commit - r3081:06ca18b04225

Adds a 'no_permission_check' option to the MailHandler....

Jean-Philippe Lang -

r3081:06ca18b04225

parent child

Context file:

r3081:06ca18b04225

Collapse all files

app/models/mail_handler.rb +17 -5

                 @@handler_options[:allow_override] << 'project' unless @@handler_options[:issue].has_key?(:project)
                 # Status overridable by default
                 @@handler_options[:allow_override] << 'status' unless @@handler_options[:issue].has_key?(:status)
+                @@handler_options[:no_permission_check] = (@@handler_options[:no_permission_check].to_s == '1' ? true : false)
                 super email
               end
                 status =  (get_keyword(:status) && IssueStatus.find_by_name(get_keyword(:status)))
                 # check permission
-                raise UnauthorizedAction unless user.allowed_to?(:add_issues, project)
+                unless @@handler_options[:no_permission_check]
+                  raise UnauthorizedAction unless user.allowed_to?(:add_issues, project)
+                end
                 issue = Issue.new(:author => user, :project => project, :tracker => tracker, :category => category, :priority => priority)
                 # check workflow
                 if status && issue.new_statuses_allowed_to(user).include?(status)
                 issue = Issue.find_by_id(issue_id)
                 return unless issue
                 # check permission
-                raise UnauthorizedAction unless user.allowed_to?(:add_issue_notes, issue.project) || user.allowed_to?(:edit_issues, issue.project)
+                unless @@handler_options[:no_permission_check]
-                raise UnauthorizedAction unless status.nil? || user.allowed_to?(:edit_issues, issue.project)
+                  raise UnauthorizedAction unless user.allowed_to?(:add_issue_notes, issue.project) || user.allowed_to?(:edit_issues, issue.project)
+                  raise UnauthorizedAction unless status.nil? || user.allowed_to?(:edit_issues, issue.project)
+                end
                 # add the note
                 journal = issue.init_journal(user, plain_text_body)
                 message = Message.find_by_id(message_id)
                 if message
                   message = message.root
-                  if user.allowed_to?(:add_messages, message.project) && !message.locked?
+                  unless @@handler_options[:no_permission_check]
+                    raise UnauthorizedAction unless user.allowed_to?(:add_messages, message.project)
+                  end
+                  if !message.locked?
                     reply = Message.new(:subject => email.subject.gsub(%r{^.*msg\d+\]}, '').strip,
                                         :content => plain_text_body)
                     reply.author = user
                     add_attachments(reply)
                     reply
                   else
-                    raise UnauthorizedAction
+                    logger.info "MailHandler: ignoring reply from [#{sender_email}] to a locked topic" if logger && logger.info
                   end
                 end
               end

extra/mail_handler/rdm-mailhandler.rb +9 -3

             #                                  ignore: email is ignored (default)
             #                                  accept: accept as anonymous user
             #                                  create: create a user account
+            #       --no-permission-check      disable permission checking when receiving
+            #                                  the email
             #   -h, --help                     show this help
             #   -v, --verbose                  show extra information
             #   -V, --version                  show version information and exit
             class RedmineMailHandler
               VERSION = '0.1'
-              attr_accessor :verbose, :issue_attributes, :allow_override, :unknown_user, :url, :key
+              attr_accessor :verbose, :issue_attributes, :allow_override, :unknown_user, :no_permission_check, :url, :key
               def initialize
                 self.issue_attributes = {}
                   [ '--category',             GetoptLong::REQUIRED_ARGUMENT],
                   [ '--priority',             GetoptLong::REQUIRED_ARGUMENT],
                   [ '--allow-override', '-o', GetoptLong::REQUIRED_ARGUMENT],
-                  [ '--unknown-user',         GetoptLong::REQUIRED_ARGUMENT]
+                  [ '--unknown-user',         GetoptLong::REQUIRED_ARGUMENT],
+                  [ '--no-permission-check',  GetoptLong::NO_ARGUMENT]
                 )
                 opts.each do |opt, arg|
                     self.allow_override = arg.dup
                   when '--unknown-user'
                     self.unknown_user = arg.dup
+                  when '--no-permission-check'
+                    self.no_permission_check = '1'
                   end
                 end
                 data = { 'key' => key, 'email' => email,
                                        'allow_override' => allow_override,
-                                       'unknown_user' => unknown_user }
+                                       'unknown_user' => unknown_user,
+                                       'no_permission_check' => no_permission_check}
                 issue_attributes.each { |attr, value| data["issue[#{attr}]"] = value }
                 debug "Posting to #{uri}..."

lib/tasks/email.rake +6 0

                                        ignore: email is ignored (default)
                                        accept: accept as anonymous user
                                        create: create a user account
+              no_permission_check=1    disable permission checking when receiving
+                                       the email
             Issue attributes control options:
               project=PROJECT          identifier of the target project
                   %w(project status tracker category priority).each { |a| options[:issue][a.to_sym] = ENV[a] if ENV[a] }
                   options[:allow_override] = ENV['allow_override'] if ENV['allow_override']
                   options[:unknown_user] = ENV['unknown_user'] if ENV['unknown_user']
+                  options[:no_permission_check] = ENV['no_permission_check'] if ENV['no_permission_check']
                   MailHandler.receive(STDIN.read, options)
                 end
                                        ignore: email is ignored (default)
                                        accept: accept as anonymous user
                                        create: create a user account
+              no_permission_check=1    disable permission checking when receiving
+                                       the email
             Available IMAP options:
               host=HOST                IMAP server host (default: 127.0.0.1)
                   %w(project status tracker category priority).each { |a| options[:issue][a.to_sym] = ENV[a] if ENV[a] }
                   options[:allow_override] = ENV['allow_override'] if ENV['allow_override']
                   options[:unknown_user] = ENV['unknown_user'] if ENV['unknown_user']
+                  options[:no_permission_check] = ENV['no_permission_check'] if ENV['no_permission_check']
                   Redmine::IMAP.check(imap_options, options)
                 end

test/unit/mail_handler_test.rb +20 0

@@ -165,6 +165,26 class MailHandlerTest < ActiveSupport::TestCase
165	end	165	end
166	end	166	end
167		167
		168	def test_add_issue_by_anonymous_user_on_private_project
		169	Role.anonymous.add_permission!(:add_issues)
		170	assert_no_difference 'User.count' do
		171	assert_no_difference 'Issue.count' do
		172	assert_equal false, submit_email('ticket_by_unknown_user.eml', :issue => {:project => 'onlinestore'}, :unknown_user => 'accept')
		173	end
		174	end
		175	end
		176
		177	def test_add_issue_by_anonymous_user_on_private_project_without_permission_check
		178	assert_no_difference 'User.count' do
		179	assert_difference 'Issue.count' do
		180	issue = submit_email('ticket_by_unknown_user.eml', :issue => {:project => 'onlinestore'}, :no_permission_check => '1', :unknown_user => 'accept')
		181	assert issue.is_a?(Issue)
		182	assert issue.author.anonymous?
		183	assert !issue.project.is_public?
		184	end
		185	end
		186	end
		187
168	def test_add_issue_by_created_user	188	def test_add_issue_by_created_user
169	Setting.default_language = 'en'	189	Setting.default_language = 'en'
170	assert_difference 'User.count' do	190	assert_difference 'User.count' do

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