From 9c4d0496ac8d5146c282136ad73816f971ac5af8 Mon Sep 17 00:00:00 2001 From: LArkema Date: Sun, 18 Aug 2024 17:00:32 -0700 Subject: [PATCH] Properly fix update-fingerprints action --- .github/workflows/update-fingerprints.yml | 19 ++++++++++--------- DCTransistor-Bidirectional/config.h | 6 +++--- DCTransistor/config.h | 6 +++--- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/.github/workflows/update-fingerprints.yml b/.github/workflows/update-fingerprints.yml index 3a3ffaa..91936a7 100644 --- a/.github/workflows/update-fingerprints.yml +++ b/.github/workflows/update-fingerprints.yml @@ -28,18 +28,19 @@ jobs: echo | openssl s_client -showcerts -servername $1-connect $1:443 2>/dev/null | openssl x509 -inform pem -fingerprint -sha1 | head -n 1 | cut -d '=' -f 2 | sed "s/:/ /g"; } - WMATA_SERVER=$(grep WMATA_ENDPOINT $CONFIG_FILE | cut -d '/' -f 3) - UPDATE_SERVER=$(grep UPDATE_HOST $CONFIG_FILE | cut -d '"' -f 2) - GITHUB_SERVER=$(grep LATEST_VERSION_URL $CONFIG_FILE | cut -d '/' -f 3) - GIS_SERVER=$(grep GIS_CONFIG_ENDPOING $CONFIG_FILE | cut -d '/' -f 3) - GIS_SERVICES_SERVER=$(grep GIS_TRAIN_LOC_ENDPOINT $CONFIG_FILE | cut -d '/' -f 3) - - server_array=($DATA_SERVER $UPDATE_SERVER $GITHUB_SERVER $GIS_SERVER $GIS_SERVICES_SERVER) - + WMATA_SERVER=$(grep WMATA_ENDPOINT $CONFIG_FILE | head -n 1 | cut -d '/' -f 3) + UPDATE_SERVER=$(grep UPDATE_HOST $CONFIG_FILE | head -n 1 | cut -d '"' -f 2) + GITHUB_SERVER=$(grep LATEST_VERSION_URL $CONFIG_FILE | head -n 1 | cut -d '/' -f 3) + GIS_SERVER=$(grep GIS_CONFIG_ENDPOINT $CONFIG_FILE | head -n 1 | cut -d '/' -f 3) + GIS_SERVICES_SERVER=$(grep GIS_TRAIN_LOC_ENDPOINT $CONFIG_FILE | head -n 1 | cut -d '/' -f 3) + + server_array=( $WMATA_SERVER $UPDATE_SERVER $GITHUB_SERVER $GIS_SERVER $GIS_SERVICES_SERVER ) + for server in ${server_array[@]}; do + fingerprint_var=$(echo ${server}_fingerprint | sed 's/\./_/g' ) fingerprint_var=${fingerprint_var^^} - conf_string=$(grep $fingerprint_var $CONFIG_FILE | cut -d '#' -f 2) + conf_string=$(grep $fingerprint_var $CONFIG_FILE | head -n 1 | cut -d '#' -f 2) cur_fingerprint=$(get_current_fingerprint $server) new_conf_string=$(echo -n "define ${fingerprint_var} \""${cur_fingerprint}"\"") diff --git a/DCTransistor-Bidirectional/config.h b/DCTransistor-Bidirectional/config.h index e7f484e..1b84c9f 100644 --- a/DCTransistor-Bidirectional/config.h +++ b/DCTransistor-Bidirectional/config.h @@ -99,9 +99,9 @@ const uint32_t SPECIAL_TRAIN_HEX[SPECIAL_TRAIN_HEX_COUNT] = {RD_HEX_COLOR, SV_HE //Web server certificate SHA1 fingerprints for TLS connections. Updated daily by update-fingerprints action -#define GITHUB_COM_FINGERPRINT "A3 B5 9E 5F E8 84 EE 1F 34 D9 8E EF 85 8E 3F B6 62 AC 10 4A" -#define RAW_GITHUBUSERCONTENT_COM_FINGERPRINT "A1 46 14 C7 2A 1D 52 79 F6 AA 2B B2 C5 0A 3B D3 F5 02 06 75" -#define API_WMATA_COM_FINGERPRINT "99 E2 96 23 71 DD 13 88 D0 5F 0B 72 2C FA 69 87 7A 8C 1F 40" +#define GITHUB_COM_FINGERPRINT "E7 03 5B CC 1C 18 77 1F 79 2F 90 86 6B 6C 1D F8 DF AA BD C0" +#define RAW_GITHUBUSERCONTENT_COM_FINGERPRINT "97 D8 C5 70 0F 12 24 6C 88 BC FA 06 7E 8C A7 4D A8 62 67 28" +#define API_WMATA_COM_FINGERPRINT "EB F7 11 3D 6B 1F 5E 55 93 15 85 1B 27 22 59 F6 91 12 F0 4F" #define GIS_WMATA_COM_FINGERPRINT "18 8B 85 55 50 B3 DD 75 3A 5A B9 D5 E4 BC E4 07 4D D9 E1 48" #define GISSERVICES_WMATA_COM_FINGERPRINT "18 8B 85 55 50 B3 DD 75 3A 5A B9 D5 E4 BC E4 07 4D D9 E1 48" diff --git a/DCTransistor/config.h b/DCTransistor/config.h index 82f835f..90cd511 100644 --- a/DCTransistor/config.h +++ b/DCTransistor/config.h @@ -97,9 +97,9 @@ const uint32_t SPECIAL_TRAIN_HEX[SPECIAL_TRAIN_HEX_COUNT] = {RD_HEX_COLOR, SV_HE //Web server certificate SHA1 fingerprints for TLS connections. Updated daily by update-fingerprints action -#define GITHUB_COM_FINGERPRINT "A3 B5 9E 5F E8 84 EE 1F 34 D9 8E EF 85 8E 3F B6 62 AC 10 4A" -#define RAW_GITHUBUSERCONTENT_COM_FINGERPRINT "A1 46 14 C7 2A 1D 52 79 F6 AA 2B B2 C5 0A 3B D3 F5 02 06 75" -#define API_WMATA_COM_FINGERPRINT "99 E2 96 23 71 DD 13 88 D0 5F 0B 72 2C FA 69 87 7A 8C 1F 40" +#define GITHUB_COM_FINGERPRINT "E7 03 5B CC 1C 18 77 1F 79 2F 90 86 6B 6C 1D F8 DF AA BD C0" +#define RAW_GITHUBUSERCONTENT_COM_FINGERPRINT "97 D8 C5 70 0F 12 24 6C 88 BC FA 06 7E 8C A7 4D A8 62 67 28" +#define API_WMATA_COM_FINGERPRINT "EB F7 11 3D 6B 1F 5E 55 93 15 85 1B 27 22 59 F6 91 12 F0 4F" #define GIS_WMATA_COM_FINGERPRINT "18 8B 85 55 50 B3 DD 75 3A 5A B9 D5 E4 BC E4 07 4D D9 E1 48" #define GISSERVICES_WMATA_COM_FINGERPRINT "18 8B 85 55 50 B3 DD 75 3A 5A B9 D5 E4 BC E4 07 4D D9 E1 48"