kinto 19.3.0__py3-none-any.whl → 19.3.1__py3-none-any.whl

kinto/core/initialization.py

@@ -1,6 +1,7 @@
 import logging
 import random
 import re
+import urllib.parse
 import warnings
 from datetime import datetime
 from secrets import token_hex
@@ -474,6 +475,7 @@ def setup_metrics(config):
 
         try:
             endpoint = utils.strip_uri_prefix(request.path)
+            endpoint = urllib.parse.quote_plus(endpoint, safe="/?&=-_")
         except UnicodeDecodeError as e:
             # This `on_new_response` callback is also called when a HTTP 400
             # is returned because of an invalid UTF-8 path. We still want metrics.
@@ -507,7 +509,7 @@ def setup_metrics(config):
             unique=[
                 ("method", request.method.lower()),
                 ("endpoint", endpoint),
-                ("status", str(request.response.status_code)),
+                ("status", str(event.response.status_code)),
             ]
             + metrics_matchdict_labels,
         )
@@ -527,7 +529,7 @@ def setup_metrics(config):
         # Observe response size.
         metrics_service.observe(
             "request_size",
-            len(request.response.body or b""),
+            len(event.response.body or b""),
             labels=[("endpoint", endpoint)] + metrics_matchdict_labels,
         )
 

kinto/core/resource/__init__.py

@@ -665,7 +665,7 @@ class Resource:
         obj = self._get_object_or_404(self.object_id)
         self._raise_412_if_modified(obj)
 
-        # Retreive the last_modified information from a querystring if present.
+        # Retrieve the last_modified information from a querystring if present.
         last_modified = self.request.validated["querystring"].get("last_modified")
 
         # If less or equal than current object. Ignore it.
@@ -1060,7 +1060,8 @@ class Resource:
         """Extracts filters from QueryString parameters."""
 
         def is_valid_timestamp(value):
-            return isinstance(value, int) or re.match(r'^"?\d+"?$', str(value))
+            # Is either integer, or integer as string, or integer between 2 quotes.
+            return isinstance(value, int) or re.match(r'^(\d+)$|^("\d+")$', str(value))
 
         queryparams = self.request.validated["querystring"]
 

kinto/plugins/statsd.py

@@ -13,6 +13,14 @@ except ImportError:  # pragma: no cover
     statsd_module = None
 
 
+def sanitize(value):
+    """
+    Telegraf does not support ':' in values.
+    See https://github.com/influxdata/telegraf/issues/4495
+    """
+    return value.replace(":", "") if isinstance(value, str) else value
+
+
 @implementer(metrics.IMetricsService)
 class StatsDService:
     def __init__(self, host, port, prefix):
@@ -22,7 +30,7 @@ class StatsDService:
         return self._client.timer(key)
 
     def observe(self, key, value, labels=[]):
-        return self._client.gauge(key, value)
+        return self._client.gauge(key, sanitize(value))
 
     def count(self, key, count=1, unique=None):
         if unique is None:
@@ -30,7 +38,7 @@ class StatsDService:
         if isinstance(unique, list):
             # [("method", "get")] -> "method.get"
             # [("endpoint", "/"), ("method", "get")] -> "endpoint./.method.get"
-            unique = ".".join(f"{label[0]}.{label[1]}" for label in unique)
+            unique = ".".join(f"{label[0]}.{sanitize(label[1])}" for label in unique)
         else:
             warnings.warn(
                 "`unique` parameter should be of type ``list[tuple[str, str]]``",

{kinto-19.3.0.dist-info → kinto-19.3.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: kinto
-Version: 19.3.0
+Version: 19.3.1
 Summary: Kinto Web Service - Store, Sync, Share, and Self-Host.
 Author-email: Mozilla Services <developers@kinto-storage.org>
 License: Copyright 2012 - Mozilla Foundation
@@ -34,45 +34,45 @@ License-File: LICENSE
 Requires-Dist: bcrypt
 Requires-Dist: colander
 Requires-Dist: cornice
-Requires-Dist: cornice-swagger
+Requires-Dist: cornice_swagger
 Requires-Dist: dockerflow
 Requires-Dist: jsonschema
 Requires-Dist: jsonpatch
 Requires-Dist: logging-color-formatter
 Requires-Dist: python-dateutil
 Requires-Dist: pyramid
-Requires-Dist: pyramid-mailer
-Requires-Dist: pyramid-multiauth
+Requires-Dist: pyramid_mailer
+Requires-Dist: pyramid_multiauth
 Requires-Dist: transaction
-Requires-Dist: pyramid-tm
+Requires-Dist: pyramid_tm
 Requires-Dist: requests
 Requires-Dist: waitress
 Requires-Dist: python-rapidjson
-Provides-Extra: dev
-Requires-Dist: build ; extra == 'dev'
-Requires-Dist: ruff ; extra == 'dev'
-Requires-Dist: twine ; extra == 'dev'
+Provides-Extra: redis
+Requires-Dist: kinto_redis; extra == "redis"
 Provides-Extra: memcached
-Requires-Dist: python-memcached ; extra == 'memcached'
-Provides-Extra: monitoring
-Requires-Dist: newrelic ; extra == 'monitoring'
-Requires-Dist: sentry-sdk[sqlalchemy] ; extra == 'monitoring'
-Requires-Dist: statsd ; extra == 'monitoring'
-Requires-Dist: werkzeug ; extra == 'monitoring'
-Requires-Dist: prometheus-client ; extra == 'monitoring'
+Requires-Dist: python-memcached; extra == "memcached"
 Provides-Extra: postgresql
-Requires-Dist: SQLAlchemy <3 ; extra == 'postgresql'
-Requires-Dist: psycopg2 ; extra == 'postgresql'
-Requires-Dist: zope.sqlalchemy ; extra == 'postgresql'
-Provides-Extra: redis
-Requires-Dist: kinto-redis ; extra == 'redis'
+Requires-Dist: SQLAlchemy<3; extra == "postgresql"
+Requires-Dist: psycopg2; extra == "postgresql"
+Requires-Dist: zope.sqlalchemy; extra == "postgresql"
+Provides-Extra: monitoring
+Requires-Dist: newrelic; extra == "monitoring"
+Requires-Dist: sentry-sdk[sqlalchemy]; extra == "monitoring"
+Requires-Dist: statsd; extra == "monitoring"
+Requires-Dist: werkzeug; extra == "monitoring"
+Requires-Dist: prometheus-client; extra == "monitoring"
 Provides-Extra: test
-Requires-Dist: bravado ; extra == 'test'
-Requires-Dist: pytest ; extra == 'test'
-Requires-Dist: pytest-cache ; extra == 'test'
-Requires-Dist: pytest-cov ; extra == 'test'
-Requires-Dist: playwright ; extra == 'test'
-Requires-Dist: webtest ; extra == 'test'
+Requires-Dist: bravado; extra == "test"
+Requires-Dist: pytest; extra == "test"
+Requires-Dist: pytest-cache; extra == "test"
+Requires-Dist: pytest-cov; extra == "test"
+Requires-Dist: playwright; extra == "test"
+Requires-Dist: webtest; extra == "test"
+Provides-Extra: dev
+Requires-Dist: build; extra == "dev"
+Requires-Dist: ruff; extra == "dev"
+Requires-Dist: twine; extra == "dev"
 
 Kinto
 =====

{kinto-19.3.0.dist-info → kinto-19.3.1.dist-info}/RECORD

@@ -12,7 +12,7 @@ kinto/core/authorization.py,sha256=GywY25KEzuSSAI709dFHDfdLnKxy3SLEYGwW5FkQ7Qc,1
 kinto/core/decorators.py,sha256=3SAPWXlyPNUSICZ9mz04bcN-UdbnDuFOtU0bQHHzLis,2178
 kinto/core/errors.py,sha256=fxOLR4lImwHp26hhxxaqk6uW0U7v2Jb6f4sgAcRPRu8,8854
 kinto/core/events.py,sha256=SYpXgKMtVjiD9fwYJA2Omdom9yA3nBqi9btdvU1I_nc,10345
-kinto/core/initialization.py,sha256=EOHjcE0Y1qd20ewUb0yFjvEBpvdJPZA1sQMT-zHONp8,26594
+kinto/core/initialization.py,sha256=pkpfIx1yznFELhXLttwBvO0iBIgPxSA8onisHDjG0kk,26682
 kinto/core/metrics.py,sha256=Y6Mt4PUzy2-oudeGr_oCmtX8nIR4SZkzUlPxr58jr-g,2619
 kinto/core/openapi.py,sha256=bPHRCVmdZsJCsKm8BId02Q2Wz8etF1xL7Z9rU9JDx5k,3855
 kinto/core/schema.py,sha256=d5L5TQynRYJPkZ8Mu2X7F72xEh6SKDbrHK1CNTdOf2E,3646
@@ -33,7 +33,7 @@ kinto/core/permission/testing.py,sha256=EcfqwkbqJuW3Bzx0QEYNq-Rbgu4AqvLDx90s79Lx
 kinto/core/permission/postgresql/__init__.py,sha256=546ut-LAdQ__eBhClAxj9Pc2oOkHfl2dBhJZSyIvDuI,18254
 kinto/core/permission/postgresql/schema.sql,sha256=BlKJNC-omDVF9REaWCTsfKgXupFrmCBX8ZvN4sqTWUU,1344
 kinto/core/permission/postgresql/migrations/migration_001_002.sql,sha256=ey5rDVQfStVStWpyTJn2fmQP5WSA34HhO99PapcgH1k,681
-kinto/core/resource/__init__.py,sha256=dVEW8wHpnjAIfqFGIE9P3o_Fy9ZmsZWMtTB_PjaTuWk,50657
+kinto/core/resource/__init__.py,sha256=GPF3EjG_b4gvMMiqEpR0-tR9bcjuJFhO-WPKDD4FhpA,50749
 kinto/core/resource/model.py,sha256=xjZ6shnhelXCdWvgw6yeOWXodxiKMm9iyDqLTk0i8Bs,15626
 kinto/core/resource/schema.py,sha256=z5ZhuPcNydByinaSNwTHe0xXCgJvwQcVFwFT0YNSjaQ,16141
 kinto/core/resource/viewset.py,sha256=3Uck_7Fp1lIDunDoAU6yDzswBr3ZDSPn16sIckRHdko,7602
@@ -79,7 +79,7 @@ kinto/core/views/version.py,sha256=-m5G_o0oHTpCgrtfFrHFve6Zqw_gs_szT0Bd8jnNmD4,1
 kinto/plugins/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 kinto/plugins/flush.py,sha256=HnKJ6-oDo-NMSjdZskqZ09aMnFM-LJHW9vIw4VIyvcI,812
 kinto/plugins/prometheus.py,sha256=tLxb1VZOzZS-8PJgqXDfjHz773wHtwZjcFZuE10-hbA,5486
-kinto/plugins/statsd.py,sha256=_b0wXepCsBnkCzH4GsRtGds2MwUXmZnwI-Y-awi6wVk,2235
+kinto/plugins/statsd.py,sha256=-VasJZM1xkhTfFa6_0GgWwfPqKnYS2722bSMDLzZ3pI,2469
 kinto/plugins/accounts/__init__.py,sha256=LUyPfIWIn-HtpmyKO8wAxY9oFsgeYgbMHFmNOcns7rY,4365
 kinto/plugins/accounts/authentication.py,sha256=h7l_KezC8os4sKN1bz3RKEwXwYTYAs21DRzzU9na_U0,3742
 kinto/plugins/accounts/mails.py,sha256=vfb80INjDIJqC1JkPhcwGXlVWjvXhazxA_pnckmOOdo,3481
@@ -125,9 +125,9 @@ kinto/views/contribute.py,sha256=NEDr2g1HhVwcMBg0qHEZDmWVJ1V31WsM8cRs0Vm6hfc,118
 kinto/views/groups.py,sha256=jOq5fX0-4lwZE8k1q5HME2tU7x9052rtBPF7YqcJ-Qg,3181
 kinto/views/permissions.py,sha256=F0_eKx201WyLonXJ5vLdGKa9RcFKjvAihrEEhU1JuLw,9069
 kinto/views/records.py,sha256=lYfACW2L8qcQoyYBD5IX-fTPjFWmGp7GjHq_U4InlyE,5037
-kinto-19.3.0.dist-info/LICENSE,sha256=oNEIMTuTJzppR5ZEyi86yvvtSagveMYXTYFn56zF0Uk,561
-kinto-19.3.0.dist-info/METADATA,sha256=So9rRBLy7Q9zcbnOqCHpGPqUfGG8M9Am6xRe__cMEyg,8878
-kinto-19.3.0.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-kinto-19.3.0.dist-info/entry_points.txt,sha256=3KlqBWPKY81mrCe_oX0I5s1cRO7Q53nCLbnVr5P9LH4,85
-kinto-19.3.0.dist-info/top_level.txt,sha256=EG_YmbZL6FAug9VwopG7JtF9SvH_r0DEnFp-3twPPys,6
-kinto-19.3.0.dist-info/RECORD,,
+kinto-19.3.1.dist-info/LICENSE,sha256=oNEIMTuTJzppR5ZEyi86yvvtSagveMYXTYFn56zF0Uk,561
+kinto-19.3.1.dist-info/METADATA,sha256=SYYPOi9T_o6UEeor1EtrJMCGDtaVaPBehNirDhYL-K4,8858
+kinto-19.3.1.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+kinto-19.3.1.dist-info/entry_points.txt,sha256=3KlqBWPKY81mrCe_oX0I5s1cRO7Q53nCLbnVr5P9LH4,85
+kinto-19.3.1.dist-info/top_level.txt,sha256=EG_YmbZL6FAug9VwopG7JtF9SvH_r0DEnFp-3twPPys,6
+kinto-19.3.1.dist-info/RECORD,,

{kinto-19.3.0.dist-info → kinto-19.3.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.3.0)
+Generator: setuptools (75.6.0)
 Root-Is-Purelib: true
 Tag: py3-none-any