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

kinto/plugins/accounts/{views/__init__.py → views.py}

@@ -1,6 +1,3 @@
-import re
-import uuid
-
 import colander
 from pyramid import httpexceptions
 from pyramid.authorization import Authenticated, Everyone
@@ -8,22 +5,12 @@ from pyramid.decorator import reify
 from pyramid.events import subscriber
 from pyramid.settings import aslist
 
-from kinto.core import resource
+from kinto.core import resource, utils
 from kinto.core.errors import http_error, raise_invalid
 from kinto.core.events import ACTIONS, ResourceChanged
 from kinto.views import NameGenerator
 
-from ..mails import Emailer
-from ..utils import (
-    ACCOUNT_POLICY_NAME,
-    cache_validation_key,
-    delete_cached_account,
-    get_cached_validation_key,
-    hash_password,
-)
-
-
-DEFAULT_EMAIL_REGEXP = "^[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+\\.[a-zA-Z0-9-.]+$"
+from .utils import ACCOUNT_CACHE_KEY, ACCOUNT_POLICY_NAME, hash_password
 
 
 def _extract_posted_body_id(request):
@@ -63,13 +50,6 @@ class Account(resource.Resource):
         )
         # Shortcut to check if current is anonymous (before get_parent_id()).
         context.is_anonymous = Authenticated not in request.effective_principals
-        # Is the "accounts validation" setting set?
-        context.validation_enabled = settings.get("account_validation", False)
-        # Account validation requires the user id to be an email.
-        validation_email_regexp = settings.get(
-            "account_validation.email_regexp", DEFAULT_EMAIL_REGEXP
-        )
-        context.validation_email_regexp = re.compile(validation_email_regexp)
 
         super().__init__(request, context)
 
@@ -122,26 +102,6 @@ class Account(resource.Resource):
             error_details = {"name": "data.id", "description": "Accounts must have an ID."}
             raise_invalid(self.request, **error_details)
 
-        # Account validation requires that the record ID is an email address.
-        # TODO: this might be better suited for a schema. Do we have a way to
-        # dynamically change the schema according to the settings?
-        if self.context.validation_enabled and old is None:
-            email_regexp = self.context.validation_email_regexp
-            # Account validation requires that the record ID is an email address.
-            user_email = new[self.model.id_field]
-            if not email_regexp.match(user_email):
-                error_details = {
-                    "name": "data.id",
-                    "description": f"Account validation is enabled, and user id should match {email_regexp}",
-                }
-                raise_invalid(self.request, **error_details)
-
-            activation_key = str(uuid.uuid4())
-            new["validated"] = False
-
-            # Store the activation key in the cache to be used in the `validate` endpoint.
-            cache_validation_key(activation_key, new["id"], self.request.registry)
-
         # Administrators can reach other accounts and anonymous have no
         # selected_userid. So do not try to enforce.
         if self.context.is_administrator or self.context.is_anonymous:
@@ -164,28 +124,13 @@ class Account(resource.Resource):
 )
 def on_account_changed(event):
     request = event.request
+    cache = request.registry.cache
+    settings = request.registry.settings
+    hmac_secret = settings["userid_hmac_secret"]
 
     for obj in event.impacted_objects:
         # Extract username and password from current user
         username = obj["old"]["id"]
+        cache_key = utils.hmac_digest(hmac_secret, ACCOUNT_CACHE_KEY.format(username))
         # Delete cache
-        delete_cached_account(username, request.registry)
-
-
-# Send activation code by email on account creation if account validation is enabled.
-@subscriber(ResourceChanged, for_resources=("account",), for_actions=(ACTIONS.CREATE,))
-def on_account_created(event):
-    request = event.request
-    settings = request.registry.settings
-    if not settings.get("account_validation", False):
-        return
-
-    for impacted_object in event.impacted_objects:
-        account = impacted_object["new"]
-        user_email = account["id"]
-        activation_key = get_cached_validation_key(user_email, request.registry)
-        if activation_key is None:
-            continue
-
-        # Send an email to the user with the link to activate their account.
-        Emailer(request, account).send_activation(activation_key)
+        cache.delete(cache_key)

kinto/plugins/admin/VERSION

@@ -1 +1 @@
-3.5.1
+3.6.0

kinto/plugins/admin/build/VERSION

@@ -1 +1 @@
-3.5.1
+3.6.0

kinto/plugins/admin/build/assets/asn1-EdZsLKOL.js

@@ -0,0 +1 @@
+function u(i){for(var s={},c=i.split(" "),T=0;T<c.length;++T)s[c[T]]=!0;return s}const o={keywords:u("DEFINITIONS OBJECTS IF DERIVED INFORMATION ACTION REPLY ANY NAMED CHARACTERIZED BEHAVIOUR REGISTERED WITH AS IDENTIFIED CONSTRAINED BY PRESENT BEGIN IMPORTS FROM UNITS SYNTAX MIN-ACCESS MAX-ACCESS MINACCESS MAXACCESS REVISION STATUS DESCRIPTION SEQUENCE SET COMPONENTS OF CHOICE DistinguishedName ENUMERATED SIZE MODULE END INDEX AUGMENTS EXTENSIBILITY IMPLIED EXPORTS"),cmipVerbs:u("ACTIONS ADD GET NOTIFICATIONS REPLACE REMOVE"),compareTypes:u("OPTIONAL DEFAULT MANAGED MODULE-TYPE MODULE_IDENTITY MODULE-COMPLIANCE OBJECT-TYPE OBJECT-IDENTITY OBJECT-COMPLIANCE MODE CONFIRMED CONDITIONAL SUBORDINATE SUPERIOR CLASS TRUE FALSE NULL TEXTUAL-CONVENTION"),status:u("current deprecated mandatory obsolete"),tags:u("APPLICATION AUTOMATIC EXPLICIT IMPLICIT PRIVATE TAGS UNIVERSAL"),storage:u("BOOLEAN INTEGER OBJECT IDENTIFIER BIT OCTET STRING UTCTime InterfaceIndex IANAifType CMIP-Attribute REAL PACKAGE PACKAGES IpAddress PhysAddress NetworkAddress BITS BMPString TimeStamp TimeTicks TruthValue RowStatus DisplayString GeneralString GraphicString IA5String NumericString PrintableString SnmpAdminString TeletexString UTF8String VideotexString VisibleString StringStore ISO646String T61String UniversalString Unsigned32 Integer32 Gauge Gauge32 Counter Counter32 Counter64"),modifier:u("ATTRIBUTE ATTRIBUTES MANDATORY-GROUP MANDATORY-GROUPS GROUP GROUPS ELEMENTS EQUALITY ORDERING SUBSTRINGS DEFINED"),accessTypes:u("not-accessible accessible-for-notify read-only read-create read-write"),multiLineStrings:!0};function g(i){var s=i.keywords||o.keywords,c=i.cmipVerbs||o.cmipVerbs,T=i.compareTypes||o.compareTypes,N=i.status||o.status,d=i.tags||o.tags,f=i.storage||o.storage,m=i.modifier||o.modifier,C=i.accessTypes||o.accessTypes;i.multiLineStrings||o.multiLineStrings;var R=i.indentStatements!==!1,A=/[\|\^]/,E;function y(e,n){var t=e.next();if(t=='"'||t=="'")return n.tokenize=D(t),n.tokenize(e,n);if(/[\[\]\(\){}:=,;]/.test(t))return E=t,"punctuation";if(t=="-"&&e.eat("-"))return e.skipToEnd(),"comment";if(/\d/.test(t))return e.eatWhile(/[\w\.]/),"number";if(A.test(t))return e.eatWhile(A),"operator";e.eatWhile(/[\w\-]/);var r=e.current();return s.propertyIsEnumerable(r)?"keyword":c.propertyIsEnumerable(r)?"variableName":T.propertyIsEnumerable(r)?"atom":N.propertyIsEnumerable(r)?"comment":d.propertyIsEnumerable(r)?"typeName":f.propertyIsEnumerable(r)||m.propertyIsEnumerable(r)||C.propertyIsEnumerable(r)?"modifier":"variableName"}function D(e){return function(n,t){for(var r=!1,S,O=!1;(S=n.next())!=null;){if(S==e&&!r){var I=n.peek();I&&(I=I.toLowerCase(),(I=="b"||I=="h"||I=="o")&&n.next()),O=!0;break}r=!r&&S=="\\"}return O&&(t.tokenize=null),"string"}}function p(e,n,t,r,S){this.indented=e,this.column=n,this.type=t,this.align=r,this.prev=S}function a(e,n,t){var r=e.indented;return e.context&&e.context.type=="statement"&&(r=e.context.indented),e.context=new p(r,n,t,null,e.context)}function l(e){var n=e.context.type;return(n==")"||n=="]"||n=="}")&&(e.indented=e.context.indented),e.context=e.context.prev}return{name:"asn1",startState:function(){return{tokenize:null,context:new p(-2,0,"top",!1),indented:0,startOfLine:!0}},token:function(e,n){var t=n.context;if(e.sol()&&(t.align==null&&(t.align=!1),n.indented=e.indentation(),n.startOfLine=!0),e.eatSpace())return null;E=null;var r=(n.tokenize||y)(e,n);if(r=="comment")return r;if(t.align==null&&(t.align=!0),(E==";"||E==":"||E==",")&&t.type=="statement")l(n);else if(E=="{")a(n,e.column(),"}");else if(E=="[")a(n,e.column(),"]");else if(E=="(")a(n,e.column(),")");else if(E=="}"){for(;t.type=="statement";)t=l(n);for(t.type=="}"&&(t=l(n));t.type=="statement";)t=l(n)}else E==t.type?l(n):R&&((t.type=="}"||t.type=="top")&&E!=";"||t.type=="statement"&&E=="newstatement")&&a(n,e.column(),"statement");return n.startOfLine=!1,r},languageData:{indentOnInput:/^\s*[{}]$/,commentTokens:{line:"--"}}}}export{g as asn1};