rubymta 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 342f0caad82d98379a66f1b3a776211bf9469edd
-  data.tar.gz: 90406eb6b7165e27a40f841f3e424883d4390824
+  metadata.gz: 6c52ecaf44252583e1acf920df9c794b12092e04
+  data.tar.gz: ba9c68b84c02143eae29d36c936fdbb6703cbb49
 SHA512:
-  metadata.gz: 64bc2f2844106e9aa06089f2f3cdbc145702cbed7a60d155b0c5b287bc62f99a0db11997a2ae5aa81988d29ead7f741eb36409f2be496c6207b964c6a4ebf91d
-  data.tar.gz: 118905e30a717ed45d89da660c5a06ed5dea9c203339d3dfdf1d309eec16ddf3520cd1e182c94a0e136a986d6f1449d8b75d807c2526ae25a4ce6f3cef85ee9e
+  metadata.gz: 93cf89849cd9d7be667570a3bf380b4a7a62211f15cef441381a3a992e60f806c08151779dff358e719f28b29a44cf39e0cee7f89a18057425182ef1935b1c76
+  data.tar.gz: 8ac70f9e8e603c43a2b43c6d2a84a3e5e08f7e5c17eb27aab55cfcc63591ebe58c2cde2b525e523af5826b69eed4d15ef0545901b18fa73de47301810906cefd

data/lib/rubymta/receiver.rb

@@ -361,20 +361,25 @@ class Receiver
     # Also, members MUST use use authenticated email on the SubmissionPort to
     # submit mail; non-members MUST use non-authenticated email on the
     # StandardMailPort to submit mail
-    if (from[:mailbox_id]) && (@mail[:local_port]!=InternalSubmitPort)
-      # traffic is from our member
-      return "556 5.7.27 #{ServerTitle} members must use port #{SubmissionPort} to send mail" \
-        if @mail[:local_port]!=SubmissionPort
+    case @mail[:local_port]
+    when StandardMailPort   # '25'--non client must come in here
+      return "556 5.7.27 #{ServerTitle} members must use port #{InternalSubmitPort} or #{SubmissionPort} to send mail" \
+        if from[:mailbox_id]
+    when InternalSubmitPort # '465'-- client, internal use only, block external use with iptables
+      return "556 5.7.27 Non #{ServerTitle} members must use port #{StandardMailPort} to send mail" \
+        if !from[:mailbox_id]
+    when SubmissionPort     # '587'--client, external or internal req. auth & enc
+      return "556 5.7.27 Non #{ServerTitle} members must use port #{StandardMailPort} to send mail" \
+        if !from[:mailbox_id]
       return "556 5.7.27 Traffic on port #{SubmissionPort} must be authenticated (i.e., #{ServerTitle} client)" \
         if !@mail[:authenticated]
       return "556 5.7.27 Traffic on port #{SubmissionPort} must be encrypted" \
         if !@mail[:encrypted]
-    else
-      # traffic is from a non-member
-      return "556 5.7.27 Non #{ServerTitle} members must use port #{StandardMailPort} to send mail" \
-        if !from[:mailbox_id] && @mail[:local_port]!=StandardMailPort
     end
 
+    # use the mail_from(value) method in the configuration file to add
+    # more rules for filtering senders; psych_value will determine if
+    # the sender is a member, if you have a 'client_lookup(url)', as mentioned above
     if respond_to?(:mail_from)
       msg = mail_from(value)
       return msg if !msg.nil?

data/lib/rubymta/version.rb

@@ -1,5 +1,5 @@
 module Version
-  VERSION = "0.0.4"
-  MODIFIED = "2017-09-16"
+  VERSION = "0.0.5"
+  MODIFIED = "2017-09-24"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubymta
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Michael J. Welch, Ph.D.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-16 00:00:00.000000000 Z
+date: 2017-09-24 00:00:00.000000000 Z
 dependencies: []
 description: RubyMta is an experimental mail transport agent written in Ruby. See
   the README.
@@ -53,7 +53,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A Ruby Gem providing a complete Mail Transport Agent package.