X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=mimedecode.py;h=8d50b7d0d56453ab0d148cc0d66311c2d6b13081;hb=bc6318c1a631d838dfe6bfe1c94638c59ea626bf;hp=50f8a18675a5265700f2f4928208e169dc116f8d;hpb=2f5f5a47bcc3cc87ba568ca1ee3107218cb1d6b6;p=mimedecode.git diff --git a/mimedecode.py b/mimedecode.py index 50f8a18..8d50b7d 100755 --- a/mimedecode.py +++ b/mimedecode.py @@ -1,10 +1,9 @@ #! /usr/bin/env python """Decode MIME message""" -from mimedecode_version import __version__, __author__, __copyright__, __license__ - import sys, os -import email +from mimedecode_version import __version__, \ + __author__, __copyright__, __license__ me = os.path.basename(sys.argv[0]) @@ -21,17 +20,17 @@ def usage(code=0, errormsg=''): Usage: %s [-h|--help] [-V|--version] [-cCDP] [-H|--host=hostname] [-f charset] [-d header1[,h2,...]|*[,-h1,...]] [-p header1[,h2,h3,...]:param1[,p2,p3,...]] [-r header1[,h2,...]|*[,-h1,...]] [-R header1[,h2,h3,...]:param1[,p2,p3,...]] [--set-header header:value] [--set-param header:param=value] [-Bbeit mask] [--save-headers|body|message mask] [-O dest_dir] [-o output_file] [input_file [output_file]] """ % me) if errormsg: - sys.stderr.write(errormsg + '\n') + sys.stderr.write(errormsg + os.linesep) sys.exit(code) def output_headers(msg): unix_from = msg.get_unixfrom() if unix_from: - output(unix_from + '\n') + output(unix_from + os.linesep) for key, value in msg.items(): - output("%s: %s\n" % (key, value)) - output("\n") # End of headers + output("%s: %s%s" % (key, value, os.linesep)) + output(os.linesep) # End of headers def recode_if_needed(s, charset): @@ -223,9 +222,9 @@ def decode_body(msg, s): if not command: return s - file = open(filename, 'w') - file.write(s) - file.close() + outfile = open(filename, 'wb') + outfile.write(s) + outfile.close() pipe = os.popen(command, 'r') s = pipe.read() @@ -263,6 +262,18 @@ def totext(msg, instring): return s +mimetypes = None + +def _guess_extension(ctype): + global mimetypes + if mimetypes is None: + import mimetypes + mimetypes.init() + user_mime_type = os.path.expanduser('~/.mime.types') + if os.path.exists(user_mime_type): + mimetypes._db.read(user_mime_type) + return mimetypes.guess_extension(ctype) + def _save_message(msg, outstring, save_headers=False, save_body=False): for header, param in ( ("Content-Disposition", "filename"), @@ -284,6 +295,9 @@ def _save_message(msg, outstring, save_headers=False, save_body=False): fname = '' g.save_counter += 1 fname = str(g.save_counter) + fname + if '.' not in fname: + ext = _guess_extension(msg.get_content_type()) + if ext: fname += ext global output save_output = output @@ -307,8 +321,7 @@ def decode_part(msg): ctype = msg.get_content_type() if ctype: masks.append(ctype) - mtype = msg.get_content_maintype() - if mtype: + mtype = ctype.split('/')[0] masks.append(mtype + '/*') masks.append('*/*') @@ -320,6 +333,8 @@ def decode_part(msg): elif content_type in g.binary_mask: left_binary = True break + elif content_type in g.fully_ignore_mask: + return encoding = msg["Content-Transfer-Encoding"] if left_binary or encoding in (None, '', '7bit', '8bit', 'binary'): @@ -340,7 +355,7 @@ def decode_part(msg): break elif content_type in g.ignore_mask: output_headers(msg) - output("\nMessage body of type %s skipped.\n" % ctype) + output("%sMessage body of type %s skipped.%s" % (os.linesep, ctype, os.linesep)) break elif content_type in g.error_mask: break @@ -351,9 +366,9 @@ def decode_part(msg): for content_type in masks: if content_type in g.save_headers_mask: _save_message(msg, outstring, save_headers=True, save_body=False) - elif content_type in g.save_body_mask: + if content_type in g.save_body_mask: _save_message(msg, outstring, save_headers=False, save_body=True) - elif content_type in g.save_message_mask: + if content_type in g.save_message_mask: _save_message(msg, outstring, save_headers=True, save_body=True) for content_type in masks: @@ -364,29 +379,49 @@ def decode_multipart(msg): "Decode multipart" decode_headers(msg) + boundary = msg.get_boundary() + + masks = [] + ctype = msg.get_content_type() + if ctype: + masks.append(ctype) + mtype = ctype.split('/')[0] + masks.append(mtype + '/*') + masks.append('*/*') + + for content_type in masks: + if content_type in g.fully_ignore_mask: + return + elif content_type in g.ignore_mask: + output_headers(msg) + output("%sMessage body of type %s skipped.%s" % (os.linesep, ctype, os.linesep)) + if boundary: + output("%s--%s--%s" % (os.linesep, boundary, os.linesep)) + return + elif content_type in g.error_mask: + raise ValueError, "content type %s prohibited" % ctype + output_headers(msg) if msg.preamble: # Preserve the first part, it is probably not a RFC822-message output(msg.preamble) # Usually it is just a few lines of text (MIME warning) if msg.preamble is not None: - output("\n") + output(os.linesep) first_subpart = True - boundary = msg.get_boundary() - for subpart in msg.get_payload(): if boundary: if first_subpart: first_subpart = False else: - output("\n") - output("--%s\n" % boundary) + output(os.linesep) + output("--%s%s" % (boundary, os.linesep)) # Recursively decode all parts of the subpart decode_message(subpart) if boundary: - output("\n--%s--\n" % boundary) + output("%s--%s--%s" % (os.linesep, boundary, os.linesep)) if msg.epilogue: output(msg.epilogue) @@ -410,7 +445,7 @@ def open_output_file(filename): if create: os.makedirs(full_dir) try: - return open(fullpath, 'w') + return open(fullpath, 'wb') except: if create: os.removedirs(full_dir) @@ -445,7 +480,8 @@ class GlobalOptions: totext_mask = [] # A list of content-types to decode binary_mask = [] # A list of content-types to pass through decoded_binary_mask = [] # A list of content-types to pass through (content-transfer-decoded) - ignore_mask = [] # Ignore (skip, do not decode and do not include into output) + ignore_mask = [] # Ignore (do not decode and do not include into output) but output a warning instead of the body + fully_ignore_mask = [] # Completely ignore - no headers, no body, no warning error_mask = [] # Raise error if encounter one of these save_counter = 0 @@ -465,7 +501,7 @@ def get_opts(): try: options, arguments = getopt(sys.argv[1:], - 'hVcCDPH:f:d:p:r:R:b:B:e:i:t:O:o:', + 'hVcCDPH:f:d:p:r:R:b:B:e:I:i:t:O:o:', ['help', 'version', 'host=', 'save-headers=', 'save-body=', 'save-message=', 'set-header=', 'set-param=']) @@ -514,6 +550,8 @@ def get_opts(): g.binary_mask.append(value) elif option == '-b': g.decoded_binary_mask.append(value) + elif option == '-I': + g.fully_ignore_mask.append(value) elif option == '-i': g.ignore_mask.append(value) elif option == '-e': @@ -583,6 +621,7 @@ if __name__ == "__main__": g.outfile = outfile output = outfile.write + import email msg = email.message_from_file(infile) for header, value in g.set_header_value: