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

Update API Upstream DNS address encoding (#2534)

Browse Source 
Why:

* The portal was not able to properly JSON encode the Clients Upstream
DNS struct.
This commit is contained in:
bmanifold
2023-10-31 02:37:07 -04:00
committed by GitHub
parent 6b4142e5e9
commit 01f7839d0f
3 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
elixir/README.md
View File

@@ -61,8 +61,10 @@ Now you can verify that it's working by connecting to a websocket:
<details>
<summary>Gateway</summary>
```elixir
```bash
# Note: The token value below is an example. The token value you will need is generated and printed out when seeding the database, as described earlier in the document.
❯ export GATEWAY_TOKEN_FROM_SEEDS="SFMyNTY.g2gDaAJtAAAAJDNjZWYwNTY2LWFkZmQtNDhmZS1hMGYxLTU4MDY3OTYwOGY2Zm0AAABAamp0enhSRkpQWkdCYy1vQ1o5RHkyRndqd2FIWE1BVWRwenVScjJzUnJvcHg3NS16bmhfeHBfNWJUNU9uby1yYm4GAJXr4emIAWIAAVGA.jz0s-NohxgdAXeRMjIQ9kLBOyd7CmKXWi2FHY-Op8GM"
❯ websocat --header="User-Agent: iOS/12.7 (iPhone) connlib/0.7.412" "ws://127.0.0.1:13000/gateway/websocket?token=${GATEWAY_TOKEN_FROM_SEEDS}&external_id=thisisrandomandpersistent&name_suffix=kkX1&public_key=kceI60D6PrwOIiGoVz6hD7VYCgD1H57IVQlPJTTieUE="
# After this you need to join the `gateway` topic.
@@ -77,8 +79,10 @@ Now you can verify that it's working by connecting to a websocket:
<details>
<summary>Relay</summary>
```elixir
```bash
# Note: The token value below is an example. The token value you will need is generated and printed out when seeding the database, as described earlier in the document.
❯ export RELAY_TOKEN_FROM_SEEDS="SFMyNTY.g2gDaAJtAAAAJDcyODZiNTNkLTA3M2UtNGM0MS05ZmYxLWNjODQ1MWRhZDI5OW0AAABARVg3N0dhMEhLSlVWTGdjcE1yTjZIYXRkR25mdkFEWVFyUmpVV1d5VHFxdDdCYVVkRVUzbzktRmJCbFJkSU5JS24GAMDq4emIAWIAAVGA.fLlZsUMS0VJ4RCN146QzUuINmGubpsxoyIf3uhRHdiQ"
❯ websocat --header="User-Agent: Linux/5.2.6 (Debian; x86_64) relay/0.7.412" "ws://127.0.0.1:8081/relay/websocket?token=${RELAY_TOKEN_FROM_SEEDS}&ipv4=24.12.79.100&ipv6=4d36:aa7f:473c:4c61:6b9e:2416:9917:55cc"
# Here is what you will see in docker logs firezone-api-1
@@ -96,7 +100,8 @@ Now you can verify that it's working by connecting to a websocket:
<details>
<summary>Client</summary>
```elixir
```bash
# Note: The token value below is an example. The token value you will need is generated and printed out when seeding the database, as described earlier in the document.
❯ export CLIENT_TOKEN_FROM_SEEDS="SFMyNTY.g2gDaAN3CGlkZW50aXR5bQAAACQ3ZGE3ZDFjZC0xMTFjLTQ0YTctYjVhYy00MDI3YjlkMjMwZTV3Bmlnbm9yZW4GAJhGr7WKAWIACTqA.mrPu5eFVwkfRml7zzHb5uYfosLGaYVHq03-wE02xUNc"
# Panel will only accept token if it's coming with this User-Agent header and from IP 172.28.0.1

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

@@ -8,7 +8,7 @@ defmodule API.Client.Views.Interface do
|> Keyword.fetch!(:upstream_dns)
|> Enum.map(fn dns_config ->
addr = ClientsUpstreamDNS.normalize_dns_address(dns_config)
%{dns_config | address: addr}
Map.from_struct(%{dns_config | address: addr})
end)
%{

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

@@ -141,14 +141,8 @@ defmodule API.Client.ChannelTest do
ipv4: client.ipv4,
ipv6: client.ipv6,
upstream_dns: [
%Domain.Config.Configuration.ClientsUpstreamDNS{
protocol: :ip_port,
address: "1.1.1.1:53"
},
%Domain.Config.Configuration.ClientsUpstreamDNS{
protocol: :ip_port,
address: "8.8.8.8:53"
}
%{protocol: :ip_port, address: "1.1.1.1:53"},
%{protocol: :ip_port, address: "8.8.8.8:53"}
]
}
end