From afbad0cb509817fe8a561c2d50944356a363675e Mon Sep 17 00:00:00 2001 From: Madzone Date: Fri, 25 Sep 2026 21:14:21 +0200 Subject: [PATCH] EJBCA Update --- EJBCA/finish_ejbca_issuing.py | 97 +++++++++++++++++++++++++++++++++++ 1 file changed, 97 insertions(+) create mode 100644 EJBCA/finish_ejbca_issuing.py diff --git a/EJBCA/finish_ejbca_issuing.py b/EJBCA/finish_ejbca_issuing.py new file mode 100644 index 0000000..5ad38bc --- /dev/null +++ b/EJBCA/finish_ejbca_issuing.py @@ -0,0 +1,97 @@ +#!/usr/bin/env python3 +"""Finish only the verified Issuing migration run; never deploy the app.""" +import importlib.util +import json +import os +from pathlib import Path +import subprocess +import sys + +RUN = Path('/root/ejbca-issuing-migration/run-20260924-163240-49d64d') +DUMP_HASH = '23e989f0c39ee7abc1491833cb37b61827029091e8b5f8aaa8148251f74f83be' + + +def main(): + if os.geteuid() != 0: + raise RuntimeError('Als root auf dem Docker-Host ausfuehren.') + os.umask(0o077) + spec = importlib.util.spec_from_file_location('migration', '/root/migrate_ejbca_issuing.py') + m = importlib.util.module_from_spec(spec) + spec.loader.exec_module(m) + m.WORK = RUN + m.check(m.APP == 'ejbca_issuing' and m.FINAL_DB == 'ejbca_issuing_db', 'Unerwartete Zielnamen.') + for app in (m.APP, m.TEST_APP): + m.check(m.inspect(app)['State']['Status'] == 'exited', app + ' muss gestoppt sein.') + original = json.loads((RUN / 'original.inspect.json').read_text()) + current = m.inspect(m.APP) + for key in ('Id', 'Image', 'Config', 'Mounts', 'HostConfig'): + m.check(current[key] == original[key], 'Originalkonfiguration hat sich geaendert: ' + key) + m.check(current['Image'] == m.EXPECTED_IMAGE, 'Unerwartetes EJBCA-Image.') + image = json.loads(m.docker('image', 'inspect', m.EXPECTED_IMAGE))[0] + m.check(m.EJBCA_IMAGE in image.get('RepoDigests', []), 'EJBCA-Digest fehlt.') + dump = RUN / 'issuing-clean.dump' + m.check(m.digest(dump) == DUMP_HASH, 'Pruefsumme des sauberen Exports stimmt nicht.') + expected = {t: tuple(v) for t, v in json.loads((RUN / 'clean-counts-and-digests.json').read_text()).items()} + m.check(len(expected) == 37 and sum(v[0] for v in expected.values()) == 129, + 'Erwartetes Inventar stimmt nicht.') + m.check(expected['userdatasourcedata'][0] == 0, 'userdatasourcedata muss leer sein.') + m.check(m.snapshot(m.TEST_DB) == expected, 'Saubere Testdatenbank wurde zwischenzeitlich veraendert.') + for line in (RUN / 'original.sha256').read_text().splitlines(): + checksum, name = line.split() + m.check(name in ('original.mv.db', 'original-volume.tar'), 'Unerwarteter Sicherungspfad.') + m.check(m.digest(RUN / name) == checksum, 'Originalsicherung stimmt nicht: ' + name) + url = m.envmap(current['Config'])['DATABASE_JDBC_URL'] + m.check(url.startswith('jdbc:h2:/mnt/persistent/'), 'Quelle ist nicht mehr H2.') + dbfile = url.split(';')[0].removeprefix('jdbc:h2:') + '.mv.db' + checkfile = RUN / 'original-current-check.mv.db' + m.docker('cp', m.APP + ':' + dbfile, str(checkfile)) + checkfile.chmod(0o600) + m.check(m.digest(checkfile) == m.digest(RUN / 'original.mv.db'), 'Original-H2 wurde seit der Sicherung veraendert.') + credentials = json.loads((RUN / 'credentials.private.json').read_text()) + m.FINAL_PASSWORD = credentials['issuing_pg'] + m.check(bool(m.FINAL_PASSWORD), 'Zielpasswort fehlt.') + # Reuse exactly the PostgreSQL image used by the verified test database. + pgimage = json.loads(m.docker('image', 'inspect', m.inspect(m.TEST_DB)['Image']))[0] + m.PG_PIN = next((d for d in pgimage.get('RepoDigests', []) if d.startswith('postgres@')), None) + m.check(m.PG_PIN, 'PostgreSQL-Image-Digest fehlt.') + m.absent('container', [m.FINAL_DB]) + m.absent('network', [m.FINAL_NETWORK]) + m.absent('volume', [m.FINAL_DB_VOLUME, m.FINAL_APP_VOLUME]) + for name in ('docker-compose.issuing.yml', 'docker-compose.database-reference.yml'): + m.check(not (RUN / name).exists(), 'Compose-Datei existiert bereits: ' + name) + print('Vorpruefungen erfolgreich. Neues Issuing-PostgreSQL-Ziel wird erstellt.', flush=True) + m.docker('network', 'create', '--internal', m.FINAL_NETWORK) + m.create_pg(m.FINAL_DB, m.FINAL_DB_VOLUME, m.FINAL_NETWORK, m.FINAL_PASSWORD) + m.docker('exec', '-i', m.FINAL_DB, 'pg_restore', '-U', 'ejbca', '-d', 'ejbcadb', + '--exit-on-error', '--single-transaction', data=dump.read_bytes(), timeout=3600) + m.check(m.snapshot(m.FINAL_DB) == expected, 'Endgueltiges Ziel weicht vom sauberen Stand ab.') + m.check(m.inspect(m.APP)['State']['Status'] == 'exited', 'Original-App wurde gestartet.') + m.copy_volume(m.FINAL_APP_VOLUME) + m.write_compose(original, m.envmap(image['Config'])) + if subprocess.run(['docker', 'compose', 'version'], stdout=subprocess.DEVNULL, + stderr=subprocess.DEVNULL).returncode == 0: + m.docker('compose', '-f', str(RUN / 'docker-compose.issuing.yml'), 'config', '--quiet') + (RUN / 'finish-report.json').write_text(json.dumps({ + 'dump_sha256': DUMP_HASH, 'rows': 129, 'tables': 37, 'valid_additional_indexes': 44, + 'app_deployed': False, 'offline_token': 'ImportedCryptoToken264870329', + 'offline_token_key_tested': False, + 'active_token_key_tests': '5 successful tests reported by operator in chat' + }, indent=2)) + print('OK: Ziel wiederhergestellt und vollstaendig mit dem sauberen Stand verglichen.') + print('Die Issuing-App bleibt gestoppt. Deployment erfolgt anschliessend in Portainer.') + print('\nISSUING-POSTGRESQL-PASSWORT (vertraulich):\n' + m.FINAL_PASSWORD) + print('\nCOMPOSE FUER DEN BESTEHENDEN STACK ejbca-issuing:\n') + print((RUN / 'docker-compose.issuing.yml').read_text()) + print('Die database-reference-Datei NICHT als weiteren Stack deployen.') + print('Passwort und Compose nicht in den Chat posten. Ergebnisverzeichnis: ' + str(RUN)) + + +if __name__ == '__main__': + try: + main() + except (Exception, KeyboardInterrupt) as exc: + # Avoid displaying command outputs or configuration containing secrets. + print('ABBRUCH: ' + (str(exc) if type(exc).__name__ in ('MigrationError', 'RuntimeError') + else type(exc).__name__), file=sys.stderr) + print('Vorhandene Ressourcen bleiben erhalten. Nicht blind erneut starten.', file=sys.stderr) + sys.exit(1)