Search for multipart/(signed|encrypted) in message-forward-make-body

Search for multipart/(signed|encrypted) in message-forward-make-body

[Reiner Steib]

Hi,

in `message-forward-make-body' we have:

  (if digest
      (message-forward-make-body-digest forward-buffer)
    (if message-forward-as-mime
	(if (and message-forward-show-mml
		 (not (and (eq message-forward-show-mml 'best)
			   (with-current-buffer forward-buffer
			     (goto-char (point-min))
			     (re-search-forward
			      "Content-Type: *multipart/\\(signed\\|encrypted\\)"
			      nil t)))))
	    (message-forward-make-body-mml forward-buffer)
	  (message-forward-make-body-mime forward-buffer))
      (message-forward-make-body-plain forward-buffer)))

Shouldn't the search for multipart/(signed|encrypted) be restricted to
the headers?

--8<---------------cut here---------------start------------->8---
--- message.el	09 Nov 2006 14:45:46 +0100	7.189
+++ message.el	09 Nov 2006 14:48:17 +0100	
@@ -6798,10 +6798,12 @@
 	(if (and message-forward-show-mml
 		 (not (and (eq message-forward-show-mml 'best)
 			   (with-current-buffer forward-buffer
-			     (goto-char (point-min))
-			     (re-search-forward
-			      "Content-Type: *multipart/\\(signed\\|encrypted\\)"
-			      nil t)))))
+			     (save-restriction
+			       (mail-narrow-to-head)
+			       (goto-char (point-min))
+			       (re-search-forward
+				"Content-Type: *multipart/\\(signed\\|encrypted\\)"
+				nil t))))))
 	    (message-forward-make-body-mml forward-buffer)
 	  (message-forward-make-body-mime forward-buffer))
       (message-forward-make-body-plain forward-buffer)))
--8<---------------cut here---------------end--------------->8---

Bye, Reiner.
-- 
       ,,,
      (o o)
---ooO-(_)-Ooo---  |  PGP key available  |  http://rsteib.home.pages.de/

Re: Search for multipart/(signed|encrypted) in message-forward-make-body

[Katsumi Yamaoka]

>>>>> In <v93b8senm9.fsf@marauder.physik.uni-ulm.de>
>>>>>	Reiner Steib wrote:

> in `message-forward-make-body' we have:

>   (if digest
>       (message-forward-make-body-digest forward-buffer)
>     (if message-forward-as-mime
> 	(if (and message-forward-show-mml
> 		 (not (and (eq message-forward-show-mml 'best)
> 			   (with-current-buffer forward-buffer
> 			     (goto-char (point-min))
> 			     (re-search-forward
> 			      "Content-Type: *multipart/\\(signed\\|encrypted\\)"
> 			      nil t)))))
> 	    (message-forward-make-body-mml forward-buffer)
> 	  (message-forward-make-body-mime forward-buffer))
>       (message-forward-make-body-plain forward-buffer)))

> Shouldn't the search for multipart/(signed|encrypted) be restricted to
> the headers?

I don't think so.  I tested your patch by forwarding again a
forwarded message in which the forwarded part contains non-ASCII
text and a gpg signature.  Note that the gpg signature was made
with encoded text.  Where the word *encoded* means charset
encoding and CTE (i.e., 7bit, B, or Q) encoding.

When I type `C-c C-f' in the summary buffer, I get a message
buffer with human-readable text in the body.  That's good.
However, Gnus will not necessarily use the same CTE as the one
used when the original message was sent.  Because there is no
`encoding=' tag which inherits the original CTE.  Even if they
are the same, Q encoding does not always output the same result.
So, it may destroy the consistency of the text and the signature.

Regards,

Re: Search for multipart/(signed|encrypted) in message-forward-make-body

[Reiner Steib]

On Fri, Nov 10 2006, Katsumi Yamaoka wrote:

>>>>>>	Reiner Steib wrote:
>
>> in `message-forward-make-body' we have:
>
>>   (if digest
>>       (message-forward-make-body-digest forward-buffer)
>>     (if message-forward-as-mime
>> 	(if (and message-forward-show-mml
>> 		 (not (and (eq message-forward-show-mml 'best)
>> 			   (with-current-buffer forward-buffer
>> 			     (goto-char (point-min))
>> 			     (re-search-forward
>> 			      "Content-Type: *multipart/\\(signed\\|encrypted\\)"
>> 			      nil t)))))
>> 	    (message-forward-make-body-mml forward-buffer)
>> 	  (message-forward-make-body-mime forward-buffer))
>>       (message-forward-make-body-plain forward-buffer)))
>
>> Shouldn't the search for multipart/(signed|encrypted) be restricted to
>> the headers?
>
> I don't think so.  I tested your patch by forwarding again a
> forwarded message in which the forwarded part contains non-ASCII
> text and a gpg signature.

Ah, I didn't think of this case.  Thanks for clarifying.

Wouldn't any text like "Content-Type: multipart/encrypted" in this
line give a false match?  Probably this isn't harmful because the
message body looks nice with `message-forward-make-body-mml', but
`message-forward-make-body-mime' is safer.  Is this correct?

Maybe adding a doc string and a few comments to
`message-forward-make-body' would be a good idea.

Bye, Reiner.
-- 
       ,,,
      (o o)
---ooO-(_)-Ooo---  |  PGP key available  |  http://rsteib.home.pages.de/

Re: Search for multipart/(signed|encrypted) in message-forward-make-body

[Katsumi Yamaoka]

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

>>>>> In <v9ejs9g05r.fsf@marauder.physik.uni-ulm.de>
>>>>>	Reiner Steib wrote:

>>> in `message-forward-make-body' we have:

[...]

>>> Shouldn't the search for multipart/(signed|encrypted) be restricted to
>>> the headers?

>> I don't think so.  I tested your patch by forwarding again a
>> forwarded message in which the forwarded part contains non-ASCII
>> text and a gpg signature.

> Ah, I didn't think of this case.  Thanks for clarifying.

> Wouldn't any text like "Content-Type: multipart/encrypted" in this
> line give a false match?  Probably this isn't harmful because the
> message body looks nice with `message-forward-make-body-mml', but
> `message-forward-make-body-mime' is safer.  Is this correct?

The complete version is below. :)
The new function `message-signed-or-encrypted-p' dissects the
message to forward and detects a signed or encrypted part by
rightful means.  Even if the function causes an error, Message
chooses the raw mode safely.  Could you test it?  In addition,
I'd like to install it to only the trunk if it is ok.  WDYT?


[-- Attachment #2: Type: application/emacs-lisp, Size: 2293 bytes --]

Re: Search for multipart/(signed|encrypted) in message-forward-make-body

[Katsumi Yamaoka]

>>>>> In <b4mirh8ndrx.fsf@jpl.org> Katsumi Yamaoka wrote:

> The complete version is below. :)
> The new function `message-signed-or-encrypted-p' dissects the
> message to forward and detects a signed or encrypted part by
> rightful means.  Even if the function causes an error, Message
> chooses the raw mode safely.  Could you test it?  In addition,
> I'd like to install it to only the trunk if it is ok.  WDYT?

I've committed this only in the trunk along with comments.

Re: Search for multipart/(signed|encrypted) in message-forward-make-body

[Reiner Steib]

On Thu, Nov 30 2006, Katsumi Yamaoka wrote:

>>>>>> In <b4mirh8ndrx.fsf@jpl.org> Katsumi Yamaoka wrote:
>
>> The complete version is below. :)
>> The new function `message-signed-or-encrypted-p' dissects the
>> message to forward and detects a signed or encrypted part by
>> rightful means.  Even if the function causes an error, Message
>> chooses the raw mode safely.  Could you test it?  

I didn't have time to test it.

>> In addition, I'd like to install it to only the trunk if it is ok.
>> WDYT?
>
> I've committed this only in the trunk along with comments.

Thanks.

Bye, Reiner.
-- 
       ,,,
      (o o)
---ooO-(_)-Ooo---  |  PGP key available  |  http://rsteib.home.pages.de/