Send usernumber too
parent
22b937f7ec
commit
b39eceafcb
|
@ -2,7 +2,7 @@
|
||||||
# FILE: admin/user/del
|
# FILE: admin/user/del
|
||||||
# DESCRIPTION: Delete a user
|
# DESCRIPTION: Delete a user
|
||||||
# USAGE: del remote_ip querystring
|
# USAGE: del remote_ip querystring
|
||||||
# QUERYSTRING: ?t=$token&user=$username
|
# QUERYSTRING: ?t=$token&user=$username&un=$usernumber
|
||||||
# ERRORS:
|
# ERRORS:
|
||||||
# 3: bad args/usage
|
# 3: bad args/usage
|
||||||
# 4: Wireguard not installed
|
# 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'
|
<<<"${qs}" grep -qx "t=${saved_token}" || token_fail 'mismatched'
|
||||||
printf '%s token was valid\n' "${ip}" >>"${LOGFILE}"
|
printf '%s token was valid\n' "${ip}" >>"${LOGFILE}"
|
||||||
|
|
||||||
# Check username
|
# Check username and usernumber
|
||||||
username="$(<<<"${qs}" grep -oP 'user=(.*)' | sed 's/^user=//')"
|
username="$(<<<"${qs}" grep -oP 'user=(.*)' | sed 's/^user=//')"
|
||||||
|
|
||||||
|
usernumber="$(<<<"${qs}" grep -oP 'un=(.*)' | sed 's/^un=//')"
|
||||||
if [[ "${username}" == "" ]]; then
|
if [[ "${username}" == "" ]]; then
|
||||||
printf 'ERROR! Username "%s" missing!\n' "${username}" >>"${LOGFILE}"
|
printf 'ERROR! Username missing!\n' | tee -a "${LOGFILE}" | "${LIB_DIR}/http_res" 400
|
||||||
printf 'Username missing!\n' | "${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
|
exit 9
|
||||||
else
|
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
|
fi
|
||||||
|
|
||||||
# Get all peer IPs
|
# Get all peer IPs
|
||||||
|
|
|
@ -195,7 +195,7 @@ function PeerList() {
|
||||||
user = self.userToDelete()
|
user = self.userToDelete()
|
||||||
if (confirm(`Are you sure you want to delete ${user.name}?`)) {
|
if (confirm(`Are you sure you want to delete ${user.name}?`)) {
|
||||||
user.isDeleting(true)
|
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 {
|
try {
|
||||||
const res = await fetch(url, {method: 'DELETE'})
|
const res = await fetch(url, {method: 'DELETE'})
|
||||||
if (res.ok) self.peers.remove(peer)
|
if (res.ok) self.peers.remove(peer)
|
||||||
|
|
Loading…
Reference in New Issue