#2687 - Include mimeo python module

modules/adblockplus/files/mimeo.py

 #!/usr/bin/env python3
 
 import argparse
-import logging
+import re
 import sys
+import threading
+import traceback
 
 from http.server import BaseHTTPRequestHandler, HTTPServer
 from string import Template
 
-PUNCTUATION = """!"#$%&'()*+,-./:;<=>?@[\]^_`{|}~"""
-PROXY_TOKEN = 'http_'
+# The token used for the headers passed by nginx is: http_
+REGEX = r'\$http_\w+\b'
+DEFAULT_LOG = '$remote_addr - - [$time_local] "$request" $status $bytes_sent'
+_lock = threading.Lock()
 
 
 class Handler(BaseHTTPRequestHandler):
-    def get_header_values(self, log_format):

[Vasily Kuznetsov, 2017/08/07 13:06:41]

What about not passing `log_format`? You can always just access it via
`self.log_format`.

[f.lopez, 2017/08/07 18:40:01]

Done.

+    def get_header_values(self):
         values = {}
-        for var in log_format.split():
-            name = var.strip()

[Vasily Kuznetsov, 2017/08/07 13:06:41]

Shouldn't you remove punctuation here instead of spaces? If the variables will
look like "$http_var" or "${http_var}", this will not work. Or am I missing
something?

[f.lopez, 2017/08/07 18:40:01]

Done.

-            if name.startswith(PROXY_TOKEN):
-                name = var.strip(PUNCTUATION)
-                new_var = name[len(PROXY_TOKEN):].title()
-                values[name] = self.headers.get(new_var, '-')
+        headers = re.findall(REGEX, self.format)
+        for name in headers:
+            new_var = name[6:].replace('_', '-')
+            values[name[1:]] = self.headers.get(new_var, '-')
         return values
 
-    def message_log(self, form, args):

[Vasily Kuznetsov, 2017/08/07 13:06:40]

This name is somewhat confusing, looks like a method returning a message log,
instead of a method that's logging something. Maybe call it 'log_info' instead,
if you want to avoid name collision with 'log_message'?

[f.lopez, 2017/08/07 18:40:02]

Done.

-        message = Template(form)
-        logging.info(message.safe_substitute(args))
+    def send_simple_response(self, status, response=None):
+        self.send_response(status)
+        self.end_headers()
+        if response is None:
+            response = bytes(self.responses[status][0], 'UTF-8')
+        self.wfile.write(response)
+
+    def write_info(self, args):
+        message = Template(self.format).safe_substitute(args) + '\n'
+        with _lock:
+            self.output.write(message)
+            self.output.flush()
 
     def do_POST(self):
         status = 200
         content = bytes(self.response, 'UTF-8')
         values = {
             'remote_addr': self.address_string(),
             'time_local': self.log_date_time_string(),
             'request': self.requestline,
             'status': status,
-            'bytes_sent"': len(content),

[Vasily Kuznetsov, 2017/08/07 13:06:40]

Oops, double quote :)

[f.lopez, 2017/08/07 18:40:01]

Done.

-            'Content-Type': 'text/plain',
-            'Content-Length': len(content),
+            'bytes_sent': len(content),
         }
-        values.update(self.get_header_values(self.log_format))
-        self.message_log(self.log_format, values)
-        self.send_response(status)
-        self.send_header('Content-Type', values['Content-Type'])
-        self.send_header('Content-Length', values['Content-Length'])
-        self.end_headers()
-        self.wfile.write(content)
-        self.log_request(200)
+        values.update(self.get_header_values())
+        try:
+            self.write_info(values)
+            self.send_simple_response(status, content)
+        except:
+            traceback.print_exc(file=sys.stderr)
+            self.send_simple_response(500)
 
 
 if __name__ == '__main__':
     parser = argparse.ArgumentParser()
     parser.add_argument('--port', action='store',
                         default=8000, type=int,
                         nargs='?',
-                        help='Specify alternate port [default: 8000]')

[Vasily Kuznetsov, 2017/08/07 13:06:40]

I don't think you need "Specify" here either.

[f.lopez, 2017/08/07 18:40:02]

Done.

+                        help='Port to use [default: 8000]')
     parser.add_argument('--response', action='store',
                         type=str, nargs='?', default='OK',
                         help='The response send to the client')
-    parser.add_argument('--log_format', action='store',

[Vasily Kuznetsov, 2017/08/07 13:06:40]

Probably having some kind of default log format would be good. Does this
actually work without a default?

[f.lopez, 2017/08/07 18:40:01]

Done.

+    parser.add_argument('--format', action='store',
                         type=str, nargs='?',
+                        default=DEFAULT_LOG,
                         help='Format of the log ouput')
-    parser.add_argument('log_file', action='store',
-                        type=str, nargs='?', default=sys.stdout,

[Vasily Kuznetsov, 2017/08/07 13:06:40]

Can you pass `sys.stdout` as `filename` to `logging.basicConfig`? For me it just
throws an exception.

[f.lopez, 2017/08/07 18:40:02]

You are right, I got the error as well, I'm pretty sure I tested this...

+    parser.add_argument('output', action='store',
+                        type=str, nargs='?', default='-',
                         help='The file where the logs will be written')
     args = parser.parse_args()
-    handler_class = Handler
-    server_class = HTTPServer
-    setattr(handler_class, 'log_format', args.log_format)
-    setattr(handler_class, 'response', args.response)
-    server_address = ('', args.port)
-    httpd = server_class(server_address, handler_class)
-    logging.basicConfig(filename=args.log_file, level=logging.INFO)
-    httpd.serve_forever()
+    if args.output and args.output != '-':
+        fh = open(args.output, 'a')
+    else:
+        fh = open(sys.stdout.fileno(), 'w', closefd=False)
+    try:
+        Handler.output = fh
+        Handler.format = args.format
+        Handler.response = args.response
+        server_address = ('', args.port)
+        httpd = HTTPServer(server_address, Handler)
+        httpd.serve_forever()
+    finally:
+        fh.close()