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

Quiet all the greps

master
Keith Irwin 2022-09-10 14:29:37 -06:00
parent e4d7140e66
commit 418ba05366
Signed by: ki9
GPG Key ID: DF773B3F4A88DA86
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
back/srv/dashboard/add
View File

@ -45,7 +45,7 @@ token_fail(){
}
saved_token="$(grep "${ip}" "${TOKENS_FILE}" | cut -f2)"
[ "${saved_token}" == "" ] && token_fail 'missing'
<<<"${qs}" grep -x "t=${saved_token}" >/dev/null || token_fail 'mismatched'
<<<"${qs}" grep -qx "t=${saved_token}" || token_fail 'mismatched'
printf '%s token was valid\n' "${ip}" >>"${LOGFILE}"
# Check user
@ -54,7 +54,7 @@ username="$("${LIB_DIR}/ns_lookup_rdns" "${REMOTE_ADDR}" | cut -d'.' -f2)" || (
printf 'User not found' | "${LIB_DIR}/http_res" 403
exit 17
)
printf '%s identified as %s\n' "${ip}" "${username}" >>"${LOGFILE}"
printf '%s identified as %s\n' "${ip}" "${username}" >>"${LOGFILE}"
domain="${hostname}.${username}.${TLD}"
# Check if new peer already exists
@ -75,7 +75,7 @@ ipv6s="$(<<<"${peers}" awk '{print $3}')"
usernumber="$(<<<"${ipv4s}" head -n1 | cut -d'.' -f3)"
# Increment hostnumber from 1 until an unused one is found
used_hostnumbers="$(<<<"${ipv4s}" cut -d'.' -f4 | sort | uniq)"
hostnumber=1; while <<<"${used_hostnumbers}" grep "${hostnumber}"
hostnumber=1; while <<<"${used_hostnumbers}" grep -q "${hostnumber}"
do ((hostnumber++))
done
ipv4="${IPV4_NET%.*.*}.${usernumber}.${hostnumber}"