gf4
/
wagon
2
0
Fork 0
Code Issues 3 Pull Requests Projects Releases Wiki Activity

Tried to fix POST

master
Keith Irwin 2022-09-08 14:39:59 -06:00
parent 397f4b63a5
commit 743fb7a468
Signed by: ki9
GPG Key ID: DF773B3F4A88DA86
2 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
back/srv/dashboard/add
View File

@ -11,7 +11,7 @@
# 8: Invalid token # 8: Invalid token
# 9: Token file not found # 9: Token file not found
# 10: Failed to get peer data from wg # 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 # 12: Servers file doesn't exist
# 15: Failed to add user to local wireguard # 15: Failed to add user to local wireguard
# 16: Failed to add user to federated server # 16: Failed to add user to federated server
@ -85,14 +85,7 @@ privkey="$(/usr/bin/wg genkey)"
pubkey="$(echo $privkey | /usr/bin/wg pubkey)" pubkey="$(echo $privkey | /usr/bin/wg pubkey)"
address="${ipv4}/${IPV4_NET##*/},${ipv6}/${IPV6_NET##*/}" address="${ipv4}/${IPV4_NET##*/},${ipv6}/${IPV6_NET##*/}"
server_blocks='' server_blocks=''
while read -r -a arr; do while IFS=$' ' read -r server_hostname server_ipv4 server_ipv6 server_pubkey server_endpoint server_admin server_secret; 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]}"
server_psk="$(/usr/bin/wg genpsk)" 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" 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}" ] if [ "${server_hostname}" == "${LOCAL_SERVER}" ]

6
back/srv/dashboard/index.cgi
View File

@ -32,12 +32,12 @@ case "${REQUEST_METHOD}" in
;; ;;
# Add peer # Add peer
'POST') ./add "${REMOTE_ADDR}" "${username}" "${QUERY_STRING}" "${POST_DATA}";; 'POST') "./add" "${REMOTE_ADDR}" "${QUERY_STRING}";;
# Delete peer # Delete peer
'DELETE') ./delete "${REMOTE_ADDR}" "${QUERY_STRING}";; 'DELETE') "./delete" "${REMOTE_ADDR}" "${QUERY_STRING}";;
# Bad request # Bad request
*) printf 'Invalid HTTP verb' | "${LIB_DIR}/http_res" 400;; *) printf 'Invalid HTTP verb' | "${LIB_DIR}/http_res" 405;;
esac && exit 0 esac && exit 0