udata-hydra-csvapi 0.4.3.dev3__py3-none-any.whl → 0.4.3.dev5__py3-none-any.whl

api_tabular/core/cors.py

@@ -1,24 +1,40 @@
 from aiohttp import web
+from aiohttp.web_urldispatcher import MatchInfoError
+
+CORS_HEADERS = {
+    # Using "*" ensures the Nginx cache remains consistent for all origins
+    "Access-Control-Allow-Origin": "*",
+    "Access-Control-Allow-Methods": "GET, OPTIONS",
+    "Access-Control-Allow-Headers": "Content-Type, Authorization, X-Requested-With",
+    "Access-Control-Expose-Headers": "*",
+}
+
+
+def _accepts_method(match_info: web.UrlMappingMatchInfo, method: str) -> bool:
+    # No route registers OPTIONS, so an existing path resolves to a 405 listing its allowed methods
+    return (
+        isinstance(match_info, MatchInfoError)
+        and isinstance(match_info.http_exception, web.HTTPMethodNotAllowed)
+        and method in match_info.http_exception.allowed_methods
+    )
 
 
 @web.middleware
-async def cors_middleware(request, handler):
-    """
-    Middleware to handle CORS and the OPTIONS preflight.
-    """
+async def _preflight_middleware(request: web.Request, handler):
+    """Answer an OPTIONS preflight with a 204, only for a route accepting the requested method."""
     if request.method == "OPTIONS":
-        # Handle cases of preflight OPTIONS requests (was managed by aiohttp_cors before)
-        response = web.Response(status=204)
-    else:
-        response = await handler(request)
+        requested_method = request.headers.get("Access-Control-Request-Method", "GET")
+        if _accepts_method(request.match_info, requested_method):
+            return web.Response(status=204)
+    return await handler(request)
+
+
+async def add_cors_headers(request: web.Request, response: web.StreamResponse) -> None:
+    # on_response_prepare also fires for raised HTTP errors, unhandled 500s and streamed responses
+    response.headers.update(CORS_HEADERS)
 
-    # Add CORS headers to the response
-    # Using "*" ensures the Nginx cache remains consistent for all origins
-    response.headers["Access-Control-Allow-Origin"] = "*"
-    response.headers["Access-Control-Allow-Methods"] = "GET, OPTIONS"
-    response.headers["Access-Control-Allow-Headers"] = (
-        "Content-Type, Authorization, X-Requested-With"
-    )
-    response.headers["Access-Control-Expose-Headers"] = "*"
 
-    return response
+def setup_cors(app: web.Application) -> None:
+    """Enable CORS on an app: answer OPTIONS preflights and add CORS headers to every response."""
+    app.middlewares.append(_preflight_middleware)
+    app.on_response_prepare.append(add_cors_headers)

api_tabular/core/query.py

@@ -163,35 +163,20 @@ def split_top_level(s: str) -> list[str]:
 
 
 def find_arg_val(param: str) -> tuple[str, str]:
-    if param.count('"') not in {0, 2, 4}:
-        raise ValueError(f"argument '{param}' could not be parsed")
-    column_operator_pattern = r'^"[^"]*"__[a-z]+'
-    value_pattern = r'\."[^"]*"$'
-    if param.count('"') == 0:
-        # no quote, we expect col__op.val
-        _split = param.split(".")
-        if len(_split) != 2:
-            raise ValueError(f"argument '{param}' could not be parsed")
-        return tuple[str, str](_split)  # ty: ignore[invalid-argument-type]
-    elif param.count('"') == 4:
-        # 4 quotes, we expect "col.umn"__op."val.ue"
-        col_op = re.findall(column_operator_pattern, param)
-        val = re.findall(value_pattern, param)
-        if len(col_op) != 1 or len(val) != 1:
-            raise ValueError(f"argument '{param}' could not be parsed")
+    # the operator is not checked here, add_filter validates it like for unquoted columns
+    quoted_column = re.match(r'^"([^"]*)"__', param)
+    if quoted_column:
         # we drop the double quotes around the column as they will be added back in get_column_and_operator
-        # the dot is included in the value result, we pop it in the result
-        return col_op[0].replace('"', ""), val[0][1:]
+        column_prefix = f"{quoted_column.group(1)}__"
+        operator_value = param[quoted_column.end() :]
     else:
-        # we have any of "col.umn"__op.val, col__op."val.ue"
-        col_op = re.findall(column_operator_pattern, param)
-        val = re.findall(value_pattern, param)
-        if not col_op:
-            # case col__op."val.ue"
-            return param.split(".")[0], val[0][1:]
-        else:
-            # case "col.umn"__op.val
-            return col_op[0].replace('"', ""), param.split(".")[-1]
+        column_prefix, operator_value = "", param
+    operator, dot, value = operator_value.partition(".")
+    # a quoted value is kept as is, an unquoted one can't contain a dot
+    value_is_valid = re.fullmatch(r'"[^"]*"', value) or not re.search(r'[".]', value)
+    if not dot or '"' in operator or not value_is_valid:
+        raise ValueError(f"argument '{param}' could not be parsed")
+    return column_prefix + operator, value
 
 
 def parse_operator(query: str, operator: str, top_level: bool = False):

api_tabular/metrics/app.py

@@ -7,7 +7,7 @@ from aiohttp import ClientSession, web
 from aiohttp_swagger import setup_swagger
 
 from api_tabular import config
-from api_tabular.core.cors import cors_middleware
+from api_tabular.core.cors import setup_cors
 from api_tabular.core.data import stream_data
 from api_tabular.core.error import QueryException, handle_exception
 from api_tabular.core.health import check_health
@@ -108,7 +108,8 @@ async def app_factory():
     async def on_cleanup(app):
         await app["csession"].close()
 
-    app = web.Application(middlewares=[cors_middleware])
+    app = web.Application()
+    setup_cors(app)
     app.add_routes(routes)
     app.on_startup.append(on_startup)
     app.on_cleanup.append(on_cleanup)

api_tabular/tabular/app.py

@@ -7,7 +7,7 @@ from aiohttp import ClientSession, web
 from aiohttp_swagger import setup_swagger
 
 from api_tabular import config
-from api_tabular.core.cors import cors_middleware
+from api_tabular.core.cors import setup_cors
 from api_tabular.core.health import check_health
 from api_tabular.core.sentry import get_sentry_kwargs
 from api_tabular.core.swagger import build_swagger_file
@@ -173,7 +173,8 @@ async def app_factory():
     async def on_cleanup(app):
         await app["csession"].close()
 
-    app = web.Application(middlewares=[cors_middleware])
+    app = web.Application()
+    setup_cors(app)
     app.add_routes(routes)
     app.on_startup.append(on_startup)
     app.on_cleanup.append(on_cleanup)

{udata_hydra_csvapi-0.4.3.dev3.dist-info → udata_hydra_csvapi-0.4.3.dev5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: udata-hydra-csvapi
-Version: 0.4.3.dev3
+Version: 0.4.3.dev5
 Summary: API for CSV converted by udata-hydra
 Author-email: "data.gouv.fr" <opendatateam@data.gouv.fr>
 License-Expression: MIT

{udata_hydra_csvapi-0.4.3.dev3.dist-info → udata_hydra_csvapi-0.4.3.dev5.dist-info}/RECORD

@@ -1,23 +1,23 @@
 api_tabular/__init__.py,sha256=sYG6CMz-twob-QLyfsPYRc6cWDtqWXvq_N5Dxk-U5qA,2263
 api_tabular/config_default.toml,sha256=cX506NdqHW7gK_2aZjzLiz0Z4gMSl1tU_tI4i4BvuXs,421
 api_tabular/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-api_tabular/core/cors.py,sha256=QY006pAnR1fMBMJJTAeRGcopL_4LkY7YoA3y8KYk4dI,825
+api_tabular/core/cors.py,sha256=xX4qSbv06pVT-NrohQlysFPSR9z7Pj2THz18TCbvJ90,1707
 api_tabular/core/data.py,sha256=5j-3d_el7LMoHpn6V__UdhYHD6GiJbwdH67jrnOYWZQ,1459
 api_tabular/core/error.py,sha256=xRt6fkQfsiupv0tWWzdX0DJjAKbw1n0tRxFyt15VBLA,1062
 api_tabular/core/health.py,sha256=NeFT1C00onvm3CbgesFAcN1N8bmelbQdEYFbmmftICQ,647
-api_tabular/core/query.py,sha256=J7woFLDzA8RpMBXJKpKm8olDdZsp2_TQEROJtIaeokM,10238
+api_tabular/core/query.py,sha256=Qf34vtzt_kPJBYIrHX2QsV-K3ADrbDeLeb8xC__cs-k,9616
 api_tabular/core/sentry.py,sha256=fN5MrDZszLnzLXF3b_nUymPVB0ffNn4PI7xS1GtJNyE,948
 api_tabular/core/swagger.py,sha256=mMEESM4UlgK-voyRTKrddVuUrlUMfTDOQtK1VrVp7Ak,14748
 api_tabular/core/url.py,sha256=af7VKfrMtKMzlHrGgtLDLuRBim4qFv7xlt2PYxAyW2g,761
 api_tabular/core/utils.py,sha256=Ghd9Un0HugFg4oEcEb5yB5FEop7tDSoX4OCzR8mcM-Y,1922
 api_tabular/core/version.py,sha256=OKLg0l1CpDRHV2hsqVgtSihoo3tg0aMG6kzMILtQ-bY,250
 api_tabular/metrics/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-api_tabular/metrics/app.py,sha256=m2H4qOvzvi8oDjCg1R23JAK6VaqDcrqYCz6ScIk9iAc,4305
+api_tabular/metrics/app.py,sha256=W2htxUO54bTfQLReJhEY3JtsbLWaefC71DmjV9SvUII,4291
 api_tabular/tabular/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-api_tabular/tabular/app.py,sha256=fBnbIR2H3jm0suVVEfNuVdSccOwZeMKH__iekwmDVa8,6542
+api_tabular/tabular/app.py,sha256=6lwujb2Pf_70QQlTKL8bhQTnhYinRyDlF_yTdit0pQw,6528
 api_tabular/tabular/utils.py,sha256=BL2nl04-3imBQG-RZiYvVMjxoBORi4lwrKq8NiWecLY,4487
-udata_hydra_csvapi-0.4.3.dev3.dist-info/licenses/LICENSE,sha256=fb-HAYw94ffh--z1cZrWbpk6YKM0p9WFG7kdd0K7uGQ,1062
-udata_hydra_csvapi-0.4.3.dev3.dist-info/METADATA,sha256=mBjWOUsIDJAxQWABC7L49YdknGyNsX2tKDG3Sh7spTk,21835
-udata_hydra_csvapi-0.4.3.dev3.dist-info/WHEEL,sha256=mOdXR9C3wMVov7cSY8PY-XCzo3SmmWCHvGQr5csJoao,91
-udata_hydra_csvapi-0.4.3.dev3.dist-info/top_level.txt,sha256=MAaK09hxwPhIBBC0i1TdEBAgdu3W_gXnAZqk767gVak,12
-udata_hydra_csvapi-0.4.3.dev3.dist-info/RECORD,,
+udata_hydra_csvapi-0.4.3.dev5.dist-info/licenses/LICENSE,sha256=fb-HAYw94ffh--z1cZrWbpk6YKM0p9WFG7kdd0K7uGQ,1062
+udata_hydra_csvapi-0.4.3.dev5.dist-info/METADATA,sha256=2VEJANlzoHtKJt5iU3MCEw1H-jPyirRWHCreKOTFDHg,21835
+udata_hydra_csvapi-0.4.3.dev5.dist-info/WHEEL,sha256=mOdXR9C3wMVov7cSY8PY-XCzo3SmmWCHvGQr5csJoao,91
+udata_hydra_csvapi-0.4.3.dev5.dist-info/top_level.txt,sha256=MAaK09hxwPhIBBC0i1TdEBAgdu3W_gXnAZqk767gVak,12
+udata_hydra_csvapi-0.4.3.dev5.dist-info/RECORD,,