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

Send usernumber too

master
Keith Irwin 2022-11-02 12:28:36 -06:00
parent 22b937f7ec
commit b39eceafcb
Signed by: ki9
GPG Key ID: DF773B3F4A88DA86
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
back/lib/admin/user/del
View File

@ -2,7 +2,7 @@
# FILE: admin/user/del
# DESCRIPTION: Delete a user
# USAGE: del remote_ip querystring
# QUERYSTRING: ?t=$token&user=$username
# QUERYSTRING: ?t=$token&user=$username&un=$usernumber
# ERRORS:
# 3: bad args/usage
# 4: Wireguard not installed
@ -46,14 +46,18 @@ saved_token="$(grep "${ip}" "${TOKENS_FILE}" | cut -f2)"
<<<"${qs}" grep -qx "t=${saved_token}" || token_fail 'mismatched'
printf '%s token was valid\n' "${ip}" >>"${LOGFILE}"
# Check username
# Check username and usernumber
username="$(<<<"${qs}" grep -oP 'user=(.*)' | sed 's/^user=//')"
usernumber="$(<<<"${qs}" grep -oP 'un=(.*)' | sed 's/^un=//')"
if [[ "${username}" == "" ]]; then
printf 'ERROR! Username "%s" missing!\n' "${username}" >>"${LOGFILE}"
printf 'Username missing!\n' | "${LIB_DIR}/http_res" 400
printf 'ERROR! Username missing!\n' | tee -a "${LOGFILE}" | "${LIB_DIR}/http_res" 400
exit 9
elif [[ "${usernumber}" == "" ]]; then
printf 'ERROR! Usernumber missing!\n' | tee -a "${LOGFILE}" |"${LIB_DIR}/http_res" 400
exit 9
else
printf 'Admin %s requested deletion of user "%s"\n' "${ip}" "${username}" >>"${LOGFILE}"
printf 'Admin %s requested deletion of user "%s" with usernumber "%s"\n' "${ip}" "${username}" "${usernumber}" >>"${LOGFILE}"
fi
# Get all peer IPs

2
front/admin.js
View File

@ -195,7 +195,7 @@ function PeerList() {
user = self.userToDelete()
if (confirm(`Are you sure you want to delete ${user.name}?`)) {
user.isDeleting(true)
const url = `${API_URL}/user?t=${self.token()}&user=${user.name}`
const url = `${API_URL}/user?t=${self.token()}&user=${user.name}&un=${user.number}`
try {
const res = await fetch(url, {method: 'DELETE'})
if (res.ok) self.peers.remove(peer)