From 7a8e12f4a57694a663b00b06360c39c687cf97ba Mon Sep 17 00:00:00 2001 From: Evan Pratten Date: Fri, 3 May 2024 11:21:40 -0400 Subject: [PATCH] Migrate most macros to standalone scripts --- configs/shells/bash/macros.sh | 118 +++------------------------------- scripts/genpass | 10 +++ scripts/ssh-sign | 16 +++++ scripts/ssh-verify | 10 +++ scripts/wg-cat | 9 +++ scripts/wg-edit | 9 +++ scripts/wg-restart | 12 ++++ 7 files changed, 75 insertions(+), 109 deletions(-) create mode 100755 scripts/genpass create mode 100644 scripts/ssh-sign create mode 100644 scripts/ssh-verify create mode 100644 scripts/wg-cat create mode 100644 scripts/wg-edit create mode 100644 scripts/wg-restart diff --git a/configs/shells/bash/macros.sh b/configs/shells/bash/macros.sh index d0f0b63..06803b2 100644 --- a/configs/shells/bash/macros.sh +++ b/configs/shells/bash/macros.sh @@ -71,14 +71,6 @@ if [ ! -z "$EWP_IN_GURU_ENVIRONMENT" ]; then alias cd-dev="cd /s/development/epratten" fi -# Kill via pgrep -nkill() { - if [ $# != 1 ]; then - echo "Usage: nkill " - else - kill -9 $(pgrep $1) - fi -} # Makes a directory, then moves into it mkcd() { @@ -121,66 +113,6 @@ extract() { fi } -# Generate a password -genpass() { - if [ $# != 1 ]; then - echo "Usage: genpass " - else - echo $(openssl rand -base64 $1 | tr -d "\n") - fi - -} - -# Sign a file with an SSH key -ssh-sign(){ - if [ $# != 2 ]; then - echo "Usage: ssh-sign " - else - if [ -f $2 ]; then - cat $2 | ssh-keygen -Y sign -f $1 -n file - - else - >&2 echo "File not found: $2" - fi - fi -} - -# Verify a file, using the ~/.ssh/allowed_signers file -ssh-verify(){ - if [ $# != 3 ]; then - echo "Usage: ssh-verify " - else - ssh-keygen -Y verify -f ~/.ssh/allowed_signers -n file -I $1 -s $2 < $3 - fi -} - -# Fully restart a wireguard link -wg-restart() { - if [ $# != 1 ]; then - echo "Usage: wg-restart " - else - wg-quick down $1 || true; - wg-quick up $1 - fi -} - -# Edit a wireguard config file -wg-edit() { - if [ $# != 1 ]; then - echo "Usage: wg-edit " - else - sudoedit /etc/wireguard/$1.conf - fi -} - -# Print a wireguard config file -wg-cat() { - if [ $# != 1 ]; then - echo "Usage: wg-cat " - else - sudo cat /etc/wireguard/$1.conf - fi -} - # Updates ewconfig ewconfig-pull() { cwd=$(pwd) @@ -230,46 +162,14 @@ ewconfig-reinstall() { ewconfig-run sh ./install-$1.sh } -# Define a function to emulate gh -gh-emulated() { - if [ $# != 3 ]; then - echo "You don't have gh installed. Emulating its functionality." - echo "Usage: gh repo clone /" - else - git clone https://github.com/$3 - fi -} - -# Only if `gh` is not installed +# If `gh` is not installed, fake it so that I can save my muscle memory if ! command -v gh &> /dev/null; then - alias gh=gh-emulated + gh() { + if [ $# != 3 ]; then + echo "You don't have gh installed. Emulating its functionality." + echo "Usage: gh repo clone /" + else + git clone https://github.com/$3 + fi + } fi - -# Convert an SVG to a PNG -svg2png() { - if [ $# != 1 ]; then - echo "Usage: svg2png " - else - inkscape -z "$1.png" "$1" --export-type=png - fi -} - -# Get the AS Path to an IP -aspath() { - # There must be at least one argument (cab be more) - if [ $# -lt 1 ]; then - echo "Usage: aspath [args]" - else - mtr $@ -z -rw -c1 -G0.25 | tail -n +3 | awk '{print $2}' | grep -v AS\?\?\? | uniq | cut -c 3- | tr '\n' ',' | sed 's/,/ -> /g' | rev | cut -c 5- | rev - fi -} - -# Get the AS Path to an IP (include unknown hops) -aspath-long() { - # There must be at least one argument (cab be more) - if [ $# -lt 1 ]; then - echo "Usage: aspath-long [args]" - else - mtr $@ -z -rw -c1 -G0.25 | tail -n +3 | awk '{print $2}' | uniq | cut -c 3- | tr '\n' ',' | sed 's/,/ -> /g' | rev | cut -c 5- | rev - fi -} diff --git a/scripts/genpass b/scripts/genpass new file mode 100755 index 0000000..989c74c --- /dev/null +++ b/scripts/genpass @@ -0,0 +1,10 @@ +#! /bin/bash +set -e + +# Check args +if [ $# != 1 ]; then + echo "Usage: genpass " + exit 1 +fi + +echo $(openssl rand -base64 $1 | tr -d "\n") \ No newline at end of file diff --git a/scripts/ssh-sign b/scripts/ssh-sign new file mode 100644 index 0000000..44907db --- /dev/null +++ b/scripts/ssh-sign @@ -0,0 +1,16 @@ +#! /bin/bash +set -e + +# Check args +if [ $# != 2 ]; then + echo "Usage: ssh-sign " + exit 1 +fi + + +if [ -f $2 ]; then + cat $2 | ssh-keygen -Y sign -f $1 -n file - +else + >&2 echo "File not found: $2" + exit 1 +fi diff --git a/scripts/ssh-verify b/scripts/ssh-verify new file mode 100644 index 0000000..a2ae458 --- /dev/null +++ b/scripts/ssh-verify @@ -0,0 +1,10 @@ +#! /bin/bash +# Verify a file, using the ~/.ssh/allowed_signers file +set -e + +# Check args +if [ $# != 3 ]; then + echo "Usage: ssh-verify " +fi + +ssh-keygen -Y verify -f ~/.ssh/allowed_signers -n file -I $1 -s $2 < $3 diff --git a/scripts/wg-cat b/scripts/wg-cat new file mode 100644 index 0000000..d853dc7 --- /dev/null +++ b/scripts/wg-cat @@ -0,0 +1,9 @@ +#! /bin/bash +set -e + +# Check args +if [ $# != 1 ]; then + echo "Usage: wg-cat " +fi + +sudo cat /etc/wireguard/$1.conf diff --git a/scripts/wg-edit b/scripts/wg-edit new file mode 100644 index 0000000..9e9e89f --- /dev/null +++ b/scripts/wg-edit @@ -0,0 +1,9 @@ +#! /bin/bash +set -e + +# Check args +if [ $# != 1 ]; then + echo "Usage: wg-edit " +fi + +sudoedit /etc/wireguard/$1.conf diff --git a/scripts/wg-restart b/scripts/wg-restart new file mode 100644 index 0000000..f125bea --- /dev/null +++ b/scripts/wg-restart @@ -0,0 +1,12 @@ +#! /bin/bash +# Fully restarts a wireguard link +set -e + +# Check args +if [ $# != 1 ]; then + echo "Usage: wg-restart " +fi + +# Its ok if the down command fails +wg-quick down $1 || true; +wg-quick up $1