cherrypy-foundation 1.0.0a1__py3-none-any.whl → 1.0.0a3__py3-none-any.whl

cherrypy_foundation/tools/tests/test_auth_mfa.py

@@ -0,0 +1,367 @@
+# CherryPy
+# Copyright (C) 2025 IKUS Software
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+
+import datetime
+from collections import namedtuple
+from urllib.parse import urlencode
+
+import cherrypy
+from cherrypy.lib.sessions import RamSession
+from cherrypy.test import helper
+
+from ..auth import AUTH_LAST_PASSWORD_AT
+from ..auth_mfa import (
+    MFA_CODE_TIME,
+    MFA_DEFAULT_CODE_TIMEOUT,
+    MFA_DEFAULT_TRUST_DURATION,
+    MFA_TRUSTED_IP_LIST,
+    MFA_USER_KEY,
+    MFA_VERIFICATION_TIME,
+)
+from ..sessions_timeout import SESSION_PERSISTENT
+
+User = namedtuple('User', 'id,username,password,email,mfa', defaults=[False])
+
+users = {
+    User(2, 'myuser', 'changeme', 'myuser@example.com', False),
+    User(3, 'mfauser', 'changeme', 'mfauser@example.com', True),
+    User(4, 'noemail', 'changeme', '', True),
+}
+
+
+def checkpassword(username, password):
+    for u in users:
+        if u.username == username and u.password == password:
+            return True
+    return False
+
+
+def user_lookup_func(login, user_info):
+    for u in users:
+        if u.username == login:
+            return u.id, u
+    return None
+
+
+def user_from_key_func(userkey):
+    for u in users:
+        if u.id == userkey:
+            return u
+    return None
+
+
+@cherrypy.tools.sessions()
+@cherrypy.tools.auth(
+    user_lookup_func=user_lookup_func,
+    user_from_key_func=user_from_key_func,
+    checkpassword=checkpassword,
+)
+@cherrypy.tools.auth_mfa(
+    mfa_enabled=lambda: hasattr(cherrypy.serving.request, 'currentuser') and cherrypy.request.currentuser.mfa
+)
+class Root:
+
+    @cherrypy.expose
+    def index(self):
+        return "OK"
+
+    @cherrypy.expose()
+    def login(self, username=None, password=None):
+        if cherrypy.serving.request.method == 'POST' and username and password:
+            userobj = cherrypy.tools.auth.login_with_credentials(username, password)
+            if userobj:
+                raise cherrypy.tools.auth.redirect_to_original_url()
+            else:
+                return "invalid credentials"
+        return "login"
+
+    @cherrypy.expose()
+    def mfa(self, code=None, resend_code=None, persistent=False):
+        html = "mfa\n"
+        if cherrypy.serving.request.method == 'POST' and code:
+            if cherrypy.tools.auth_mfa.verify_code(code=code, persistent=persistent):
+                raise cherrypy.tools.auth.redirect_to_original_url()
+            else:
+                html += "<p>invalid verification code</p>\n"
+        # Send verification code if previous code expired.
+        # Or when requested by user.
+        if (resend_code and cherrypy.serving.request.method == 'POST') or cherrypy.tools.auth_mfa.is_code_expired():
+            code = cherrypy.tools.auth_mfa.generate_code()
+            # Here the code should be send by email, SMS or any other means.
+            # For our test we store it in the session.
+            cherrypy.serving.session['code'] = code
+            html += "<p>new verification code sent to your email</p>\n"
+        return html
+
+
+class AuthManagerMfaTest(helper.CPWebCase):
+    interactive = False
+    # Authenticated by default.
+    login = True
+
+    @classmethod
+    def setup_server(cls):
+        cherrypy.tree.mount(Root(), '/')
+
+    def getPage(self, *args, **kwargs):
+        """
+        This implementation keep track of session cookies.
+        """
+        headers = kwargs.pop('headers', [])
+        if hasattr(self, 'cookies') and self.cookies:
+            headers.extend(self.cookies)
+        return helper.CPWebCase.getPage(self, *args, headers=headers, **kwargs)
+
+    def _login(self, username, password):
+        self.getPage('/login/', method='POST', body=urlencode({'username': username, 'password': password}))
+        self.assertStatus(303)
+        self.assertHeaderItemValue('Location', f'http://{self.HOST}:{self.PORT}/')
+
+    @property
+    def _session_id(self):
+        if hasattr(self, 'cookies') and self.cookies:
+            for unused, value in self.cookies:
+                for part in value.split(';'):
+                    key, unused, value = part.partition('=')
+                    if key == 'session_id':
+                        return value
+
+    def _get_code(self):
+        # Query MFA page to generate a code
+        self.getPage("/mfa/")
+        self.assertStatus(200)
+        self.assertInBody("new verification code sent to your email")
+        # Extract code from user session for testing only.
+        session = RamSession.cache[self._session_id][0]
+        return session['code']
+
+    def test_get_without_login(self):
+        # Given the user is not authenticated.
+        # When requesting /mfa/
+        self.getPage("/mfa/")
+        # Then user is redirected to /login/
+        self.assertStatus(303)
+        self.assertHeaderItemValue('Location', f'http://{self.HOST}:{self.PORT}/login/')
+
+    def test_get_with_mfa_disabled(self):
+        # Given an authenticated user with MFA Disable
+        self._login('myuser', 'changeme')
+        # When requesting /mfa/ page
+        self.getPage("/mfa/")
+        # Then user is redirected to root page
+        self.assertStatus(303)
+        self.assertHeaderItemValue('Location', f'http://{self.HOST}:{self.PORT}/')
+        # Then index is enabled.
+        self.getPage("/")
+        self.assertStatus(200)
+        self.assertInBody('OK')
+
+    def test_get_with_trusted(self):
+        # Given an authenticated user with MFA Disable
+        self._login('mfauser', 'changeme')
+        # Given an authenticated user with MFA enabled and already verified
+        session = RamSession.cache[self._session_id][0]
+        session[MFA_USER_KEY] = 3
+        session[MFA_VERIFICATION_TIME] = datetime.datetime.now()
+        session[MFA_TRUSTED_IP_LIST] = ['127.0.0.1']
+
+        # When requesting /mfa/ page when we are already trusted
+        self.getPage("/mfa/")
+        # Then user is redirected to root page
+        self.assertStatus(303)
+        self.assertHeaderItemValue('Location', f'http://{self.HOST}:{self.PORT}/')
+
+    def test_get_with_trusted_expired(self):
+        # Given an authenticated user with MFA enabled and already verified
+        self._login('mfauser', 'changeme')
+        session = RamSession.cache[self._session_id][0]
+        session[MFA_USER_KEY] = 3
+        session[MFA_VERIFICATION_TIME] = datetime.datetime.now() - datetime.timedelta(minutes=60)
+
+        # When requesting /mfa/ page
+        self.getPage("/mfa/")
+        self.assertStatus(200)
+        # Then a verification code is send to the user
+        self.assertInBody("new verification code sent to your email")
+
+    def test_get_with_trusted_different_ip(self):
+        # Given an authenticated user with MFA enabled and already verified
+        self._login('mfauser', 'changeme')
+        session = RamSession.cache[self._session_id][0]
+        session[MFA_USER_KEY] = 3
+        session[MFA_VERIFICATION_TIME] = datetime.datetime.now()
+
+        # When requesting /mfa/ page from a different ip
+        self.getPage("/mfa/", headers=[('X-Forwarded-For', '10.255.14.23')])
+        self.assertStatus(200)
+        # Then a verification code is send to the user
+        self.assertInBody("new verification code sent to your email")
+
+    def test_get_without_verified(self):
+        # Given an authenticated user With MFA enabled
+        self._login('mfauser', 'changeme')
+        # When requesting /mfa/ page
+        self.getPage("/mfa/")
+        self.assertStatus(200)
+        # Then a verification code is send to the user
+        self.assertInBody("new verification code sent to your email")
+
+    def test_verify_code_valid(self):
+        prev_session_id = self._session_id
+        # Given an authenticated user With MFA enabled
+        self._login('mfauser', 'changeme')
+        code = self._get_code()
+        # When sending a valid verification code
+        self.getPage("/mfa/", method='POST', body=urlencode({'code': code}))
+        # Then a new session_id is generated
+        self.assertNotEqual(prev_session_id, self._session_id)
+        # Then user is redirected to root page
+        self.assertStatus(303)
+        self.assertHeaderItemValue('Location', f'http://{self.HOST}:{self.PORT}/')
+        # Then user has access
+        self.getPage("/")
+        self.assertStatus(200)
+
+    def test_verify_code_invalid(self):
+        # Given an authenticated user With MFA enabled
+        # When sending an invalid verification code
+        self.getPage("/mfa/", method='POST', body=urlencode({'code': '1234567'}))
+        # Then user is redirected to login page
+        self.assertStatus(303)
+        self.assertHeaderItemValue('Location', f'http://{self.HOST}:{self.PORT}/login/')
+
+    def test_verify_code_expired(self):
+        # Given an authenticated user With MFA enabled
+        self._login('mfauser', 'changeme')
+        code = self._get_code()
+        # When sending a valid verification code that expired
+        session = RamSession.cache[self._session_id][0]
+
+        session[MFA_CODE_TIME] = datetime.datetime.now() - datetime.timedelta(minutes=MFA_DEFAULT_CODE_TIMEOUT + 1)
+
+        self.getPage("/mfa/", method='POST', body=urlencode({'code': code}))
+        # Then a new code get generated.
+        self.assertStatus(200)
+        self.assertInBody("invalid verification code")
+
+    def test_verify_code_invalid_after_3_tentative(self):
+        # Given an authenticated user With MFA
+        self._login('mfauser', 'changeme')
+        code = self._get_code()
+        # When user enter an invalid verification code 3 times
+        self.getPage("/mfa/", method='POST', body=urlencode({'code': '1234567'}))
+        self.assertStatus(200)
+        self.getPage("/mfa/", method='POST', body=urlencode({'code': '1234567'}))
+        self.assertStatus(200)
+        self.getPage("/mfa/", method='POST', body=urlencode({'code': '1234567'}))
+        # Then an error get displayed to the user
+        self.assertStatus(200)
+        self.assertInBody("invalid verification code")
+        # Then a new code get send to the user.
+        self.assertInBody("new verification code sent to your email")
+        session = RamSession.cache[self._session_id][0]
+        new_code = session['code']
+        self.assertNotEqual(code, new_code)
+
+    def test_resend_code(self):
+        # Given an authenticated user With MFA enabled with an existing code
+        self._login('mfauser', 'changeme')
+        code = self._get_code()
+        # When user request a new code
+        self.getPage("/mfa/", method='POST', body=urlencode({'resend_code': '1'}))
+        # Then A success message is displayedto the user.
+        self.assertInBody("new verification code sent to your email")
+        session = RamSession.cache[self._session_id][0]
+        new_code = session['code']
+        self.assertNotEqual(code, new_code)
+
+    def test_redirect_to_original_url(self):
+        # Given an authenticated user
+        self._login('mfauser', 'changeme')
+        # When querying a page that required mfa
+        self.getPage('/prefs/general')
+        # Then user is redirected to mfa page
+        self.assertStatus(303)
+        self.assertHeaderItemValue('Location', f'http://{self.HOST}:{self.PORT}/mfa/')
+        # When providing verification code
+        code = self._get_code()
+        self.getPage("/mfa/", method='POST', body=urlencode({'code': code}))
+        # Then user is redirected to original url
+        self.assertStatus(303)
+        self.assertHeaderItemValue('Location', f'http://{self.HOST}:{self.PORT}/prefs/general')
+
+    def test_login_persistent_when_login_timeout(self):
+        prev_session_id = self._session_id
+        # Given a user authenticated with MFA with "persistent"
+        self._login('mfauser', 'changeme')
+        code = self._get_code()
+        self.getPage("/mfa/", method='POST', body=urlencode({'code': code, 'persistent': '1'}))
+        self.assertStatus(303)
+        self.getPage("/")
+        self.assertStatus(200)
+        self.assertNotEqual(prev_session_id, self._session_id)
+        session = RamSession.cache[self._session_id][0]
+        self.assertTrue(session[SESSION_PERSISTENT])
+        # When the re-auth time expired (after 15 min)
+        session[AUTH_LAST_PASSWORD_AT] = datetime.datetime.now() - datetime.timedelta(minutes=60, seconds=1)
+
+        # Then next query redirect user to /login/ page (by mfa)
+        self.getPage("/")
+        self.assertStatus(303)
+        self.assertHeaderItemValue('Location', f'http://{self.HOST}:{self.PORT}/login/')
+        prev_session_id = self._session_id
+        # When user enter valid username password
+        self.getPage("/login/", method='POST', body=urlencode({'username': 'mfauser', 'password': 'changeme'}))
+        # Then user is redirected to original url without need to pass MFA again.
+        self.assertStatus(303)
+        self.assertHeaderItemValue('Location', f'http://{self.HOST}:{self.PORT}/')
+        self.assertNotEqual(prev_session_id, self._session_id)
+        self.getPage("/")
+        self.assertStatus(200)
+        self.assertInBody('OK')
+
+    def test_login_persistent_when_mfa_timeout(self):
+        prev_session_id = self._session_id
+        # Given a user authenticated with MFA with "persistent"
+        self._login('mfauser', 'changeme')
+        code = self._get_code()
+        self.getPage("/mfa/", method='POST', body=urlencode({'code': code, 'persistent': '1'}))
+        self.assertStatus(303)
+        self.getPage("/")
+        self.assertStatus(200)
+        self.assertNotEqual(prev_session_id, self._session_id)
+        session = RamSession.cache[self._session_id][0]
+
+        self.assertTrue(session[SESSION_PERSISTENT])
+        # When the mfa verification timeout (after 15 min)
+        session[MFA_VERIFICATION_TIME] = datetime.datetime.now() - datetime.timedelta(
+            minutes=MFA_DEFAULT_TRUST_DURATION, seconds=1
+        )
+
+        # Then next query redirect user to mfa page
+        self.getPage("/prefs/general")
+        self.assertStatus(303)
+        self.assertHeaderItemValue('Location', f'http://{self.HOST}:{self.PORT}/mfa/')
+        # When user enter valid code
+        code = self._get_code()
+        self.getPage("/mfa/", method='POST', body=urlencode({'code': code, 'persistent': '1'}))
+        # Then user is redirected to original page.
+        self.assertStatus(303)
+        self.assertHeaderItemValue('Location', f'http://{self.HOST}:{self.PORT}/prefs/general')
+        self.getPage("/")
+        self.assertStatus(200)
+        self.assertInBody('OK')

cherrypy_foundation/tools/tests/test_jinja2.py

@@ -0,0 +1,123 @@
+# CherryPy Foundation
+# Copyright (C) 2025 IKUS Software
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+import importlib
+from datetime import datetime, timezone
+from unittest import skipUnless
+
+import cherrypy
+from cherrypy.test import helper
+from parameterized import parameterized
+
+from .. import i18n  # noqa
+from .. import jinja2  # noqa
+
+HAS_JINJAX = importlib.util.find_spec("jinjax") is not None
+
+env = cherrypy.tools.jinja2.create_env(
+    package_name=__package__,
+    globals={
+        'const1': 'STATIC VALUE',
+    },
+)
+
+
+def extra_processor():
+    return {'var2': 'bar'}
+
+
+@cherrypy.tools.jinja2(env=env, extra_processor=extra_processor)
+class Root:
+
+    @cherrypy.expose
+    @cherrypy.tools.jinja2(template='test_jinja2.html')
+    def index(self):
+        return {'var1': 'test-jinja2'}
+
+    @cherrypy.expose
+    @cherrypy.tools.jinja2(template='test_jinjax.html')
+    def jinjax(self):
+        return {'var1': 'test-jinjax'}
+
+    @cherrypy.expose
+    @cherrypy.tools.jinja2(template='test_jinja2_i18n.html')
+    @cherrypy.tools.i18n(
+        default='fr',
+        default_timezone='America/Toronto',
+        mo_dir=importlib.resources.files(__package__) / 'locales',
+        domain='messages',
+    )
+    def localized(self):
+        return {
+            'my_datetime': datetime(year=2025, month=11, day=26, hour=11, minute=16, tzinfo=timezone.utc),
+            'my_date': datetime(year=2025, month=12, day=22, hour=14, minute=8, tzinfo=timezone.utc),
+        }
+
+
+class Jinja2Test(helper.CPWebCase):
+    default_lang = None
+    interactive = False
+
+    @classmethod
+    def setup_server(cls):
+        cherrypy.tree.mount(Root(), '/')
+
+    def test_get_page(self):
+        # Given a page render using jinja2
+        # When querying the page
+        self.getPage("/")
+        # Then the page return without error
+        self.assertStatus(200)
+        # Then the page is render dynamically using page context
+        self.assertInBody('test-jinja2')
+        self.assertInBody('bar')
+        self.assertInBody('STATIC VALUE')
+
+    @skipUnless(HAS_JINJAX, reason='Required jinjax')
+    def test_get_page_jinjax(self):
+        # Given a page render using jinjax
+        # When querying the page
+        self.getPage("/jinjax")
+        # Then the page return without error
+        self.assertStatus(200)
+        # Then the page is render dynamically using page context
+        self.assertInBody('<a class="btn btn-primary" href="http://example.com">foo</a>')
+
+    @parameterized.expand(
+        [
+            ('server_default', {}, 'fr'),
+            ('accept_lang_fr', {'Accept-Language': 'fr'}, 'fr'),
+            ('accept_lang_en', {'Accept-Language': 'en'}, 'en'),
+        ]
+    )
+    def test_get_page_i18n(self, _name, headers, expected_lang):
+        # Given a localized page render with jinja2
+        # When querying the page
+        self.getPage("/localized", headers=list(headers.items()))
+        # Then the page return without error
+        self.assertStatus(200)
+        # Then the page is render dynamically using page context
+        if expected_lang == 'fr':
+            self.assertInBody('lang="fr"')
+            self.assertInBody('français')
+            self.assertInBody('Du texte à traduire')
+            self.assertInBody('mercredi 26 novembre 2025, 06:16:00 heure normale de l’Est nord-américain')
+            self.assertInBody('lundi, décembre 22, 2025')
+        else:
+            self.assertInBody('lang="en"')
+            self.assertInBody('English')
+            self.assertInBody('Some text to translate')
+            self.assertInBody('Wednesday, November 26, 2025, 6:16:00\u202fAM Eastern Standard Time')
+            self.assertInBody('Monday, December 22, 2025')

{cherrypy_foundation-1.0.0a1.dist-info → cherrypy_foundation-1.0.0a3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cherrypy-foundation
-Version: 1.0.0a1
+Version: 1.0.0a3
 Summary: CherryPy Foundation
 Author-email: Patrik Dufresne <patrik@ikus-soft.com>
 License: GPLv3

{cherrypy_foundation-1.0.0a1.dist-info → cherrypy_foundation-1.0.0a3.dist-info}/RECORD

@@ -1,5 +1,5 @@
 cherrypy_foundation/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cherrypy_foundation/error_page.py,sha256=dhZBdVztS5tHr7jFsKUYWTvIUiZAfQ4PvXm5bkuKiTQ,3052
+cherrypy_foundation/error_page.py,sha256=Mz47u6n4eqQ85LKT9lWglqPPtmizikY9xBsrhGl7_nI,3198
 cherrypy_foundation/flash.py,sha256=fFRbutUX6c1lVHqjehmO9y98dJgmfNCjhd76t2mth2s,1542
 cherrypy_foundation/form.py,sha256=8c9dO0o47sK3CBosTkGXoVRtzNQwY0aw0vNZfTqmhvo,3994
 cherrypy_foundation/logging.py,sha256=YIOK5ZAZLCv52YDdP66yBYpEX1C336JnI3wnrTKl1Lw,3468
@@ -11,17 +11,17 @@ cherrypy_foundation/components/Datatable.css,sha256=7wSwgdA61vYCdEuQ0bp2o0oSvu5m
 cherrypy_foundation/components/Datatable.jinja,sha256=K-24vpN5TO8Jk2COvuC5uBaCj3PFLd6ubr28JHFq3KM,3375
 cherrypy_foundation/components/Datatable.js,sha256=jiV78bJPNMTLcjrX03vaYcsEdRbI6ctzSvCo880H8Hw,12072
 cherrypy_foundation/components/Field.css,sha256=CtOkvIbix7ykrOKLJxQJLJsWfEwFqfducJ1BH2vlMvA,244
-cherrypy_foundation/components/Field.jinja,sha256=QYJdB9xRysQrdC_oDlu9V8cpZyFJxQOlnZOi_wt-iP8,2762
+cherrypy_foundation/components/Field.jinja,sha256=R-ZUm88XXOb3zi_hysTuwFUCGGR67A59P4TT5d1Qo_o,3152
 cherrypy_foundation/components/Field.js,sha256=SFixZ62WlLq7SSCEazMAGhSnc9EnQ1wg6PZX4ayO6ZE,2047
 cherrypy_foundation/components/Fields.jinja,sha256=UDu1txwMguvr7dyga9PXepEhFvz9C6ZvchBnhQCWgHI,318
 cherrypy_foundation/components/Icon.jinja,sha256=Z1RGYBg5xlDEoUy3glqb_k_LEjkJHeCxQXqDEvWzEF4,135
 cherrypy_foundation/components/SideBySideMultiSelect.css,sha256=_poMY9O8rvDsOh01pQLf9qtg1Gm4eCM2HsM_ekC5zkk,503
 cherrypy_foundation/components/SideBySideMultiSelect.jinja,sha256=sud1WP-6JzuP7ZLRr-JQqvgMRWZRlXvxUJfguFr_klk,478
 cherrypy_foundation/components/SideBySideMultiSelect.js,sha256=5YMz1pgkXeWC_SRRfDbQI3X-c4PuxiTIpbWJt9sY7Rc,197
-cherrypy_foundation/components/Typeahead.css,sha256=8VyPN6FP_l0_mRyES2tjrwr9rEkKT4y0obeBI6nfGLk,1645
-cherrypy_foundation/components/Typeahead.jinja,sha256=g7oiiROxIjwkgwiZtxxFlSIIaWUr2ml2eS0RWm7yUvU,3215
+cherrypy_foundation/components/Typeahead.css,sha256=iaLKi4lx01MQqSSRrdDUIDCCD6Q_0INCsMRZ3nqdkuw,1718
+cherrypy_foundation/components/Typeahead.jinja,sha256=TjCotrTIzSx7TujxmgNxLIgxvtequCARLCjqeDzlZXU,3218
 cherrypy_foundation/components/Typeahead.js,sha256=mnsPRwM_1xtI7ImGn_pu46QdFw_LK_PDHNCRKp_CVxc,236
-cherrypy_foundation/components/__init__.py,sha256=15gQpb1eSzMmPPS5Gna8E25DGN0Midrxdns7veFKOyU,2034
+cherrypy_foundation/components/__init__.py,sha256=Ck_AY_eTkq4Pyf-jjyOxwfpoKXgtCx90hJpRHPRiA_Q,2012
 cherrypy_foundation/components/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cherrypy_foundation/components/tests/test_static.py,sha256=bDtS0CFM5LZxwxbXbUyLkXv7sM5KM-eQtHOWywZu_nc,3814
 cherrypy_foundation/components/vendor/bootstrap-icons/bootstrap-icons.css,sha256=AEMichyFVzMXWbxt2qy7aJsPBxXWiK7IK9BW0tW1zDs,99556
@@ -79,39 +79,47 @@ cherrypy_foundation/components/vendor/popper/popper.min.js,sha256=whL0tQWoY1Ku1i
 cherrypy_foundation/components/vendor/typeahead/jquery.typeahead.min.css,sha256=gBsvk2nlQnvCXdG7JITz1SrnqWQrO6EsUo_r06-KRtU,12464
 cherrypy_foundation/components/vendor/typeahead/jquery.typeahead.min.js,sha256=eFBtgouYdW587kYINWsjkN-UR8GVWAG_fQe1fpJfjOw,47828
 cherrypy_foundation/plugins/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cherrypy_foundation/plugins/db.py,sha256=V-gk6Zg-DRNA6snfHLte3ye6hzowvuE-8lYKCTKs7Vg,9118
-cherrypy_foundation/plugins/ldap.py,sha256=MTg-TqdyziuqFYr-wXecHvu0zK7YCzr-k5E8jq3dF-k,9519
+cherrypy_foundation/plugins/db.py,sha256=46S-2kR9BHVYRN9cxWwYfzY2WkpEVBCpx1ubsJolYfA,10108
+cherrypy_foundation/plugins/ldap.py,sha256=N-bJT7daJcLybEigA3P_5iuDr4PFwmLt8YzcMrWafAY,9870
 cherrypy_foundation/plugins/restapi.py,sha256=S5GIxHL0M3Wcs33fyVOb0RfX1FXbp2fqUxJ_ufqBrD4,2843
-cherrypy_foundation/plugins/scheduler.py,sha256=aUk_X-z1zLD3oqfuMdm6AEV5j6Iyy422y7sMn3SrYVg,5467
-cherrypy_foundation/plugins/smtp.py,sha256=IimRsULIEEpwI8OcYAxNifwkjdQNBNX2YtrIu1635fQ,6789
+cherrypy_foundation/plugins/scheduler.py,sha256=H6ExfmAlTPt2ypK5lBMynNfcUzcWK_n1EP2_K5x2bx8,10400
+cherrypy_foundation/plugins/smtp.py,sha256=yTCUj2XzrJEJ84CIbYcrCUAP6Mg59aZfu6OZDGQyJbQ,7479
 cherrypy_foundation/plugins/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cherrypy_foundation/plugins/tests/test_db.py,sha256=TfI4JIWBZzzXE1Y_HceoQ4c4OY_Ff-CgW--Z0_oxRO8,3925
+cherrypy_foundation/plugins/tests/test_db.py,sha256=PELi5ojj8VqcXyPbpaig2Ac4ZqlR_gEPGUYrWJPANWg,3921
 cherrypy_foundation/plugins/tests/test_ldap.py,sha256=7EhFvhxwDCCBoNlAD5XpZxLtKvkrjpQxrtCHMT9wkQ4,14393
-cherrypy_foundation/plugins/tests/test_scheduler.py,sha256=NCk0rqggOxj9RdKtVxU6EosGk_lOEiCqLXW9or6hovM,3054
-cherrypy_foundation/plugins/tests/test_smtp.py,sha256=J06pZTS2SPXpOvEDand7_xfkadO7vXSpAACyPre1rZA,3918
+cherrypy_foundation/plugins/tests/test_scheduler.py,sha256=I-ZuQhMvCCvqFDwukwsyz_UkdJJ8JSLTkAanUo24GCE,3564
+cherrypy_foundation/plugins/tests/test_smtp.py,sha256=qs5yezIpSXkBmLmFlqckfPW7NmntHZxQjDSkdQG_dNE,4183
 cherrypy_foundation/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cherrypy_foundation/tests/test_error_page.py,sha256=8u5p6lv_I4XvfGipjJXNFwW7G1N8AK8IOnc_Th-Ebto,2181
+cherrypy_foundation/tests/test_form.py,sha256=urYi0qC8JqelopdeLBHvtndEv0QJ0hwlv3JkpAvdCYQ,4324
 cherrypy_foundation/tests/test_passwd.py,sha256=gC5O4yhHyU1YRYuDc0pG0T_5zvrG2qrr6P822iyK3Rg,1956
+cherrypy_foundation/tests/templates/test_form.html,sha256=sm-n2cYvih2vbDE4Y8kkERSoulnKAbwoefbzBggMMnA,189
 cherrypy_foundation/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cherrypy_foundation/tools/auth.py,sha256=F9SMQMTOqHbtDw13VdlGf9gYJtUhXrr9p-RYPkcEySs,9090
-cherrypy_foundation/tools/auth_mfa.py,sha256=2TU_EnykYRmj1pluGHFUFGzrE0jkyekamECf9TUd8HQ,9250
-cherrypy_foundation/tools/errors.py,sha256=DhWl03tthV9tlN_3qdJzgWg6LQS7ANP5gCl6R_VgW4E,1027
-cherrypy_foundation/tools/i18n.py,sha256=pZVawC8ahzvm1HmMe_6zZuYTjsWW7OsKdFjV0KtF6fk,13885
-cherrypy_foundation/tools/jinja2.py,sha256=lZ3aiYerop9WDecrsX9B9OY49NmH-eIJZiXVnVqDY2I,5290
-cherrypy_foundation/tools/ratelimit.py,sha256=k0MRdanioF8UNRHcFUWyT5aVvHtSZ1-BlVYtEtLysmI,8386
-cherrypy_foundation/tools/secure_headers.py,sha256=PMKwL622sbBtjRnq-weZH_OewuaG4cR2jqIr1DOUNXM,3994
+cherrypy_foundation/tools/auth.py,sha256=lTSajxCiReMzm-Fl-xhTByi4yFnInEWOoNsmUMnHQhs,9761
+cherrypy_foundation/tools/auth_mfa.py,sha256=VaLvBz9wo6jTx-2mCGqFXPxl-z14f8UMWvd6_xeXd40,9212
+cherrypy_foundation/tools/errors.py,sha256=ELpAj0N9kIxC22QW5xDQJz60zMpCwgm-Twu2WpELM1A,1005
+cherrypy_foundation/tools/i18n.py,sha256=5pcyr7AleaqSj9rCESthvMIbNIORp-8351uJgmi2xog,14172
+cherrypy_foundation/tools/jinja2.py,sha256=nppYnk2ASDsyfNHF9m83W4foiN3MhcwDJvo5baEgnGU,5520
+cherrypy_foundation/tools/ratelimit.py,sha256=pT7vZRmjltNeuiQpdyXOmnpG9BcXjLaj-AXJ0e2x_zw,8300
+cherrypy_foundation/tools/secure_headers.py,sha256=Yh-iA_Js4MUsx5nq4ilbc-iWy90ZC0oMb3TJJD_UwYo,3921
 cherrypy_foundation/tools/sessions_timeout.py,sha256=6iBWJntPMk_Qt94fBSfBISf1IXInSh-1XrxLbKXFV-g,7408
 cherrypy_foundation/tools/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cherrypy_foundation/tools/tests/test_auth.py,sha256=YA8mh9w__8z65LMjiVASCPpcTdLUTanzAwxztIkoFI0,2851
+cherrypy_foundation/tools/tests/test_auth.py,sha256=oeM5t38M8DUC9dYn59dcf00jdGY6Ry0jZWhQd_PYQUk,2847
+cherrypy_foundation/tools/tests/test_auth_mfa.py,sha256=911hnBbdg5CKb613uIBrlggoTAyBU9SoL7Sxd-tIKS0,15008
 cherrypy_foundation/tools/tests/test_i18n.py,sha256=-bJuKn8PHHidBWhoFSVr4PdX96m3A50YY4i5osyU7DY,6251
+cherrypy_foundation/tools/tests/test_jinja2.py,sha256=_dkRJpjB0ybDV6YO0uEFFO8LAcWgVu3VBB8_vWthQ48,4296
 cherrypy_foundation/tools/tests/test_ratelimit.py,sha256=rrqybwMbh1GFlF2-Ut57zHPAc1uqX88aqea6VS_6p5E,3449
+cherrypy_foundation/tools/tests/components/Button.jinja,sha256=uSLp1GpEIgZNXK_GWglu0E_a1c3jHpDLI66MRfMqGhE,95
 cherrypy_foundation/tools/tests/locales/messages.pot,sha256=5K9piTRL7H5MxDXFIWJsCccSJRA0HwfCQQU8b8VYo30,40
 cherrypy_foundation/tools/tests/locales/en/LC_MESSAGES/messages.mo,sha256=cdyG2Js1TIU6eenDX1ICH8uP45yvl0OLN0-SMUXTBa4,259
 cherrypy_foundation/tools/tests/locales/en/LC_MESSAGES/messages.po,sha256=JCpiRLLHUSYQhzta8ZYjfB50NmpwPGNCTNwo2Glww14,322
 cherrypy_foundation/tools/tests/locales/fr/LC_MESSAGES/messages.mo,sha256=u3_kl_nqZ3FNaSyKVQKmu4KJzN3xOxxJNVmcdhw37jA,327
 cherrypy_foundation/tools/tests/locales/fr/LC_MESSAGES/messages.po,sha256=6_Sk9Igqm7dtpyyS701p5qc4DvOJE7TRT0ajRZctFAQ,342
-cherrypy_foundation-1.0.0a1.dist-info/licenses/LICENSE.md,sha256=trSLYs5qlaow_bBwsLTRKpmTXsXzFksM_YUCMqrgAJQ,35149
-cherrypy_foundation-1.0.0a1.dist-info/METADATA,sha256=bQ3It-tIMNYHnif8OInatJvVDOyHONe-6uXE9cFVevI,2022
-cherrypy_foundation-1.0.0a1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-cherrypy_foundation-1.0.0a1.dist-info/top_level.txt,sha256=B1vQPTLYhpKJ6W0JkRCWyAf8RPcnwJWdYxixv75-4ew,20
-cherrypy_foundation-1.0.0a1.dist-info/RECORD,,
+cherrypy_foundation/tools/tests/templates/test_jinja2.html,sha256=v9AHxksbBvzE7sesPqE61HMhsvU4juXt3E0ZQo-zXVQ,190
+cherrypy_foundation/tools/tests/templates/test_jinja2_i18n.html,sha256=98S51dgG7Vb4rvMZNZvomw1D9pBiM4g6pdlxAgvrxXA,373
+cherrypy_foundation/tools/tests/templates/test_jinjax.html,sha256=NT19UaUzm8FRKOIc6H6HNGPDJU6KATnakd8zf3BCeAs,153
+cherrypy_foundation-1.0.0a3.dist-info/licenses/LICENSE.md,sha256=trSLYs5qlaow_bBwsLTRKpmTXsXzFksM_YUCMqrgAJQ,35149
+cherrypy_foundation-1.0.0a3.dist-info/METADATA,sha256=rnu-JnpVHWQcZ5ykeEYGGYYQB1eOeg5Uv9YfMou5yvA,2022
+cherrypy_foundation-1.0.0a3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+cherrypy_foundation-1.0.0a3.dist-info/top_level.txt,sha256=B1vQPTLYhpKJ6W0JkRCWyAf8RPcnwJWdYxixv75-4ew,20
+cherrypy_foundation-1.0.0a3.dist-info/RECORD,,