From c17b9a0e42251f41192c53692d2a4827407b15b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christer=20War=C3=A9n?= Date: Sat, 10 May 2025 12:09:50 +0300 Subject: [PATCH] Code Update --- src/commands/ssh/config.sh | 9 +++++++-- wx | 9 +++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/commands/ssh/config.sh b/src/commands/ssh/config.sh index 2a05222..33a0f34 100644 --- a/src/commands/ssh/config.sh +++ b/src/commands/ssh/config.sh @@ -41,8 +41,13 @@ wx-ssh-config-sync(){ VAULT_STATUS=$(curl -s -o /dev/null -w "%{http_code}" https://$VAULT_DOMAIN/v1/cli/data/$USERNAME/settings/ssh/config -X GET --header "X-Vault-Token: ${config["login",$ORG]}") if [[ $VAULT_STATUS -eq 200 ]] then - echo $(curl https://$VAULT_DOMAIN/v1/cli/data/$USERNAME/settings/ssh/config -X GET --header "X-Vault-Token: ${config["login",$ORG]}" -s | jq -r '.data.data.data') | base64 -d > ~/.ssh/config 2>&1 - chmod 700 ~/.ssh/config + SSH1_CONFIG_MD5=$(curl https://$VAULT_DOMAIN/v1/cli/data/$USERNAME/settings/ssh/config -X GET --header "X-Vault-Token: ${config["login",$ORG]}" -s | jq -r '.data.data.data' | base64 -d | md5sum | base64) + SSH2_CONFIG_MD5=$(cat ~/.ssh/config | md5sum | base64) + if [[ $SSH1_CONFIG_MD5 != $SSH2_CONFIG_MD5 ]] + then + echo $(curl https://$VAULT_DOMAIN/v1/cli/data/$USERNAME/settings/ssh/config -X GET --header "X-Vault-Token: ${config["login",$ORG]}" -s | jq -r '.data.data.data') | base64 -d > ~/.ssh/config 2>&1 + chmod 700 ~/.ssh/config + fi fi } diff --git a/wx b/wx index 87059a5..c6f96d6 100755 --- a/wx +++ b/wx @@ -512,8 +512,13 @@ wx-ssh-config-sync(){ VAULT_STATUS=$(curl -s -o /dev/null -w "%{http_code}" https://$VAULT_DOMAIN/v1/cli/data/$USERNAME/settings/ssh/config -X GET --header "X-Vault-Token: ${config["login",$ORG]}") if [[ $VAULT_STATUS -eq 200 ]] then - echo $(curl https://$VAULT_DOMAIN/v1/cli/data/$USERNAME/settings/ssh/config -X GET --header "X-Vault-Token: ${config["login",$ORG]}" -s | jq -r '.data.data.data') | base64 -d > ~/.ssh/config 2>&1 - chmod 700 ~/.ssh/config + SSH1_CONFIG_MD5=$(curl https://$VAULT_DOMAIN/v1/cli/data/$USERNAME/settings/ssh/config -X GET --header "X-Vault-Token: ${config["login",$ORG]}" -s | jq -r '.data.data.data' | base64 -d | md5sum | base64) + SSH2_CONFIG_MD5=$(cat ~/.ssh/config | md5sum | base64) + if [[ $SSH1_CONFIG_MD5 != $SSH2_CONFIG_MD5 ]] + then + echo $(curl https://$VAULT_DOMAIN/v1/cli/data/$USERNAME/settings/ssh/config -X GET --header "X-Vault-Token: ${config["login",$ORG]}" -s | jq -r '.data.data.data') | base64 -d > ~/.ssh/config 2>&1 + chmod 700 ~/.ssh/config + fi fi }