edumfa 2.3.0__tar.gz → 2.4.0__tar.gz

{edumfa-2.3.0/edumfa.egg-info → edumfa-2.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: edumfa
-Version: 2.3.0
+Version: 2.4.0
 Summary: eduMFA: identity, multifactor authentication (OTP), authorization, audit
 Author-email: "edumfa.io" <edumfa@listserv.dfn.de>
 License:                     GNU AFFERO GENERAL PUBLIC LICENSE
@@ -647,31 +647,32 @@ Requires-Python: >=3.8
 Description-Content-Type: text/x-rst
 License-File: LICENSE
 License-File: AUTHORS.md
-Requires-Dist: alembic==1.13.3
+Requires-Dist: alembic==1.14.0
 Requires-Dist: argon2-cffi==23.1.0
 Requires-Dist: argon2-cffi-bindings==21.2.0
-Requires-Dist: async-timeout==4.0.3
+Requires-Dist: async-timeout==5.0.1
 Requires-Dist: babel==2.16.0
-Requires-Dist: bcrypt==4.2.0
+Requires-Dist: bcrypt==4.2.1
 Requires-Dist: beautifulsoup4==4.12.3
-Requires-Dist: blinker==1.8.2
+Requires-Dist: blinker==1.8.2; python_version < "3.9"
+Requires-Dist: blinker==1.9.0; python_version >= "3.9"
 Requires-Dist: cachetools==5.5.0
-Requires-Dist: cbor2==5.6.4
+Requires-Dist: cbor2==5.6.5
 Requires-Dist: certifi==2024.8.30
 Requires-Dist: cffi==1.17.1
-Requires-Dist: charset-normalizer==3.3.2
+Requires-Dist: charset-normalizer==3.4.0
 Requires-Dist: click==8.1.7
 Requires-Dist: configobj==5.0.9
-Requires-Dist: croniter==3.0.3
-Requires-Dist: cryptography==42.0.8
+Requires-Dist: croniter==5.0.1
+Requires-Dist: cryptography==43.0.3
 Requires-Dist: defusedxml==0.7.1
-Requires-Dist: flask==3.0.3
+Requires-Dist: flask==3.0.3; python_version < "3.9"
+Requires-Dist: flask==3.1.0; python_version >= "3.9"
 Requires-Dist: flask-babel==4.0.0
 Requires-Dist: flask-migrate==4.0.7
 Requires-Dist: flask-sqlalchemy==3.1.1
-Requires-Dist: flask-versioned==0.9.4.post20101221
-Requires-Dist: google-auth==2.35.0
-Requires-Dist: grpcio==1.66.2
+Requires-Dist: google-auth==2.36.0
+Requires-Dist: grpcio==1.68.0
 Requires-Dist: huey==2.5.2
 Requires-Dist: idna==3.10
 Requires-Dist: importlib-metadata==8.5.0
@@ -679,15 +680,17 @@ Requires-Dist: itsdangerous==2.2.0
 Requires-Dist: jinja2==3.1.4
 Requires-Dist: ldap3==2.9.1
 Requires-Dist: lxml==5.3.0
-Requires-Dist: mako==1.3.5
-Requires-Dist: markupsafe==2.1.5
+Requires-Dist: mako==1.3.6
+Requires-Dist: markupsafe==2.1.5; python_version < "3.9"
+Requires-Dist: markupsafe==3.0.2; python_version >= "3.9"
 Requires-Dist: netaddr==1.3.0
 Requires-Dist: passlib==1.7.4
 Requires-Dist: pyasn1==0.6.1
 Requires-Dist: pyasn1-modules==0.4.1
 Requires-Dist: pycparser==2.22
-Requires-Dist: pydash==8.0.3
-Requires-Dist: pyjwt==2.9.0
+Requires-Dist: pydash==8.0.4
+Requires-Dist: pyjwt==2.9.0; python_version < "3.9"
+Requires-Dist: pyjwt==2.10.1; python_version >= "3.9"
 Requires-Dist: pymysql==1.1.1
 Requires-Dist: pyopenssl==24.2.1
 Requires-Dist: pyrad==2.4
@@ -695,28 +698,31 @@ Requires-Dist: python-dateutil==2.9.0.post0
 Requires-Dist: python-gnupg==0.5.3
 Requires-Dist: pytz==2024.2
 Requires-Dist: pyyaml==6.0.2
-Requires-Dist: redis==5.1.0
+Requires-Dist: redis==5.2.0
 Requires-Dist: requests==2.32.3
 Requires-Dist: rsa==4.9
 Requires-Dist: segno==1.6.1
 Requires-Dist: six==1.16.0
 Requires-Dist: smpplib==2.2.3
 Requires-Dist: soupsieve==2.6
-Requires-Dist: sqlalchemy==2.0.35
+Requires-Dist: sqlalchemy==2.0.36
 Requires-Dist: typing-extensions==4.12.2
 Requires-Dist: urllib3==2.2.3
-Requires-Dist: werkzeug==3.0.4
-Requires-Dist: zipp==3.20.2
-Requires-Dist: setuptools==75.1.0
+Requires-Dist: werkzeug==3.0.6; python_version < "3.9"
+Requires-Dist: werkzeug==3.1.3; python_version >= "3.9"
+Requires-Dist: zipp==3.20.2; python_version < "3.9"
+Requires-Dist: zipp==3.21.0; python_version >= "3.9"
+Requires-Dist: setuptools==75.3.0; python_version < "3.9"
+Requires-Dist: setuptools==75.6.0; python_version >= "3.9"
 Provides-Extra: docs
 Requires-Dist: furo==2024.8.6; extra == "docs"
 Requires-Dist: docutils==0.21.2; extra == "docs"
 Requires-Dist: imagesize==1.4.1; extra == "docs"
-Requires-Dist: packaging==24.1; extra == "docs"
+Requires-Dist: packaging==24.2; extra == "docs"
 Requires-Dist: pyenchant==3.2.2; extra == "docs"
 Requires-Dist: Pygments==2.18.0; extra == "docs"
 Requires-Dist: snowballstemmer==2.2.0; extra == "docs"
-Requires-Dist: Sphinx==8.0.2; extra == "docs"
+Requires-Dist: Sphinx==8.1.3; extra == "docs"
 Requires-Dist: sphinxcontrib-applehelp==2.0.0; extra == "docs"
 Requires-Dist: sphinxcontrib-devhelp==2.0.0; extra == "docs"
 Requires-Dist: sphinxcontrib-htmlhelp==2.1.0; extra == "docs"
@@ -729,25 +735,28 @@ Requires-Dist: sphinx-copybutton==0.5.2; extra == "docs"
 Requires-Dist: sphinx-inline-tabs==2023.4.21; extra == "docs"
 Provides-Extra: test
 Requires-Dist: attrs==24.2.0; extra == "test"
-Requires-Dist: coverage==7.6.1; extra == "test"
+Requires-Dist: coverage==7.6.1; python_version < "3.9" and extra == "test"
+Requires-Dist: coverage==7.6.8; python_version >= "3.9" and extra == "test"
 Requires-Dist: exceptiongroup==1.2.2; extra == "test"
 Requires-Dist: iniconfig==2.0.0; extra == "test"
 Requires-Dist: mock==5.1.0; extra == "test"
-Requires-Dist: packaging==24.1; extra == "test"
+Requires-Dist: packaging==24.2; extra == "test"
 Requires-Dist: pluggy==1.5.0; extra == "test"
-Requires-Dist: pyparsing==3.1.4; extra == "test"
+Requires-Dist: pyparsing==3.1.4; python_version < "3.9" and extra == "test"
+Requires-Dist: pyparsing==3.2.0; python_version >= "3.9" and extra == "test"
 Requires-Dist: pytest==8.3.3; extra == "test"
-Requires-Dist: pytest-cov==5.0.0; extra == "test"
+Requires-Dist: pytest-cov==5.0.0; python_version < "3.9" and extra == "test"
+Requires-Dist: pytest-cov==6.0.0; python_version >= "3.9" and extra == "test"
 Requires-Dist: responses==0.25.3; extra == "test"
 Requires-Dist: testfixtures==8.3.0; extra == "test"
-Requires-Dist: tomli==2.0.1; extra == "test"
+Requires-Dist: tomli==2.2.1; extra == "test"
 Requires-Dist: types-PyYAML==6.0.12.20240917; extra == "test"
 Provides-Extra: postgres
-Requires-Dist: psycopg2==2.9.9; extra == "postgres"
+Requires-Dist: psycopg2==2.9.10; extra == "postgres"
 Provides-Extra: hsm
-Requires-Dist: PyKCS11==1.5.16; extra == "hsm"
+Requires-Dist: PyKCS11==1.5.17; extra == "hsm"
 Provides-Extra: kerberos
-Requires-Dist: gssapi==1.8.3; extra == "kerberos"
+Requires-Dist: gssapi==1.9.0; extra == "kerberos"
 
 eduMFA
 ===========

{edumfa-2.3.0 → edumfa-2.4.0}/deploy/ubuntu/changelog

@@ -1,3 +1,51 @@
+edumfa (2.4.0{{CODENAME}}) {{CODENAME}}; urgency=medium
+
+  * Add different lock-table-options for backups with galera by @pmainz in https://github.com/eduMFA/eduMFA/pull/370
+  * chore(deps): update codecov/codecov-action action to v5 by @renovate in https://github.com/eduMFA/eduMFA/pull/428
+  * chore(deps): update dependency alembic to v1.14.0 by @renovate in https://github.com/eduMFA/eduMFA/pull/409
+  * chore(deps): update dependency async-timeout to v5.0.1 by @renovate in https://github.com/eduMFA/eduMFA/pull/412
+  * chore(deps): update dependency bcrypt to v4.2.1 by @renovate in https://github.com/eduMFA/eduMFA/pull/436
+  * chore(deps): update dependency blinker to v1.9.0 by @renovate in https://github.com/eduMFA/eduMFA/pull/416
+  * chore(deps): update dependency cbor2 to v5.6.5 by @renovate in https://github.com/eduMFA/eduMFA/pull/362
+  * chore(deps): update dependency charset-normalizer to v3.4.0 by @renovate in https://github.com/eduMFA/eduMFA/pull/361
+  * chore(deps): update dependency coverage to v7.6.4 by @renovate in https://github.com/eduMFA/eduMFA/pull/367
+  * chore(deps): update dependency croniter to v5 by @renovate in https://github.com/eduMFA/eduMFA/pull/398
+  * chore(deps): update dependency cryptography to v43.0.3 by @renovate in https://github.com/eduMFA/eduMFA/pull/379
+  * chore(deps): update dependency flask to v3.1.0 by @renovate in https://github.com/eduMFA/eduMFA/pull/424
+  * chore(deps): update dependency google-auth to v2.36.0 by @renovate in https://github.com/eduMFA/eduMFA/pull/413
+  * chore(deps): update dependency grpcio to v1.68.0 by @renovate in https://github.com/eduMFA/eduMFA/pull/431
+  * chore(deps): update dependency gssapi to v1.9.0 by @renovate in https://github.com/eduMFA/eduMFA/pull/347
+  * chore(deps): update dependency mako to v1.3.6 by @renovate in https://github.com/eduMFA/eduMFA/pull/381
+  * chore(deps): update dependency markupsafe to v3 by @renovate in https://github.com/eduMFA/eduMFA/pull/356
+  * chore(deps): update dependency psycopg2 to v2.9.10 by @renovate in https://github.com/eduMFA/eduMFA/pull/373
+  * chore(deps): update dependency pydash to v8.0.4 by @renovate in https://github.com/eduMFA/eduMFA/pull/407
+  * chore(deps): update dependency pyjwt to v2.10.1 by @renovate in https://github.com/eduMFA/eduMFA/pull/444
+  * chore(deps): update dependency pykcs11 to v1.5.17 by @renovate in https://github.com/eduMFA/eduMFA/pull/374
+  * chore(deps): update dependency pyparsing to v3.2.0 by @renovate in https://github.com/eduMFA/eduMFA/pull/369
+  * chore(deps): update dependency redis to v5.2.0 by @renovate in https://github.com/eduMFA/eduMFA/pull/387
+  * chore(deps): update dependency setuptools to v75.6.0 by @renovate in https://github.com/eduMFA/eduMFA/pull/437
+  * chore(deps): update dependency sphinx to v8.1.3 by @renovate in https://github.com/eduMFA/eduMFA/pull/368
+  * chore(deps): update dependency sqlalchemy to v2.0.36 by @renovate in https://github.com/eduMFA/eduMFA/pull/371
+  * chore(deps): update dependency tomli to v2.0.2 by @renovate in https://github.com/eduMFA/eduMFA/pull/346
+  * chore(deps): update dependency werkzeug to v3.1.3 by @renovate in https://github.com/eduMFA/eduMFA/pull/415
+  * chore(deps): update dependency zipp to v3.21.0 by @renovate in https://github.com/eduMFA/eduMFA/pull/417
+  * chore: Improve Ubuntu workflow by @Luc1412 in https://github.com/eduMFA/eduMFA/pull/385
+  * chore: extend filter & pyparsing fix by @fritterhoff in https://github.com/eduMFA/eduMFA/pull/376
+  * chore: remove flask versioned dependency by @fritterhoff in https://github.com/eduMFA/eduMFA/pull/352
+  * feat: deprecate and remove `application_tokentype` policy by @fritterhoff in https://github.com/eduMFA/eduMFA/pull/353
+  * fix(deps): update dependency coverage to v7.6.8 by @renovate in https://github.com/eduMFA/eduMFA/pull/438
+  * fix(deps): update dependency packaging to v24.2 by @renovate in https://github.com/eduMFA/eduMFA/pull/414
+  * fix(deps): update dependency pytest-cov to v6 by @renovate in https://github.com/eduMFA/eduMFA/pull/399
+  * fix(deps): update dependency tomli to v2.2.1 by @renovate in https://github.com/eduMFA/eduMFA/pull/443
+  * fix: create venv for bandit scan by @fritterhoff in https://github.com/eduMFA/eduMFA/pull/365
+  * fix: for events without serial or tokenowner, log 'N/A', not all tokens by @j-hoff in https://github.com/eduMFA/eduMFA/pull/445
+  * fix: indexedsecret tokens should honor DefaultChallengeValidityTime by @j-hoff in https://github.com/eduMFA/eduMFA/pull/411
+  * fix: remove password encoding from migration by @fritterhoff in https://github.com/eduMFA/eduMFA/pull/345
+  * fix: session usage by @fritterhoff in https://github.com/eduMFA/eduMFA/pull/449
+  * fix: session usage for audit module by @fritterhoff in https://github.com/eduMFA/eduMFA/pull/450
+
+ -- eduMFA <edumfa-dev@listserv.dfn.de>  Fri, 29 Nov 2024 12:00:00 +0100
+
 edumfa (2.3.0{{CODENAME}}) {{CODENAME}}; urgency=medium
 
   * Add documentation for Docker images + optimize Dockerfile

{edumfa-2.3.0 → edumfa-2.4.0}/deploy/ubuntu-server/changelog

@@ -1,3 +1,9 @@
+edumfa-server (2.4.0{{CODENAME}}) {{CODENAME}}; urgency=medium
+ 
+  * update version number
+
+ -- eduMFA <edumfa-dev@listserv.dfn.de>  Fri, 29 Nov 2024 12:00:00 +0100
+
 edumfa-server (2.3.0{{CODENAME}}) {{CODENAME}}; urgency=medium
  
   * update version number

{edumfa-2.3.0 → edumfa-2.4.0}/edumfa/api/lib/prepolicy.py

@@ -323,44 +323,6 @@ def check_otp_pin(request=None, action=None):
     return True
 
 
-def check_application_tokentype(request=None, action=None):
-    """
-    This pre policy checks if the request is allowed to specify the tokentype.
-    If the policy is not set, a possibly set parameter "type" is removed
-    from the request.
-
-    Check ACTION.APPLICATION_TOKENTYPE
-
-    This decorator should wrap
-        /validate/check, /validate/samlcheck and /validate/triggerchallenge.
-
-    :param request: The request that is intercepted during the API call
-    :type request: Request Object
-    :param action: An optional Action
-    :type action: basestring
-    :returns: Always true. Modified the parameter request
-    """
-    application_allowed = Match.generic(g, scope=SCOPE.AUTHZ,
-                                        action=ACTION.APPLICATION_TOKENTYPE,
-                                        user_object=request.User,
-                                        active=True).any()
-
-    # if the application is not allowed, we remove the tokentype
-    if not application_allowed and "type" in request.all_data:
-        # We need the tokentype to be present in usernameless authentication
-        is_usernameless = Match.generic(g, scope=SCOPE.AUTH,
-                                        action=WEBAUTHNACTION.USERNAMELESS_AUTHN,
-                                        user_object=None,
-                                        active=True).any()
-        if "user" not in request.all_data and "serial" not in request.all_data and is_usernameless:
-            return True
-        log.info("Removing parameter 'type' from request, "
-                 "since application is not allowed to authenticate by token type.")
-        del request.all_data["type"]
-
-    return True
-
-
 def sms_identifiers(request=None, action=None):
     """
     This is a token specific wrapper for sms tokens

{edumfa-2.3.0 → edumfa-2.4.0}/edumfa/api/validate.py

@@ -73,7 +73,7 @@ from edumfa.api.lib.prepolicy import (prepolicy, set_realm,
                                            api_key_required, mangle,
                                            save_client_application_type,
                                            check_base_action, pushtoken_wait, webauthntoken_auth, webauthntoken_authz,
-                                           webauthntoken_request, check_application_tokentype,
+                                           webauthntoken_request,
                                            increase_failcounter_on_challenge, legacypushtoken_wait)
 from edumfa.api.lib.postpolicy import (postpolicy,
                                             check_tokentype, check_serial,
@@ -203,7 +203,6 @@ def offlinerefill():
 @postpolicy(check_serial, request=request)
 @postpolicy(autoassign, request=request)
 @add_serial_from_response_to_g
-@prepolicy(check_application_tokentype, request=request)
 @prepolicy(pushtoken_wait, request=request)
 @prepolicy(legacypushtoken_wait, request=request)
 @prepolicy(set_realm, request=request)
@@ -239,7 +238,7 @@ def check():
     :param realm: The realm of the user, who tries to authenticate. If the
         realm is omitted, the user is looked up in the default realm.
     :param type: The tokentype of the tokens, that are taken into account during
-        authentication. Requires the *authz* policy :ref:`application_tokentype_policy`.
+        authentication.
         It is ignored when a distinct serial is given.
     :param pass: The password, that consists of the OTP PIN and the OTP value.
     :param otponly: If set to 1, only the OTP value is verified. This is used
@@ -447,7 +446,6 @@ def check():
 @postpolicy(preferred_client_mode, request=request)
 @add_serial_from_response_to_g
 @check_user_or_serial_in_request(request)
-@prepolicy(check_application_tokentype, request=request)
 @prepolicy(increase_failcounter_on_challenge, request=request)
 @prepolicy(check_base_action, request, action=ACTION.TRIGGERCHALLENGE)
 @prepolicy(webauthntoken_request, request=request)
@@ -468,7 +466,7 @@ def trigger_challenge():
         realm is omitted, the user is looked up in the default realm.
     :param serial: The serial number of the token.
     :param type: The tokentype of the tokens, that are taken into account during
-        authentication. Requires authz policy application_tokentype.
+        authentication.
         Is ignored when a distinct serial is given.
 
     :return: a json result with a "result" of the number of matching

{edumfa-2.3.0 → edumfa-2.4.0}/edumfa/app.py

@@ -31,7 +31,6 @@ import yaml
 from flask import Flask, request, Response
 from flask_babel import Babel
 from flask_migrate import Migrate
-from flaskext.versioned import Versioned
 
 # we need this import to add the before/after request function to the blueprints
 import edumfa.api.before_after
@@ -130,9 +129,6 @@ def create_app(config_name="development",
     if config_name:
         app.config.from_object(config[config_name])
 
-    # Set up flask-versioned
-    versioned = Versioned(app, format='%(path)s?v=%(version)s')
-
     try:
         # Try to load the given config_file.
         # If it does not exist, just ignore it.

{edumfa-2.3.0 → edumfa-2.4.0}/edumfa/commands/manage/backup.py

@@ -143,7 +143,17 @@ def restore(backup_file: str):
 @click.option("-r", "--radius_dir", help="Path to FreeRADIUS config directory",
               type=click.Path(exists=True, file_okay=False, readable=True), default=None, show_default=True)
 @click.option("-e", "--enckey", is_flag=True, help="Add the encryption key to the backup")
-def create(target_dir: str, config_dir: str, radius_dir=None, enckey: bool = False):
+@click.option("-l", "--lock_table_strategy", type=click.Choice(["LAT","ST","SLT"], case_sensitive=False),
+              help="""
+                Set the strategy for how to lock tables (only needed for mariadb galera cluster).
+                Options are:\n
+                LAT: Lock ALL tables in ALL databases! (not recommended for productive instances or
+                if the cluster has more databases than just edumfa; requires at least RELOAD privilege);\n
+                ST: Single transaction (only for InnoDB);\n
+                SLT: Skip lock tables (may lead to inconsistent dumps)
+                """,
+              default=None)
+def create(target_dir: str, config_dir: str, radius_dir=None, enckey: bool = False, lock_table_strategy: str = None):
     """
     Create a new backup of the database and the configuration. The default
     does not include the encryption key. Use the 'enckey' option to also
@@ -152,6 +162,11 @@ def create(target_dir: str, config_dir: str, radius_dir=None, enckey: bool = Fal
 
     If you want to also include the RADIUS configuration into the backup
     specify a directory using 'radius_directory'.
+
+    MariaDB Galera cluster currently does not support the LOCK TABLE option
+    causing the backup to fail. Therefore when using galera a different lock
+    table strategy needs to be set via the '-l' option.
+    Please read option documentation and choose your option carefully!
     """
     CONF_DIR = config_dir
     DATE = datetime.now().strftime("%Y%m%d-%H%M")
@@ -187,6 +202,13 @@ def create(target_dir: str, config_dir: str, radius_dir=None, enckey: bool = Fal
         if parsed_sqluri.port:
             cmd.extend(['-P', str(parsed_sqluri.port)])
         cmd.extend(['-B', shlex_quote(database), '-r', shlex_quote(sqlfile)])
+        if lock_table_strategy:
+            if lock_table_strategy.upper() == 'LAT':
+                cmd.append('--lock-all-tables')
+            elif lock_table_strategy.upper() == 'ST':
+                cmd.append('--single-transaction')
+            elif lock_table_strategy.upper() == 'SLT':
+                cmd.append('--skip-lock-tables')
         call(cmd, shell=False)
     elif sqltype in PSQL_DIALECTS:
         env = os.environ.copy()

{edumfa-2.3.0 → edumfa-2.4.0}/edumfa/lib/auditmodules/sqlaudit.py

@@ -150,8 +150,7 @@ class Audit(AuditBase):
         # create a configured "Session" class. ``scoped_session`` is not
         # necessary because we do not share session objects among threads.
         # We use it anyway as a safety measure.
-        Session = scoped_session(sessionmaker(bind=self.engine))
-        self.session = Session()
+        self.session = scoped_session(sessionmaker(bind=self.engine))
         # Ensure that the connection gets returned to the pool when the request has
         # been handled. This may close an already-closed session, but this is not a problem.
         register_finalizer(self._finalize_session)

{edumfa-2.3.0 → edumfa-2.4.0}/edumfa/lib/eventhandler/logginghandler.py

@@ -147,9 +147,11 @@ class LoggingEventHandler(BaseEventHandler):
                 tokens = get_tokens(serial=serial)
                 if tokens:
                     tokentype = tokens[0].get_tokentype()
-            else:
-                token_objects = get_tokens(user=tokenowner)
+            elif tokenowner:
+                token_objects = get_tokens(user=tokenowner, active=True)
                 serial = ','.join([tok.get_serial() for tok in token_objects])
+            else:
+                serial = 'N/A'
 
             tags = create_tag_dict(logged_in_user=logged_in_user,
                                    request=request,

{edumfa-2.3.0 → edumfa-2.4.0}/edumfa/lib/policy.py

@@ -2292,10 +2292,7 @@ def get_static_policy_definitions(scope=None):
             },
             ACTION.APPLICATION_TOKENTYPE: {
                 'type': 'bool',
-                'desc': _("Allow the application to choose which token types should be used "
-                          "for authentication. Application may set the parameter 'type' in "
-                          "the request. Works with validate/check, validate/samlcheck and "
-                          "validate/triggerchallenge.")
+                'desc': _("<b>DEPRECATED:</b> This policy does not apply any more. Every application is allowed to set the requested tokentype.")
             },
             ACTION.AUTHMAXSUCCESS: {
                 'type': 'str',

{edumfa-2.3.0 → edumfa-2.4.0}/edumfa/lib/resolvers/SQLIdResolver.py

@@ -485,7 +485,7 @@ class IdResolver (UserIdResolver):
         # which involves the connect-string and the pool settings.
         self.engine = get_engine(self.getResolverId(), self._create_engine)
         # We use ``scoped_session``.
-        self.session = scoped_session(sessionmaker(bind=self.engine))()
+        self.session = scoped_session(sessionmaker(bind=self.engine))
         # Session should be closed on teardown
         register_finalizer(self.session.close)
         self.session._model_changes = {}

{edumfa-2.3.0 → edumfa-2.4.0}/edumfa/lib/tokens/indexedsecrettoken.py

@@ -36,6 +36,7 @@ returns -1.
 
 import logging
 import datetime
+from edumfa.lib.config import get_from_config
 from edumfa.lib.tokenclass import TokenClass, AUTHENTICATIONMODE
 from edumfa.lib.policy import SCOPE, ACTION, GROUP, get_action_values_from_options
 from edumfa.lib.crypto import urandom, safe_compare
@@ -210,7 +211,7 @@ class IndexedSecretTokenClass(TokenClass):
                                                                 options) or DEFAULT_POSITION_COUNT)
 
         attributes = {'state': transactionid}
-        validity = 120
+        validity = int(get_from_config('DefaultChallengeValidityTime', 120))
 
         if self.is_active() is True:
             # We need to get a number of random positions from the secret string

{edumfa-2.3.0 → edumfa-2.4.0}/edumfa/static/templates/footer.html

@@ -1,88 +1,88 @@
 
 
 
-<ng-include src="'{{ instance }}/{{ "static/components/dialogs/views/dialog.about.html" | versioned }}'">
+<ng-include src="'{{ instance }}/{{ "static/components/dialogs/views/dialog.about.html" }}'">
 </ng-include>
 
-<ng-include src="'{{ instance }}/{{ "static/components/dialogs/views/dialog.lock.html" | versioned }}'">
+<ng-include src="'{{ instance }}/{{ "static/components/dialogs/views/dialog.lock.html" }}'">
 </ng-include>
 
-<ng-include src="'{{ instance }}/{{ "static/components/dialogs/views/dialog.autocreate_realm.html" | versioned }}'">
+<ng-include src="'{{ instance }}/{{ "static/components/dialogs/views/dialog.autocreate_realm.html" }}'">
 </ng-include>
 
-<ng-include src="'{{ instance }}/{{ "static/components/dialogs/views/dialog.welcome.html" | versioned }}'">
+<ng-include src="'{{ instance }}/{{ "static/components/dialogs/views/dialog.welcome.html" }}'">
 </ng-include>
 
-<ng-include src="'{{ instance }}/{{ "static/components/dialogs/views/dialog.no.token.html" | versioned }}'">
+<ng-include src="'{{ instance }}/{{ "static/components/dialogs/views/dialog.no.token.html" }}'">
 </ng-include>
 
 <!--load all javascripts after the HTML part-->
-<script src="{{ instance }}/{{ "static/contrib/js/angular.js" | versioned }}"></script>
-<script src="{{ instance }}/{{ "static/contrib/js/ui-bootstrap-tpls.js" | versioned }}"></script>
-<script src="{{ instance }}/{{ "static/contrib/js/jquery.js" | versioned }}"></script>
-<script src="{{ instance }}/{{ "static/contrib/js/bootstrap.js" | versioned }}"></script>
-<script src="{{ instance }}/{{ "static/contrib/js/ngmodules/isteven-multi-select.js" | versioned }}"></script>
-<script src="{{ instance }}/{{ "static/contrib/js/ngmodules/ng-file-upload.js" | versioned }}"></script>
-<script src="{{ instance }}/{{ "static/contrib/js/hotkeys.js" | versioned }}"></script>
-<script src="{{ instance }}/{{ "static/contrib/js/ngmodules/angular-ui-router.js" | versioned }}"></script>
-<script src="{{ instance }}/{{ "static/contrib/js/ngmodules/angular-idle.js" | versioned }}"></script>
-<script src="{{ instance }}/{{ "static/contrib/js/ngmodules/angular-gettext.js" | versioned }}"></script>
-<script src="{{ instance }}/{{  "static/components/translation/translations.js" | versioned }}"></script>
-<script src="{{ instance }}/{{ "static/contrib/js/ngmodules/angular-sanitize.js" | versioned }}"></script>
-<script src="{{ instance }}/{{ "static/app.js" | versioned }}"></script>
-<script src="{{ instance }}/{{ "static/providers/versioningProvider.js" | versioned }}"></script>
-<script src="{{ instance }}/{{ "static/providers/errorMessageProvider.js" | versioned }}"></script>
-<script src="{{ instance }}/{{ "static/components/directives/controllers/directives.js" | versioned }}"></script>
-<script src="{{ instance }}/{{ "static/components/login/factories/auth.js" | versioned }}"></script>
-<script src="{{ instance }}/{{ "static/components/login/factories/u2f.js" | versioned }}"></script>
-<script src="{{ instance }}/{{ "static/components/login/factories/webauthn.js" | versioned }}"></script>
-<script src="{{ instance }}/{{ "static/components/login/states/states.js" | versioned }}"></script>
-<script src="{{ instance }}/{{ "static/components/login/controllers/loginControllers.js" | versioned }}"></script>
-<script src="{{ instance }}/{{ "static/components/dashboard/controllers/dashboardControllers.js" | versioned }}"></script>
-<script src="{{ instance }}/{{ "static/components/dashboard/states/states.js" | versioned }}"></script>
-<script src="{{ instance }}/{{ "static/components/token/factories/token.js" | versioned }}"></script>
-<script src="{{ instance }}/{{ "static/components/token/factories/validate.js" | versioned }}"></script>
-<script src="{{ instance }}/{{ "static/components/token/states/states.js" | versioned }}"></script>
-<script src="{{ instance }}/{{ "static/components/token/controllers/tokenControllers.js" | versioned }}"></script>
-<script src="{{ instance }}/{{ "static/components/token/controllers/tokenDetailController.js" | versioned }}"></script>
-<script src="{{ instance }}/{{ "static/components/token/controllers/tokenLostController.js" | versioned }}"></script>
-<script src="{{ instance }}/{{ "static/components/token/controllers/tokenGetSerialController.js" | versioned }}"></script>
-<script src="{{ instance }}/{{ "static/components/token/controllers/tokenChallengesController.js" | versioned }}"></script>
-<script src="{{ instance }}/{{ "static/components/token/controllers/tokenApplicationsController.js" | versioned }}"></script>
-<script src="{{ instance }}/{{ "static/components/user/factories/user.js" | versioned }}"></script>
-<script src="{{ instance }}/{{ "static/components/user/states/states.js" | versioned }}"></script>
-<script src="{{ instance }}/{{ "static/components/user/controllers/userControllers.js" | versioned }}"></script>
-<script src="{{ instance }}/{{ "static/components/audit/factories/audit.js" | versioned }}"></script>
-<script src="{{ instance }}/{{ "static/components/audit/states/states.js" | versioned }}"></script>
-<script src="{{ instance }}/{{ "static/components/audit/controllers/auditControllers.js" | versioned }}"></script>
-<script src="{{ instance }}/{{ "static/components/components/factories/component.js" | versioned }}"></script>
-<script src="{{ instance }}/{{ "static/components/components/states/states.js" | versioned }}"></script>
-<script src="{{ instance }}/{{ "static/components/components/controllers/componentControllers.js" | versioned }}"></script>
-<script src="{{ instance }}/{{ "static/components/config/factories/config.js" | versioned }}"></script>
-<script src="{{ instance }}/{{ "static/components/config/states/states.js" | versioned }}"></script>
-<script src="{{ instance }}/{{ "static/components/config/controllers/configControllers.js" | versioned }}"></script>
-<script src="{{ instance }}/{{ "static/components/config/controllers/eventController.js" | versioned }}"></script>
-<script src="{{ instance }}/{{ "static/components/config/controllers/periodicTaskController.js" | versioned }}"></script>
-<script src="{{ instance }}/{{ "static/components/config/controllers/ldapMachineResolverController.js" | versioned }}"></script>
-<script src="{{ instance }}/{{ "static/components/config/controllers/smtpServerController.js" | versioned }}"></script>
-<script src="{{ instance }}/{{ "static/components/config/controllers/radiusServerController.js" | versioned }}"></script>
-<script src="{{ instance }}/{{ "static/components/config/controllers/tokengroupController.js" | versioned }}"></script>
-<script src="{{ instance }}/{{ "static/components/config/controllers/serviceidController.js" | versioned }}"></script>
-<script src="{{ instance }}/{{ "static/components/config/controllers/eduMfaServerController.js" | versioned }}"></script>
-<script src="{{ instance }}/{{ "static/components/config/controllers/smsgatewayController.js" | versioned }}"></script>
-<script src="{{ instance }}/{{ "static/components/machine/factories/machine.js" | versioned }}"></script>
-<script src="{{ instance }}/{{ "static/components/machine/states/states.js" | versioned }}"></script>
-<script src="{{ instance }}/{{ "static/components/machine/controllers/machineController.js" | versioned }}"></script>
-<script src="{{ instance }}/{{ "static/components/machine/controllers/machineDetailsController.js" | versioned }}"></script>
-<script src="{{ instance }}/{{ "static/components/register/states/states.js" | versioned }}"></script>
-<script src="{{ instance }}/{{ "static/components/register/controllers/registerControllers.js" | versioned }}"></script>
-<script src="{{ instance }}/{{ "static/components/register/factories/registerFactory.js" | versioned }}"></script>
-<script src="{{ instance }}/{{ "static/components/recovery/states/states.js" | versioned }}"></script>
-<script src="{{ instance }}/{{ "static/components/recovery/controllers/recoveryControllers.js" | versioned }}"></script>
-<script src="{{ instance }}/{{ "static/components/recovery/factories/recoveryFactory.js" | versioned }}"></script>
-<script src="{{ instance }}/{{ "static/components/filters/filters.js" | versioned }}"></script>
-<script src="{{ instance }}/{{ "static/contrib/js/angular-inform.js" | versioned }}"></script>
-<script src="{{ instance }}/{{ "static/contrib/js/webauthn-client/edumfa-webauthn.js" | versioned }}"></script>
-<script src="{{ instance }}/{{ "static/contrib/js/u2f-api.js" | versioned }}"></script>
+<script src="{{ instance }}/{{ "static/contrib/js/angular.js" }}"></script>
+<script src="{{ instance }}/{{ "static/contrib/js/ui-bootstrap-tpls.js" }}"></script>
+<script src="{{ instance }}/{{ "static/contrib/js/jquery.js" }}"></script>
+<script src="{{ instance }}/{{ "static/contrib/js/bootstrap.js" }}"></script>
+<script src="{{ instance }}/{{ "static/contrib/js/ngmodules/isteven-multi-select.js" }}"></script>
+<script src="{{ instance }}/{{ "static/contrib/js/ngmodules/ng-file-upload.js" }}"></script>
+<script src="{{ instance }}/{{ "static/contrib/js/hotkeys.js" }}"></script>
+<script src="{{ instance }}/{{ "static/contrib/js/ngmodules/angular-ui-router.js" }}"></script>
+<script src="{{ instance }}/{{ "static/contrib/js/ngmodules/angular-idle.js" }}"></script>
+<script src="{{ instance }}/{{ "static/contrib/js/ngmodules/angular-gettext.js" }}"></script>
+<script src="{{ instance }}/{{  "static/components/translation/translations.js" }}"></script>
+<script src="{{ instance }}/{{ "static/contrib/js/ngmodules/angular-sanitize.js" }}"></script>
+<script src="{{ instance }}/{{ "static/app.js" }}"></script>
+<script src="{{ instance }}/{{ "static/providers/versioningProvider.js" }}"></script>
+<script src="{{ instance }}/{{ "static/providers/errorMessageProvider.js" }}"></script>
+<script src="{{ instance }}/{{ "static/components/directives/controllers/directives.js" }}"></script>
+<script src="{{ instance }}/{{ "static/components/login/factories/auth.js" }}"></script>
+<script src="{{ instance }}/{{ "static/components/login/factories/u2f.js" }}"></script>
+<script src="{{ instance }}/{{ "static/components/login/factories/webauthn.js" }}"></script>
+<script src="{{ instance }}/{{ "static/components/login/states/states.js" }}"></script>
+<script src="{{ instance }}/{{ "static/components/login/controllers/loginControllers.js" }}"></script>
+<script src="{{ instance }}/{{ "static/components/dashboard/controllers/dashboardControllers.js" }}"></script>
+<script src="{{ instance }}/{{ "static/components/dashboard/states/states.js" }}"></script>
+<script src="{{ instance }}/{{ "static/components/token/factories/token.js" }}"></script>
+<script src="{{ instance }}/{{ "static/components/token/factories/validate.js" }}"></script>
+<script src="{{ instance }}/{{ "static/components/token/states/states.js" }}"></script>
+<script src="{{ instance }}/{{ "static/components/token/controllers/tokenControllers.js" }}"></script>
+<script src="{{ instance }}/{{ "static/components/token/controllers/tokenDetailController.js" }}"></script>
+<script src="{{ instance }}/{{ "static/components/token/controllers/tokenLostController.js" }}"></script>
+<script src="{{ instance }}/{{ "static/components/token/controllers/tokenGetSerialController.js" }}"></script>
+<script src="{{ instance }}/{{ "static/components/token/controllers/tokenChallengesController.js" }}"></script>
+<script src="{{ instance }}/{{ "static/components/token/controllers/tokenApplicationsController.js" }}"></script>
+<script src="{{ instance }}/{{ "static/components/user/factories/user.js" }}"></script>
+<script src="{{ instance }}/{{ "static/components/user/states/states.js" }}"></script>
+<script src="{{ instance }}/{{ "static/components/user/controllers/userControllers.js" }}"></script>
+<script src="{{ instance }}/{{ "static/components/audit/factories/audit.js" }}"></script>
+<script src="{{ instance }}/{{ "static/components/audit/states/states.js" }}"></script>
+<script src="{{ instance }}/{{ "static/components/audit/controllers/auditControllers.js" }}"></script>
+<script src="{{ instance }}/{{ "static/components/components/factories/component.js" }}"></script>
+<script src="{{ instance }}/{{ "static/components/components/states/states.js" }}"></script>
+<script src="{{ instance }}/{{ "static/components/components/controllers/componentControllers.js" }}"></script>
+<script src="{{ instance }}/{{ "static/components/config/factories/config.js" }}"></script>
+<script src="{{ instance }}/{{ "static/components/config/states/states.js" }}"></script>
+<script src="{{ instance }}/{{ "static/components/config/controllers/configControllers.js" }}"></script>
+<script src="{{ instance }}/{{ "static/components/config/controllers/eventController.js" }}"></script>
+<script src="{{ instance }}/{{ "static/components/config/controllers/periodicTaskController.js" }}"></script>
+<script src="{{ instance }}/{{ "static/components/config/controllers/ldapMachineResolverController.js" }}"></script>
+<script src="{{ instance }}/{{ "static/components/config/controllers/smtpServerController.js" }}"></script>
+<script src="{{ instance }}/{{ "static/components/config/controllers/radiusServerController.js" }}"></script>
+<script src="{{ instance }}/{{ "static/components/config/controllers/tokengroupController.js" }}"></script>
+<script src="{{ instance }}/{{ "static/components/config/controllers/serviceidController.js" }}"></script>
+<script src="{{ instance }}/{{ "static/components/config/controllers/eduMfaServerController.js" }}"></script>
+<script src="{{ instance }}/{{ "static/components/config/controllers/smsgatewayController.js" }}"></script>
+<script src="{{ instance }}/{{ "static/components/machine/factories/machine.js" }}"></script>
+<script src="{{ instance }}/{{ "static/components/machine/states/states.js" }}"></script>
+<script src="{{ instance }}/{{ "static/components/machine/controllers/machineController.js" }}"></script>
+<script src="{{ instance }}/{{ "static/components/machine/controllers/machineDetailsController.js" }}"></script>
+<script src="{{ instance }}/{{ "static/components/register/states/states.js" }}"></script>
+<script src="{{ instance }}/{{ "static/components/register/controllers/registerControllers.js" }}"></script>
+<script src="{{ instance }}/{{ "static/components/register/factories/registerFactory.js" }}"></script>
+<script src="{{ instance }}/{{ "static/components/recovery/states/states.js" }}"></script>
+<script src="{{ instance }}/{{ "static/components/recovery/controllers/recoveryControllers.js" }}"></script>
+<script src="{{ instance }}/{{ "static/components/recovery/factories/recoveryFactory.js" }}"></script>
+<script src="{{ instance }}/{{ "static/components/filters/filters.js" }}"></script>
+<script src="{{ instance }}/{{ "static/contrib/js/angular-inform.js" }}"></script>
+<script src="{{ instance }}/{{ "static/contrib/js/webauthn-client/edumfa-webauthn.js" }}"></script>
+<script src="{{ instance }}/{{ "static/contrib/js/u2f-api.js" }}"></script>
 </body>
 </html>