Merge pull request #14665 from opf/fix/51799/imap-deprecated-options

Use non-deprecated call option for imap ssl
opf · Jan 29, 2024 · 48e6cb2 · 48e6cb2
2 parents 3c19f31 + ac550bf
commit 48e6cb2
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/lib/redmine/imap.rb b/lib/redmine/imap.rb
@@ -48,9 +48,15 @@ def check(imap_options = {}, options = {})
       def connect_imap(imap_options)
         host = imap_options[:host] || '127.0.0.1'
         port = imap_options[:port] || '143'
-        ssl = imap_options[:ssl]
-        ssl_verification = imap_options[:ssl_verification]
-        imap = Net::IMAP.new(host, port, ssl, nil, ssl_verification)
+        verify_mode = imap_options[:ssl_verification] ? OpenSSL::SSL::VERIFY_PEER : OpenSSL::SSL::VERIFY_NONE
+        ssl_params =
+          if imap_options[:ssl]
+            { verify_mode: }
+          else
+            false
+          end
+
+        imap = Net::IMAP.new(host, port:, ssl: ssl_params)
 
         imap.login(imap_options[:username], imap_options[:password]) unless imap_options[:username].nil?