Land #18377, add support for HELO to smtp_relay auxiliary module in c…

…ase EHLO is not supported
rapid7 · Sep 18, 2023 · 4dd18d8 · 4dd18d8
2 parents 0fc88a8 + e5c9226
commit 4dd18d8
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/modules/auxiliary/scanner/smtp/smtp_relay.rb b/modules/auxiliary/scanner/smtp/smtp_relay.rb
@@ -84,6 +84,11 @@ def do_test_relay(testnumber, mailfrom, mailto)
 
       res = raw_send_recv("EHLO X\r\n")
       vprint_status("#{res.inspect}")
+      # check if the EHLO is actually supported. In case it's not, try the HELO command instead
+      if res.to_s =~ /^5\d\d/
+        res = raw_send_recv("HELO X\r\n")
+        vprint_status("#{res.inspect}")
+      end
 
       res = raw_send_recv("#{mailfrom}\r\n")
       vprint_status("#{res.inspect}")