Skip to content

Commit

Permalink
add suggestions from grische
Browse files Browse the repository at this point in the history
  • Loading branch information
T0biii authored and grische committed Mar 26, 2024
1 parent b45d288 commit 294d565
Showing 1 changed file with 17 additions and 15 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -120,16 +120,16 @@ is_loadbalancing_enabled() {
get_wgkex_data(){
local version="$1"
WGKEX_BROKER="$PROTO://$WGKEX_BROKER_BASE_PATH/api/$version/wg/key/exchange"

logger -p info -t checkuplink "Contacting wgkex broker $WGKEX_BROKER"

if ! WGKEX_DATA=$(force_wan_connection wget -q -O- --post-data='{"domain": "'"$SEGMENT"'","public_key": "'"$PUBLICKEY"'"}' "$WGKEX_BROKER"); then
logger -p err -t checkuplink "Contacting wgkex broker failed, response: $WGKEX_DATA"
exit 1
else
logger -p info -t checkuplink "Got data from wgkex broker: $WGKEX_DATA"
echo $WGKEX_DATA
return 1
fi

logger -p info -t checkuplink "Got data from wgkex broker: $WGKEX_DATA"
echo $WGKEX_DATA

Check warning on line 132 in ffmuc-mesh-vpn-wireguard-vxlan/files/lib/gluon/gluon-mesh-wireguard-vxlan/checkuplink

View workflow job for this annotation

GitHub Actions / runner / shellcheck

[shellcheck] reported by reviewdog 🐶 Double quote to prevent globbing and word splitting. Raw Output: ./ffmuc-mesh-vpn-wireguard-vxlan/files/lib/gluon/gluon-mesh-wireguard-vxlan/checkuplink:132:7: info: Double quote to prevent globbing and word splitting. (ShellCheck.SC2086)

Check failure on line 132 in ffmuc-mesh-vpn-wireguard-vxlan/files/lib/gluon/gluon-mesh-wireguard-vxlan/checkuplink

View workflow job for this annotation

GitHub Actions / runner / shellcheck

[shellcheck (suggestion)] reported by reviewdog 🐶 Raw Output: ffmuc-mesh-vpn-wireguard-vxlan/files/lib/gluon/gluon-mesh-wireguard-vxlan/checkuplink:132:- echo $WGKEX_DATA ffmuc-mesh-vpn-wireguard-vxlan/files/lib/gluon/gluon-mesh-wireguard-vxlan/checkuplink:132:+ echo "$WGKEX_DATA"
}

use_api_v1(){
Expand Down Expand Up @@ -160,16 +160,17 @@ use_api_v2() {
logger -p err -t checkuplink "Parsing wgkex broker data failed"
logger -p info -t checkuplink "Falling back to API v1"
use_api_v1
else
logger -p debug -t checkuplink "Successfully parsed wgkex broker data"
PEER_HOST="$(echo "$data" | sed -n 1p)"
PEER_PORT="$(echo "$data" | sed -n 2p)"
PEER_PUBLICKEY="$(echo "$data" | sed -n 3p)"
PEER_LINKADDRESS=$(echo "$data" | sed -n 4p)

PEER_ADDRESS="$(resolve_host "$PEER_HOST")"
PEER_ENDPOINT="$(combine_ip_port "$PEER_ADDRESS" "$PEER_PORT")"
return
fi

logger -p debug -t checkuplink "Successfully parsed wgkex broker data"
PEER_HOST="$(echo "$data" | sed -n 1p)"
PEER_PORT="$(echo "$data" | sed -n 2p)"
PEER_PUBLICKEY="$(echo "$data" | sed -n 3p)"
PEER_LINKADDRESS=$(echo "$data" | sed -n 4p)

PEER_ADDRESS="$(resolve_host "$PEER_HOST")"
PEER_ENDPOINT="$(combine_ip_port "$PEER_ADDRESS" "$PEER_PORT")"
}


Expand Down Expand Up @@ -276,12 +277,13 @@ WGKEX_BROKER_BASE_PATH="$(get_site_string mesh_vpn.wireguard.broker | sed 's|/ap

if is_loadbalancing_enabled; then
# Use /api/v2, get gateway peer details from broker response
logger -p info -t checkuplink "Loadbalancing enabled."
use_api_v2

else
# Use /api/v1, get gateway peer details from config
logger -p info -t checkuplink "Loadbalancing disabled."
use_api_v1

fi

logger -p info -t checkuplink "Connecting to $PEER_HOST($PEER_ENDPOINT)"
Expand Down

0 comments on commit 294d565

Please sign in to comment.