diff --git a/wile_coyote/acme/nomad_uploader.py b/wile_coyote/acme/nomad_uploader.py index b63ac71c6a6c8fe790cf4e78635aa5418babad7e..823fdf6eef9f6814dec524aa09021e9eeb7b5b68 100644 --- a/wile_coyote/acme/nomad_uploader.py +++ b/wile_coyote/acme/nomad_uploader.py @@ -1,13 +1,12 @@ """Nomad Uploader Options: - provider = ACME Provider (sectigo_ev, sectigo_ov, letsencrypt) + provider = ACME Provider (harica_dv, harica_ov, sectigo_ev, sectigo_ov, letsencrypt) domain = Certificate name project = Nomad Project nomad_env = staging nomad_env wildcard = Wildcard (Bool) """ - import os import tempfile import wile_coyote.tools diff --git a/wile_coyote/acme/uploader.py b/wile_coyote/acme/uploader.py index b30d7d702e87149d64cc63ab602c20d3abe4377f..adf05b95c8f39e2e7e643d32d4e74a10526093a6 100644 --- a/wile_coyote/acme/uploader.py +++ b/wile_coyote/acme/uploader.py @@ -1,7 +1,7 @@ """Certificates Uploader Options: - provider = ACME Provider (sectigo_ev, sectigo_ov, letsencrypt) + provider = ACME Provider (harica_dv, harica_ov, sectigo_ev, sectigo_ov, letsencrypt) domain = Certificate name client = Client that will access the private key unit = Unit, entity or team diff --git a/wile_coyote/acme/wildcard_uploader.py b/wile_coyote/acme/wildcard_uploader.py index c87970690ea3a67b6850d730a66b3bc760e15aa6..0f99cc66e4ea7398ce0ec46005f0ad98ac68c373 100644 --- a/wile_coyote/acme/wildcard_uploader.py +++ b/wile_coyote/acme/wildcard_uploader.py @@ -1,7 +1,7 @@ """Wildcard Uploader Options: - provider = ACME Provider (sectigo_ev, sectigo_ov, letsencrypt) + provider = ACME Provider (harica_dv, harica_ov, sectigo_ev, sectigo_ov, letsencrypt) domain = Certificate name """ diff --git a/wile_coyote/bin/cert2json b/wile_coyote/bin/cert2json index 06d7c33de0a5a29c759c076b30064dffb63af846..b115294e900a6a5392e9c195ba9f5f936f88bccd 100755 --- a/wile_coyote/bin/cert2json +++ b/wile_coyote/bin/cert2json @@ -8,7 +8,7 @@ Usage: Options: -h --help Show this screen - -p PROVIDER --provider=PROVIDER Provider [sectigo_ev | sectigo_ov | letsencrypt| all] + -p PROVIDER --provider=PROVIDER Provider [harica_dv | harica_ov| sectigo_ev | sectigo_ov | letsencrypt| all] """ import json import os @@ -24,13 +24,15 @@ import wile_coyote.tools PROCESSES = 6 WEB_BASE = REDIS_HOST = wile_coyote.tools.WEB_BASE +ACME_PROVIDERS = wile_coyote.tools.ACME_PROVIDERS +ALL_PROVIDERS = ACME_PROVIDERS.append("all") ARGS = docopt(__doc__) PROVIDER = ARGS['--provider'] -if PROVIDER not in ["letsencrypt", "sectigo_ov", "sectigo_ev", "all"]: - print("valid providers are: sectigo_ev, sectigo_ov, letsencrypt, and all") +if PROVIDER not in ALL_PROVIDERS: + print(f"valid providers are: {', '.join(ALL_PROVIDERS)}") os.sys.exit() elif PROVIDER == 'all': - PROVIDERS = ["letsencrypt", "sectigo_ov", "sectigo_ev"] + PROVIDERS = ACME_PROVIDERS else: PROVIDERS = [PROVIDER] @@ -79,7 +81,6 @@ if __name__ == "__main__": pool.close() pool.join() - # sort list of dictionaries by value: https://stackoverflow.com/a/73050/3151187 sorted_certname = sorted(cert_list, key=lambda k: k['certname']) sorted_expired = sorted( cert_list, diff --git a/wile_coyote/common/combine.py b/wile_coyote/common/combine.py index ecf88860b9f3f1f5f6f886ce7a5947bd4a56eb91..e3e95501a738a616d1d8c22b6fb09ad3b97ea0e0 100644 --- a/wile_coyote/common/combine.py +++ b/wile_coyote/common/combine.py @@ -20,6 +20,10 @@ def keys(certpath, provider, keypath, outpath): capath = os.path.join(ssl_dir, "COMODO_EV.crt") elif provider == "letsencrypt": capath = os.path.join(ssl_dir, "LE.crt") + elif provider == "harica_dv": + capath = os.path.join(ssl_dir, "HARICA_DV.crt") + elif provider == "harica_ov": + capath = os.path.join(ssl_dir, "HARICA_OV.crt") else: raise NotImplementedError(f"Provider {provider} not supported") diff --git a/wile_coyote/tools/__init__.py b/wile_coyote/tools/__init__.py index e6c3813845d7ec3ec94bf700dbcc96e0fb3003ec..be34336939dc938b8617470c174a0e9d358a05e3 100644 --- a/wile_coyote/tools/__init__.py +++ b/wile_coyote/tools/__init__.py @@ -1,3 +1,5 @@ +""" This module is a package that contains all the tools used by the wile_coyote package. """ + from ast import literal_eval as l_eval import pkgutil import configparser