rubymta 0.0.6 → 0.0.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/rubymta/receiver.rb +9 -4
- data/lib/rubymta/server.rb +4 -1
- data/lib/rubymta/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 87cbfaf3b9718feb0968b30d487bd36c528d4718
|
|
4
|
+
data.tar.gz: b1e46f9bb97fc3d3ef43a0d3a003001f1794bfe7
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 97c704a3036488d6b665f95f181e35f363c0696ca6ee1fe397d1740a5a26df02f1c184b183c0f185c8e3c68cc989fdbd8eeb13f3a7aacf4cc16cb5942819ae1b
|
|
7
|
+
data.tar.gz: 56083c4d14f72bc6640fe8dffe120c4370f84e999bc7c1a7e5b2cb27079b96b46f6259bc069c34618f88f8373a21b666678ff8a0a3cd2d9a987ca50cc95c57d6
|
data/lib/rubymta/receiver.rb
CHANGED
|
@@ -267,6 +267,7 @@ class Receiver
|
|
|
267
267
|
if ok
|
|
268
268
|
pid = Process::spawn("#{$app[:path]}/run_queue.rb")
|
|
269
269
|
Process::detach(pid)
|
|
270
|
+
LOG.info(@mail[:mail_id]) {"Spawned run_queue.rb, pwd=#{`pwd`}, path=>#{$app[:path]}, pid=>#{pid.inspect}"}
|
|
270
271
|
end
|
|
271
272
|
end
|
|
272
273
|
|
|
@@ -608,7 +609,7 @@ class Receiver
|
|
|
608
609
|
return msg if !msg.nil?
|
|
609
610
|
end
|
|
610
611
|
|
|
611
|
-
return "504 5.7.4 authentication mechanism not supported"
|
|
612
|
+
return "504 5.7.4 authentication mechanism not supported; use TLS and PLAIN"
|
|
612
613
|
end
|
|
613
614
|
|
|
614
615
|
# These are not overrideable
|
|
@@ -616,9 +617,13 @@ class Receiver
|
|
|
616
617
|
def starttls(value)
|
|
617
618
|
send_text("220 2.0.0 TLS go ahead")
|
|
618
619
|
LOG.info(@mail[:mail_id]) {"<-> (handshake)"} if LogReceiverConversation
|
|
619
|
-
|
|
620
|
-
|
|
621
|
-
|
|
620
|
+
begin
|
|
621
|
+
@connection.accept
|
|
622
|
+
@encrypted = true
|
|
623
|
+
@mail[:encrypted] = true
|
|
624
|
+
rescue => e
|
|
625
|
+
LOG.error(@mail[:mail_id]) {e.inspect}
|
|
626
|
+
end
|
|
622
627
|
return nil
|
|
623
628
|
end
|
|
624
629
|
|
data/lib/rubymta/server.rb
CHANGED
|
@@ -94,7 +94,10 @@ end
|
|
|
94
94
|
|
|
95
95
|
# load the DKIM private key for this domain, if any
|
|
96
96
|
$app[:dkim] = nil
|
|
97
|
-
|
|
97
|
+
puts "--> *666* fn=>'#{$app[:path]}/#{DKIMPrivateKeyFile}'"
|
|
98
|
+
|
|
99
|
+
File::open("#{$app[:path]}/#{DKIMPrivateKeyFile}", "r") { |f| $app[:dkim] = f.read } if DKIMPrivateKeyFile
|
|
100
|
+
puts "--> *777* #{$app[:dkim]}"
|
|
98
101
|
|
|
99
102
|
# MAIN server class -- starts at Server#start
|
|
100
103
|
class Server
|
data/lib/rubymta/version.rb
CHANGED