PyPI - kinto - Versions diffs - 19.5.0__py3-none-any.whl → 20.0.0__py3-none-any.whl - Mend

kinto 19.5.0py3-none-any.whl → 20.0.0py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.

This version of kinto might be problematic. Click here for more details.

Files changed (70) hide show

kinto/__main__.py +0 -17
kinto/config/kinto.tpl +0 -13
kinto/contribute.json +27 -0
kinto/core/__init__.py +3 -3
kinto/core/cornice/__init__.py +93 -0
kinto/core/cornice/cors.py +144 -0
kinto/core/cornice/errors.py +40 -0
kinto/core/cornice/pyramidhook.py +373 -0
kinto/core/cornice/renderer.py +89 -0
kinto/core/cornice/resource.py +205 -0
kinto/core/cornice/service.py +641 -0
kinto/core/cornice/util.py +138 -0
kinto/core/cornice/validators/__init__.py +94 -0
kinto/core/cornice/validators/_colander.py +142 -0
kinto/core/cornice/validators/_marshmallow.py +182 -0
kinto/core/cornice_swagger/__init__.py +92 -0
kinto/core/cornice_swagger/converters/__init__.py +21 -0
kinto/core/cornice_swagger/converters/exceptions.py +6 -0
kinto/core/cornice_swagger/converters/parameters.py +90 -0
kinto/core/cornice_swagger/converters/schema.py +249 -0
kinto/core/cornice_swagger/swagger.py +725 -0
kinto/core/cornice_swagger/templates/index.html +73 -0
kinto/core/cornice_swagger/templates/index_script_template.html +21 -0
kinto/core/cornice_swagger/util.py +42 -0
kinto/core/cornice_swagger/views.py +78 -0
kinto/core/initialization.py +0 -14
kinto/core/openapi.py +2 -3
kinto/core/resource/viewset.py +1 -1
kinto/core/storage/postgresql/pool.py +1 -1
kinto/core/testing.py +1 -1
kinto/core/utils.py +3 -2
kinto/core/views/batch.py +1 -1
kinto/core/views/errors.py +2 -0
kinto/core/views/openapi.py +1 -1
kinto/plugins/accounts/__init__.py +2 -19
kinto/plugins/accounts/authentication.py +8 -54
kinto/plugins/accounts/utils.py +0 -133
kinto/plugins/accounts/{views/__init__.py → views.py} +7 -62
kinto/plugins/admin/VERSION +1 -1
kinto/plugins/admin/build/VERSION +1 -1
kinto/plugins/admin/build/assets/asn1-EdZsLKOL.js +1 -0
kinto/plugins/admin/build/assets/index-Bq62Gei8.js +165 -0
kinto/plugins/admin/build/assets/{index-BdpYyatM.css → index-Cs7JVwIg.css} +1 -1
kinto/plugins/admin/build/assets/javascript-qCveANmP.js +1 -0
kinto/plugins/admin/build/assets/mllike-CXdrOF99.js +1 -0
kinto/plugins/admin/build/assets/sql-D0XecflT.js +1 -0
kinto/plugins/admin/build/assets/ttcn-cfg-B9xdYoR4.js +1 -0
kinto/plugins/admin/build/index.html +2 -2
kinto/plugins/flush.py +1 -1
kinto/plugins/openid/views.py +1 -1
kinto/views/contribute.py +14 -13
{kinto-19.5.0.dist-info → kinto-20.0.0.dist-info}/METADATA +2 -6
{kinto-19.5.0.dist-info → kinto-20.0.0.dist-info}/RECORD +57 -42
{kinto-19.5.0.dist-info → kinto-20.0.0.dist-info}/WHEEL +1 -1
kinto/plugins/accounts/mails.py +0 -96
kinto/plugins/accounts/views/validation.py +0 -136
kinto/plugins/admin/build/assets/asn1-CGOzndHr.js +0 -1
kinto/plugins/admin/build/assets/index-n-QM_iZE.js +0 -165
kinto/plugins/admin/build/assets/javascript-iSgyE4tI.js +0 -1
kinto/plugins/admin/build/assets/mllike-C_8OmSiT.js +0 -1
kinto/plugins/admin/build/assets/sql-C4g8LzGK.js +0 -1
kinto/plugins/admin/build/assets/ttcn-cfg-BIkV9KBc.js +0 -1
kinto/plugins/quotas/__init__.py +0 -21
kinto/plugins/quotas/listener.py +0 -226
kinto/plugins/quotas/scripts.py +0 -80
kinto/plugins/quotas/utils.py +0 -7
kinto/scripts.py +0 -41
{kinto-19.5.0.dist-info → kinto-20.0.0.dist-info}/LICENSE +0 -0
{kinto-19.5.0.dist-info → kinto-20.0.0.dist-info}/entry_points.txt +0 -0
{kinto-19.5.0.dist-info → kinto-20.0.0.dist-info}/top_level.txt +0 -0

kinto/core/cornice_swagger/templates/index.html ADDED Viewed

@@ -0,0 +1,73 @@
+<!-- HTML for static distribution bundle build -->
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <title>Swagger UI</title>
+  <link href="https://fonts.googleapis.com/css?family=Open+Sans:400,700|Source+Code+Pro:300,600|Titillium+Web:400,600,700" rel="stylesheet">
+  <link rel="stylesheet" type="text/css" href="${ui_css_url}" >
+  <style>
+    html
+    {
+      box-sizing: border-box;
+      overflow: -moz-scrollbars-vertical;
+      overflow-y: scroll;
+    }
+    *,
+    *:before,
+    *:after
+    {
+      box-sizing: inherit;
+    }
+    body {
+      margin:0;
+      background: #fafafa;
+    }
+  </style>
+</head>
+<body>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="position:absolute;width:0;height:0">
+  <defs>
+    <symbol viewBox="0 0 20 20" id="unlocked">
+          <path d="M15.8 8H14V5.6C14 2.703 12.665 1 10 1 7.334 1 6 2.703 6 5.6V6h2v-.801C8 3.754 8.797 3 10 3c1.203 0 2 .754 2 2.199V8H4c-.553 0-1 .646-1 1.199V17c0 .549.428 1.139.951 1.307l1.197.387C5.672 18.861 6.55 19 7.1 19h5.8c.549 0 1.428-.139 1.951-.307l1.196-.387c.524-.167.953-.757.953-1.306V9.199C17 8.646 16.352 8 15.8 8z"></path>
+    </symbol>
+    <symbol viewBox="0 0 20 20" id="locked">
+      <path d="M15.8 8H14V5.6C14 2.703 12.665 1 10 1 7.334 1 6 2.703 6 5.6V8H4c-.553 0-1 .646-1 1.199V17c0 .549.428 1.139.951 1.307l1.197.387C5.672 18.861 6.55 19 7.1 19h5.8c.549 0 1.428-.139 1.951-.307l1.196-.387c.524-.167.953-.757.953-1.306V9.199C17 8.646 16.352 8 15.8 8zM12 8H8V5.199C8 3.754 8.797 3 10 3c1.203 0 2 .754 2 2.199V8z"/>
+    </symbol>
+    <symbol viewBox="0 0 20 20" id="close">
+      <path d="M14.348 14.849c-.469.469-1.229.469-1.697 0L10 11.819l-2.651 3.029c-.469.469-1.229.469-1.697 0-.469-.469-.469-1.229 0-1.697l2.758-3.15-2.759-3.152c-.469-.469-.469-1.228 0-1.697.469-.469 1.228-.469 1.697 0L10 8.183l2.651-3.031c.469-.469 1.228-.469 1.697 0 .469.469.469 1.229 0 1.697l-2.758 3.152 2.758 3.15c.469.469.469 1.229 0 1.698z"/>
+    </symbol>
+    <symbol viewBox="0 0 20 20" id="large-arrow">
+      <path d="M13.25 10L6.109 2.58c-.268-.27-.268-.707 0-.979.268-.27.701-.27.969 0l7.83 7.908c.268.271.268.709 0 .979l-7.83 7.908c-.268.271-.701.27-.969 0-.268-.269-.268-.707 0-.979L13.25 10z"/>
+    </symbol>
+    <symbol viewBox="0 0 20 20" id="large-arrow-down">
+      <path d="M17.418 6.109c.272-.268.709-.268.979 0s.271.701 0 .969l-7.908 7.83c-.27.268-.707.268-.979 0l-7.908-7.83c-.27-.268-.27-.701 0-.969.271-.268.709-.268.979 0L10 13.25l7.418-7.141z"/>
+    </symbol>
+    <symbol viewBox="0 0 24 24" id="jump-to">
+      <path d="M19 7v4H5.83l3.58-3.59L8 6l-6 6 6 6 1.41-1.41L5.83 13H21V7z"/>
+    </symbol>
+    <symbol viewBox="0 0 24 24" id="expand">
+      <path d="M10 18h4v-2h-4v2zM3 6v2h18V6H3zm3 7h12v-2H6v2z"/>
+    </symbol>
+  </defs>
+</svg>
+<div id="swagger-ui"></div>
+<script src="${ui_js_bundle_url}"> </script>
+<script src="${ui_js_standalone_url}"> </script>
+${swagger_ui_script}
+</body>
+</html>

kinto/core/cornice_swagger/templates/index_script_template.html ADDED Viewed

@@ -0,0 +1,21 @@
+<script>
+    window.onload = function() {
+        // Build a system
+        const ui = SwaggerUIBundle({
+            url: "${swagger_spec_url}",
+            dom_id: '#swagger-ui',
+            deepLinking: true,
+            presets: [
+                SwaggerUIBundle.presets.apis,
+                SwaggerUIStandalonePreset
+            ],
+            plugins: [
+                SwaggerUIBundle.plugins.DownloadUrl
+            ],
+            layout: "StandaloneLayout"
+        })
+        window.ui = ui
+    }
+</script>

kinto/core/cornice_swagger/util.py ADDED Viewed

@@ -0,0 +1,42 @@
+import colander
+from kinto.core.cornice.validators import colander_body_validator
+def trim(docstring):
+    """
+    Remove the tabs to spaces, and remove the extra spaces / tabs that are in
+    front of the text in docstrings.
+    Implementation taken from http://www.python.org/dev/peps/pep-0257/
+    """
+    if not docstring:
+        return ""
+    # Convert tabs to spaces (following the normal Python rules)
+    # and split into a list of lines:
+    lines = docstring.expandtabs().splitlines()
+    lines = [line.strip() for line in lines]
+    res = "\n".join(lines)
+    return res
+def body_schema_transformer(schema, args):
+    validators = args.get("validators", [])
+    if colander_body_validator in validators:
+        body_schema = schema
+        schema = colander.MappingSchema()
+        schema["body"] = body_schema
+    return schema
+def merge_dicts(base, changes):
+    """Merge b into a recursively, without overwriting values.
+    :param base: the dict that will be altered.
+    :param changes: changes to update base.
+    """
+    for k, v in changes.items():
+        if isinstance(v, dict):
+            merge_dicts(base.setdefault(k, {}), v)
+        else:
+            base.setdefault(k, v)

kinto/core/cornice_swagger/views.py ADDED Viewed

@@ -0,0 +1,78 @@
+import importlib
+from string import Template
+import cornice
+import cornice_swagger
+import pkg_resources
+from pyramid.response import Response
+# hardcode for now since that will work for vast majority of users
+# maybe later add minified resources for behind firewall support?
+ui_css_url = "https://cdnjs.cloudflare.com/ajax/libs/swagger-ui/3.23.11/swagger-ui.css"
+ui_js_bundle_url = "https://cdnjs.cloudflare.com/ajax/libs/swagger-ui/3.23.11/swagger-ui-bundle.js"
+ui_js_standalone_url = (
+    "https://cdnjs.cloudflare.com/ajax/libs/swagger-ui/3.23.11/swagger-ui-standalone-preset.js"
+)
+def swagger_ui_template_view(request):
+    """
+    Serves Swagger UI page, default Swagger UI config is used but you can
+    override the callable that generates the `<script>` tag by setting
+    `cornice_swagger.swagger_ui_script_generator` in pyramid config, it defaults
+    to 'cornice_swagger.views:swagger_ui_script_template'
+    :param request:
+    :return:
+    """
+    script_generator = request.registry.settings.get(
+        "cornice_swagger.swagger_ui_script_generator",
+        "cornice_swagger.views:swagger_ui_script_template",
+    )
+    package, callable = script_generator.split(":")
+    imported_package = importlib.import_module(package)
+    script_callable = getattr(imported_package, callable)
+    template = pkg_resources.resource_string("cornice_swagger", "templates/index.html").decode(
+        "utf8"
+    )
+    html = Template(template).safe_substitute(
+        ui_css_url=ui_css_url,
+        ui_js_bundle_url=ui_js_bundle_url,
+        ui_js_standalone_url=ui_js_standalone_url,
+        swagger_ui_script=script_callable(request),
+    )
+    return Response(html)
+def open_api_json_view(request):
+    """
+    :param request:
+    :return:
+    Generates JSON representation of Swagger spec
+    """
+    doc = cornice_swagger.CorniceSwagger(
+        cornice.service.get_services(), pyramid_registry=request.registry
+    )
+    kwargs = request.registry.settings["cornice_swagger.spec_kwargs"]
+    my_spec = doc.generate(**kwargs)
+    return my_spec
+def swagger_ui_script_template(request, **kwargs):
+    """
+    :param request:
+    :return:
+    Generates the <script> code that bootstraps Swagger UI, it will be injected
+    into index template
+    """
+    swagger_spec_url = request.route_url("cornice_swagger.open_api_path")
+    template = pkg_resources.resource_string(
+        "cornice_swagger", "templates/index_script_template.html"
+    ).decode("utf8")
+    return Template(template).safe_substitute(
+        swagger_spec_url=swagger_spec_url,
+    )

kinto/core/initialization.py CHANGED Viewed

@@ -334,16 +334,6 @@ def setup_sentry(config):
         config.add_subscriber(on_app_created, ApplicationCreated)
-def setup_statsd(config):
-    # It would be pretty rare to find users that have a custom ``kinto.initialization_sequence`` setting.
-    # But just in case, warn that it will be removed in next major.
-    warnings.warn(
-        "``setup_statsd()`` is now deprecated. Use ``kinto.core.initialization.setup_metrics()`` instead.",
-        DeprecationWarning,
-    )
-    setup_metrics(config)
 def install_middlewares(app, settings):
     "Install a set of middlewares defined in the ini file on the given app."
     # Setup new-relic.
@@ -544,10 +534,6 @@ def setup_metrics(config):
     config.add_subscriber(on_new_response, NewResponse)
-    # While statsd is deprecated, we include its plugin by default for retro-compability.
-    if settings["statsd_url"]:
-        config.include("kinto.plugins.statsd")
 class EventActionFilter:
     def __init__(self, actions, config):

kinto/core/openapi.py CHANGED Viewed

@@ -1,6 +1,5 @@
-from cornice_swagger import CorniceSwagger
-from cornice_swagger.converters.schema import TypeConverter
+from kinto.core.cornice_swagger import CorniceSwagger
+from kinto.core.cornice_swagger.converters.schema import TypeConverter
 from kinto.core.schema import Any

kinto/core/resource/viewset.py CHANGED Viewed

@@ -2,10 +2,10 @@ import functools
 import warnings
 import colander
-from cornice.validators import colander_validator
 from pyramid.settings import asbool
 from kinto.core import authorization
+from kinto.core.cornice.validators import colander_validator
 from .schema import (
     ObjectGetQuerySchema,

kinto/core/storage/postgresql/pool.py CHANGED Viewed

@@ -21,7 +21,7 @@ class _QueueWithMaxBacklog(Queue):
         with self.mutex:
             self.cur_backlog += 1
             try:
-                if self.max_backlog >= 0:
+                if self.max_backlog >= 0:  # pragma: no branch
                     if self.cur_backlog > self.max_backlog:
                         block = False
                         timeout = None

kinto/core/testing.py CHANGED Viewed

@@ -5,10 +5,10 @@ from collections import defaultdict
 from unittest import mock
 import webtest
-from cornice import errors as cornice_errors
 from pyramid.url import parse_url_overrides
 from kinto.core import DEFAULT_SETTINGS
+from kinto.core.cornice import errors as cornice_errors
 from kinto.core.storage import generators
 from kinto.core.utils import encode64, follow_subrequest, memcache, sqlalchemy
 from kinto.plugins import prometheus, statsd

kinto/core/utils.py CHANGED Viewed

@@ -13,7 +13,6 @@ from urllib.parse import unquote
 import jsonpatch
 import rapidjson
 from colander import null
-from cornice import cors
 from pyramid import httpexceptions
 from pyramid.authorization import Authenticated
 from pyramid.interfaces import IRoutesMapper
@@ -21,6 +20,8 @@ from pyramid.request import Request, apply_request_extensions
 from pyramid.settings import aslist
 from pyramid.view import render_view_to_response
+from kinto.core.cornice import cors
 try:
     import sqlalchemy
@@ -289,7 +290,7 @@ def current_service(request):
     """Return the Cornice service matching the specified request.
     :returns: the service or None if unmatched.
-    :rtype: cornice.Service
+    :rtype: kinto.core.cornice.Service
     """
     if request.matched_route:
         services = request.registry.cornice_services

kinto/core/views/batch.py CHANGED Viewed

@@ -1,11 +1,11 @@
 import logging
 import colander
-from cornice.validators import colander_validator
 from pyramid import httpexceptions
 from pyramid.security import NO_PERMISSION_REQUIRED
 from kinto.core import Service, errors
+from kinto.core.cornice.validators import colander_validator
 from kinto.core.errors import ErrorSchema
 from kinto.core.resource.viewset import CONTENT_TYPES
 from kinto.core.utils import build_request, build_response, merge_dicts

kinto/core/views/errors.py CHANGED Viewed

@@ -22,6 +22,8 @@ def authorization_required(response, request):
     """
     if Authenticated not in request.effective_principals:
         if response.content_type != "application/json":
+            # This is always the case when `HTTPForbidden` is raised by Pyramid
+            # on protected views with unauthenticated requests.
             error_msg = "Please authenticate yourself to use this endpoint."
             response = http_error(
                 httpexceptions.HTTPUnauthorized(),

kinto/core/views/openapi.py CHANGED Viewed

@@ -1,8 +1,8 @@
 import colander
-from cornice.service import get_services
 from pyramid.security import NO_PERMISSION_REQUIRED
 from kinto.core import Service
+from kinto.core.cornice.service import get_services
 from kinto.core.openapi import OpenAPI

kinto/plugins/accounts/__init__.py CHANGED Viewed

@@ -6,19 +6,12 @@ from pyramid.exceptions import ConfigurationError
 from kinto.authorization import PERMISSIONS_INHERITANCE_TREE
 from .authentication import AccountsAuthenticationPolicy as AccountsPolicy
-from .utils import (
-    ACCOUNT_CACHE_KEY,
-    ACCOUNT_POLICY_NAME,
-    ACCOUNT_RESET_PASSWORD_CACHE_KEY,
-    ACCOUNT_VALIDATION_CACHE_KEY,
-)
+from .utils import ACCOUNT_CACHE_KEY, ACCOUNT_POLICY_NAME
 __all__ = [
     "ACCOUNT_CACHE_KEY",
     "ACCOUNT_POLICY_NAME",
-    "ACCOUNT_RESET_PASSWORD_CACHE_KEY",
-    "ACCOUNT_VALIDATION_CACHE_KEY",
     "AccountsPolicy",
 ]
@@ -27,16 +20,13 @@ DOCS_URL = "https://kinto.readthedocs.io/en/stable/api/1.x/accounts.html"
 def includeme(config):
     settings = config.get_settings()
-    validation_enabled = settings.get("account_validation", False)
     config.add_api_capability(
         "accounts",
         description="Manage user accounts.",
         url="https://kinto.readthedocs.io/en/latest/api/1.x/accounts.html",
-        validation_enabled=validation_enabled,
+        validation_enabled=False,
     )
     kwargs = {}
-    if not validation_enabled:
-        kwargs["ignore"] = "kinto.plugins.accounts.views.validation"
     config.scan("kinto.plugins.accounts.views", **kwargs)
     PERMISSIONS_INHERITANCE_TREE["root"].update({"account:create": {}})
@@ -45,13 +35,6 @@ def includeme(config):
         "read": {"account": ["write", "read"]},
     }
-    if validation_enabled:
-        # Valid mailers other than the default are `debug` and `testing`
-        # according to
-        # https://docs.pylonsproject.org/projects/pyramid_mailer/en/latest/#debugging
-        mailer = settings.get("mail.mailer", "")
-        config.include("pyramid_mailer" + (f".{mailer}" if mailer else ""))
     # Check that the account policy is mentioned in config if included.
     accountClass = "AccountsPolicy"
     policy = None

kinto/plugins/accounts/authentication.py CHANGED Viewed

@@ -5,31 +5,27 @@ from kinto.core import utils
 from kinto.core.storage import exceptions as storage_exceptions
 from .utils import (
+    ACCOUNT_CACHE_KEY,
     ACCOUNT_POLICY_NAME,
-    cache_account,
-    delete_cached_reset_password,
-    get_account_cache_key,
-    get_cached_account,
-    get_cached_reset_password,
-    is_validated,
-    refresh_cached_account,
 )
 def account_check(username, password, request):
     settings = request.registry.settings
-    validation_enabled = settings.get("account_validation", False)
-    cache_key = get_account_cache_key(username, request.registry)
+    hmac_secret = settings["userid_hmac_secret"]
+    cache_key = utils.hmac_digest(hmac_secret, ACCOUNT_CACHE_KEY.format(username))
+    cache_ttl = int(settings.get("account_cache_ttl_seconds", 30))
     hashed_password = utils.hmac_digest(cache_key, password)
     # Check cache to see whether somebody has recently logged in with the same
     # username and password.
-    cache_result = get_cached_account(username, request.registry)
+    cache = request.registry.cache
+    cache_result = cache.get(cache_key)
     # Username and password have been verified previously. No need to compare hashes
     if cache_result == hashed_password:
         # Refresh the cache TTL.
-        refresh_cached_account(username, request.registry)
+        cache.expire(cache_key, cache_ttl)
         return True
     # Back to standard procedure
@@ -41,53 +37,11 @@ def account_check(username, password, request):
     except storage_exceptions.ObjectNotFoundError:
         return None
-    if validation_enabled and not is_validated(existing):
-        return None
     hashed = existing["password"].encode(encoding="utf-8")
     pwd_str = password.encode(encoding="utf-8")
     # Check if password is valid (it is a very expensive computation)
     if bcrypt.checkpw(pwd_str, hashed):
-        cache_account(hashed_password, username, request.registry)
-        return True
-    # Last chance, is this a "reset password" flow?
-    return reset_password_flow(username, password, request)
-def reset_password_flow(username, password, request):
-    cache_key = get_account_cache_key(username, request.registry)
-    hashed_password = utils.hmac_digest(cache_key, password)
-    pwd_str = password.encode(encoding="utf-8")
-    cached_password = get_cached_reset_password(username, request.registry)
-    if not cached_password:
-        return None
-    # The temporary reset password is only available for changing a user's password.
-    if request.method.lower() not in ["post", "put", "patch"]:
-        return None
-    # Only allow modifying a user account, no other resource.
-    uri = utils.strip_uri_prefix(request.path)
-    resource_name, _ = utils.view_lookup(request, uri)
-    if resource_name != "account":
-        return None
-    try:
-        data = request.json["data"]
-    except (ValueError, KeyError):
-        return None
-    # Request one and only one data field: the `password`.
-    if not data or "password" not in data or len(data.keys()) > 1:
-        return None
-    cached_password_str = cached_password.encode(encoding="utf-8")
-    if bcrypt.checkpw(pwd_str, cached_password_str):
-        # Remove the temporary reset password from the cache.
-        delete_cached_reset_password(username, request.registry)
-        cache_account(hashed_password, username, request.registry)
+        cache.set(cache_key, hashed_password, ttl=cache_ttl)
         return True

kinto/plugins/accounts/utils.py CHANGED Viewed

@@ -1,14 +1,8 @@
 import bcrypt
-from kinto.core import utils
 ACCOUNT_CACHE_KEY = "accounts:{}:verified"
 ACCOUNT_POLICY_NAME = "account"
-ACCOUNT_RESET_PASSWORD_CACHE_KEY = "accounts:{}:reset-password"
-ACCOUNT_VALIDATION_CACHE_KEY = "accounts:{}:validation-key"
-DEFAULT_RESET_PASSWORD_CACHE_TTL_SECONDS = 7 * 24 * 60 * 60
-DEFAULT_VALIDATION_KEY_CACHE_TTL_SECONDS = 7 * 24 * 60 * 60
 def hash_password(password):
@@ -17,130 +11,3 @@ def hash_password(password):
     pwd_str = password.encode(encoding="utf-8")
     hashed = bcrypt.hashpw(pwd_str, bcrypt.gensalt())
     return hashed.decode(encoding="utf-8")
-def is_validated(user):
-    """Is this user record validated?"""
-    # An account is "validated" if it has the `validated` field set to True, or
-    # no `validated` field at all (for accounts created before the "account
-    # validation option" was enabled).
-    return user.get("validated", True)
-def get_account_cache_key(username, registry):
-    """Given a username, return the cache key for this account."""
-    settings = registry.settings
-    hmac_secret = settings["userid_hmac_secret"]
-    cache_key = utils.hmac_digest(hmac_secret, ACCOUNT_CACHE_KEY.format(username))
-    return cache_key
-def cache_reset_password(reset_password, username, registry):
-    """Store a reset-password in the cache."""
-    settings = registry.settings
-    hmac_secret = settings["userid_hmac_secret"]
-    cache_key = utils.hmac_digest(hmac_secret, ACCOUNT_RESET_PASSWORD_CACHE_KEY.format(username))
-    # Store a reset password for 7 days by default.
-    cache_ttl = int(
-        settings.get(
-            "account_validation.reset_password_cache_ttl_seconds",
-            DEFAULT_RESET_PASSWORD_CACHE_TTL_SECONDS,
-        )
-    )
-    cache = registry.cache
-    cache_result = cache.set(cache_key, reset_password, ttl=cache_ttl)
-    return cache_result
-def get_cached_reset_password(username, registry):
-    """Given a username, get the reset-password from the cache."""
-    hmac_secret = registry.settings["userid_hmac_secret"]
-    cache_key = utils.hmac_digest(hmac_secret, ACCOUNT_RESET_PASSWORD_CACHE_KEY.format(username))
-    cache = registry.cache
-    cache_result = cache.get(cache_key)
-    return cache_result
-def delete_cached_reset_password(username, registry):
-    """Given a username, delete the reset-password from the cache."""
-    hmac_secret = registry.settings["userid_hmac_secret"]
-    cache_key = utils.hmac_digest(hmac_secret, ACCOUNT_RESET_PASSWORD_CACHE_KEY.format(username))
-    cache = registry.cache
-    cache_result = cache.delete(cache_key)
-    return cache_result
-def cache_validation_key(activation_key, username, registry):
-    """Store a validation_key in the cache."""
-    settings = registry.settings
-    hmac_secret = settings["userid_hmac_secret"]
-    cache_key = utils.hmac_digest(hmac_secret, ACCOUNT_VALIDATION_CACHE_KEY.format(username))
-    # Store an activation key for 7 days by default.
-    cache_ttl = int(
-        settings.get(
-            "account_validation.validation_key_cache_ttl_seconds",
-            DEFAULT_VALIDATION_KEY_CACHE_TTL_SECONDS,
-        )
-    )
-    cache = registry.cache
-    cache_result = cache.set(cache_key, activation_key, ttl=cache_ttl)
-    return cache_result
-def get_cached_validation_key(username, registry):
-    """Given a username, get the validation key from the cache."""
-    hmac_secret = registry.settings["userid_hmac_secret"]
-    cache_key = utils.hmac_digest(hmac_secret, ACCOUNT_VALIDATION_CACHE_KEY.format(username))
-    cache = registry.cache
-    activation_key = cache.get(cache_key)
-    return activation_key
-def delete_cached_validation_key(username, registry):
-    """Given a username, delete the validation key from the cache."""
-    hmac_secret = registry.settings["userid_hmac_secret"]
-    cache_key = utils.hmac_digest(hmac_secret, ACCOUNT_VALIDATION_CACHE_KEY.format(username))
-    cache = registry.cache
-    cache_result = cache.delete(cache_key)
-    return cache_result
-def cache_account(hashed_password, username, registry):
-    """Store an authenticated account in the cache."""
-    settings = registry.settings
-    cache_ttl = int(settings.get("account_cache_ttl_seconds", 30))
-    cache_key = get_account_cache_key(username, registry)
-    cache = registry.cache
-    cache_result = cache.set(cache_key, hashed_password, ttl=cache_ttl)
-    return cache_result
-def get_cached_account(username, registry):
-    """Given a username, get the account from the cache."""
-    cache_key = get_account_cache_key(username, registry)
-    cache = registry.cache
-    cached_account = cache.get(cache_key)
-    return cached_account
-def refresh_cached_account(username, registry):
-    """Given a username, refresh the cache TTL."""
-    settings = registry.settings
-    cache_ttl = int(settings.get("account_cache_ttl_seconds", 30))
-    cache_key = get_account_cache_key(username, registry)
-    cache = registry.cache
-    cache_result = cache.expire(cache_key, cache_ttl)
-    return cache_result
-def delete_cached_account(username, registry):
-    """Given a username, delete the account key from the cache."""
-    hmac_secret = registry.settings["userid_hmac_secret"]
-    cache_key = utils.hmac_digest(hmac_secret, ACCOUNT_CACHE_KEY.format(username))
-    cache = registry.cache
-    cache_result = cache.delete(cache_key)
-    return cache_result

kinto 19.5.0__py3-none-any.whl → 20.0.0__py3-none-any.whl

Potentially problematic release.

kinto 19.5.0py3-none-any.whl → 20.0.0py3-none-any.whl