diff options
-rw-r--r-- | lib/redmine/imap.rb | 10 | ||||
-rw-r--r-- | lib/tasks/email.rake | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/lib/redmine/imap.rb b/lib/redmine/imap.rb index 79e61eb52..77b8da80f 100644 --- a/lib/redmine/imap.rb +++ b/lib/redmine/imap.rb @@ -25,7 +25,15 @@ module Redmine def check(imap_options={}, options={}) host = imap_options[:host] || '127.0.0.1' port = imap_options[:port] || '143' - ssl = !imap_options[:ssl].nil? + if imap_options[:ssl] + if imap_options[:ssl] == 'force' + ssl = {verify_mode: OpenSSL::SSL::VERIFY_NONE} + else + ssl = {verify_mode: OpenSSL::SSL::VERIFY_PEER} + end + else + ssl = false + end starttls = !imap_options[:starttls].nil? folder = imap_options[:folder] || 'INBOX' diff --git a/lib/tasks/email.rake b/lib/tasks/email.rake index cdf4fc49d..4ba669510 100644 --- a/lib/tasks/email.rake +++ b/lib/tasks/email.rake @@ -37,6 +37,8 @@ Available IMAP options: host=HOST IMAP server host (default: 127.0.0.1) port=PORT IMAP server port (default: 143) ssl=SSL Use SSL/TLS? (default: false) + Setting `ssl=force` disables server certificate + verification starttls=STARTTLS Use STARTTLS? (default: false) username=USERNAME IMAP account password=PASSWORD IMAP password |