fix config parsing in manifests, remove module level configs

This commit is contained in:
erinhmclark
2025-01-24 13:33:12 +00:00
parent 0453d95f56
commit 024fe58377
16 changed files with 23 additions and 191 deletions

View File

@@ -15,13 +15,28 @@
"configs": {
"tsa_urls": {
"default": [
"http://timestamp.digicert.com",
"http://timestamp.identrust.com",
"http://timestamp.globalsign.com/tsa/r6advanced1",
"http://tss.accv.es:8318/tsa"
],
# [Adobe Approved Trust List] and [Windows Cert Store]
"http://timestamp.digicert.com",
"http://timestamp.identrust.com",
# "https://timestamp.entrust.net/TSS/RFC3161sha2TS", # not valid for timestamping
# "https://timestamp.sectigo.com", # wait 15 seconds between each request.
# [Adobe: European Union Trusted Lists].
# "https://timestamp.sectigo.com/qualified", # wait 15 seconds between each request.
# [Windows Cert Store]
"http://timestamp.globalsign.com/tsa/r6advanced1",
# [Adobe: European Union Trusted Lists] and [Windows Cert Store]
# "http://ts.quovadisglobal.com/eu", # not valid for timestamping
# "http://tsa.belgium.be/connect", # self-signed certificate in certificate chain
# "https://timestamp.aped.gov.gr/qtss", # self-signed certificate in certificate chain
# "http://tsa.sep.bg", # self-signed certificate in certificate chain
# "http://tsa.izenpe.com", #unable to get local issuer certificate
# "http://kstamp.keynectis.com/KSign", # unable to get local issuer certificate
"http://tss.accv.es:8318/tsa",
],
"help": "List of RFC3161 Time Stamp Authorities to use, separate with commas if passed via the command line.",
"type": auto_archiver.utils.parse_csv_to_set,
"type": "auto_archiver.utils.parse_csv_to_set",
}
},
"description": """

View File

@@ -26,37 +26,6 @@ class TimestampingEnricher(Enricher):
def __init__(self, config: dict) -> None:
super().__init__(config)
# @staticmethod
# def configs() -> dict:
# return {
# "tsa_urls": {
# "default": [
# # [Adobe Approved Trust List] and [Windows Cert Store]
# "http://timestamp.digicert.com",
# "http://timestamp.identrust.com",
# # "https://timestamp.entrust.net/TSS/RFC3161sha2TS", # not valid for timestamping
# # "https://timestamp.sectigo.com", # wait 15 seconds between each request.
#
# # [Adobe: European Union Trusted Lists].
# # "https://timestamp.sectigo.com/qualified", # wait 15 seconds between each request.
#
# # [Windows Cert Store]
# "http://timestamp.globalsign.com/tsa/r6advanced1",
#
# # [Adobe: European Union Trusted Lists] and [Windows Cert Store]
# # "http://ts.quovadisglobal.com/eu", # not valid for timestamping
# # "http://tsa.belgium.be/connect", # self-signed certificate in certificate chain
# # "https://timestamp.aped.gov.gr/qtss", # self-signed certificate in certificate chain
# # "http://tsa.sep.bg", # self-signed certificate in certificate chain
# # "http://tsa.izenpe.com", #unable to get local issuer certificate
# # "http://kstamp.keynectis.com/KSign", # unable to get local issuer certificate
# "http://tss.accv.es:8318/tsa",
# ],
# "help": "List of RFC3161 Time Stamp Authorities to use, separate with commas if passed via the command line.",
# "cli_set": lambda cli_val, cur_val: set(cli_val.split(","))
# }
# }
def enrich(self, to_enrich: Metadata) -> None:
url = to_enrich.get_url()
logger.debug(f"RFC3161 timestamping existing files for {url=}")