github-personal/firezone
1
0
Fork 0
mirror of https://github.com/outbackdingo/firezone.git synced 2026-01-27 10:18:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(portal): use []:53 for ipv6 addresses (#10883)

Browse Source 
connlib expects the following format for IP addresses:

- ipv4:port
- ipv6
- \[ipv6]:port

When storing the clients_upstream_dns values from the form in the admin
portal, we do not add brackets to IPv6 addresses, so URI.parse thinks
the address contains a port and strips the trailing `:` off.

We then sent these invalid IPs down to connlib which causes a
deserialization error.

To fix, we simply ensure IPs sent to connlib adhere to one of the
formats above.

Related: #10851
This commit is contained in:
Jamil
2025-11-14 06:16:04 -10:00
committed by GitHub
parent ba1b81ced0
commit 12f3f53d45
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
elixir/apps/api/lib/api/client/views/interface.ex
View File

@@ -10,16 +10,14 @@ defmodule API.Client.Views.Interface do
upstream_dns =
clients_upstream_dns
|> Enum.map(fn %{address: address} = dns_config ->
ip = URI.parse("//" <> address).host
ip = if String.contains?(address, ":"), do: "[#{address}]", else: address
Map.from_struct(%{dns_config | address: "#{ip}:53"})
end)
# new field - no port
upstream_do53 =
clients_upstream_dns
|> Enum.map(fn %{address: address} ->
%{ip: URI.parse("//" <> address).host}
end)
|> Enum.map(fn %{address: address} -> %{ip: address} end)
%{
search_domain: client.account.config.search_domain,

5
elixir/apps/api/test/api/client/channel_test.exs
View File

@@ -8,6 +8,7 @@ defmodule API.Client.ChannelTest do
Fixtures.Accounts.create_account(
config: %{
clients_upstream_dns: [
%{protocol: "ip_port", address: "1:2:3:4:5:6:7:8"},
%{protocol: "ip_port", address: "1.1.1.1"},
%{protocol: "ip_port", address: "8.8.8.8"}
],
@@ -348,10 +349,12 @@ defmodule API.Client.ChannelTest do
ipv4: client.ipv4,
ipv6: client.ipv6,
upstream_dns: [
%{address: "[1:2:3:4:5:6:7:8]:53", protocol: :ip_port},
%{protocol: :ip_port, address: "1.1.1.1:53"},
%{protocol: :ip_port, address: "8.8.8.8:53"}
],
upstream_do53: [
%{ip: "1:2:3:4:5:6:7:8"},
%{ip: "1.1.1.1"},
%{ip: "8.8.8.8"}
],
@@ -912,10 +915,12 @@ defmodule API.Client.ChannelTest do
ipv6: client.ipv6,
search_domain: "new.example.com",
upstream_dns: [
%{address: "[1:2:3:4:5:6:7:8]:53", protocol: :ip_port},
%{address: "1.1.1.1:53", protocol: :ip_port},
%{address: "8.8.8.8:53", protocol: :ip_port}
],
upstream_do53: [
%{ip: "1:2:3:4:5:6:7:8"},
%{ip: "1.1.1.1"},
%{ip: "8.8.8.8"}
],