acme2certifier 0.41.3__tar.gz → 0.45.dev1__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- acme2certifier-0.45.dev1/MANIFEST.in +3 -0
- {acme2certifier-0.41.3/acme2certifier.egg-info → acme2certifier-0.45.dev1}/PKG-INFO +24 -11
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1}/README.md +10 -6
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1/acme2certifier}/acme_srv/account.py +99 -48
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1/acme2certifier}/acme_srv/acmechallenge.py +2 -1
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1/acme2certifier}/acme_srv/authorization.py +444 -84
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1/acme2certifier}/acme_srv/certificate.py +146 -66
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1/acme2certifier}/acme_srv/certificate_business_logic.py +5 -5
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1/acme2certifier}/acme_srv/certificate_manager.py +13 -7
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1/acme2certifier}/acme_srv/certificate_repository.py +1 -1
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1/acme2certifier}/acme_srv/challenge.py +209 -77
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1/acme2certifier}/acme_srv/challenge_business_logic.py +67 -8
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1/acme2certifier}/acme_srv/challenge_error_handling.py +1 -0
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1/acme2certifier}/acme_srv/challenge_registry_setup.py +5 -1
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1/acme2certifier}/acme_srv/challenge_validators/__init__.py +2 -0
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1/acme2certifier}/acme_srv/challenge_validators/base.py +1 -0
- acme2certifier-0.45.dev1/acme2certifier/acme_srv/challenge_validators/dns_persist_validator.py +316 -0
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1/acme2certifier}/acme_srv/challenge_validators/dns_validator.py +11 -4
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1/acme2certifier}/acme_srv/challenge_validators/email_reply_validator.py +18 -14
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1/acme2certifier}/acme_srv/challenge_validators/http_validator.py +22 -12
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1/acme2certifier}/acme_srv/challenge_validators/registry.py +1 -0
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1/acme2certifier}/acme_srv/challenge_validators/source_address_validator.py +8 -3
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1/acme2certifier}/acme_srv/challenge_validators/tkauth_validator.py +1 -0
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1/acme2certifier}/acme_srv/challenge_validators/tls_alpn_validator.py +18 -13
- acme2certifier-0.45.dev1/acme2certifier/acme_srv/db_handler.py +155 -0
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1/acme2certifier}/acme_srv/directory.py +42 -7
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1/acme2certifier}/acme_srv/email_handler.py +2 -1
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1/acme2certifier}/acme_srv/error.py +1 -0
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1/acme2certifier}/acme_srv/helper.py +11 -5
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1/acme2certifier}/acme_srv/helpers/certificates.py +92 -53
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1/acme2certifier}/acme_srv/helpers/config.py +179 -11
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1/acme2certifier}/acme_srv/helpers/crypto.py +1 -0
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1/acme2certifier}/acme_srv/helpers/csr.py +9 -1
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1/acme2certifier}/acme_srv/helpers/datetime_utils.py +1 -0
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1/acme2certifier}/acme_srv/helpers/domain_utils.py +43 -2
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1/acme2certifier}/acme_srv/helpers/eab.py +1 -0
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1/acme2certifier}/acme_srv/helpers/encoding.py +1 -0
- acme2certifier-0.45.dev1/acme2certifier/acme_srv/helpers/global_variables.py +13 -0
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1/acme2certifier}/acme_srv/helpers/logging_utils.py +1 -0
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1/acme2certifier}/acme_srv/helpers/network.py +9 -10
- acme2certifier-0.45.dev1/acme2certifier/acme_srv/helpers/plugin_loader.py +310 -0
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1/acme2certifier}/acme_srv/helpers/utils.py +1 -0
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1/acme2certifier}/acme_srv/helpers/validation.py +16 -3
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1/acme2certifier}/acme_srv/housekeeping.py +35 -22
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1/acme2certifier}/acme_srv/message.py +34 -16
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1/acme2certifier}/acme_srv/monkey_patches.py +1 -0
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1/acme2certifier}/acme_srv/nonce.py +83 -2
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1/acme2certifier}/acme_srv/order.py +497 -89
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1/acme2certifier}/acme_srv/renewalinfo.py +4 -3
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1/acme2certifier}/acme_srv/signature.py +3 -2
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1/acme2certifier}/acme_srv/threadwithreturnvalue.py +1 -0
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1/acme2certifier}/acme_srv/trigger.py +6 -6
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1/acme2certifier}/acme_srv/version.py +3 -3
- acme2certifier-0.45.dev1/acme2certifier/cahandlers/__init__.py +1 -0
- {acme2certifier-0.41.3/examples/ca_handler → acme2certifier-0.45.dev1/acme2certifier/cahandlers}/acme_ca_handler.py +18 -22
- {acme2certifier-0.41.3/examples/ca_handler → acme2certifier-0.45.dev1/acme2certifier/cahandlers}/asa_ca_handler.py +18 -20
- {acme2certifier-0.41.3/examples/ca_handler → acme2certifier-0.45.dev1/acme2certifier/cahandlers}/certifier_ca_handler.py +14 -19
- {acme2certifier-0.41.3/examples/ca_handler → acme2certifier-0.45.dev1/acme2certifier/cahandlers}/certsrv.py +17 -11
- {acme2certifier-0.41.3/examples/ca_handler → acme2certifier-0.45.dev1/acme2certifier/cahandlers}/cmp_ca_handler.py +22 -30
- {acme2certifier-0.41.3/examples/ca_handler → acme2certifier-0.45.dev1/acme2certifier/cahandlers}/digicert_ca_handler.py +7 -15
- acme2certifier-0.45.dev1/acme2certifier/cahandlers/dogtag_ca_handler.py +1103 -0
- {acme2certifier-0.41.3/examples/ca_handler → acme2certifier-0.45.dev1/acme2certifier/cahandlers}/ejbca_ca_handler.py +9 -20
- {acme2certifier-0.41.3/examples/ca_handler → acme2certifier-0.45.dev1/acme2certifier/cahandlers}/entrust_ca_handler.py +2 -2
- {acme2certifier-0.41.3/examples/ca_handler → acme2certifier-0.45.dev1/acme2certifier/cahandlers}/est_ca_handler.py +20 -49
- acme2certifier-0.45.dev1/acme2certifier/cahandlers/freeipa_ca_handler.py +659 -0
- acme2certifier-0.45.dev1/acme2certifier/cahandlers/ms_wcce/__init__.py +23 -0
- acme2certifier-0.45.dev1/acme2certifier/cahandlers/ms_wcce/errors.py +19 -0
- acme2certifier-0.45.dev1/acme2certifier/cahandlers/ms_wcce/request.py +189 -0
- acme2certifier-0.45.dev1/acme2certifier/cahandlers/ms_wcce/rpc.py +140 -0
- acme2certifier-0.45.dev1/acme2certifier/cahandlers/ms_wcce/target.py +158 -0
- acme2certifier-0.45.dev1/acme2certifier/cahandlers/mscertsrv_ca_handler.py +814 -0
- acme2certifier-0.45.dev1/acme2certifier/cahandlers/mswcce_ca_handler.py +967 -0
- {acme2certifier-0.41.3/examples/ca_handler → acme2certifier-0.45.dev1/acme2certifier/cahandlers}/nclm_ca_handler.py +12 -19
- {acme2certifier-0.41.3/examples/ca_handler → acme2certifier-0.45.dev1/acme2certifier/cahandlers}/openssl_ca_handler.py +10 -9
- {acme2certifier-0.41.3/examples/ca_handler → acme2certifier-0.45.dev1/acme2certifier/cahandlers}/openxpki_ca_handler.py +11 -23
- {acme2certifier-0.41.3/examples/ca_handler → acme2certifier-0.45.dev1/acme2certifier/cahandlers}/pkcs7_soap_ca_handler.py +128 -35
- {acme2certifier-0.41.3/examples/ca_handler → acme2certifier-0.45.dev1/acme2certifier/cahandlers}/skeleton_ca_handler.py +2 -1
- {acme2certifier-0.41.3/examples/ca_handler → acme2certifier-0.45.dev1/acme2certifier/cahandlers}/vault_ca_handler.py +15 -17
- {acme2certifier-0.41.3/examples/ca_handler → acme2certifier-0.45.dev1/acme2certifier/cahandlers}/xca_ca_handler.py +23 -30
- acme2certifier-0.45.dev1/acme2certifier/compat.py +66 -0
- acme2certifier-0.45.dev1/acme2certifier/dbhandlers/__init__.py +1 -0
- {acme2certifier-0.41.3/examples/db_handler → acme2certifier-0.45.dev1/acme2certifier/dbhandlers}/django_handler.py +25 -4
- {acme2certifier-0.41.3/examples/db_handler → acme2certifier-0.45.dev1/acme2certifier/dbhandlers}/wsgi_handler.py +80 -76
- acme2certifier-0.45.dev1/acme2certifier/django_app/a2c_response.py +38 -0
- acme2certifier-0.45.dev1/acme2certifier/django_app/admin.py +6 -0
- acme2certifier-0.45.dev1/acme2certifier/django_app/apps.py +11 -0
- acme2certifier-0.45.dev1/acme2certifier/django_app/fixture/status.yaml +37 -0
- acme2certifier-0.45.dev1/acme2certifier/django_app/fixtures/status.yaml +37 -0
- acme2certifier-0.45.dev1/acme2certifier/django_app/migrations/0001_initial.py +282 -0
- acme2certifier-0.45.dev1/acme2certifier/django_app/migrations/__init__.py +0 -0
- acme2certifier-0.45.dev1/acme2certifier/django_app/models.py +144 -0
- acme2certifier-0.45.dev1/acme2certifier/django_app/tests.py +6 -0
- acme2certifier-0.45.dev1/acme2certifier/django_app/urls.py +21 -0
- acme2certifier-0.45.dev1/acme2certifier/django_app/views.py +472 -0
- acme2certifier-0.45.dev1/acme2certifier/django_project/__init__.py +0 -0
- {acme2certifier-0.41.3/examples/django/acme2certifier → acme2certifier-0.45.dev1/acme2certifier/django_project}/settings.py +27 -49
- {acme2certifier-0.41.3/examples/django/acme2certifier → acme2certifier-0.45.dev1/acme2certifier/django_project}/urls.py +3 -6
- acme2certifier-0.45.dev1/acme2certifier/django_project/wsgi.py +20 -0
- acme2certifier-0.45.dev1/acme2certifier/eabhandlers/__init__.py +1 -0
- {acme2certifier-0.41.3/examples/eab_handler → acme2certifier-0.45.dev1/acme2certifier/eabhandlers}/file_handler.py +2 -1
- {acme2certifier-0.41.3/examples/eab_handler → acme2certifier-0.45.dev1/acme2certifier/eabhandlers}/json_handler.py +2 -1
- {acme2certifier-0.41.3/examples/eab_handler → acme2certifier-0.45.dev1/acme2certifier/eabhandlers}/kid_profile_handler.py +8 -5
- {acme2certifier-0.41.3/examples/eab_handler → acme2certifier-0.45.dev1/acme2certifier/eabhandlers}/skeleton_eab_handler.py +2 -1
- {acme2certifier-0.41.3/examples/eab_handler → acme2certifier-0.45.dev1/acme2certifier/eabhandlers}/sql_handler.py +7 -5
- acme2certifier-0.45.dev1/acme2certifier/hookhandlers/__init__.py +1 -0
- {acme2certifier-0.41.3/examples/hooks → acme2certifier-0.45.dev1/acme2certifier/hookhandlers}/cn_dump_hooks.py +2 -1
- {acme2certifier-0.41.3/examples/hooks → acme2certifier-0.45.dev1/acme2certifier/hookhandlers}/email_hooks.py +3 -3
- {acme2certifier-0.41.3/examples/hooks → acme2certifier-0.45.dev1/acme2certifier/hookhandlers}/exception_test_hooks.py +2 -1
- acme2certifier-0.45.dev1/acme2certifier/share/__init__.py +0 -0
- {acme2certifier-0.41.3/examples → acme2certifier-0.45.dev1/acme2certifier/share}/acme2certifier_wsgi.py +62 -36
- {acme2certifier-0.41.3/examples → acme2certifier-0.45.dev1/acme2certifier/share}/acme_srv.cfg +7 -1
- acme2certifier-0.45.dev1/acme2certifier/share/apache2/apache_django.conf +13 -0
- acme2certifier-0.45.dev1/acme2certifier/share/apache2/apache_django_ssl.conf +17 -0
- acme2certifier-0.45.dev1/acme2certifier/share/apache2/apache_wsgi.conf +14 -0
- acme2certifier-0.45.dev1/acme2certifier/share/apache2/apache_wsgi_ssl.conf +16 -0
- {acme2certifier-0.41.3/examples → acme2certifier-0.45.dev1/acme2certifier/share}/nginx/supervisord.conf +11 -1
- acme2certifier-0.45.dev1/acme2certifier/share/skeletons/ca_handler/__init__.py +1 -0
- acme2certifier-0.45.dev1/acme2certifier/share/skeletons/ca_handler/skeleton_ca_handler.py +113 -0
- acme2certifier-0.45.dev1/acme2certifier/share/skeletons/eab_handler/__init__.py +1 -0
- acme2certifier-0.45.dev1/acme2certifier/share/skeletons/eab_handler/key_file.csv +5 -0
- acme2certifier-0.45.dev1/acme2certifier/share/skeletons/eab_handler/key_file.json +6 -0
- acme2certifier-0.45.dev1/acme2certifier/share/skeletons/eab_handler/kid_profiles.json +42 -0
- acme2certifier-0.45.dev1/acme2certifier/share/skeletons/eab_handler/kid_profiles.yml +34 -0
- acme2certifier-0.45.dev1/acme2certifier/share/skeletons/eab_handler/skeleton_eab_handler.py +49 -0
- acme2certifier-0.45.dev1/acme2certifier/share/skeletons/hooks/__init__.py +1 -0
- acme2certifier-0.45.dev1/acme2certifier/share/skeletons/hooks/skeleton_hooks.py +55 -0
- acme2certifier-0.45.dev1/acme2certifier/tools/__init__.py +1 -0
- acme2certifier-0.45.dev1/acme2certifier/tools/a2c_cert_poll.py +31 -0
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1/acme2certifier}/tools/a2c_cli.py +36 -10
- acme2certifier-0.41.3/tools/cliuser_mgmt.py → acme2certifier-0.45.dev1/acme2certifier/tools/a2c_cliuser_mgmt.py +44 -31
- acme2certifier-0.45.dev1/acme2certifier/tools/a2c_db_update.py +19 -0
- acme2certifier-0.45.dev1/acme2certifier/tools/a2c_django_secret_keygen.py +16 -0
- acme2certifier-0.41.3/tools/django_update.py → acme2certifier-0.45.dev1/acme2certifier/tools/a2c_django_update.py +8 -3
- acme2certifier-0.41.3/tools/eab_chk.py → acme2certifier-0.45.dev1/acme2certifier/tools/a2c_eab_chk.py +35 -43
- acme2certifier-0.45.dev1/acme2certifier/tools/a2c_invalidator.py +29 -0
- acme2certifier-0.45.dev1/acme2certifier/tools/a2c_manage.py +24 -0
- acme2certifier-0.45.dev1/acme2certifier/tools/a2c_mswcce_connection_test.py +19 -0
- acme2certifier-0.45.dev1/acme2certifier/tools/a2c_report_generator.py +39 -0
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1/acme2certifier.egg-info}/PKG-INFO +24 -11
- acme2certifier-0.45.dev1/acme2certifier.egg-info/SOURCES.txt +209 -0
- acme2certifier-0.45.dev1/acme2certifier.egg-info/entry_points.txt +12 -0
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1}/acme2certifier.egg-info/requires.txt +17 -4
- acme2certifier-0.45.dev1/acme2certifier.egg-info/top_level.txt +1 -0
- acme2certifier-0.45.dev1/pyproject.toml +107 -0
- acme2certifier-0.45.dev1/requirements.txt +24 -0
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1}/test/test_account.py +327 -140
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1}/test/test_acme_ca_handler.py +502 -631
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1}/test/test_acmechallenge.py +3 -3
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1}/test/test_asa_ca_handler.py +137 -189
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1}/test/test_authorization.py +1020 -143
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1}/test/test_certificate.py +1063 -755
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1}/test/test_certificate_business_logic.py +41 -22
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1}/test/test_certificate_manager.py +9 -8
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1}/test/test_certificate_repository.py +5 -3
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1}/test/test_certifier_handler.py +146 -164
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1}/test/test_challenge.py +496 -244
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1}/test/test_challenge_business_logic.py +196 -53
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1}/test/test_challenge_error_handling.py +2 -1
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1}/test/test_challenge_registry_setup.py +536 -365
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1}/test/test_challenge_validators.py +710 -124
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1}/test/test_cli.py +142 -133
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1}/test/test_cmp_ca_handler.py +43 -81
- acme2certifier-0.45.dev1/test/test_compat.py +74 -0
- acme2certifier-0.45.dev1/test/test_db_handler_loader.py +96 -0
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1}/test/test_digicert.py +125 -153
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1}/test/test_directory.py +160 -108
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1}/test/test_django_update.py +65 -56
- acme2certifier-0.45.dev1/test/test_dogtag_ca_handler.py +1512 -0
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1}/test/test_eabfile_handler.py +7 -6
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1}/test/test_eabjson_handler.py +7 -6
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1}/test/test_eabkid_profile_handler.py +36 -35
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1}/test/test_eabsql_handler.py +79 -60
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1}/test/test_ejbca_handler.py +129 -168
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1}/test/test_email_handler.py +17 -15
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1}/test/test_email_hooks.py +79 -79
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1}/test/test_entrust.py +187 -187
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1}/test/test_error.py +4 -4
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1}/test/test_est_ca_handler.py +75 -91
- acme2certifier-0.45.dev1/test/test_freeipa_ca_handler.py +830 -0
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1}/test/test_helper.py +1194 -827
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1}/test/test_housekeeping.py +196 -196
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1}/test/test_message.py +115 -97
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1}/test/test_msca_handler.py +203 -242
- acme2certifier-0.45.dev1/test/test_mswcce_ca_handler.py +2255 -0
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1}/test/test_nclm_ca_handler.py +141 -168
- acme2certifier-0.45.dev1/test/test_nonce.py +335 -0
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1}/test/test_openssl_ca_handler.py +245 -244
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1}/test/test_openxpki_ca_handler.py +86 -112
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1}/test/test_order.py +939 -295
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1}/test/test_pkcs7_soap_ca_handler.py +99 -95
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1}/test/test_renewalinfo.py +34 -32
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1}/test/test_signature.py +35 -35
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1}/test/test_trigger.py +74 -74
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1}/test/test_vault_handler.py +66 -88
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1}/test/test_wsgi_acme2certifier.py +271 -71
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1}/test/test_wsgi_handler.py +63 -63
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1}/test/test_xca_ca_handler.py +504 -551
- acme2certifier-0.41.3/MANIFEST.in +0 -22
- acme2certifier-0.41.3/acme2certifier.egg-info/SOURCES.txt +0 -225
- acme2certifier-0.41.3/acme2certifier.egg-info/top_level.txt +0 -1
- acme2certifier-0.41.3/acme_srv/helpers/global_variables.py +0 -6
- acme2certifier-0.41.3/acme_srv/helpers/plugin_loader.py +0 -99
- acme2certifier-0.41.3/docs/CONTRIBUTING.md +0 -96
- acme2certifier-0.41.3/docs/__init__.py +0 -3
- acme2certifier-0.41.3/docs/a2c-alma-loadbalancing.md +0 -680
- acme2certifier-0.41.3/docs/a2c-alma-loadbalancing.png +0 -0
- acme2certifier-0.41.3/docs/a2c-ubuntu-loadbalancing.md +0 -679
- acme2certifier-0.41.3/docs/a2c-ubuntu-loadbalancing.png +0 -0
- acme2certifier-0.41.3/docs/acme-clients.md +0 -140
- acme2certifier-0.41.3/docs/acme_ca.md +0 -211
- acme2certifier-0.41.3/docs/acme_profiling.md +0 -79
- acme2certifier-0.41.3/docs/acme_srv.md +0 -82
- acme2certifier-0.41.3/docs/architecture/account-architecture.md +0 -94
- acme2certifier-0.41.3/docs/architecture/authorization-architecture.md +0 -349
- acme2certifier-0.41.3/docs/architecture/certificate-architecture.md +0 -120
- acme2certifier-0.41.3/docs/architecture/challenge-architecture.md +0 -542
- acme2certifier-0.41.3/docs/architecture/directory-architecture.md +0 -76
- acme2certifier-0.41.3/docs/architecture/order-architecture.md +0 -116
- acme2certifier-0.41.3/docs/architecture/renewalinfo-architecture.md +0 -106
- acme2certifier-0.41.3/docs/asa.md +0 -109
- acme2certifier-0.41.3/docs/async_mode.md +0 -40
- acme2certifier-0.41.3/docs/ca_handler.md +0 -110
- acme2certifier-0.41.3/docs/cert-mgr.md +0 -108
- acme2certifier-0.41.3/docs/certifier.md +0 -218
- acme2certifier-0.41.3/docs/cmp.md +0 -73
- acme2certifier-0.41.3/docs/database_scheme.png +0 -0
- acme2certifier-0.41.3/docs/digicert.md +0 -135
- acme2certifier-0.41.3/docs/eab.md +0 -249
- acme2certifier-0.41.3/docs/eab_profiling.md +0 -276
- acme2certifier-0.41.3/docs/ejbca.md +0 -159
- acme2certifier-0.41.3/docs/entrust.md +0 -134
- acme2certifier-0.41.3/docs/est.md +0 -73
- acme2certifier-0.41.3/docs/external_database_support.md +0 -273
- acme2certifier-0.41.3/docs/header_info.md +0 -46
- acme2certifier-0.41.3/docs/hooks.md +0 -77
- acme2certifier-0.41.3/docs/housekeeping.md +0 -69
- acme2certifier-0.41.3/docs/install_apache2_wsgi.md +0 -162
- acme2certifier-0.41.3/docs/install_deb.md +0 -162
- acme2certifier-0.41.3/docs/install_docker.md +0 -7
- acme2certifier-0.41.3/docs/install_nginx_wsgi.md +0 -155
- acme2certifier-0.41.3/docs/install_nginx_wsgi_ub22.md +0 -146
- acme2certifier-0.41.3/docs/install_rpm.md +0 -110
- acme2certifier-0.41.3/docs/mscertsrv.md +0 -213
- acme2certifier-0.41.3/docs/mswcce.md +0 -183
- acme2certifier-0.41.3/docs/nclm.md +0 -45
- acme2certifier-0.41.3/docs/openssl.md +0 -96
- acme2certifier-0.41.3/docs/openxpki.md +0 -179
- acme2certifier-0.41.3/docs/pkcs7_soap_ca.md +0 -87
- acme2certifier-0.41.3/docs/poll.md +0 -42
- acme2certifier-0.41.3/docs/prevalidated_domainlist.md +0 -95
- acme2certifier-0.41.3/docs/proxy_support.md +0 -50
- acme2certifier-0.41.3/docs/rfc8823_email_identifier.md +0 -88
- acme2certifier-0.41.3/docs/tnauthlist.md +0 -38
- acme2certifier-0.41.3/docs/trigger.md +0 -45
- acme2certifier-0.41.3/docs/upgrading.md +0 -80
- acme2certifier-0.41.3/docs/vault.md +0 -109
- acme2certifier-0.41.3/docs/xca-ca-list.png +0 -0
- acme2certifier-0.41.3/docs/xca.md +0 -135
- acme2certifier-0.41.3/examples/Docker/.env +0 -5
- acme2certifier-0.41.3/examples/Docker/.gitignore +0 -4
- acme2certifier-0.41.3/examples/Docker/README.md +0 -244
- acme2certifier-0.41.3/examples/Docker/docker-compose.yml +0 -20
- acme2certifier-0.41.3/examples/Docker/soap_srv.yml +0 -19
- acme2certifier-0.41.3/examples/acme_srv.db.example +0 -0
- acme2certifier-0.41.3/examples/ca_handler/mscertsrv_ca_handler.py +0 -497
- acme2certifier-0.41.3/examples/ca_handler/mswcce_ca_handler.py +0 -412
- acme2certifier-0.41.3/examples/django/acme2certifier/wsgi.py +0 -18
- acme2certifier-0.41.3/examples/django/manage.py +0 -22
- acme2certifier-0.41.3/examples/trigger/certifier_trigger.sh +0 -25
- acme2certifier-0.41.3/pyproject.toml +0 -50
- acme2certifier-0.41.3/test/test_mswcce_ca_handler.py +0 -1308
- acme2certifier-0.41.3/test/test_nonce.py +0 -143
- acme2certifier-0.41.3/tools/cert_poll.py +0 -42
- acme2certifier-0.41.3/tools/db_update.py +0 -20
- acme2certifier-0.41.3/tools/django_secret_keygen.py +0 -6
- acme2certifier-0.41.3/tools/entrust_mgr.py +0 -96
- acme2certifier-0.41.3/tools/invalidator.py +0 -34
- acme2certifier-0.41.3/tools/mswcce_connection_test.py +0 -26
- acme2certifier-0.41.3/tools/report_generator.py +0 -58
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1}/LICENSE +0 -0
- {acme2certifier-0.41.3/examples/ca_handler → acme2certifier-0.45.dev1/acme2certifier}/__init__.py +0 -0
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1/acme2certifier}/acme_srv/__init__.py +0 -0
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1/acme2certifier}/acme_srv/helpers/__init__.py +0 -0
- {acme2certifier-0.41.3/examples/db_handler → acme2certifier-0.45.dev1/acme2certifier/django_app}/__init__.py +0 -0
- {acme2certifier-0.41.3/examples/django/acme2certifier → acme2certifier-0.45.dev1/acme2certifier/django_app/fixture}/__init__.py +0 -0
- {acme2certifier-0.41.3/examples/hooks → acme2certifier-0.45.dev1/acme2certifier/hookhandlers}/skeleton_hooks.py +0 -0
- {acme2certifier-0.41.3/examples → acme2certifier-0.45.dev1/acme2certifier/share}/nginx/acme2certifier.ini +0 -0
- {acme2certifier-0.41.3/examples → acme2certifier-0.45.dev1/acme2certifier/share}/nginx/acme2certifier.te +0 -0
- {acme2certifier-0.41.3/examples → acme2certifier-0.45.dev1/acme2certifier/share}/nginx/nginx_acme_srv.conf +0 -0
- {acme2certifier-0.41.3/examples → acme2certifier-0.45.dev1/acme2certifier/share}/nginx/nginx_acme_srv_ssl.conf +0 -0
- {acme2certifier-0.41.3/examples → acme2certifier-0.45.dev1/acme2certifier/share}/nginx/uwsgi.service +0 -0
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1}/acme2certifier.egg-info/dependency_links.txt +0 -0
- {acme2certifier-0.41.3 → acme2certifier-0.45.dev1}/setup.cfg +0 -0
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: acme2certifier
|
|
3
|
-
Version: 0.
|
|
3
|
+
Version: 0.45.dev1
|
|
4
4
|
Summary: ACMEv2 server
|
|
5
5
|
Author-email: grindsa <grindelsack@gmail.com>
|
|
6
6
|
License: GNU GENERAL PUBLIC LICENSE
|
|
@@ -692,9 +692,8 @@ License-File: LICENSE
|
|
|
692
692
|
Requires-Dist: setuptools
|
|
693
693
|
Requires-Dist: jwcrypto
|
|
694
694
|
Requires-Dist: cryptography
|
|
695
|
-
Requires-Dist: pyOpenssl
|
|
695
|
+
Requires-Dist: pyOpenssl==26.1.0
|
|
696
696
|
Requires-Dist: dnspython
|
|
697
|
-
Requires-Dist: certsrv[ntlm]
|
|
698
697
|
Requires-Dist: pytz
|
|
699
698
|
Requires-Dist: configparser
|
|
700
699
|
Requires-Dist: python-dateutil
|
|
@@ -706,11 +705,21 @@ Requires-Dist: xmltodict
|
|
|
706
705
|
Requires-Dist: pyasn1
|
|
707
706
|
Requires-Dist: pyasn1_modules
|
|
708
707
|
Requires-Dist: requests_pkcs12
|
|
709
|
-
Requires-Dist: requests_gssapi
|
|
710
|
-
Requires-Dist: gssapi
|
|
711
708
|
Requires-Dist: pyyaml
|
|
712
709
|
Requires-Dist: idna
|
|
713
710
|
Requires-Dist: werkzeug>=3.0.6
|
|
711
|
+
Provides-Extra: gssapi
|
|
712
|
+
Requires-Dist: gssapi; extra == "gssapi"
|
|
713
|
+
Requires-Dist: requests_gssapi; extra == "gssapi"
|
|
714
|
+
Provides-Extra: django
|
|
715
|
+
Requires-Dist: Django; extra == "django"
|
|
716
|
+
Provides-Extra: full
|
|
717
|
+
Requires-Dist: gssapi; extra == "full"
|
|
718
|
+
Requires-Dist: requests_gssapi; extra == "full"
|
|
719
|
+
Requires-Dist: Django; extra == "full"
|
|
720
|
+
Provides-Extra: test
|
|
721
|
+
Requires-Dist: pytest; extra == "test"
|
|
722
|
+
Requires-Dist: pytest-cov; extra == "test"
|
|
714
723
|
Dynamic: license-file
|
|
715
724
|
|
|
716
725
|
<!-- markdownlint-disable MD013 -->
|
|
@@ -743,11 +752,13 @@ The project consists of two main libraries:
|
|
|
743
752
|
| Feature Support | Enrollment (E) | Revocation (R) | [EAB Profiling (P)](docs/eab_profiling.md) |
|
|
744
753
|
| ---------------------------------------------------------------------------------------------------------------------------------------------- | -------------- | -------------- | ------------------------------------------ |
|
|
745
754
|
| [DigiCert® CertCentral](docs/digicert.md) | ✅ | ✅ | ✅ |
|
|
755
|
+
| [Dogtag Certificate System](docs/dogtag.md) | ✅ | ✅ | ✅ |
|
|
746
756
|
| [Entrust ECS Enterprise](docs/entrust.md) | ✅ | ✅ | ✅ |
|
|
747
757
|
| [EJBCA](docs/ejbca.md) | ✅ | ✅ | ✅ |
|
|
748
|
-
| [Generic ACME Handler](docs/acme_ca.md) (LetsEncrypt,
|
|
758
|
+
| [Generic ACME Handler](docs/acme_ca.md) (LetsEncrypt, ZeroSSL) | ✅ | ✅ | ✅ |
|
|
749
759
|
| [Generic CMPv2 Handler](docs/cmp.md) | ✅ | ❌ | ❌ |
|
|
750
760
|
| [Generic EST Handler](docs/est.md) | ✅ | ❌ | ❌ |
|
|
761
|
+
| [FreeIPA](docs/freeipa.md) | ✅ | ✅ | ✅ |
|
|
751
762
|
| [Hashicorp Vault](docs/vault.md) | ✅ | ✅ | ✅ |
|
|
752
763
|
| [Insta ActiveCMS](docs/asa.md) | ✅ | ✅ | ✅ |
|
|
753
764
|
| [Microsoft Certificate Enrollment Web Services](docs/mscertsrv.md) | ✅ | ❌ | ✅ |
|
|
@@ -799,6 +810,7 @@ ______________________________________________________________________
|
|
|
799
810
|
- [RFC 8738](https://www.rfc-editor.org/rfc/rfc8738.html) – **IP Address Certificates**
|
|
800
811
|
- [RFC 8823](https://www.rfc-editor.org/rfc/rfc8823.html) - **Automatic Certificate Management Environment for End-User S/MIME Certificates**
|
|
801
812
|
- [RFC 9773](https://datatracker.ietf.org/doc/rfc9773/) - **ACME Renewal Information (ARI) Extension**
|
|
813
|
+
- [draft-ietf-acme-dns-persist](https://datatracker.ietf.org/doc/draft-ietf-acme-dns-persist/) - **Persistent DNS TXT Record Validation**
|
|
802
814
|
- [ACME Profiles Extension](docs/acme_profiling.md)
|
|
803
815
|
- **TNAuthList identifiers** ([TNAuthList Profile](docs/tnauthlist.md))
|
|
804
816
|
- [RFC 9447 - Automated Certificate Management Environment (ACME) Challenges Using an Authority Token](https://www.rfc-editor.org/rfc/rfc9447)
|
|
@@ -808,7 +820,8 @@ Supported challenge types:
|
|
|
808
820
|
|
|
809
821
|
- [http-01](https://tools.ietf.org/html/rfc8555#section-8.3)
|
|
810
822
|
- [dns-01](https://tools.ietf.org/html/rfc8555#section-8.4)
|
|
811
|
-
- [
|
|
823
|
+
- [dns-persist-01 (experimental)](docs/dns-persist-01.md) — persistent DNS-based authorization and JIT validation (see doc for details)
|
|
824
|
+
- [email-reply-00](docs/rfc8823_email_identifier.md)
|
|
812
825
|
- [tls-alpn-01](https://tools.ietf.org/html/rfc8737)
|
|
813
826
|
- [tkauth-01](https://www.rfc-editor.org/rfc/rfc9447)
|
|
814
827
|
|
|
@@ -822,15 +835,15 @@ ______________________________________________________________________
|
|
|
822
835
|
- **Django project** (allows using alternative databases)
|
|
823
836
|
|
|
824
837
|
The fastest and most convenient way to install acme2certifier is to use docker containers. There are ready made images available at [dockerhub](https://hub.docker.com/r/grindsa/acme2certifier) and [ghcr.io](https://github.com/grindsa?tab=packages&ecosystem=container) as well as [instructions to build your own container](examples/Docker/).
|
|
825
|
-
In addition rpm packages for AlmaLinux/CentOS Stream/Redhat EL 9 and deb packages for Ubuntu
|
|
838
|
+
In addition rpm packages for AlmaLinux/CentOS Stream/Redhat EL 9 and deb packages for Ubuntu 24.04 will be provided with every release. A Python package is also published on [PyPI](https://pypi.org/project/acme2certifier/).
|
|
826
839
|
|
|
827
840
|
Installation guides:
|
|
828
841
|
|
|
842
|
+
- [PyPI + Apache2 WSGI (Ubuntu)](docs/install_apache2_wsgi.md) — recommended for pip installs
|
|
829
843
|
- [RPM Installation (AlmaLinux 9)](docs/install_rpm.md)
|
|
830
|
-
- [DEB Installation (Ubuntu
|
|
844
|
+
- [DEB Installation (Ubuntu 24.04)](docs/install_deb.md)
|
|
831
845
|
- [Docker Build Instructions](examples/Docker/)
|
|
832
|
-
- [
|
|
833
|
-
- [Nginx WSGI Setup (Ubuntu 22.04)](docs/install_nginx_wsgi_ub22.md)
|
|
846
|
+
- [Nginx WSGI Setup (Ubuntu 24.04)](docs/install_nginx_wsgi_ub24.md)
|
|
834
847
|
|
|
835
848
|
## Software Bill Of Material
|
|
836
849
|
|
|
@@ -28,11 +28,13 @@ The project consists of two main libraries:
|
|
|
28
28
|
| Feature Support | Enrollment (E) | Revocation (R) | [EAB Profiling (P)](docs/eab_profiling.md) |
|
|
29
29
|
| ---------------------------------------------------------------------------------------------------------------------------------------------- | -------------- | -------------- | ------------------------------------------ |
|
|
30
30
|
| [DigiCert® CertCentral](docs/digicert.md) | ✅ | ✅ | ✅ |
|
|
31
|
+
| [Dogtag Certificate System](docs/dogtag.md) | ✅ | ✅ | ✅ |
|
|
31
32
|
| [Entrust ECS Enterprise](docs/entrust.md) | ✅ | ✅ | ✅ |
|
|
32
33
|
| [EJBCA](docs/ejbca.md) | ✅ | ✅ | ✅ |
|
|
33
|
-
| [Generic ACME Handler](docs/acme_ca.md) (LetsEncrypt,
|
|
34
|
+
| [Generic ACME Handler](docs/acme_ca.md) (LetsEncrypt, ZeroSSL) | ✅ | ✅ | ✅ |
|
|
34
35
|
| [Generic CMPv2 Handler](docs/cmp.md) | ✅ | ❌ | ❌ |
|
|
35
36
|
| [Generic EST Handler](docs/est.md) | ✅ | ❌ | ❌ |
|
|
37
|
+
| [FreeIPA](docs/freeipa.md) | ✅ | ✅ | ✅ |
|
|
36
38
|
| [Hashicorp Vault](docs/vault.md) | ✅ | ✅ | ✅ |
|
|
37
39
|
| [Insta ActiveCMS](docs/asa.md) | ✅ | ✅ | ✅ |
|
|
38
40
|
| [Microsoft Certificate Enrollment Web Services](docs/mscertsrv.md) | ✅ | ❌ | ✅ |
|
|
@@ -84,6 +86,7 @@ ______________________________________________________________________
|
|
|
84
86
|
- [RFC 8738](https://www.rfc-editor.org/rfc/rfc8738.html) – **IP Address Certificates**
|
|
85
87
|
- [RFC 8823](https://www.rfc-editor.org/rfc/rfc8823.html) - **Automatic Certificate Management Environment for End-User S/MIME Certificates**
|
|
86
88
|
- [RFC 9773](https://datatracker.ietf.org/doc/rfc9773/) - **ACME Renewal Information (ARI) Extension**
|
|
89
|
+
- [draft-ietf-acme-dns-persist](https://datatracker.ietf.org/doc/draft-ietf-acme-dns-persist/) - **Persistent DNS TXT Record Validation**
|
|
87
90
|
- [ACME Profiles Extension](docs/acme_profiling.md)
|
|
88
91
|
- **TNAuthList identifiers** ([TNAuthList Profile](docs/tnauthlist.md))
|
|
89
92
|
- [RFC 9447 - Automated Certificate Management Environment (ACME) Challenges Using an Authority Token](https://www.rfc-editor.org/rfc/rfc9447)
|
|
@@ -93,7 +96,8 @@ Supported challenge types:
|
|
|
93
96
|
|
|
94
97
|
- [http-01](https://tools.ietf.org/html/rfc8555#section-8.3)
|
|
95
98
|
- [dns-01](https://tools.ietf.org/html/rfc8555#section-8.4)
|
|
96
|
-
- [
|
|
99
|
+
- [dns-persist-01 (experimental)](docs/dns-persist-01.md) — persistent DNS-based authorization and JIT validation (see doc for details)
|
|
100
|
+
- [email-reply-00](docs/rfc8823_email_identifier.md)
|
|
97
101
|
- [tls-alpn-01](https://tools.ietf.org/html/rfc8737)
|
|
98
102
|
- [tkauth-01](https://www.rfc-editor.org/rfc/rfc9447)
|
|
99
103
|
|
|
@@ -107,15 +111,15 @@ ______________________________________________________________________
|
|
|
107
111
|
- **Django project** (allows using alternative databases)
|
|
108
112
|
|
|
109
113
|
The fastest and most convenient way to install acme2certifier is to use docker containers. There are ready made images available at [dockerhub](https://hub.docker.com/r/grindsa/acme2certifier) and [ghcr.io](https://github.com/grindsa?tab=packages&ecosystem=container) as well as [instructions to build your own container](examples/Docker/).
|
|
110
|
-
In addition rpm packages for AlmaLinux/CentOS Stream/Redhat EL 9 and deb packages for Ubuntu
|
|
114
|
+
In addition rpm packages for AlmaLinux/CentOS Stream/Redhat EL 9 and deb packages for Ubuntu 24.04 will be provided with every release. A Python package is also published on [PyPI](https://pypi.org/project/acme2certifier/).
|
|
111
115
|
|
|
112
116
|
Installation guides:
|
|
113
117
|
|
|
118
|
+
- [PyPI + Apache2 WSGI (Ubuntu)](docs/install_apache2_wsgi.md) — recommended for pip installs
|
|
114
119
|
- [RPM Installation (AlmaLinux 9)](docs/install_rpm.md)
|
|
115
|
-
- [DEB Installation (Ubuntu
|
|
120
|
+
- [DEB Installation (Ubuntu 24.04)](docs/install_deb.md)
|
|
116
121
|
- [Docker Build Instructions](examples/Docker/)
|
|
117
|
-
- [
|
|
118
|
-
- [Nginx WSGI Setup (Ubuntu 22.04)](docs/install_nginx_wsgi_ub22.md)
|
|
122
|
+
- [Nginx WSGI Setup (Ubuntu 24.04)](docs/install_nginx_wsgi_ub24.md)
|
|
119
123
|
|
|
120
124
|
## Software Bill Of Material
|
|
121
125
|
|
|
@@ -5,7 +5,7 @@ from __future__ import print_function
|
|
|
5
5
|
import json
|
|
6
6
|
from typing import List, Tuple, Dict, Optional
|
|
7
7
|
from dataclasses import dataclass, field
|
|
8
|
-
from acme_srv.helper import (
|
|
8
|
+
from acme2certifier.acme_srv.helper import (
|
|
9
9
|
generate_random_string,
|
|
10
10
|
validate_email,
|
|
11
11
|
date_to_datestr,
|
|
@@ -16,15 +16,10 @@ from acme_srv.helper import (
|
|
|
16
16
|
uts_to_date_utc,
|
|
17
17
|
uts_now,
|
|
18
18
|
)
|
|
19
|
-
from acme_srv.db_handler import DBstore
|
|
20
|
-
from acme_srv.message import Message
|
|
21
|
-
|
|
22
|
-
from acme_srv.signature import Signature
|
|
23
|
-
|
|
24
|
-
# --- ExternalAccountBinding class integrated here ---
|
|
25
|
-
import json
|
|
26
|
-
from acme_srv.helper import b64decode_pad
|
|
19
|
+
from acme2certifier.acme_srv.db_handler import DBstore
|
|
20
|
+
from acme2certifier.acme_srv.message import Message
|
|
27
21
|
|
|
22
|
+
from acme2certifier.acme_srv.signature import Signature
|
|
28
23
|
|
|
29
24
|
DB_ERROR_MSG = "Database error"
|
|
30
25
|
|
|
@@ -59,16 +54,22 @@ class ExternalAccountBinding:
|
|
|
59
54
|
result = False
|
|
60
55
|
if "jwk" in protected:
|
|
61
56
|
jwk_outer = protected["jwk"]
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
):
|
|
67
|
-
result = True
|
|
57
|
+
try:
|
|
58
|
+
jwk_inner = json.loads(b64decode_pad(self.logger, payload))
|
|
59
|
+
except Exception as err:
|
|
60
|
+
self.logger.error("Failed to decode EAB JWK payload: %s", err)
|
|
68
61
|
else:
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
62
|
+
if isinstance(jwk_inner, dict):
|
|
63
|
+
if json.dumps(jwk_outer, sort_keys=True) == json.dumps(
|
|
64
|
+
jwk_inner, sort_keys=True
|
|
65
|
+
):
|
|
66
|
+
result = True
|
|
67
|
+
else:
|
|
68
|
+
self.logger.error("JWK from outer and inner JWS do not match")
|
|
69
|
+
self.logger.debug("outer: %s", jwk_outer)
|
|
70
|
+
self.logger.debug("inner: %s", jwk_inner)
|
|
71
|
+
else:
|
|
72
|
+
self.logger.error("EAB JWK payload is not a JSON object")
|
|
72
73
|
else:
|
|
73
74
|
self.logger.error("No JWK in protected header")
|
|
74
75
|
self.logger.debug("ExternalAccountBinding.compare_jwk() ended with: %s", result)
|
|
@@ -80,7 +81,7 @@ class ExternalAccountBinding:
|
|
|
80
81
|
if content and mac_key:
|
|
81
82
|
signature = Signature(None, self.server_name, self.logger)
|
|
82
83
|
jwk_ = json.dumps({"k": mac_key, "kty": "oct"})
|
|
83
|
-
|
|
84
|
+
sig_check, error = signature.eab_check(json.dumps(content), jwk_)
|
|
84
85
|
else:
|
|
85
86
|
sig_check = False
|
|
86
87
|
error = None
|
|
@@ -101,7 +102,7 @@ class ExternalAccountBinding:
|
|
|
101
102
|
else:
|
|
102
103
|
eab_mac_key = None
|
|
103
104
|
if eab_mac_key:
|
|
104
|
-
|
|
105
|
+
result, error = self.verify_signature(
|
|
105
106
|
payload["externalaccountbinding"], eab_mac_key
|
|
106
107
|
)
|
|
107
108
|
if result:
|
|
@@ -212,6 +213,7 @@ class AccountConfiguration:
|
|
|
212
213
|
inner_header_nonce_allow: bool = False
|
|
213
214
|
tos_url: Optional[str] = None
|
|
214
215
|
eab_check: bool = False
|
|
216
|
+
eab_strict_mode: bool = True
|
|
215
217
|
eab_handler: Optional[object] = None
|
|
216
218
|
path_dic: Dict[str, str] = field(
|
|
217
219
|
default_factory=lambda: {"acct_path": "/acme/acct/"}
|
|
@@ -243,7 +245,7 @@ class Account:
|
|
|
243
245
|
self.config = AccountConfiguration()
|
|
244
246
|
self.err_msg_dic = error_dic_get(self.logger)
|
|
245
247
|
|
|
246
|
-
def __enter__(self)
|
|
248
|
+
def __enter__(self):
|
|
247
249
|
"""Enter the context manager, loading configuration."""
|
|
248
250
|
self._load_configuration()
|
|
249
251
|
return self
|
|
@@ -274,7 +276,14 @@ class Account:
|
|
|
274
276
|
if "EABhandler" in config_dic:
|
|
275
277
|
self.logger.debug("Account._load_configuration(): loading eab_handler")
|
|
276
278
|
self.config.eab_check = True
|
|
277
|
-
|
|
279
|
+
|
|
280
|
+
self.config.eab_strict_mode = config_dic.getboolean(
|
|
281
|
+
"EABhandler", "eab_strict_mode", fallback=True
|
|
282
|
+
)
|
|
283
|
+
if (
|
|
284
|
+
"eab_handler_file" in config_dic["EABhandler"]
|
|
285
|
+
or "eab_handler_module" in config_dic["EABhandler"]
|
|
286
|
+
):
|
|
278
287
|
eab_handler_module = eab_handler_load(self.logger, config_dic)
|
|
279
288
|
if eab_handler_module:
|
|
280
289
|
self.config.eab_handler = eab_handler_module.EABhandler
|
|
@@ -350,6 +359,49 @@ class Account:
|
|
|
350
359
|
self.logger.debug("Account._check_tos() ended with:%s", code)
|
|
351
360
|
return (code, message, detail)
|
|
352
361
|
|
|
362
|
+
def _skip_eab_for_non_strict_mode(self, payload: Dict[str, str]) -> bool:
|
|
363
|
+
"""Return True if EAB checks should be skipped in non-strict mode."""
|
|
364
|
+
return not self.config.eab_strict_mode and not payload.get(
|
|
365
|
+
"externalaccountbinding"
|
|
366
|
+
)
|
|
367
|
+
|
|
368
|
+
def _run_eab_check(
|
|
369
|
+
self, protected: Dict[str, str], payload: Dict[str, str]
|
|
370
|
+
) -> Tuple[int, Optional[str], Optional[str]]:
|
|
371
|
+
"""Run EAB validation when required by current configuration."""
|
|
372
|
+
if not self.config.eab_check:
|
|
373
|
+
return 200, None, None
|
|
374
|
+
|
|
375
|
+
if self._skip_eab_for_non_strict_mode(payload):
|
|
376
|
+
self.logger.debug(
|
|
377
|
+
"Account._create_account() EAB check skipped due to non-strict mode and missing EAB payload"
|
|
378
|
+
)
|
|
379
|
+
return 200, None, None
|
|
380
|
+
|
|
381
|
+
eab_handler = ExternalAccountBinding(
|
|
382
|
+
self.logger, self.config.eab_handler, self.server_name
|
|
383
|
+
)
|
|
384
|
+
return eab_handler.check(protected, payload, self.err_msg_dic)
|
|
385
|
+
|
|
386
|
+
def _get_eab_kid_for_account(
|
|
387
|
+
self, account_name: str, payload: Dict[str, str]
|
|
388
|
+
) -> Optional[str]:
|
|
389
|
+
"""Extract EAB kid for account data when EAB data is provided/required."""
|
|
390
|
+
if not self.config.eab_check:
|
|
391
|
+
return None
|
|
392
|
+
|
|
393
|
+
if self._skip_eab_for_non_strict_mode(payload):
|
|
394
|
+
self.logger.debug(
|
|
395
|
+
"Account._create_account() EAB binding skipped for account %s due to non-strict mode and missing EAB payload",
|
|
396
|
+
account_name,
|
|
397
|
+
)
|
|
398
|
+
return None
|
|
399
|
+
|
|
400
|
+
eab_handler = ExternalAccountBinding(
|
|
401
|
+
self.logger, self.config.eab_handler, self.server_name
|
|
402
|
+
)
|
|
403
|
+
return eab_handler.get_kid(payload["externalaccountbinding"]["protected"])
|
|
404
|
+
|
|
353
405
|
def _create_account(
|
|
354
406
|
self, payload: Dict[str, str], protected: Dict[str, str]
|
|
355
407
|
) -> Tuple[int, str, str]:
|
|
@@ -360,20 +412,13 @@ class Account:
|
|
|
360
412
|
|
|
361
413
|
# tos check
|
|
362
414
|
if self.config.tos_url and not self.config.tos_check_disable:
|
|
363
|
-
|
|
415
|
+
code, message, detail = self._check_tos(payload)
|
|
364
416
|
if code != 200:
|
|
365
417
|
return code, message, detail
|
|
366
418
|
|
|
367
|
-
|
|
368
|
-
if
|
|
369
|
-
|
|
370
|
-
self.logger, self.config.eab_handler, self.server_name
|
|
371
|
-
)
|
|
372
|
-
code, message, detail = eab_handler.check(
|
|
373
|
-
protected, payload, self.err_msg_dic
|
|
374
|
-
)
|
|
375
|
-
if code != 200:
|
|
376
|
-
return code, message, detail
|
|
419
|
+
code, message, detail = self._run_eab_check(protected, payload)
|
|
420
|
+
if code != 200:
|
|
421
|
+
return code, message, detail
|
|
377
422
|
|
|
378
423
|
# Validate contact information
|
|
379
424
|
if not self.config.contact_check_disable:
|
|
@@ -389,15 +434,9 @@ class Account:
|
|
|
389
434
|
contact=contact_list,
|
|
390
435
|
created_at=date_to_datestr(uts_now()),
|
|
391
436
|
)
|
|
392
|
-
|
|
393
|
-
|
|
394
|
-
|
|
395
|
-
)
|
|
396
|
-
eab_kid = eab_handler.get_kid(
|
|
397
|
-
payload["externalaccountbinding"]["protected"]
|
|
398
|
-
)
|
|
399
|
-
if eab_kid:
|
|
400
|
-
account_data.eab_kid = eab_kid
|
|
437
|
+
eab_kid = self._get_eab_kid_for_account(account_name, payload)
|
|
438
|
+
if eab_kid:
|
|
439
|
+
account_data.eab_kid = eab_kid
|
|
401
440
|
|
|
402
441
|
# Add account to database
|
|
403
442
|
return self._add_account_to_db(account_data)
|
|
@@ -421,7 +460,7 @@ class Account:
|
|
|
421
460
|
self, protected: Dict[str, str], payload: Dict[str, str]
|
|
422
461
|
) -> Tuple[int, str, str]:
|
|
423
462
|
"""check onlyreturnexisting"""
|
|
424
|
-
self.logger.debug("Account._onlyreturnexisting(
|
|
463
|
+
self.logger.debug("Account._onlyreturnexisting()")
|
|
425
464
|
|
|
426
465
|
if "onlyreturnexisting" in payload:
|
|
427
466
|
if payload["onlyreturnexisting"]:
|
|
@@ -461,11 +500,19 @@ class Account:
|
|
|
461
500
|
"""Handle account deactivation."""
|
|
462
501
|
self.logger.debug("Account._handle_deactivation(%s)", account_name)
|
|
463
502
|
if payload.get("status", "").lower() == "deactivated":
|
|
503
|
+
account_obj = self._lookup_account_by_name(account_name)
|
|
504
|
+
if not account_obj:
|
|
505
|
+
return self._build_response(
|
|
506
|
+
400,
|
|
507
|
+
self.err_msg_dic["accountdoesnotexist"],
|
|
508
|
+
"Deactivation failed",
|
|
509
|
+
)
|
|
464
510
|
code, message, detail = self._deactivate_account(account_name)
|
|
465
511
|
if code == 200:
|
|
466
|
-
|
|
467
|
-
|
|
468
|
-
return self._build_response(code,
|
|
512
|
+
data = self._build_account_info(account_obj)
|
|
513
|
+
data["status"] = "deactivated"
|
|
514
|
+
return self._build_response(code, account_name, data)
|
|
515
|
+
return self._build_response(code, message, detail)
|
|
469
516
|
else:
|
|
470
517
|
return self._build_response(
|
|
471
518
|
400, self.err_msg_dic["malformed"], "Invalid status for deactivation"
|
|
@@ -645,7 +692,7 @@ class Account:
|
|
|
645
692
|
account_obj = self._lookup_account_by_name(account_name)
|
|
646
693
|
if account_obj:
|
|
647
694
|
data = self._build_account_info(account_obj)
|
|
648
|
-
return self._build_response(200,
|
|
695
|
+
return self._build_response(200, account_name, data)
|
|
649
696
|
return self._build_response(
|
|
650
697
|
400, self.err_msg_dic["accountdoesnotexist"], "Account not found"
|
|
651
698
|
)
|
|
@@ -719,7 +766,11 @@ class Account:
|
|
|
719
766
|
] = f'{self.server_name}{self.config.path_dic["acct_path"]}{message}'
|
|
720
767
|
|
|
721
768
|
# add exernal account binding
|
|
722
|
-
if
|
|
769
|
+
if (
|
|
770
|
+
self.config.eab_check
|
|
771
|
+
and payload
|
|
772
|
+
and "externalaccountbinding" in payload
|
|
773
|
+
):
|
|
723
774
|
response_dic["data"]["externalaccountbinding"] = payload[
|
|
724
775
|
"externalaccountbinding"
|
|
725
776
|
]
|