Shut up, grep
parent
8559884328
commit
6fd9a371e2
|
@ -12,7 +12,7 @@ psk="$(<<<"${qs}" grep -oP 'psk=(.*)' | sed 's/^psk=//' | xargs)"
|
||||||
allowedips="$(<<<"${qs}" grep -oP 'ips=(.*)' | sed 's/^ips=//' | xargs)"
|
allowedips="$(<<<"${qs}" grep -oP 'ips=(.*)' | sed 's/^ips=//' | xargs)"
|
||||||
|
|
||||||
# Check that requesting ip is in the servers file
|
# Check that requesting ip is in the servers file
|
||||||
if ! sed '/^#/d' /etc/wgapi/servers | cut -f2,3 | grep -w "${ip}"; then
|
if ! sed '/^#/d' /etc/wgapi/servers | cut -f2,3 | grep -qw "${ip}"; then
|
||||||
printf "ERROR! Federated server %s requested to create new peer but isn't in servers file!/n" "${ip}" >&2
|
printf "ERROR! Federated server %s requested to create new peer but isn't in servers file!/n" "${ip}" >&2
|
||||||
/usr/lib/wgapi/http_res 403; exit
|
/usr/lib/wgapi/http_res 403; exit
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -10,7 +10,7 @@ secret="$(<<<"${qs}" grep -oP 'secret=(.*)' | sed 's/^secret=//' | xargs)"
|
||||||
pubkey="$(<<<"${qs}" grep -oP 'pubkey=(.*)' | sed 's/^pubkey=//' | xargs)"
|
pubkey="$(<<<"${qs}" grep -oP 'pubkey=(.*)' | sed 's/^pubkey=//' | xargs)"
|
||||||
|
|
||||||
# Check that requesting ip is in the servers file
|
# Check that requesting ip is in the servers file
|
||||||
if ! sed '/^#/d' /etc/wgapi/servers | cut -f2,3 | grep -w "${ip}"; then
|
if ! sed '/^#/d' /etc/wgapi/servers | cut -f2,3 | grep -qw "${ip}"; then
|
||||||
printf "ERROR! Federated server %s requested to create new peer but isn't in servers file!/n" "${ip}" >&2
|
printf "ERROR! Federated server %s requested to create new peer but isn't in servers file!/n" "${ip}" >&2
|
||||||
/usr/lib/wgapi/http_res 403; exit
|
/usr/lib/wgapi/http_res 403; exit
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in New Issue