feat: move mblog header handling into mime4cl
Accessing the headers of a MIME message feels like something mime4cl should handle. We implemented this ad hoc in mblog before in order to not need to worry about doing it in a sensible way. Now we introduce a decent-ish interface for getting a header from a MIME message, mime-message-header-values: * It returns a list because MIME message headers may appear multiple times. * It decodes RFC2047 only upon request, as you may want to be stricter about parsing certain fields. * It checks header name equality case insensitively. The code for decoding the RFC2047 string is retained and still uses babel for doing the actual decoding. Change-Id: I58bbbe4b46dbded04160b481a28a40d14775673d Reviewed-on: https://cl.tvl.fyi/c/depot/+/5150 Tested-by: BuildkiteCI Reviewed-by: sterni <sternenseemann@systemli.org>
This commit is contained in:
parent
81c47da91c
commit
5bc73de59d
7 changed files with 43 additions and 37 deletions
1
third_party/lisp/mime4cl/default.nix
vendored
1
third_party/lisp/mime4cl/default.nix
vendored
|
@ -6,6 +6,7 @@ depot.nix.buildLisp.library {
|
|||
name = "mime4cl";
|
||||
|
||||
deps = [
|
||||
depot.third_party.lisp.babel
|
||||
depot.third_party.lisp.sclf
|
||||
depot.third_party.lisp.npg
|
||||
depot.third_party.lisp.trivial-gray-streams
|
||||
|
|
18
third_party/lisp/mime4cl/endec.lisp
vendored
18
third_party/lisp/mime4cl/endec.lisp
vendored
|
@ -644,7 +644,7 @@ method of RFC2047 and return a sequence of bytes."
|
|||
(vector-push-extend (char-code c) output-sequence)))
|
||||
finally (return output-sequence)))
|
||||
|
||||
(defun decode-RFC2047-string (encoding string &key (start 0) (end (length string)))
|
||||
(defun decode-RFC2047-part (encoding string &key (start 0) (end (length string)))
|
||||
"Decode STRING according to RFC2047 and return a sequence of
|
||||
bytes."
|
||||
(gcase (encoding string-equal)
|
||||
|
@ -674,10 +674,24 @@ sequence, a charset string indicating the original coding."
|
|||
(push (subseq text previous-end start)
|
||||
result))
|
||||
(setf previous-end (+ end 2))
|
||||
(push (cons (decode-RFC2047-string encoding text :start (1+ second-?) :end end)
|
||||
(push (cons (decode-RFC2047-part encoding text :start (1+ second-?) :end end)
|
||||
charset)
|
||||
result))
|
||||
finally (unless (= previous-end (length text))
|
||||
(push (subseq text previous-end (length text))
|
||||
result))
|
||||
(return (nreverse result))))
|
||||
|
||||
(defun decode-RFC2047 (text)
|
||||
"Decode TEXT into a fully decoded string. Whenever a non ASCII part is
|
||||
encountered, try to decode it using babel, otherwise signal an error."
|
||||
(flet ((decode-part (part)
|
||||
(etypecase part
|
||||
(cons (babel:octets-to-string
|
||||
(car part)
|
||||
:encoding (babel-encodings:get-character-encoding
|
||||
(intern (string-upcase (cdr part)) 'keyword))))
|
||||
(string part))))
|
||||
(apply #'concatenate
|
||||
(cons 'string
|
||||
(mapcar #'decode-part (mime:parse-RFC2047-text text))))))
|
||||
|
|
14
third_party/lisp/mime4cl/mime.lisp
vendored
14
third_party/lisp/mime4cl/mime.lisp
vendored
|
@ -622,6 +622,20 @@ found in STREAM."
|
|||
|
||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
|
||||
(defun mime-message-header-values (name message &key decode)
|
||||
"Return all values of the header with NAME in MESSAGE, optionally decoding
|
||||
it according to RFC2047 if :DECODE is T."
|
||||
(loop ;; A header may occur multiple times
|
||||
for header in (mime-message-headers message)
|
||||
;; MIME Headers should be case insensitive
|
||||
;; https://stackoverflow.com/a/6143644
|
||||
when (string-equal (car header) name)
|
||||
collect (if decode
|
||||
(decode-RFC2047 (cdr header))
|
||||
(cdr header))))
|
||||
|
||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
|
||||
(defvar *lazy-mime-decode* t
|
||||
"If true don't decode mime bodies in memory.")
|
||||
|
||||
|
|
3
third_party/lisp/mime4cl/package.lisp
vendored
3
third_party/lisp/mime4cl/package.lisp
vendored
|
@ -30,6 +30,8 @@
|
|||
#:process-wait
|
||||
#:process-alive-p
|
||||
#:run-program)
|
||||
(:import-from :babel :octets-to-string)
|
||||
(:import-from :babel-encodings :get-character-encoding)
|
||||
(:export #:*lazy-mime-decode*
|
||||
#:print-mime-part
|
||||
#:read-mime-message
|
||||
|
@ -61,6 +63,7 @@
|
|||
#:mime-type-string
|
||||
#:mime-type-parameters
|
||||
#:mime-message-headers
|
||||
#:mime-message-header-values
|
||||
#:mime=
|
||||
#:find-mime-part-by-path
|
||||
#:find-mime-part-by-id
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue