X-Git-Url: https://thelambdalab.xyz/gitweb/index.cgi?p=lambdamail.git;a=blobdiff_plain;f=lambdamail.scm;h=07b14519b32214829b8572ea5df1c431934a7e72;hp=55398dcc5c5a607412aa65765ff8c4dfc10c0346;hb=24573e108fe7cb5368cabd16dad6906a67ed91d1;hpb=6c88f8669ce1ff3faad7b477034ee294c93ca02b

diff --git a/lambdamail.scm b/lambdamail.scm
index 55398dc..07b1451 100644
--- a/lambdamail.scm
+++ b/lambdamail.scm
@@ -14,14 +14,18 @@
         (chicken process-context)
         (chicken process-context posix)
         (chicken condition)
+        (chicken sort)
         srfi-1 srfi-13 matchable base64)
 
-(define lambdamail-version "LambdaMail v0.0.1")
+(define lambdamail-version "LambdaMail v1.0.0")
 
 (define-record config host port spool-dir user group)
 (define-record message to from text user password)
 (define (make-empty-message) (make-message "" "" "" "" ""))
 
+(define (time-stamp)
+  (time->string (seconds->local-time) "%d %b %Y %T %z"))
+
 
 ;;; Server initialization
 ;;
@@ -58,9 +62,10 @@
 
 (define (receive-messages listener config)
   (let ((messages '()))
+    (print "*** Waiting for incoming mail")
     (let-values (((in-port out-port) (tcp-accept listener)))
       (let-values (((local-ip remote-ip) (tcp-addresses in-port)))
-        (print "Accepted connection from " remote-ip " on " (seconds->string)))
+        (print "Accepted connection from " remote-ip " on " (time-stamp)))
       (condition-case
           (set! messages (process-smtp (make-smtp-session in-port out-port config) config))
         (o (exn)
@@ -72,15 +77,18 @@
 
 (define (make-smtp-session in-port out-port config)
   (let ((user "")
-        (password ""))
-    (lambda msg
-      (match msg
+        (password "")
+        (helo ""))
+    (lambda command
+      (match command
         (('get-line) (read-line in-port))
-        (('send-line strings ...) (write-line (conc (apply conc strings) "\r") out-port))
+        (('send strings ...) (write-line (conc (apply conc strings) "\r") out-port))
         (('set-user! u) (set! user u))
         (('set-password! p) (set! password p))
+        (('set-helo! h) (set! helo h))
         (('user) user)
-        (('password) password)))))
+        (('password) password)
+        (('helo) helo)))))
 
 (define (smtp-command? cmd-string input-string)
   (string-prefix? cmd-string (string-downcase input-string)))
@@ -91,7 +99,7 @@
       ""))
 
 (define (process-smtp smtp-session config)
-  (smtp-session 'send-line "220 " (config-host config) lambdamail-version)
+  (smtp-session 'send "220 " (config-host config) " " lambdamail-version)
   (let loop ((msg (make-empty-message))
              (received-messages '()))
     (let ((line (smtp-session 'get-line)))
@@ -99,14 +107,16 @@
         (print "got " line)
         (cond
          ((smtp-command? "helo" line)
-          (smtp-session 'send-line "250 ok")
+          (smtp-session 'set-helo! (smtp-command-args "helo" line))
+          (smtp-session 'send "250 ok")
           (loop msg received-messages))
          ((smtp-command? "ehlo" line)
-          (smtp-session 'send-line
+          (smtp-session 'set-helo! (smtp-command-args "helo" line))
+          (smtp-session 'send
                         "250-" (config-host config)
                         " Hello " (smtp-command-args "ehlo" line))
-          (smtp-session 'send-line "250 AUTH PLAIN")
-          ;; (smtp-session 'send-line "250 STARTTLS")
+          (smtp-session 'send "250 AUTH PLAIN")
+          ;; (smtp-session 'send "250 STARTTLS")
           (loop msg received-messages))
          ((smtp-command? "auth plain" line)
           (let* ((auth-string (smtp-command-args "auth plain" line))
@@ -117,34 +127,37 @@
             (smtp-session 'set-user! user)
             (smtp-session 'set-password! password)
             (print "Attempted login, user: " user ", password: " password)
-            (smtp-session 'send-line "235 authentication successful")
+            (smtp-session 'send "235 authentication successful")
             (loop msg received-messages)))
          ((smtp-command? "mail from:" line)
           (message-from-set! msg (smtp-command-args "mail from:" line))
-          (smtp-session 'send-line "250 ok")
+          (smtp-session 'send "250 ok")
           (loop msg received-messages))
          ((smtp-command? "rcpt to:" line)
           (message-to-set! msg (smtp-command-args "rcpt to:" line))
-          (smtp-session 'send-line "250 ok")
+          (smtp-session 'send "250 ok")
           (loop msg received-messages))
          ((smtp-command? "data" line)
-          (smtp-session 'send-line "354 intermediate")
-          (let text-loop ((text ""))
+          (smtp-session 'send "354 intermediate")
+          (let text-loop ((text (conc "Received: from " (smtp-session 'helo) "\n"
+                                      "   by " (config-host config) "\n"
+                                      "   for " (message-from msg)
+                                      "; " (time-stamp) "\n")))
             (let ((text-line (smtp-session 'get-line)))
               (if (string=? "." text-line)
                   (message-text-set! msg text)
                   (text-loop (conc text text-line "\n")))))
           (message-user-set! msg (smtp-session 'user))
           (message-password-set! msg (smtp-session 'password))
-          (smtp-session 'send-line "250 ok")
+          (smtp-session 'send "250 ok")
           (loop (make-empty-message) (cons msg received-messages)))
          ((smtp-command? "quit" line)
-          (smtp-session 'send-line "221 closing transmission channel")
+          (smtp-session 'send "221 closing transmission channel")
           received-messages)
          ((string=? "" (string-trim line))
           (loop msg received-messages))
          (else
-          (smtp-session 'send-line "502 command not implemented")
+          (smtp-session 'send "502 command not implemented")
           (loop msg received-messages)))))))
 
 
@@ -152,10 +165,42 @@
 ;;
 
 (define (deliver-messages config messages)
-  (print "Attempting delivery of " (length messages) " mail items.")
+  (print "**** Attempting delivery of " (length messages) " mail items.")
   (filter (lambda (msg) (not (deliver-message msg config)))
           messages))
 
+(define (deliver-message msg config)
+  (print "From: " (message-from msg))
+  (print "To: " (message-to msg))
+  (condition-case
+      (let* ((local-addresses (get-local-addresses config))
+             (dest (assoc (message-to msg) local-addresses))
+             (orig (assoc (message-from msg) local-addresses)))
+        (cond
+         (dest
+          (let ((dest-dir (cadr dest)))
+            (deliver-message-local msg dest-dir)))
+         (orig
+          (let ((password (caddr orig)))
+            (if (and (string=? (conc "<" (message-user msg) "@" (config-host config) ">")
+                               (message-from msg))
+                     password
+                     (string=? (message-password msg) password))
+                (deliver-message-remote msg config)
+                (begin
+                  (print "* REMOTE DELIVERY NOT ALLOWED (auth failure)")
+                  #t))))
+         (else
+          (print "* REMOTE DELIVERY REJECTED (relay forbidden)")
+          #t)))
+    (o (exn)
+       (print "* DELIVERY FAILED")
+       (print-error-message o)
+       #t)))
+
+
+;; Local delivery
+
 (define (get-local-addresses config)
   (map (lambda (p) (cons
                     (conc "<" (car p) "@" (config-host config) ">")
@@ -172,36 +217,73 @@
 (define (deliver-message-local msg dest-dir)
   (with-output-to-file (conc dest-dir "/" (current-seconds))
     (lambda ()
-      (print (message-text msg)))))
+      (print (message-text msg))))
+  (print "* MESSAGE DELIVERED (local)")
+  #t)
 
-(define (deliver-message-remote msg)
-  (print "TODO"))
 
-(define (deliver-message msg config)
-  (let* ((local-addresses (get-local-addresses config))
-         (dest (assoc (message-to msg) local-addresses))
-         (orig (assoc (message-from msg) local-addresses)))
-    (cond
-     (dest
-      (let ((dest-dir (cadr dest)))
-        (deliver-message-local msg dest-file))
-      (print "Message DELIVERED (local):"))
-     (orig
-      (let ((password (caddr orig)))
-        (if (and
-             (string=? (conc "<" (message-user msg) "@" (config-host config) ">")
-                       (message-from msg))
-             password
-             (string=? (message-password msg) password))
-            (begin
-              (deliver-message-remote msg)
-              (print "Message DELIVERED (remote):"))
-            (print "Message DELIVERY REJECTED (auth failure):"))))
-     (else
-      (print "Message DELIVERY REJECTED (relay forbidden):"))))
-  (print " * From: " (message-from msg))
-  (print " * To: " (message-to msg))
-  #t)
+;; Remote delivery
+
+(define (get-domain-from-email email-string)
+  (car (string-split (cadr (string-split email-string "@")) ">")))
+
+;; This is a hack - there's no built-in interface to res_query()
+;; in chicken, so we have to resort to a system call to dig...
+(define (get-mail-server-for-domain domain)
+  (let* ((mx-lines (let-values (((in out id) (process (conc "dig " domain " mx +short"))))
+                     (with-input-from-port in read-lines)))
+         (mx-entries (map (lambda (l)
+                            (let ((s (string-split l)))
+                              (list (string->number (car s)) 
+                                    (string-drop-right (cadr s) 1)))) ; remove trailing "."
+                          mx-lines))
+         (sorted-mx-entries (sort mx-entries (lambda (e f) (< (car e) (car f))))))
+    (if (null? sorted-mx-entries)
+        domain ; fall-back to email address domain if no mx entries
+        (cadar sorted-mx-entries)))) ; otherwise pick the highest priority server
+
+(define (deliver-message-remote msg config)
+  (let* ((domain (get-domain-from-email (message-to msg)))
+         (mail-server (get-mail-server-for-domain domain)))
+    (print "Attempting delivery to " mail-server)
+    (let-values (((tcp-in tcp-out) (tcp-connect mail-server 25)))
+      (let ((smtp-session (make-outgoing-smtp-session tcp-in tcp-out)))
+        (let ((result (and
+                       (smtp-session 'expect "220")
+                       (smtp-session 'send "helo " (config-host config))
+                       (smtp-session 'expect "250")
+                       (smtp-session 'send "mail from:" (message-from msg))
+                       (smtp-session 'expect "250")
+                       (smtp-session 'send "rcpt to:" (message-to msg))
+                       (smtp-session 'expect "250")
+                       (smtp-session 'send "data")
+                       (smtp-session 'expect "354")
+                       (smtp-session 'send (message-text msg))
+                       (smtp-session 'send ".")
+                       (smtp-session 'expect "250")
+                       (smtp-session 'send "quit"))))
+          (close-input-port tcp-in)
+          (close-output-port tcp-out)
+          (print "Connection closed.")
+          (if result
+              (print "* MESSAGE DELIVERED (remote)")
+              (print "* REMOTE DELIVERY FAILED (unexpected server response)"))
+          result)))))
+
+(define ((make-outgoing-smtp-session tcp-in tcp-out) . command)
+  (match command
+    (('expect code)
+     (let ((result (read-line tcp-in)))
+       (print "Expecting " code " got " result)
+       (string-prefix? code result)))
+    (('send strings ...)
+     (print "Sending " (if (> (string-length (car strings)) 30)
+                           (string-take (car strings) 30)
+                           (car strings)))
+     (let ((processed-string
+            (string-translate* (conc (apply conc strings) "\n")
+                               '(("\n" . "\r\n")))))
+       (write-string processed-string #f tcp-out)))))
 
 
 ;;; Command line argument parsing