kinto 18.0.0__tar.gz → 18.1.1__tar.gz

{kinto-18.0.0 → kinto-18.1.1}/.github/workflows/publish.yml

@@ -28,8 +28,8 @@ jobs:
           node --version
           npm --version
 
-      - name: Build Admin UI
-        run: make build-kinto-admin
+      - name: Pull Admin UI
+        run: make pull-kinto-admin
 
       - name: Install pypa/build
         run: python3 -m pip install build
@@ -86,7 +86,7 @@ jobs:
           images: kinto/kinto-server
 
       - name: Build and push Docker image
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: .
           file: ./Dockerfile

{kinto-18.0.0 → kinto-18.1.1}/.github/workflows/test.yml

@@ -32,7 +32,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        pyenv: [py38, py39, py310, py311, py311-raw]
+        pyenv: [py38, py39, py310, py311, py312, py312-raw]
         include:
           - pyenv: py38
             python-version: "3.8"
@@ -42,8 +42,10 @@ jobs:
             python-version: "3.10"
           - pyenv: py311
             python-version: "3.11"
-          - pyenv: py311-raw
-            python-version: "3.11"
+          - pyenv: py312
+            python-version: "3.12"
+          - pyenv: py312-raw
+            python-version: "3.12"
     services:
       postgres:
         image: postgres
@@ -177,7 +179,7 @@ jobs:
           install: true
 
       - name: Build container
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           cache-from: type=local,src=${{ env.DOCKER_CACHE}}
           cache-to: type=local,dest=${{ env.DOCKER_CACHE}},mode=max
@@ -227,8 +229,8 @@ jobs:
           which firefox
           firefox --version
 
-      - name: make build-kinto-admin
-        run: make build-kinto-admin
+      - name: make pull-kinto-admin
+        run: make pull-kinto-admin
 
       - name: Install dependencies
         run: make install-dev

{kinto-18.0.0 → kinto-18.1.1}/Dockerfile

@@ -1,25 +1,23 @@
 # Mozilla Kinto server
-
-FROM node:lts-bullseye-slim as node-builder
-RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates curl
-COPY scripts/build-kinto-admin.sh .
-COPY /kinto/plugins/admin ./kinto/plugins/admin
-RUN bash build-kinto-admin.sh
-
-FROM python:3.10-slim-bullseye as python-builder
+FROM python:3.10-bullseye as python-builder
 RUN python -m venv /opt/venv
-RUN apt-get update && apt-get install -y --no-install-recommends build-essential libpq-dev
 ARG KINTO_VERSION=1
 ENV SETUPTOOLS_SCM_PRETEND_VERSION_FOR_KINTO=${KINTO_VERSION} \
     PATH="/opt/venv/bin:$PATH"
 # At this stage we only fetch and build all dependencies.
+
+# Pull kinto-admin before building kinto so we can cache it
+WORKDIR /kinto-admin
+COPY kinto/plugins/admin kinto/plugins/admin
+COPY scripts/pull-kinto-admin.sh .
+RUN bash pull-kinto-admin.sh
+
 WORKDIR /pkg-kinto
-COPY constraints.txt .
-COPY pyproject.toml .
+COPY constraints.txt pyproject.toml ./
+RUN pip install --upgrade pip && pip install -r constraints.txt
 COPY kinto/ kinto/
-RUN pip install --upgrade pip && \
-    pip install ".[postgresql,memcached,monitoring]" -c constraints.txt && \
-    pip install kinto-attachment kinto-emailer httpie
+RUN cp -r /kinto-admin/kinto/plugins/admin/build kinto/plugins/admin/
+RUN pip install ".[postgresql,memcached,monitoring]" -c constraints.txt && pip install kinto-attachment kinto-emailer httpie
 
 FROM python:3.10-slim-bullseye
 RUN apt-get update && apt-get install -y --no-install-recommends libpq-dev
@@ -27,7 +25,6 @@ RUN groupadd --gid 10001 app && \
     useradd --uid 10001 --gid 10001 --home /app --create-home app
 
 COPY --from=python-builder /opt/venv /opt/venv
-COPY --from=node-builder /kinto/plugins/admin/build ./kinto/plugins/admin/build
 
 ENV KINTO_INI=/etc/kinto/kinto.ini \
     PORT=8888 \

{kinto-18.0.0 → kinto-18.1.1}/Makefile

@@ -20,13 +20,14 @@ help:
 	@echo "  install-monitoring          enable monitoring features like StatsD and Newrelic"
 	@echo "  install-postgres            install postgresql support"
 	@echo "  install-dev                 install dependencies and everything needed to run tests"
-	@echo "  build-kinto-admin           build the Kinto admin UI plugin (requires npm)"
+	@echo "  pull-kinto-admin            pull the Kinto admin UI plugin (requires npm)"
 	@echo "  serve                       start the kinto server on default port"
 	@echo "  migrate                     run the kinto migrations"
 	@echo "  lint                        run the code linters"
 	@echo "  tests                       run all the tests with all the supported python interpreters (same as CI)"
+	@echo "  test-deps                   pulls and runs docker postgres and memcached containers for tests"
 	@echo "  tdd                         run pytest-watch to rerun tests automatically on changes for tdd"
-	@echo "  tests-once  	             only run the tests once with the default python interpreter"
+	@echo "  tests-once  	               only run the tests once with the default python interpreter"
 	@echo "  functional                  run functional test against a real kinto"
 	@echo "  browser-test                run browser test against a real kinto"
 	@echo "  clean                       remove *.pyc files and __pycache__ directory"
@@ -67,8 +68,8 @@ $(DOC_STAMP): $(PYTHON) docs/requirements.txt
 constraints.txt: constraints.in
 	pip-compile -o constraints.txt constraints.in
 
-build-kinto-admin: need-npm
-	scripts/build-kinto-admin.sh
+pull-kinto-admin:
+	scripts/pull-kinto-admin.sh
 
 $(SERVER_CONFIG):
 	$(VENV)/bin/kinto init --ini $(SERVER_CONFIG)
@@ -94,6 +95,14 @@ tests: install-postgres install-monitoring install-memcached version-file instal
 tests-raw: version-file install-dev
 	$(VENV)/bin/py.test
 
+test-deps:
+	docker pull memcached
+	docker pull postgres
+	docker run -p 11211:11211 --name kinto-memcached -d memcached || echo "cannot start memcached, already exists?"
+	docker run -p 5432:5432 --name kinto-postgres -e POSTGRES_PASSWORD=postgres -d postgres  || echo "cannot start postgres, already exists?"
+	sleep 2
+	PGPASSWORD=postgres psql -c "CREATE DATABASE testdb ENCODING 'UTF8' TEMPLATE template0;" -U postgres -h localhost
+
 lint: install-dev
 	$(VENV)/bin/ruff check kinto tests docs/conf.py
 	$(VENV)/bin/ruff format --check kinto tests docs/conf.py
@@ -105,9 +114,6 @@ format: install-dev
 tdd: install-dev
 	$(VENV)/bin/ptw --runner $(VENV)/bin/py.test
 
-need-npm:
-	@npm --version 2>/dev/null 1>&2 || (echo "The 'npm' command is required to build the Kinto Admin UI." && exit 1)
-
 need-kinto-running:
 	@curl http://localhost:8888/v0/ 2>/dev/null 1>&2 || (echo "Run 'make runkinto' before starting tests." && exit 1)
 
@@ -119,12 +125,15 @@ functional: install-dev need-kinto-running
 	$(VENV)/bin/py.test tests/functional.py
 
 browser-test: need-kinto-running
+	$(VENV)/bin/playwright install firefox
 	$(VENV)/bin/py.test tests/browser.py
 
 clean:
 	find . -name '*.pyc' -delete
 	find . -name '__pycache__' -type d | xargs rm -fr
 	rm -fr docs/_build/
+	docker rm -f kinto-memcached || echo ""
+	docker rm -f kinto-postgres || echo ""
 
 distclean: clean
 	rm -fr *.egg *.egg-info/ dist/ build/

{kinto-18.0.0/kinto.egg-info → kinto-18.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: kinto
-Version: 18.0.0
+Version: 18.1.1
 Summary: Kinto Web Service - Store, Sync, Share, and Self-Host.
 Author-email: Mozilla Services <developers@kinto-storage.org>
 License: Copyright 2012 - Mozilla Foundation
@@ -66,7 +66,7 @@ Requires-Dist: bravado; extra == "test"
 Requires-Dist: pytest; extra == "test"
 Requires-Dist: pytest-cache; extra == "test"
 Requires-Dist: pytest-cov; extra == "test"
-Requires-Dist: selenium; extra == "test"
+Requires-Dist: playwright; extra == "test"
 Requires-Dist: webtest; extra == "test"
 Provides-Extra: dev
 Requires-Dist: build; extra == "dev"

{kinto-18.0.0 → kinto-18.1.1}/constraints.in

@@ -33,7 +33,7 @@ bravado_core
 pytest
 pytest-cache
 pytest-cov
-selenium
+playwright
 webtest
 # dev
 build

{kinto-18.0.0 → kinto-18.1.1}/constraints.txt

@@ -1,70 +1,61 @@
 #
-# This file is autogenerated by pip-compile with Python 3.9
+# This file is autogenerated by pip-compile with Python 3.10
 # by the following command:
 #
-#    pip-compile --strip-extras
+#    pip-compile --output-file=constraints.txt --strip-extras constraints.in
 #
 arrow==1.3.0
     # via isoduration
 attrs==23.2.0
     # via
     #   jsonschema
-    #   outcome
     #   referencing
-    #   trio
-bcrypt==4.1.2
-    # via -r requirements.in
+bcrypt==4.1.3
+    # via -r constraints.in
 beautifulsoup4==4.12.3
     # via webtest
 bravado-core==6.1.1
-    # via -r requirements.in
-build==1.0.3
-    # via -r requirements.in
+    # via -r constraints.in
+build==1.2.1
+    # via -r constraints.in
 certifi==2023.11.17
     # via
     #   requests
-    #   selenium
     #   sentry-sdk
 charset-normalizer==3.3.2
     # via requests
 colander==2.0
     # via
-    #   -r requirements.in
+    #   -r constraints.in
     #   cornice-swagger
 colorama==0.4.6
     # via logging-color-formatter
 cornice==6.0.1
     # via
-    #   -r requirements.in
+    #   -r constraints.in
     #   cornice-swagger
 cornice-swagger==1.0.1
-    # via -r requirements.in
+    # via -r constraints.in
 coverage==7.4.0
-    # via
-    #   coverage
-    #   pytest-cov
-dockerflow==2024.1.0
-    # via -r requirements.in
+    # via pytest-cov
+dockerflow==2024.4.2
+    # via -r constraints.in
 exceptiongroup==1.2.0
-    # via
-    #   pytest
-    #   trio
-    #   trio-websocket
+    # via pytest
 execnet==2.0.2
     # via pytest-cache
 fqdn==1.5.1
     # via jsonschema
-h11==0.14.0
-    # via wsproto
+greenlet==3.0.3
+    # via
+    #   playwright
+    #   sqlalchemy
 hupper==1.12
     # via pyramid
-idna==3.6
+idna==3.7
     # via
     #   jsonschema
     #   requests
-    #   trio
-importlib-metadata==7.0.1
-    # via build
 iniconfig==2.0.0
     # via pytest
 iso8601==2.1.0
@@ -72,30 +63,28 @@ iso8601==2.1.0
 isoduration==20.11.0
     # via jsonschema
 jsonpatch==1.33
-    # via -r requirements.in
+    # via -r constraints.in
 jsonpointer==2.4
     # via
     #   jsonpatch
     #   jsonschema
 jsonref==1.1.0
     # via bravado-core
-jsonschema==4.21.1
+jsonschema==4.22.0
     # via
-    #   -r requirements.in
+    #   -r constraints.in
     #   bravado-core
     #   swagger-spec-validator
 jsonschema-specifications==2023.12.1
     # via jsonschema
 logging-color-formatter==1.1.0
-    # via -r requirements.in
+    # via -r constraints.in
 markupsafe==2.1.4
     # via werkzeug
 msgpack==1.0.7
     # via bravado-core
-newrelic==9.5.0
-    # via -r requirements.in
-outcome==1.3.0.post0
-    # via trio
+newrelic==9.11.0
+    # via -r constraints.in
 packaging==23.2
     # via
     #   build
@@ -109,45 +98,47 @@ plaster==1.1.2
     #   pyramid
 plaster-pastedeploy==1.0.1
     # via pyramid
-pluggy==1.3.0
+playwright==1.44.0
+    # via -r constraints.in
+pluggy==1.5.0
     # via pytest
 psycopg2==2.9.9
-    # via -r requirements.in
+    # via -r constraints.in
+pyee==11.1.0
+    # via playwright
 pyproject-hooks==1.0.0
     # via build
 pyramid==2.0.2
     # via
-    #   -r requirements.in
+    #   -r constraints.in
     #   cornice
     #   pyramid-mailer
     #   pyramid-multiauth
     #   pyramid-tm
 pyramid-mailer==0.15.1
-    # via -r requirements.in
-pyramid-multiauth==1.0.1
-    # via -r requirements.in
+    # via -r constraints.in
+pyramid-multiauth==1.0.2
+    # via -r constraints.in
 pyramid-tm==2.5
-    # via -r requirements.in
-pysocks==1.7.1
-    # via urllib3
-pytest==7.4.4
+    # via -r constraints.in
+pytest==8.2.2
     # via
-    #   -r requirements.in
+    #   -r constraints.in
     #   pytest-cache
     #   pytest-cov
 pytest-cache==1.0
-    # via -r requirements.in
-pytest-cov==4.1.0
-    # via -r requirements.in
-python-dateutil==2.8.2
+    # via -r constraints.in
+pytest-cov==5.0.0
+    # via -r constraints.in
+python-dateutil==2.9.0.post0
     # via
-    #   -r requirements.in
+    #   -r constraints.in
     #   arrow
     #   bravado-core
 python-memcached==1.62
-    # via -r requirements.in
+    # via -r constraints.in
 python-rapidjson==1.14
-    # via -r requirements.in
+    # via -r constraints.in
 pytz==2023.3.post1
     # via bravado-core
 pyyaml==6.0.1
@@ -160,9 +151,9 @@ referencing==0.32.1
     #   jsonschema-specifications
 repoze-sendmail==4.4.1
     # via pyramid-mailer
-requests==2.31.0
+requests==2.32.3
     # via
-    #   -r requirements.in
+    #   -r constraints.in
     #   bravado-core
 rfc3339-validator==0.1.4
     # via jsonschema
@@ -172,12 +163,10 @@ rpds-py==0.17.1
     # via
     #   jsonschema
     #   referencing
-ruff==0.1.14
-    # via -r requirements.in
-selenium==4.12.0
-    # via -r requirements.in
+ruff==0.4.9
+    # via -r constraints.in
 sentry-sdk==1.39.2
-    # via -r requirements.in
+    # via -r constraints.in
 simplejson==3.19.2
     # via bravado-core
 six==1.16.0
@@ -186,19 +175,15 @@ six==1.16.0
     #   cornice-swagger
     #   python-dateutil
     #   rfc3339-validator
-sniffio==1.3.0
-    # via trio
-sortedcontainers==2.4.0
-    # via trio
 soupsieve==2.5
     # via beautifulsoup4
-sqlalchemy==2.0.25
+sqlalchemy==2.0.30
     # via
-    #   -r requirements.in
+    #   -r constraints.in
     #   sentry-sdk
     #   zope-sqlalchemy
 statsd==4.0.1
-    # via -r requirements.in
+    # via -r constraints.in
 swagger-spec-validator==3.0.3
     # via bravado-core
 tomli==2.0.1
@@ -209,7 +194,7 @@ tomli==2.0.1
     #   pytest
 transaction==4.0
     # via
-    #   -r requirements.in
+    #   -r constraints.in
     #   pyramid-mailer
     #   pyramid-tm
     #   repoze-sendmail
@@ -218,33 +203,26 @@ translationstring==1.4
     # via
     #   colander
     #   pyramid
-trio==0.24.0
-    # via
-    #   selenium
-    #   trio-websocket
-trio-websocket==0.11.1
-    # via selenium
 types-python-dateutil==2.8.19.20240106
     # via arrow
 typing-extensions==4.9.0
     # via
-    #   selenium
+    #   pyee
     #   sqlalchemy
     #   swagger-spec-validator
 uri-template==1.3.0
     # via jsonschema
-urllib3==2.1.0
+urllib3==2.2.2
     # via
     #   requests
-    #   selenium
     #   sentry-sdk
 venusian==3.1.0
     # via
     #   cornice
     #   pyramid
-waitress==2.1.2
+waitress==3.0.0
     # via
-    #   -r requirements.in
+    #   -r constraints.in
     #   webtest
 webcolors==1.13
     # via jsonschema
@@ -253,13 +231,9 @@ webob==1.8.7
     #   pyramid
     #   webtest
 webtest==3.0.0
-    # via -r requirements.in
-werkzeug==3.0.1
-    # via -r requirements.in
-wsproto==1.2.0
-    # via trio-websocket
-zipp==3.17.0
-    # via importlib-metadata
+    # via -r constraints.in
+werkzeug==3.0.3
+    # via -r constraints.in
 zope-deprecation==5.0
     # via pyramid
 zope-interface==6.1
@@ -269,7 +243,7 @@ zope-interface==6.1
     #   transaction
     #   zope-sqlalchemy
 zope-sqlalchemy==3.1
-    # via -r requirements.in
+    # via -r constraints.in
 
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools

{kinto-18.0.0 → kinto-18.1.1}/docs/community.rst

@@ -119,7 +119,7 @@ Get started!
 
     git clone git@github.com:your_name_here/kinto.git
 
-3. Setup a local PostgreSQL database for the tests (:ref:`more details <postgresql-install>`)::
+3. Run ``make test-deps``, or setup a local PostgreSQL database (:ref:`more details <postgresql-install>`)::
 
     sudo apt-get install postgresql
     sudo -n -u postgres -s -- psql -c "ALTER USER postgres WITH PASSWORD 'postgres';" -U postgres
@@ -235,16 +235,7 @@ In another terminal, run the end-to-end tests with:
 
 Browser Tests
 -------------
-
-Make sure the `geckodriver <https://github.com/mozilla/geckodriver/releases>`_ binary is available in your path.
-
-.. note::
-
-    If your installation of *Firefox* is custom, specify the path of its binary using an alias:
-
-    ::
-
-        alias geckodriver="geckodriver --binary /path/to/firefox"
+We use `playwright <https://playwright.dev/>`_ for browser testing. The tests included in this repo are very simple and verify the admin UI can at least authenticate with the current kinto back-end. Comprehensive unit tests are maintained in the kinto-admin repo.
 
 
 In a terminal, run an instance with the provided ``browser.ini`` configuration:

{kinto-18.0.0 → kinto-18.1.1}/docs/requirements.txt

@@ -1,12 +1,12 @@
-Sphinx==7.2.6
+Sphinx==7.3.7
 sphinx_rtd_theme==2.0.0
 docutils==0.20.1
 sphinxcontrib-httpdomain==1.8.1
-sphinx-github-changelog==1.2.1
+sphinx-github-changelog==1.3.0
 kinto
 mock==5.1.0
 webtest==3.0.0
-cornice==6.0.1
+cornice==6.1.0
 pyramid==2.0.2
-python-rapidjson==1.14
-SQLAlchemy==2.0.25
+python-rapidjson==1.17
+SQLAlchemy==2.0.30

{kinto-18.0.0 → kinto-18.1.1}/docs/tutorials/install.rst

@@ -316,9 +316,9 @@ Kinto Admin
 -----------
 
 In order to run a local `Kinto Admin UI <https://github.com/Kinto/kinto-admin>`_ from a cloned
-repo, the ``npm`` command must be available in order to build it with ::
+repo, run ::
 
-    make build-kinto-admin
+    make pull-kinto-admin
 
 
 Go further

{kinto-18.0.0 → kinto-18.1.1}/kinto/core/__init__.py

@@ -1,5 +1,5 @@
-"""Main entry point
-"""
+"""Main entry point"""
+
 import logging
 import tempfile
 
@@ -54,6 +54,7 @@ DEFAULT_SETTINGS = {
     "initialization_sequence": (
         "kinto.core.initialization.setup_request_bound_data",
         "kinto.core.initialization.setup_json_serializer",
+        "kinto.core.initialization.restrict_http_methods_if_readonly",
         "kinto.core.initialization.setup_csp_headers",
         "kinto.core.initialization.setup_logging",
         "kinto.core.initialization.setup_storage",

{kinto-18.0.0 → kinto-18.1.1}/kinto/core/initialization.py

@@ -8,7 +8,12 @@ from secrets import token_hex
 from dateutil import parser as dateparser
 from pyramid.events import ApplicationCreated, NewRequest, NewResponse
 from pyramid.exceptions import ConfigurationError
-from pyramid.httpexceptions import HTTPBadRequest, HTTPGone, HTTPTemporaryRedirect
+from pyramid.httpexceptions import (
+    HTTPBadRequest,
+    HTTPGone,
+    HTTPMethodNotAllowed,
+    HTTPTemporaryRedirect,
+)
 from pyramid.interfaces import IAuthenticationPolicy
 from pyramid.renderers import JSON as JSONRenderer
 from pyramid.response import Response
@@ -78,6 +83,24 @@ def setup_csp_headers(config):
     config.add_subscriber(on_new_response, NewResponse)
 
 
+def restrict_http_methods_if_readonly(config):
+    """Prevent write operations if server is configured as read-only.
+
+    This is an additional layer of security on top of the verifications done
+    in :method:`kinto.core.Resource.register_service`, in case an installed
+    plugin does not take this setting into account in the definition of its
+    ad-hoc Pyramid views.
+    """
+    settings = config.get_settings()
+
+    def on_new_request(event):
+        if event.request.method.lower() not in ("get", "head", "options"):
+            raise HTTPMethodNotAllowed()
+
+    if asbool(settings["readonly"]):
+        config.add_subscriber(on_new_request, NewRequest)
+
+
 def setup_version_redirection(config):
     """Add a view which redirects to the current version of the API."""
     settings = config.get_settings()

{kinto-18.0.0 → kinto-18.1.1}/kinto/core/resource/__init__.py

@@ -1058,6 +1058,10 @@ class Resource:
 
     def _extract_filters(self):
         """Extracts filters from QueryString parameters."""
+
+        def is_valid_timestamp(value):
+            return isinstance(value, int) or re.match(r'^"?\d+"?$', str(value))
+
         queryparams = self.request.validated["querystring"]
 
         filters = []
@@ -1090,7 +1094,7 @@ class Resource:
                         send_alert(self.request, message, url)
                     operator = COMPARISON.LT
 
-                if value == "" or not isinstance(value, (int, str, type(None))):
+                if value is not None and not is_valid_timestamp(value):
                     raise_invalid(self.request, **error_details)
 
                 filters.append(Filter(self.model.modified_field, value, operator))
@@ -1127,7 +1131,7 @@ class Resource:
                 error_details["description"] = "Invalid character 0x00"
                 raise_invalid(self.request, **error_details)
 
-            if field == self.model.modified_field and value == "":
+            if field == self.model.modified_field and not is_valid_timestamp(value):
                 raise_invalid(self.request, **error_details)
 
             filters.append(Filter(field, value, operator))

{kinto-18.0.0 → kinto-18.1.1}/kinto/core/scripts.py

@@ -1,6 +1,7 @@
 """
 kinto.core.scripts: utilities to build admin scripts for kinto-based services
 """
+
 import logging
 
 from pyramid.settings import asbool

{kinto-18.0.0 → kinto-18.1.1}/kinto/core/storage/exceptions.py

@@ -1,5 +1,4 @@
-"""Exceptions raised by storage backend.
-"""
+"""Exceptions raised by storage backend."""
 
 
 class BackendError(Exception):