X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=mimedecode.py;h=c12afbb963bcdd60eeaee789d6de8848d8ee1a26;hb=180a1e42c8b840f489a79d0012cb9ee3d2aa08c3;hp=42318f47594639ed667db47c753310647a402f54;hpb=502931f2c502991905892ae23548d9b02adf7fd0;p=mimedecode.git diff --git a/mimedecode.py b/mimedecode.py index 42318f4..c12afbb 100755 --- a/mimedecode.py +++ b/mimedecode.py @@ -18,7 +18,7 @@ Broytman mimedecode.py version %s, %s def usage(code=0, errormsg=''): version(0) sys.stdout.write("""\ -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 header:param] [-beit mask] [-o output_file] [input_file [output_file]] + 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] [-o output_file] [input_file [output_file]] """ % me) if errormsg: sys.stderr.write(errormsg + '\n') @@ -108,6 +108,27 @@ def _decode_headers_params(msg, header, decode_all_params, param_list): for param in param_list: decode_header_param(msg, header, param) +def _remove_headers_params(msg, header, remove_all_params, param_list): + if remove_all_params: + params = msg.get_params(header=header) + if params: + if param_list: + for param, value in params: + if param not in param_list: + msg.del_param(param, header) + else: + value = msg[header] + if value is None: # No such header + return + if ';' not in value: # There are no parameters + return + del msg[header] # Delete all such headers + # Get the value without parameters and set it back + msg[header] = value.split(';')[0].strip() + else: + for param in param_list: + msg.del_param(param, header) + def decode_headers(msg): "Decode message headers according to global options" @@ -122,18 +143,20 @@ def decode_headers(msg): for header in header_list: del msg[header] - #for header in gopts.remove_all_params: - # value = msg[header] - # if value is None: # No such header - # continue - # if ';' not in value: # There are no parameters - # continue - # del msg[header] # Delete all such headers - # # Get the value without parameters and set it back - # msg[header] = value.split(';')[0].strip() - - for header, param in gopts.remove_header_params: - msg.del_param(param, header) + for header_list, param_list in gopts.remove_headers_params: + header_list = header_list.split(',') + param_list = param_list.split(',') + remove_all_params = param_list[0] == '*' # Remove all params except listed + if remove_all_params: + param_list = _get_exceptions(param_list) + if header_list[0] == '*': # Remove for all headers except listed + header_list = _get_exceptions(header_list) + for header in msg.keys(): + if header.lower() not in header_list: + _remove_headers_params(msg, header, remove_all_params, param_list) + else: # Decode for listed headers + for header in header_list: + _remove_headers_params(msg, header, remove_all_params, param_list) for header_list in gopts.decode_headers: header_list = header_list.split(',') @@ -249,14 +272,6 @@ def decode_part(msg): "Decode one part of the message" decode_headers(msg) - encoding = msg["Content-Transfer-Encoding"] - - if encoding in (None, '', '7bit', '8bit', 'binary'): - outstring = str(msg.get_payload()) - else: # Decode from transfer ecoding to text or binary form - outstring = str(msg.get_payload(decode=1)) - set_header(msg, "Content-Transfer-Encoding", "8bit") - msg["X-MIME-Autoconverted"] = "from %s to 8bit by %s id %s" % (encoding, gopts.host_name, me) # Test all mask lists and find what to do with this content type masks = [] @@ -268,11 +283,26 @@ def decode_part(msg): masks.append(mtype + '/*') masks.append('*/*') + left_binary = False + for content_type in masks: + if content_type in gopts.binary_mask: + left_binary = True + break + + encoding = msg["Content-Transfer-Encoding"] + if left_binary or encoding in (None, '', '7bit', '8bit', 'binary'): + outstring = msg.get_payload() + else: # Decode from transfer ecoding to text or binary form + outstring = msg.get_payload(decode=1) + set_header(msg, "Content-Transfer-Encoding", "8bit") + msg["X-MIME-Autoconverted"] = "from %s to 8bit by %s id %s" % (encoding, gopts.host_name, me) + for content_type in masks: if content_type in gopts.totext_mask: totext(msg, outstring) return - elif content_type in gopts.binary_mask: + elif content_type in gopts.binary_mask or \ + content_type in gopts.decoded_binary_mask: output_headers(msg) output(outstring) return @@ -342,10 +372,16 @@ class GlobalOptions: # A list of headers to remove remove_headers = [] # A list of headers parameters to remove - remove_header_params = [] + remove_headers_params = [] + + # A list of header/value pairs to set + set_header_value = [] + # A list of header/parameter/value triples to set + set_header_param = [] totext_mask = [] # A list of content-types to decode - binary_mask = [] # A list to pass through + 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) error_mask = [] # Raise error if encounter one of these @@ -360,8 +396,8 @@ def get_opt(): try: options, arguments = getopt(sys.argv[1:], - 'hVcCDPH:f:d:p:r:R:b:e:i:t:o:', - ['help', 'version', 'host=']) + 'hVcCDPH:f:d:p:r:R:b:B:e:i:t:o:', + ['help', 'version', 'host=', 'set-header=', 'set-param=']) except GetoptError: usage(1) @@ -391,11 +427,22 @@ def get_opt(): elif option == '-r': gopts.remove_headers.append(value) elif option == '-R': - gopts.remove_header_params.append(value.split(':', 1)) + gopts.remove_headers_params.append(value.split(':', 1)) + elif option == '--set-header': + gopts.set_header_value.append(value.split(':', 1)) + elif option == '--set-param': + header, value = value.split(':', 1) + if '=' in value: + param, value = value.split('=', 1) + else: + param, value = value.split(':', 1) + gopts.set_header_param.append((header, param, value)) elif option == '-t': gopts.totext_mask.append(value) - elif option == '-b': + elif option == '-B': gopts.binary_mask.append(value) + elif option == '-b': + gopts.decoded_binary_mask.append(value) elif option == '-i': gopts.ignore_mask.append(value) elif option == '-e': @@ -457,8 +504,17 @@ if __name__ == "__main__": gopts.outfile = outfile output = outfile.write + msg = email.message_from_file(infile) + + for header, value in gopts.set_header_value: + msg[header] = value + + for header, param, value in gopts.set_header_param: + if header in msg: + msg.set_param(param, value, header) + try: - decode_message(email.message_from_file(infile)) + decode_message(msg) finally: infile.close() outfile.close()