Client: preserve base64 padding when parsing server key response
This commit is contained in:
@@ -244,11 +244,16 @@ register_peer_on_server() {
|
|||||||
|
|
||||||
SERVER_RESPONSE_RAW="$response"
|
SERVER_RESPONSE_RAW="$response"
|
||||||
|
|
||||||
SERVER_STATUS="$(echo "$response" | awk -F= '/^STATUS=/{print $2; exit}')"
|
kv_get() {
|
||||||
CLIENT_ADDRESS="$(echo "$response" | awk -F= '/^CLIENT_ADDRESS=/{print $2; exit}')"
|
local key="$1"
|
||||||
SERVER_PUBLIC_KEY="$(echo "$response" | awk -F= '/^SERVER_PUBLIC_KEY=/{print $2; exit}')"
|
printf '%s\n' "$response" | sed -n "s/^${key}=//p" | head -n1
|
||||||
SERVER_ENDPOINT="$(echo "$response" | awk -F= '/^SERVER_ENDPOINT=/{print $2; exit}')"
|
}
|
||||||
SERVER_DNS_REMOTE="$(echo "$response" | awk -F= '/^SERVER_DNS=/{print $2; exit}')"
|
|
||||||
|
SERVER_STATUS="$(kv_get STATUS)"
|
||||||
|
CLIENT_ADDRESS="$(kv_get CLIENT_ADDRESS)"
|
||||||
|
SERVER_PUBLIC_KEY="$(kv_get SERVER_PUBLIC_KEY)"
|
||||||
|
SERVER_ENDPOINT="$(kv_get SERVER_ENDPOINT)"
|
||||||
|
SERVER_DNS_REMOTE="$(kv_get SERVER_DNS)"
|
||||||
|
|
||||||
[[ -n "$SERVER_PUBLIC_KEY" ]] || die "Сервер не вернул SERVER_PUBLIC_KEY"
|
[[ -n "$SERVER_PUBLIC_KEY" ]] || die "Сервер не вернул SERVER_PUBLIC_KEY"
|
||||||
[[ -n "$CLIENT_ADDRESS" ]] || die "Сервер не вернул CLIENT_ADDRESS"
|
[[ -n "$CLIENT_ADDRESS" ]] || die "Сервер не вернул CLIENT_ADDRESS"
|
||||||
|
|||||||
Reference in New Issue
Block a user