From: Peter Palfrader <peter@palfrader.org>
Date: Sat, 21 May 2011 13:41:47 +0000 (+0200)
Subject: More lax with mime
X-Git-Tag: userdir-ldap-0.3.85~106
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fuserdir-ldap.git;a=commitdiff_plain;h=43aa6ad5f244e7b574309b29b2bf512336ea27b1

More lax with mime
---

diff --git a/userdir_gpg.py b/userdir_gpg.py
index b84a76d..d89b78e 100644
--- a/userdir_gpg.py
+++ b/userdir_gpg.py
@@ -108,10 +108,10 @@ def GetClearSig(Msg, Paranoid = 0, lax_multipart = False):
 
       (Signed, Signature) = payloads
 
-      if Signed.get_content_type() != "text/plain":
-         raise UDFormatError, "Invalid pgp/mime encoding [wrong plaintext type]";
+      if Signed.get_content_type() != "text/plain" and not lax_multipart:
+         raise UDFormatError, "Invalid pgp/mime encoding for first part[wrong plaintext type]";
       if Signature.get_content_type() != "application/pgp-signature":
-         raise UDFormatError, "Invalid pgp/mime encoding [wrong signature type]";
+         raise UDFormatError, "Invalid pgp/mime encoding for second part [wrong signature type]";
 
       # Append the PGP boundary header and the signature text to re-form the
       # original signed block [needs to convert to \r\n]