edumfa 2.0.0__tar.gz → 2.0.2__tar.gz

{edumfa-2.0.0/edumfa.egg-info → edumfa-2.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: edumfa
-Version: 2.0.0
+Version: 2.0.2
 Summary: eduMFA: identity, multifactor authentication (OTP), authorization, audit
 Home-page: https://www.edumfa.io
 Author: edumfa.io
@@ -48,7 +48,6 @@ Requires-Dist: ldap3>=2.6
 Requires-Dist: lxml>=5.0.0
 Requires-Dist: netaddr>=0.7.12
 Requires-Dist: passlib[bcrypt]>=1.7.0
-Requires-Dist: psycopg2-binary>=2.9.9
 Requires-Dist: pyOpenSSL>=24
 Requires-Dist: pydash>=4.7.4
 Requires-Dist: pyrad>=2.0
@@ -71,6 +70,8 @@ Requires-Dist: pytest>=3.6.0; extra == "test"
 Requires-Dist: pytest-cov>=2.5.1; extra == "test"
 Requires-Dist: responses>=0.9.0; extra == "test"
 Requires-Dist: testfixtures>=6.14.2; extra == "test"
+Provides-Extra: postgres
+Requires-Dist: psycopg2>=2.9.9; extra == "postgres"
 Provides-Extra: hsm
 Requires-Dist: PyKCS11>=1.5.10; extra == "hsm"
 Provides-Extra: kerberos
@@ -139,8 +140,7 @@ Setup
 =====
 
 For setting up the system to *run* it, please read install instructions 
-at `edumfa.readthedocs.io <http://edumfa.readthedocs.io/en/latest/installation/index
-.html>`_.
+at `edumfa.readthedocs.io <http://edumfa.readthedocs.io/en/latest/installation/index.html>`_.
 
 If you want to setup a development environment start like this::
 
@@ -176,8 +176,7 @@ submodules, by running::
 Running it
 ==========
 
-First You need to create a `config-file <https://edumfa.readthedocs
-.io/en/latest/installation/system/inifile.html>`_.
+First You need to create a `config-file <https://edumfa.readthedocs.io/en/latest/installation/system/inifile.html>`_.
 
 Then create the database tables and the encryption key::
 
@@ -202,7 +201,7 @@ Run it::
 
     ./edumfa-manage runserver
 
-Now you can connect to http://localhost:5000 with your browser and login
+Now you can connect to ``http://localhost:5000`` with your browser and login
 as administrator.
 
 Run tests
@@ -223,7 +222,7 @@ if you are not a developer.
 If you found a security vulnerability please report it to us using the reporting form provided by GitHub
 
 You can find detailed information about contributing here:
-https://github.com/eduMFA/eduMFA/blob/master/CONTRIBUTING.md
+https://github.com/eduMFA/eduMFA/blob/main/CONTRIBUTING.md
 
 Code structure
 ==============

{edumfa-2.0.0 → edumfa-2.0.2}/README.rst

@@ -61,8 +61,7 @@ Setup
 =====
 
 For setting up the system to *run* it, please read install instructions 
-at `edumfa.readthedocs.io <http://edumfa.readthedocs.io/en/latest/installation/index
-.html>`_.
+at `edumfa.readthedocs.io <http://edumfa.readthedocs.io/en/latest/installation/index.html>`_.
 
 If you want to setup a development environment start like this::
 
@@ -98,8 +97,7 @@ submodules, by running::
 Running it
 ==========
 
-First You need to create a `config-file <https://edumfa.readthedocs
-.io/en/latest/installation/system/inifile.html>`_.
+First You need to create a `config-file <https://edumfa.readthedocs.io/en/latest/installation/system/inifile.html>`_.
 
 Then create the database tables and the encryption key::
 
@@ -124,7 +122,7 @@ Run it::
 
     ./edumfa-manage runserver
 
-Now you can connect to http://localhost:5000 with your browser and login
+Now you can connect to ``http://localhost:5000`` with your browser and login
 as administrator.
 
 Run tests
@@ -145,7 +143,7 @@ if you are not a developer.
 If you found a security vulnerability please report it to us using the reporting form provided by GitHub
 
 You can find detailed information about contributing here:
-https://github.com/eduMFA/eduMFA/blob/master/CONTRIBUTING.md
+https://github.com/eduMFA/eduMFA/blob/main/CONTRIBUTING.md
 
 Code structure
 ==============

{edumfa-2.0.0 → edumfa-2.0.2}/deploy/crontab/edumfa

@@ -2,4 +2,4 @@
 */5 * * * *	edumfa	/opt/edumfa/bin/edumfa-cron run_scheduled -c
 
 # Audit rotation example: once a week at 00:00 on Sunday
-#0 0 * * 0	edumfa	/opt/edumfa/bin/edumfa-manage audit rotate_audit --age 360
+#0 0 * * 0	edumfa	/opt/edumfa/bin/edumfa-manage rotate_audit --age 360

edumfa-2.0.2/deploy/ubuntu/changelog

@@ -0,0 +1,122 @@
+edumfa (2.0.2{{CODENAME}}) {{CODENAME}}; urgency=medium
+
+  * chore: Configure Renovate
+  * chore: do not inherit from `object`
+  * chore: fix doc dependencies
+  * Update documentation (no corresponding issue)
+  * Fix migration for apache and nginx packages
+  * fix: print logo to stderr
+  * fix: correct audit log rotation example in crontab
+  * fix: correct cronjob
+  * test: add missing sms provider tests
+  * feat: add support for PostgreSQL in backup script
+  * Change docs theme to furo + upgrade docs dependencies
+  * chore(deps): update dependency babel to v2.14.0
+  * chore(deps): update dependency alembic to v1.13.1
+  * chore(deps): update dependency werkzeug to v3.0.2
+  * chore(deps): update dependency sqlalchemy to v1.4.52
+  * chore(deps): update dependency flask-migrate to v4.0.7
+  * chore(deps): update softprops/action-gh-release action to v2
+  * chore(deps): update dependency idna to v3.7 [security]
+  * chore(deps): update actions/checkout action to v4
+  * chore(deps): update dependency flask to v3.0.3
+  * chore(deps): update dependency async-timeout to v4.0.3
+  * chore(deps): update dependency smpplib to v2.2.3
+  * chore(deps): update dependency cachetools to v5.3.3
+  * chore(deps): update dependency sphinxcontrib-qthelp to v1.0.7
+  * chore(deps): update dependency sphinxcontrib-htmlhelp to v2.0.5
+  * chore(deps): update dependency sphinxcontrib-applehelp to v1.0.8
+  * chore(deps): update dependency sphinxcontrib-devhelp to v1.0.6
+  * chore(deps): update dependency croniter to v1.4.1
+  * chore(deps): update dependency charset-normalizer to v3.3.2
+  * chore(deps): update dependency cffi to v1.16.0
+  * chore(deps): update dependency cbor2 to v5.6.3
+  * chore(deps): update dependency bcrypt to v4.1.2
+  * chore(deps): update dependency responses to v0.25.0
+  * chore(deps): update dependency redis to v4.6.0
+  * chore(deps): update dependency pykcs11 to v1.5.15
+  * chore(deps): update dependency lxml to v5.2.1
+  * chore(deps): update dependency pyjwt to v2.8.0
+  * chore(deps): update dependency pytz to v2024
+  * chore(deps): update dependency pydash to v8
+  * chore(deps): update dependency netaddr to v0.10.1
+
+ -- eduMFA <edumfa-dev@listserv.dfn.de>  Fri, 26 Apr 2024 13:01:00 +0200
+
+edumfa (2.0.1{{CODENAME}}) {{CODENAME}}; urgency=medium
+
+  * chore: switch to psycopg2 instead of psycopg2-binary
+  * fix: correct sequence creation for galera
+  * ci: build ubuntu packages always (only upload on release)
+
+ -- eduMFA <edumfa-dev@listserv.dfn.de>  Fri, 12 Apr 2024 12:01:00 +0200
+
+edumfa (2.0.0{{CODENAME}}) {{CODENAME}}; urgency=medium
+ 
+  * chore: Several (major) dependency upgrades
+  * chore: Rework CLI tools and drop `Flask-Script` 
+
+ -- eduMFA <edumfa-dev@listserv.dfn.de>  Fri, 12 Apr 2024 12:00:00 +0200
+
+edumfa (1.5.1{{CODENAME}}) {{CODENAME}}; urgency=medium
+
+  * fix: correct location of venv for ubuntu packages 
+  * fix: ignore revoked, disabled webauthn tokens for passkey auth 
+  * fix: correct handling of login mode 
+
+ -- eduMFA <edumfa-dev@listserv.dfn.de>  Fri, 05 Apr 2024 12:00:00 +0200
+
+edumfa (1.5.0{{CODENAME}}) {{CODENAME}}; urgency=medium
+
+  * feat: api: set tokeninfo on init by 
+  * feat: add ubuntu packages 
+  * feat: log passkey usage 
+  * feat: allow customization of passkey label 
+  * feat: more detailed logging for eduMFA migration script 
+  * fix: add missing flask-migrate logging 
+  * fixed typo: Atttributes -> Attributes 
+
+ -- eduMFA <edumfa-dev@listserv.dfn.de>  Tue, 02 Apr 2024 07:00:00 +0100
+
+edumfa (1.4.0{{CODENAME}}) {{CODENAME}}; urgency=medium
+
+  * feat: smstoken: add configurable URL which is called after check, extend test
+  * feat: make result value available in logginghandler, verbosely log set tokeninfo
+  * feat: new API endpoint POST /info/<serial> to bulk modify tokeninfo
+  * feat: token janitor find by user
+  * fix: make ldap connections persistent and restartable
+  * fix: wrong indentation caused false "Action .. requires serial number" line
+  * fix: improve handling of resident keys
+  * fix: rename provider module names in DB on migration
+
+ -- eduMFA <edumfa-dev@listserv.dfn.de>  Tue, 19 Mar 2024 12:00:00 +0100
+
+edumfa (1.3.0{{CODENAME}}) {{CODENAME}}; urgency=medium
+
+  * Corrected ASCII art spacing
+  * Handled Windows credProtect flag
+  * Drop support for CentOS and Red Hat
+
+ -- eduMFA <edumfa-dev@listserv.dfn.de>  Mon, 4 Mar 2024 12:00:00 +0100
+
+edumfa (1.2.0{{CODENAME}}) {{CODENAME}}; urgency=medium
+
+  * Bugfix Release for CI Actions
+
+ -- eduMFA <edumfa-dev@listserv.dfn.de>  Fri, 1 Mar 2024 13:46:00 +0100
+
+edumfa (1.1.0{{CODENAME}}) {{CODENAME}}; urgency=medium
+
+  * Bugfix Release for CI Actions
+
+ -- eduMFA <edumfa-dev@listserv.dfn.de>  Fri, 1 Mar 2024 13:35:00 +0100
+
+edumfa (1.0.0{{CODENAME}}) {{CODENAME}}; urgency=medium
+
+  * Add option to enroll passkeys
+  * Add option to include description in user notifications
+  * Add containers as release artifacts
+  * Add option to filter the user_token_number on a given range instead of constant
+  * Add option to use the Remote-User header behind a reverse proxy
+
+ -- eduMFA <edumfa-dev@listserv.dfn.de>  Fri, 1 Mar 2024 12:45:00 +0100

{edumfa-2.0.0 → edumfa-2.0.2}/deploy/ubuntu/control

@@ -2,7 +2,7 @@ Source: edumfa
 Maintainer: eduMFA <edumfa-dev@listserv.dfn.de>
 Section: python
 Priority: optional
-Build-Depends: python3-all (>= 3.5), debhelper (>= 7.4.3), dh-virtualenv (>= 0.11), quilt, virtualenv, lsb-release, git
+Build-Depends: python3-all (>= 3.8), debhelper (>= 7.4.3), dh-virtualenv (>= 0.11), quilt, virtualenv, lsb-release, git
 Standards-Version: 3.9.5
 
 Package: edumfa
@@ -12,7 +12,7 @@ Breaks: python-privacyidea
 Conflicts: privacyidea-venv, privacyidea-appliance
 Pre-Depends: dpkg (>= 1.16.1), python3-minimal, ${misc:Pre-Depends}
 Depends: ${python:Depends}, ${misc:Depends}, python3-virtualenv
-X-Python-Version: >= 3.5
+X-Python-Version: >= 3.8
 Description: two-factor authentication system e.g. for OTP devices
  eduMFA: identity, multifactor authentication, authorization.
  This package contains the python module for eduMFA. If you want

{edumfa-2.0.0 → edumfa-2.0.2}/deploy/ubuntu-server/changelog

@@ -1,3 +1,15 @@
+edumfa-server (2.0.2{{CODENAME}}) {{CODENAME}}; urgency=medium
+ 
+  * update version number
+
+ -- eduMFA <edumfa-dev@listserv.dfn.de>  Fri, 26 Apr 2024 13:01:00 +0200
+
+edumfa-server (2.0.1{{CODENAME}}) {{CODENAME}}; urgency=medium
+ 
+  * update version number
+
+ -- eduMFA <edumfa-dev@listserv.dfn.de>  Fri, 12 Apr 2024 12:01:00 +0200
+
 edumfa-server (2.0.0{{CODENAME}}) {{CODENAME}}; urgency=medium
  
   * update version number

{edumfa-2.0.0 → edumfa-2.0.2}/deploy/ubuntu-server/edumfa-apache2.postinst

@@ -17,7 +17,7 @@ CERTDAYS=1095
 CERTKEYSIZE=4096
 MIGRATIONSDIR=/opt/edumfa/lib/edumfa/migrations/
 MYSQLFIX=/etc/mysql/conf.d/edumfa-maxkeylengthfix.cnf
-DB_CREATED=0
+DB_CREATED=false
 
 if test -f /etc/default/edumfa; then
   . /etc/default/edumfa
@@ -109,7 +109,7 @@ create_database() {
     echo "SQLALCHEMY_DATABASE_URI = 'mysql+pymysql://edumfa:$NPW@localhost/edumfa?charset=utf8'" >> /etc/edumfa/edumfa.cfg
     echo "DB created"
     /opt/edumfa/bin/edumfa-manage create_tables || true
-    DB_CREATED=1
+    DB_CREATED=true
   fi
 }
 
@@ -162,7 +162,7 @@ case "$1" in
     create_certificate
     #update-rc.d apache2 defaults
     service apache2 restart
-    if [ "$DB_CREATED" ]; then
+    if [ "$DB_CREATED" = true ]; then
       # We've created the DB, so we stamp the DB
       touch /tmp/edumfa-install
       /opt/edumfa/bin/edumfa-manage db stamp -d $MIGRATIONSDIR head

{edumfa-2.0.0 → edumfa-2.0.2}/deploy/ubuntu-server/edumfa-nginx.postinst

@@ -16,7 +16,7 @@ CERTDAYS=1095
 CERTKEYSIZE=4096
 MIGRATIONSDIR=/opt/edumfa/lib/edumfa/migrations/
 MYSQLFIX=/etc/mysql/conf.d/edumfa-maxkeylengthfix.cnf
-DB_CREATED=0
+DB_CREATED=false
 
 
 if test -f /etc/default/edumfa; then
@@ -110,7 +110,7 @@ create_database() {
     echo "SQLALCHEMY_DATABASE_URI = 'mysql+pymysql://edumfa:$NPW@localhost/edumfa?charset=utf8'" >> /etc/edumfa/edumfa.cfg
     echo "DB created"
     /opt/edumfa/bin/edumfa-manage create_tables || true
-    DB_CREATED=1
+    DB_CREATED=true
   fi
 }
 
@@ -146,7 +146,7 @@ case "$1" in
     create_database
     enable_nginx_uwsgi
     create_certificate
-    if [ "$DB_CREATED" ]; then
+    if [ "$DB_CREATED" = true ]; then
       # We've created the DB, so we stamp the DB
       /opt/edumfa/bin/edumfa-manage db stamp -d $MIGRATIONSDIR head
     else

{edumfa-2.0.0 → edumfa-2.0.2}/doc/conf.py

@@ -23,7 +23,7 @@ import functools
 # built documents.
 #
 # The short X.Y version.
-version = '2.0.0'
+version = '2.0.2'
 # The full version, including alpha/beta/rc tags.
 #release = '2.16dev5'
 release = version
@@ -58,8 +58,8 @@ sys.path.insert(0, os.path.abspath('../edumfa'))
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
 extensions = ['sphinx.ext.autodoc', 'sphinx.ext.imgmath', 'sphinx.ext.viewcode',
               'sphinxcontrib.autohttp.flask', 'sphinxcontrib.plantuml',
-              'sphinxcontrib.spelling', 'sphinx.ext.todo',
-              'pallets_sphinx_themes']
+              'sphinxcontrib.spelling', 'sphinx.ext.todo', 'sphinx_copybutton',
+              'sphinx_inline_tabs']
 http_index_ignore_prefixes = ['/token']
 
 # Add any paths that contain templates here, relative to this directory.
@@ -121,12 +121,15 @@ autoclass_content = 'both'
 #html_theme = 'sphinxdoc'
 #html_theme = 'sphinx_rtd_theme'
 #html_theme = 'agogo'
-html_theme = 'flask'
+html_theme = 'furo'
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
 # documentation.
-#html_theme_options = {}
+html_theme_options = {
+    "light_logo": "images/edumfa-logo.png",
+    "dark_logo": "images/edumfa-logo-dark.png",
+}
 
 # Add any paths that contain custom themes here, relative to this directory.
 #html_theme_path = ['_themes/flask-sphinx-themes']
@@ -141,12 +144,12 @@ html_theme = 'flask'
 
 # The name of an image file (relative to this directory) to place at the top
 # of the sidebar.
-html_logo = "images/eduMFA-logo.png"
+# html_logo = "images/edumfa-logo.png"
 
 # The name of an image file (within the static path) to use as favicon of the
 # docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
 # pixels large.
-html_favicon = "images/eduMFA-icon.png"
+html_favicon = "_static/images/edumfa-icon.png"
 
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,

{edumfa-2.0.0 → edumfa-2.0.2}/edumfa/api/lib/postpolicy.py

@@ -70,7 +70,7 @@ DEFAULT_POLICY_TEMPLATE_URL = "https://raw.githubusercontent.com/edumfa/" \
                               "policy-templates/main/templates/"
 
 
-class postpolicy(object):
+class postpolicy:
     """
     Decorator that allows one to call a specific function after the decorated
     function.
@@ -104,7 +104,7 @@ class postpolicy(object):
         return policy_wrapper
 
 
-class postrequest(object):
+class postrequest:
     """
     Decorator that is supposed to be used with after_request.
     """

{edumfa-2.0.0 → edumfa-2.0.2}/edumfa/api/lib/prepolicy.py

@@ -90,7 +90,7 @@ optional = True
 required = False
 
 
-class prepolicy(object):
+class prepolicy:
     """
     This is the decorator wrapper to call a specific function before an API
     call.

{edumfa-2.0.0 → edumfa-2.0.2}/edumfa/commands/manage/backup.py

@@ -22,8 +22,7 @@ import re
 import sys
 from datetime import datetime
 from shlex import quote as shlex_quote
-from subprocess import Popen, PIPE, call
-from urllib.parse import urlparse
+from subprocess import Popen, PIPE, call, run
 
 import click
 import sqlalchemy
@@ -33,6 +32,8 @@ from flask.cli import AppGroup
 backup_cli = AppGroup("backup", help="Perform backup operations")
 
 MYSQL_DIALECTS = ["mysql", "pymysql", "mysql+pymysql", "mariadb+pymysql"]
+PSQL_DIALECTS = ["postgresql+psycopg", "postgresql+psycopg2", "postgresql+pg8000",
+                 "postgresql+asyncpg", "postgresql+psycopg2cffi"]
 
 
 def _write_mysql_defaults(filename, username, password):
@@ -110,7 +111,7 @@ def restore(backup_file: str):
         call(["cp", sqlfile, productive_file])
         os.unlink(sqlfile)
     elif sqltype in MYSQL_DIALECTS:
-        parsed_sqluri = sqlalchemy.make_url(sqluri)
+        parsed_sqluri = sqlalchemy.engine.url.make_url(sqluri)
         username = parsed_sqluri.username
         password = parsed_sqluri.password
         hostname = parsed_sqluri.host
@@ -122,6 +123,13 @@ def restore(backup_file: str):
         call("mysql --defaults-file=%s -h %s %s < %s" % (
             shlex_quote(defaults_file), shlex_quote(hostname), shlex_quote(database), shlex_quote(sqlfile)), shell=True)
         os.unlink(sqlfile)
+    elif sqltype in PSQL_DIALECTS:
+        parsed_sqluri = sqlalchemy.engine.url.make_url(sqluri)
+        env = os.environ.copy()
+        env["PGPASSWORD"] = parsed_sqluri.password
+        cmd = ['psql', '-U', parsed_sqluri.username, '-d', parsed_sqluri.database,
+               '-h', parsed_sqluri.host, '-f', sqlfile]
+        run(cmd, env=env)
     else:
         click.echo("unsupported SQL syntax: %s" % sqltype)
         sys.exit(2)
@@ -160,7 +168,7 @@ def create(target_dir: str, config_dir: str, radius_dir=None, enckey: bool = Fal
     backup_file = "%s/%s-%s.tgz" % (target_dir, BASE_NAME, DATE)
 
     sqluri = current_app.config.get("SQLALCHEMY_DATABASE_URI")
-    parsed_sqluri = sqlalchemy.make_url(sqluri)
+    parsed_sqluri = sqlalchemy.engine.url.make_url(sqluri)
     sqltype = parsed_sqluri.drivername
 
     if sqltype == "sqlite":
@@ -180,6 +188,12 @@ def create(target_dir: str, config_dir: str, radius_dir=None, enckey: bool = Fal
             cmd.extend(['-P', str(parsed_sqluri.port)])
         cmd.extend(['-B', shlex_quote(database), '-r', shlex_quote(sqlfile)])
         call(cmd, shell=False)
+    elif sqltype in PSQL_DIALECTS:
+        env = os.environ.copy()
+        env["PGPASSWORD"] = parsed_sqluri.password
+        cmd = ['pg_dump', '-U', parsed_sqluri.username, '-d', parsed_sqluri.database,
+               '-h', parsed_sqluri.host, '-f', sqlfile]
+        run(cmd, env=env)
     else:
         click.echo(f"unsupported SQL syntax: {sqltype}")
         sys.exit(2)

{edumfa-2.0.0 → edumfa-2.0.2}/edumfa/commands/manage/main.py

@@ -57,7 +57,7 @@ def cli():
       / _ \/ _` | | | | |\/| |  __/ /\ \  
      |  __/ (_| | |_| | |  | | | / ____ \ 
       \___|\__,_|\__,_|_|  |_|_|/_/    \_\ {0!s:>12}
-    """.format('v{0!s}'.format(get_version_number())))
+    """.format('v{0!s}'.format(get_version_number())), err=True)
 
 
 cli.add_command(audit_cli)

{edumfa-2.0.0 → edumfa-2.0.2}/edumfa/config.py

@@ -38,7 +38,7 @@ def _random_password(size):
     return "".join(passwd)
 
 
-class Config(object):
+class Config:
     SECRET_KEY = os.environ.get('SECRET_KEY')
     # SQL_ALCHEMY_DATABASE_URI = "mysql://privacyidea:XmbSrlqy5d4IS08zjz"
     # "GG5HTt40Cpf5@localhost/privacyidea"

{edumfa-2.0.0 → edumfa-2.0.2}/edumfa/lib/applications/base.py

@@ -75,7 +75,7 @@ def get_machine_application_class_dict():
     return ret
 
 
-class MachineApplication(object):
+class MachineApplication:
 
     application_name = "base"
     '''If bulk_call is false, the administrator may

{edumfa-2.0.0 → edumfa-2.0.2}/edumfa/lib/auditmodules/base.py

@@ -55,7 +55,7 @@ import datetime
 log = logging.getLogger(__name__)
 
 
-class Paginate(object):
+class Paginate:
     """
     This is a pagination object, that is used for searching audit trails.
     """
@@ -73,7 +73,7 @@ class Paginate(object):
         self.total = 0
     
 
-class Audit(object):  # pragma: no cover
+class Audit:  # pragma: no cover
 
     is_readable = False
 

{edumfa-2.0.0 → edumfa-2.0.2}/edumfa/lib/auth.py

@@ -33,7 +33,7 @@ import logging
 log = logging.getLogger(__name__)
 
 
-class ROLE(object):
+class ROLE:
     ADMIN = "admin"
     USER = "user"
     VALIDATE = "validate"

{edumfa-2.0.0 → edumfa-2.0.2}/edumfa/lib/caconnectors/baseca.py

@@ -32,7 +32,7 @@ This module is tested in tests/test_lib_caconnector.py
 AvailableCAConnectors = []
 
 
-class BaseCAConnector(object):
+class BaseCAConnector:
     def revoke_cert(self, certificate, request_id=None, reason=None):
         """
         Revoke the specified certificate. At this point only the database

{edumfa-2.0.0 → edumfa-2.0.2}/edumfa/lib/caconnectors/caservice_pb2_grpc.py

@@ -5,7 +5,7 @@ import grpc
 import eduMFA.lib.caconnectors.caservice_pb2 as caservice__pb2
 
 
-class CAServiceStub(object):
+class CAServiceStub:
     """Disposition values:
     0 - Incomplete
     1 - Error
@@ -59,7 +59,7 @@ class CAServiceStub(object):
                 )
 
 
-class CAServiceServicer(object):
+class CAServiceServicer:
     """Disposition values:
     0 - Incomplete
     1 - Error
@@ -157,7 +157,7 @@ def add_CAServiceServicer_to_server(servicer, server):
 
 
  # This class is part of an EXPERIMENTAL API.
-class CAService(object):
+class CAService:
     """Disposition values:
     0 - Incomplete
     1 - Error

{edumfa-2.0.0 → edumfa-2.0.2}/edumfa/lib/caconnectors/localca.py

@@ -212,7 +212,7 @@ def _get_crl_next_update(filename):
     return dt
 
 
-class CONFIG(object):
+class CONFIG:
 
     def __init__(self, name):
         self.directory = "./ca"
@@ -238,7 +238,7 @@ class CONFIG(object):
         return s
 
 
-class ATTR(object):
+class ATTR:
     __doc__ = """This is the list Attributes of the Local CA."""
     CAKEY = "cakey"
     CACERT = "cacert"

{edumfa-2.0.0 → edumfa-2.0.2}/edumfa/lib/caconnectors/msca.py

@@ -56,7 +56,7 @@ CRL_REASONS = ["unspecified", "keyCompromise", "CACompromise",
 TIMEOUT = 3
 
 
-class CONFIG(object):  # pragma: no cover
+class CONFIG:  # pragma: no cover
     # Only needed for command line creation
 
     def __init__(self, name):
@@ -81,7 +81,7 @@ class CONFIG(object):  # pragma: no cover
         return s
 
 
-class ATTR(object):
+class ATTR:
     __doc__ = """This is the list Attributes of the Microsoft CA connector."""
     HOSTNAME = "hostname"
     PORT = "port"

{edumfa-2.0.0 → edumfa-2.0.2}/edumfa/lib/challengeresponsedecorators.py

@@ -45,7 +45,7 @@ log = logging.getLogger(__name__)
 SEED_LENGTH = 16
 
 
-class CHALLENGE_TYPE(object):
+class CHALLENGE_TYPE:
     PIN_RESET = "generic_pin_reset"
     RESYNC = "generic_resync"
 

{edumfa-2.0.0 → edumfa-2.0.2}/edumfa/lib/config.py

@@ -62,7 +62,7 @@ this = sys.modules[__name__]
 this.config = {}
 
 
-class SharedConfigClass(object):
+class SharedConfigClass:
     """
     A shared config class object is shared between threads and is supposed
     to store the current configuration with resolvers, realms, policies
@@ -198,7 +198,7 @@ class SharedConfigClass(object):
         return self._clone()
 
 
-class LocalConfigClass(object):
+class LocalConfigClass:
     """
     The Config_Object will contain all database configuration of system
     config, resolvers, realms, policies and event handler definitions.
@@ -270,7 +270,7 @@ class LocalConfigClass(object):
         return r_config
 
 
-class SYSCONF(object):
+class SYSCONF:
     __doc__ = """This is a list of system config attributes"""
     OVERRIDECLIENT = "OverrideAuthorizationClient"
     PREPENDPIN = "PrependPin"

{edumfa-2.0.0 → edumfa-2.0.2}/edumfa/lib/crypto.py

@@ -85,7 +85,7 @@ FAILED_TO_DECRYPT_PASSWORD = "FAILED TO DECRYPT PASSWORD!"  # nosec B105 # place
 log = logging.getLogger(__name__)
 
 
-class SecretObj(object):
+class SecretObj:
     def __init__(self, val, iv, preserve=True):
         self.val = val
         self.iv = iv
@@ -503,7 +503,7 @@ def geturandom(length=20, hex=False):
 # some random functions based on geturandom #################################
 
 
-class urandom(object):
+class urandom:
 
     precision = 12
 
@@ -681,7 +681,7 @@ def _slow_rsa_verify_raw(key, sig, msg):
     return msg == pow(sig, pn.e, pn.n)
 
 
-class Sign(object):
+class Sign:
     """
     Signing class that is used to sign Audit Entries and to sign API responses.
     """