warengroup/wx
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: warengroup:master
Branches Tags
warengroup:master warengroup:develop
..
compare: warengroup:85ec9b80d89cd47148c4c8906a8083e6ac47e615
Branches Tags
warengroup:develop warengroup:master

1 Commits
master ... 85ec9b80d8

Author SHA1 Message Date
Christer Warén
85ec9b80d8 Update SSH Keys Sign feature 2026-01-18 18:55:03 +02:00
6 changed files with 30 additions and 70 deletions
Expand all files Collapse all files

21
src/commands/auth/login.sh
View File

@@ -12,7 +12,7 @@ wx-login(){
elif [[ ! -z ${args['token']} ]] elif [[ ! -z ${args['token']} ]]
then then
AUTH_METHOD=token AUTH_METHOD=token
elif [[ $(wxi-config login read) ]] elif [[ -f "$HOME/.warengroup/config.json" && $(cat $HOME/.warengroup/config.json | jq -r .login.$ORG.token) != 'null' && $(cat $HOME/.warengroup/config.json | jq -r .login.$ORG.token) != '' ]]
then then
AUTH_METHOD=token AUTH_METHOD=token
elif [[ ! -z ${args['username']} ]] elif [[ ! -z ${args['username']} ]]
@@ -66,7 +66,7 @@ wx-login(){
fi fi
TOKEN=$VAULT_LOGIN TOKEN=$VAULT_LOGIN
wxi-config login write wxi-config login
;; ;;
token) token)
echo -n "Token: " echo -n "Token: "
@@ -76,9 +76,9 @@ wx-login(){
then then
TOKEN=${args['token']} TOKEN=${args['token']}
fi fi
elif [[ $(wxi-config login read) ]] elif [[ -f "$HOME/.warengroup/config.json" && $(cat $HOME/.warengroup/config.json | jq -r .login.$ORG.token) != 'null' && $(cat $HOME/.warengroup/config.json | jq -r .login.$ORG.token) != '' ]]
then then
TOKEN=$(wxi-config login read) TOKEN=$(cat $HOME/.warengroup/config.json | jq -r .login.$ORG.token)
else else
read -s TOKEN read -s TOKEN
fi fi
@@ -107,18 +107,13 @@ wx-login(){
then then
wxi-content status "Login" "Failed" wxi-content status "Login" "Failed"
wxi-footer wxi-footer
wx-logout &> /dev/null
if [[ $(wxi-config login read) ]] wx-login
then #wxi-stop
wx-logout &> /dev/null
wx-login
else
wxi-stop
fi
fi fi
TOKEN=$VAULT_LOGIN TOKEN=$VAULT_LOGIN
wxi-config login write wxi-config login
;; ;;
*) *)
wxi-content status "Login Type" "Unsupported" wxi-content status "Login Type" "Unsupported"

3
src/commands/auth/logout.sh
View File

@@ -14,7 +14,8 @@ wx-logout(){
then then
wxi-header "$ORG_HEADER" h3 wxi-header "$ORG_HEADER" h3
echo "Logging Out..." echo "Logging Out..."
wxi-config login erase TOKEN=""
wxi-config login
wxi-footer wxi-footer
fi fi

4
src/commands/infra.sh
View File

@@ -72,12 +72,10 @@ wx-infra(){
else else
host=${args['host']} host=${args['host']}
fi fi
operation=${args['operation']} operation=${args['operation']}
extra_vars=${args['extra-vars']}
wxi-header "Manager" h3 wxi-header "Manager" h3
ansible-playbook $INFRA_VAULT manager.yml --tags $operation --extra-vars "host=$host" --extra-vars="$extra_vars" ansible-playbook $INFRA_VAULT manager.yml --tags $operation --extra-vars "host=$host"
else else
wxi-header "Infra" h3 wxi-header "Infra" h3
host=${args['host']} host=${args['host']}

2
src/commands/ssh/keys/sign.sh
View File

@@ -2,6 +2,8 @@ wxi-ssh-keys-sign(){
wxi-header "SSH / Keys / Sign" wxi-header "SSH / Keys / Sign"
wxi-restricted wxi-restricted
wxi-ssh-keys-sign-create $ORG sysadmin 3600
if [[ $USERNAME == "cwchristerw" ]] if [[ $USERNAME == "cwchristerw" ]]
then then
wxi-ssh-keys-sign-create cwchristerw sysadmin 3600 wxi-ssh-keys-sign-create cwchristerw sysadmin 3600

20
src/functions/config.sh
View File

@@ -1,24 +1,8 @@
wxi-config(){ wxi-config(){
case $1 in case $1 in
login) login)
case $2 in jq '.login.'$ORG'.token = "'$TOKEN'"' $HOME/.warengroup/config.json &> $HOME/.warengroup/config.json.tmp
write) ;;
jq '.login.'$ORG'.token = "'$TOKEN'"' $HOME/.warengroup/config.json &> $HOME/.warengroup/config.json.tmp
;;
read)
if [[ -f "$HOME/.warengroup/config.json" && $(cat $HOME/.warengroup/config.json | jq -r .login.$ORG.token) != 'null' && $(cat $HOME/.warengroup/config.json | jq -r .login.$ORG.token) != '' ]]
then
cat $HOME/.warengroup/config.json | jq -r .login.$ORG.token
else
return 1
fi
;;
erase)
TOKEN=""
wxi-config login write
;;
esac
;;
*) *)
echo -n "" echo -n ""
;; ;;

50
wx
View File

@@ -12,24 +12,8 @@ declare -Ax messages
wxi-config(){ wxi-config(){
case $1 in case $1 in
login) login)
case $2 in jq '.login.'$ORG'.token = "'$TOKEN'"' $HOME/.warengroup/config.json &> $HOME/.warengroup/config.json.tmp
write) ;;
jq '.login.'$ORG'.token = "'$TOKEN'"' $HOME/.warengroup/config.json &> $HOME/.warengroup/config.json.tmp
;;
read)
if [[ -f "$HOME/.warengroup/config.json" && $(cat $HOME/.warengroup/config.json | jq -r .login.$ORG.token) != 'null' && $(cat $HOME/.warengroup/config.json | jq -r .login.$ORG.token) != '' ]]
then
cat $HOME/.warengroup/config.json | jq -r .login.$ORG.token
else
return 1
fi
;;
erase)
TOKEN=""
wxi-config login write
;;
esac
;;
*) *)
echo -n "" echo -n ""
;; ;;
@@ -360,12 +344,10 @@ wx-infra(){
else else
host=${args['host']} host=${args['host']}
fi fi
operation=${args['operation']} operation=${args['operation']}
extra_vars=${args['extra-vars']}
wxi-header "Manager" h3 wxi-header "Manager" h3
ansible-playbook $INFRA_VAULT manager.yml --tags $operation --extra-vars "host=$host" --extra-vars="$extra_vars" ansible-playbook $INFRA_VAULT manager.yml --tags $operation --extra-vars "host=$host"
else else
wxi-header "Infra" h3 wxi-header "Infra" h3
host=${args['host']} host=${args['host']}
@@ -424,7 +406,7 @@ wx-login(){
elif [[ ! -z ${args['token']} ]] elif [[ ! -z ${args['token']} ]]
then then
AUTH_METHOD=token AUTH_METHOD=token
elif [[ $(wxi-config login read) ]] elif [[ -f "$HOME/.warengroup/config.json" && $(cat $HOME/.warengroup/config.json | jq -r .login.$ORG.token) != 'null' && $(cat $HOME/.warengroup/config.json | jq -r .login.$ORG.token) != '' ]]
then then
AUTH_METHOD=token AUTH_METHOD=token
elif [[ ! -z ${args['username']} ]] elif [[ ! -z ${args['username']} ]]
@@ -478,7 +460,7 @@ wx-login(){
fi fi
TOKEN=$VAULT_LOGIN TOKEN=$VAULT_LOGIN
wxi-config login write wxi-config login
;; ;;
token) token)
echo -n "Token: " echo -n "Token: "
@@ -488,9 +470,9 @@ wx-login(){
then then
TOKEN=${args['token']} TOKEN=${args['token']}
fi fi
elif [[ $(wxi-config login read) ]] elif [[ -f "$HOME/.warengroup/config.json" && $(cat $HOME/.warengroup/config.json | jq -r .login.$ORG.token) != 'null' && $(cat $HOME/.warengroup/config.json | jq -r .login.$ORG.token) != '' ]]
then then
TOKEN=$(wxi-config login read) TOKEN=$(cat $HOME/.warengroup/config.json | jq -r .login.$ORG.token)
else else
read -s TOKEN read -s TOKEN
fi fi
@@ -519,18 +501,13 @@ wx-login(){
then then
wxi-content status "Login" "Failed" wxi-content status "Login" "Failed"
wxi-footer wxi-footer
wx-logout &> /dev/null
if [[ $(wxi-config login read) ]] wx-login
then #wxi-stop
wx-logout &> /dev/null
wx-login
else
wxi-stop
fi
fi fi
TOKEN=$VAULT_LOGIN TOKEN=$VAULT_LOGIN
wxi-config login write wxi-config login
;; ;;
*) *)
wxi-content status "Login Type" "Unsupported" wxi-content status "Login Type" "Unsupported"
@@ -576,7 +553,8 @@ wx-logout(){
then then
wxi-header "$ORG_HEADER" h3 wxi-header "$ORG_HEADER" h3
echo "Logging Out..." echo "Logging Out..."
wxi-config login erase TOKEN=""
wxi-config login
wxi-footer wxi-footer
fi fi
@@ -860,6 +838,8 @@ wxi-ssh-keys-sign(){
wxi-header "SSH / Keys / Sign" wxi-header "SSH / Keys / Sign"
wxi-restricted wxi-restricted
wxi-ssh-keys-sign-create $ORG sysadmin 3600
if [[ $USERNAME == "cwchristerw" ]] if [[ $USERNAME == "cwchristerw" ]]
then then
wxi-ssh-keys-sign-create cwchristerw sysadmin 3600 wxi-ssh-keys-sign-create cwchristerw sysadmin 3600