Re: bad boundary choice in forwarded multipart/signed multipart/mixed

[Andreas Seltenreich <andreas+ding@gate450.dyndns.org>]

[-- Attachment #1: Type: text/plain, Size: 1269 bytes --]

Greg Troxel writes:

> The inner test message had boundary =-=-= originally.  That got remapped
> whent he message was forwarded, which I suppose is ok.

Yeah, Gnus is a bit eager with regenerating MIME (you can tame it using
message-forward-show-mml).

> But it got remaped to ===-=-= and that's the same value that was
> chosen for the outer message's multipart/signed.
[...]
> It looks like the key code is in mml.el in gnus, but I haven't
> understood it yet.

My analysis so far:

(a) mml-multipart-number is let-bound on recursive descend of
    mml-generate-mime.  So mml-compute-boundary potentially generates
    duplicate delimiters unless the collision test prevents it.

(b) The collision test code doesn't look at the content of
    message/rfc822 [#mml] handles.

(c) If it would look at them, it wouldn't note a collision generated by
    (a) since the handle still contains the untranslated
    [#multipart]-tags instead of MIME.

I think (b) needs to be fixed anyway because a collision could occur
independently of (a).  Now either fixing (a) or (c) should prevent the
generation of broken MIME.  I guess squishing the bug the (b) + (c) way
is more adequate since it's less invasive.  Will push in a jiffy.

Thanks for your elaborate report,
andreas


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Type: text/x-patch, Size: 933 bytes --]

diff --git a/lisp/mml.el b/lisp/mml.el
index f262dc6..9dc0966 100644
--- a/lisp/mml.el
+++ b/lisp/mml.el
@@ -520,7 +520,10 @@ (defun mml-generate-mime-1 (cont)
 			  ;; `m-g-d-t' will be bound to "message/rfc822"
 			  ;; when encoding an article to be forwarded.
 			  (mml-generate-default-type "text/plain"))
-		      (mml-to-mime))
+		      (mml-to-mime)
+		      ;; Update handle so mml-compute-boundary can
+		      ;; detect collisions with the nested parts.
+		      (setcdr (assoc 'contents cont) (buffer-string)))
 		    (let ((mm-7bit-chars (concat mm-7bit-chars "\x1b")))
 		      ;; ignore 0x1b, it is part of iso-2022-jp
 		      (setq encoding (mm-body-7-or-8))))
@@ -699,7 +702,7 @@ (defun mml-compute-boundary (cont)
 (defun mml-compute-boundary-1 (cont)
   (let (filename)
     (cond
-     ((eq (car cont) 'part)
+     ((member (car cont) '(part mml))
       (with-temp-buffer
 	(cond
 	 ((cdr (assq 'buffer cont))