From 743fb7a46857b6c40d66a81abdc9043cd92ccbef Mon Sep 17 00:00:00 2001 From: Keith Irwin Date: Thu, 8 Sep 2022 14:39:59 -0600 Subject: [PATCH] Tried to fix POST --- back/srv/dashboard/add | 11 ++--------- back/srv/dashboard/index.cgi | 6 +++--- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/back/srv/dashboard/add b/back/srv/dashboard/add index 0838d13..91598e8 100755 --- a/back/srv/dashboard/add +++ b/back/srv/dashboard/add @@ -11,7 +11,7 @@ # 8: Invalid token # 9: Token file not found # 10: Failed to get peer data from wg -# 11: Failed to create new IPs +# 11: Failed to generate new IPs # 12: Servers file doesn't exist # 15: Failed to add user to local wireguard # 16: Failed to add user to federated server @@ -85,14 +85,7 @@ privkey="$(/usr/bin/wg genkey)" pubkey="$(echo $privkey | /usr/bin/wg pubkey)" address="${ipv4}/${IPV4_NET##*/},${ipv6}/${IPV6_NET##*/}" server_blocks='' -while read -r -a arr; do - server_hostname="${arr[0]}" - server_ipv4="${arr[1]}" - server_ipv6="${arr[2]}" - server_pubkey="${arr[3]}" - server_endpoint="${arr[4]}" - server_admin="${arr[5]}" - server_secret="${arr[6]}" +while IFS=$' ' read -r server_hostname server_ipv4 server_ipv6 server_pubkey server_endpoint server_admin server_secret; do server_psk="$(/usr/bin/wg genpsk)" server_blocks="${server_blocks}\n[Peer] # ${server_hostname}.${TLD}\nPublicKey=${server_pubkey}\nPresharedKey=${server_psk}\nAllowedIPs=${server_ipv4}/32,${server_ipv6}/128\nEndpoint=${server_endpoint}\n" if [ "${server_hostname}" == "${LOCAL_SERVER}" ] diff --git a/back/srv/dashboard/index.cgi b/back/srv/dashboard/index.cgi index f6d8f59..d231c78 100755 --- a/back/srv/dashboard/index.cgi +++ b/back/srv/dashboard/index.cgi @@ -32,12 +32,12 @@ case "${REQUEST_METHOD}" in ;; # Add peer - 'POST') ./add "${REMOTE_ADDR}" "${username}" "${QUERY_STRING}" "${POST_DATA}";; + 'POST') "./add" "${REMOTE_ADDR}" "${QUERY_STRING}";; # Delete peer - 'DELETE') ./delete "${REMOTE_ADDR}" "${QUERY_STRING}";; + 'DELETE') "./delete" "${REMOTE_ADDR}" "${QUERY_STRING}";; # Bad request - *) printf 'Invalid HTTP verb' | "${LIB_DIR}/http_res" 400;; + *) printf 'Invalid HTTP verb' | "${LIB_DIR}/http_res" 405;; esac && exit 0 \ No newline at end of file