From 95b0fa0813506ab4464f7e567fc7e000497fd5cc Mon Sep 17 00:00:00 2001 From: GotthardG <51994228+GotthardG@users.noreply.github.com> Date: Mon, 8 Jun 2026 11:24:19 +0200 Subject: [PATCH] tellupdater.py spreadsheetupdater.py and aaredb.py to use dynamic beamline certificates based on the beamline name --- src/aare/daq/aaredb.py | 5 +++-- src/aare/daq/spreadsheetupdater.py | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/aare/daq/aaredb.py b/src/aare/daq/aaredb.py index a2a9c5d8..0a995cea 100644 --- a/src/aare/daq/aaredb.py +++ b/src/aare/daq/aaredb.py @@ -57,8 +57,9 @@ class AareWrapper: configuration.ssl_ca_cert = "/etc/ssl/certs/secrets/mx-aaredb-dmz-01_Full_Chain_CA.pem" # 2. Present Machine Identity (The certs that worked in curl) - configuration.cert_file = "/etc/ssl/certs/secrets/mx-x10sa-queue-01_from_dmz-01.crt" - configuration.key_file = "/etc/ssl/certs/secrets/mx-x10sa-queue-01_from_dmz-01.key" + beamline_name = bl.value.lower() + configuration.cert_file = f"/etc/ssl/certs/secrets/mx-{beamline_name}-queue-01_from_dmz-01.crt" + configuration.key_file = f"/etc/ssl/certs/secrets/mx-{beamline_name}-queue-01_from_dmz-01.key" # 3. Initialize the Client with this config self.client = aareDB.ApiClient(configuration) diff --git a/src/aare/daq/spreadsheetupdater.py b/src/aare/daq/spreadsheetupdater.py index 2961e0e9..02ffeb4c 100644 --- a/src/aare/daq/spreadsheetupdater.py +++ b/src/aare/daq/spreadsheetupdater.py @@ -138,9 +138,10 @@ def main(): # FORCE a clean context context = ssl.create_default_context(ssl.Purpose.SERVER_AUTH) context.load_verify_locations(cafile="/etc/ssl/certs/secrets/mx-aaredb-dmz-01_Full_Chain_CA.pem") + beamline_name = beamline.value.lower() context.load_cert_chain( - certfile="/etc/ssl/certs/secrets/mx-x10sa-queue-01_from_dmz-01.crt", - keyfile="/etc/ssl/certs/secrets/mx-x10sa-queue-01_from_dmz-01.key" + certfile=f"/etc/ssl/certs/secrets/mx-{beamline_name}-queue-01_from_dmz-01.crt", + keyfile=f"/etc/ssl/certs/secrets/mx-{beamline_name}-queue-01_from_dmz-01.key" ) # Explicitly set the SNI hostname to match NGINX server_name