diff options
| author | Nguyễn Gia Phong <cnx@loang.net> | 2025-05-26 23:17:58 +0900 |
|---|---|---|
| committer | Nguyễn Gia Phong <cnx@loang.net> | 2025-05-26 23:17:58 +0900 |
| commit | 053b6da35753267456a167bfa84b955781b7d986 (patch) | |
| tree | 0551099003a43918ae523c907b89f05137f76f4c | |
| parent | 56a032568443bdf85dd37df5f6716b3475626d6a (diff) | |
| download | scadere-053b6da35753267456a167bfa84b955781b7d986.tar.gz | |
Stop treating empty CA name specially
| -rw-r--r-- | src/scadere/check.py | 2 | ||||
| -rw-r--r-- | src/scadere/listen.py | 2 | ||||
| -rw-r--r-- | tst/test_listen.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/scadere/check.py b/src/scadere/check.py index a042b9a..a0ca24e 100644 --- a/src/scadere/check.py +++ b/src/scadere/check.py @@ -52,5 +52,5 @@ def check(netlocs, after, output): print(not_before.isoformat(), not_after.isoformat(), # As unique identifier hostname, port, cert['serialNumber'], - base64(ca.encode()).decode() or '\0', + base64(ca.encode()).decode(), file=output) diff --git a/src/scadere/listen.py b/src/scadere/listen.py index 0777f4a..c9801a5 100644 --- a/src/scadere/listen.py +++ b/src/scadere/listen.py @@ -82,7 +82,7 @@ def xml(tree, parent=None): async def handle(certs, base_url, reader, writer): """Handle HTTP request.""" - summaries = tuple(cert.rstrip().split(maxsplit=5) + summaries = tuple(cert.rstrip('\r\n').split(' ', maxsplit=5) for cert in certs.read_text().splitlines()) lookup = {urlsplit(urljoin(base_url, path(hostname, port, issuer, serial))).path: diff --git a/tst/test_listen.py b/tst/test_listen.py index f35ce82..8004380 100644 --- a/tst/test_listen.py +++ b/tst/test_listen.py @@ -118,7 +118,7 @@ def certificates(draw): hostname = draw(domains()) port = draw(ports()) serial = draw(serials()) - issuer = draw(ca_names()) or '\0' + issuer = draw(ca_names()) return f'{not_before} {not_after} {hostname} {port} {serial} {issuer}' |