block queries with lots of one and two letter terms

[nominatim.git] / nominatim / api / logging.py

diff --git a/nominatim/api/logging.py b/nominatim/api/logging.py
index 3160ede8f53b01027ee17ffd8ef01d497f38fc9e..5b6d0e4dbbc03573b643e88cba43a871d7bd038a 100644 (file)
--- a/nominatim/api/logging.py
+++ b/nominatim/api/logging.py
@@ -12,6 +12,7 @@ from contextvars import ContextVar
 import datetime as dt
 import textwrap
 import io
 import datetime as dt
 import textwrap
 import io

+import re

 
 import sqlalchemy as sa
 from sqlalchemy.ext.asyncio import AsyncConnection
 
 import sqlalchemy as sa
 from sqlalchemy.ext.asyncio import AsyncConnection


@@ -98,14 +99,18 @@ class BaseLogger:
 
         if sa.__version__.startswith('1'):
             try:
 
         if sa.__version__.startswith('1'):
             try:

+                sqlstr = re.sub(r'__\[POSTCOMPILE_[^]]*\]', '%s', sqlstr)

                 return sqlstr % tuple((repr(params.get(name, None))
                                       for name in compiled.positiontup)) # type: ignore
             except TypeError:
                 return sqlstr
 
                 return sqlstr % tuple((repr(params.get(name, None))
                                       for name in compiled.positiontup)) # type: ignore
             except TypeError:
                 return sqlstr
 

+        # Fixes an odd issue with Python 3.7 where percentages are not
+        # quoted correctly.
+        sqlstr = re.sub(r'%(?!\()', '%%', sqlstr)
+        sqlstr = re.sub(r'__\[POSTCOMPILE_([^]]*)\]', r'%(\1)s', sqlstr)

         return sqlstr % params
 
         return sqlstr % params
 

-

 class HTMLLogger(BaseLogger):
     """ Logger that formats messages in HTML.
     """
 class HTMLLogger(BaseLogger):
     """ Logger that formats messages in HTML.
     """