1
0
مراية لـ https://github.com/postalserver/postal.git تم المزامنة 2025-12-01 05:43:04 +00:00

fix: explicitly disable TLS & starttls for unknown SSL modes

closes #2564
هذا الالتزام موجود في:
Adam Cooke
2024-02-13 15:57:48 +00:00
الأصل f9f7fb30fe
التزام 42ab5b3a6b
2 ملفات معدلة مع 19 إضافات و1 حذوفات

عرض الملف

@@ -58,6 +58,7 @@ module Postal
# Set the source IP as appropriate # Set the source IP as appropriate
smtp_client.source_address = ip_type == :aaaa ? @source_ip_address.ipv6 : @source_ip_address.ipv4 smtp_client.source_address = ip_type == :aaaa ? @source_ip_address.ipv6 : @source_ip_address.ipv4
end end
case ssl_mode case ssl_mode
when "Auto" when "Auto"
smtp_client.enable_starttls_auto(self.class.ssl_context_without_verify) smtp_client.enable_starttls_auto(self.class.ssl_context_without_verify)
@@ -65,6 +66,9 @@ module Postal
smtp_client.enable_starttls(self.class.ssl_context_with_verify) smtp_client.enable_starttls(self.class.ssl_context_with_verify)
when "TLS" when "TLS"
smtp_client.enable_tls(self.class.ssl_context_with_verify) smtp_client.enable_tls(self.class.ssl_context_with_verify)
else
smtp_client.disable_starttls
smtp_client.disable_tls
end end
smtp_client.start(@source_ip_address ? @source_ip_address.hostname : self.class.default_helo_hostname) smtp_client.start(@source_ip_address ? @source_ip_address.hostname : self.class.default_helo_hostname)

عرض الملف

@@ -40,10 +40,24 @@ mail.html_part = Mail::Part.new do
BODY BODY
end end
# puts mail.to_s c = OpenSSL::SSL::SSLContext.new
c.verify_mode = OpenSSL::SSL::VERIFY_NONE
<<<<<<< Updated upstream
Net::SMTP.start("127.0.0.1", 2525) do |smtp| Net::SMTP.start("127.0.0.1", 2525) do |smtp|
smtp.send_message mail.to_s, mail.from.first, mail.to.first smtp.send_message mail.to_s, mail.from.first, mail.to.first
end end
=======
1000.times.map do
Thread.new do
smtp = Net::SMTP.new("77.72.7.155", 25)
# smtp.enable_starttls(c)
smtp.disable_starttls
smtp.start("localhost")
smtp.send_message mail.to_s, mail.from.first, mail.to.first
smtp.finish
end
end.each(&:join)
>>>>>>> Stashed changes
puts "Sent" puts "Sent"