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): Fix traffic filtering to send port-less rules (#4778)

Browse Source
This commit is contained in:
Andrew Dryga
2024-04-25 17:35:47 -06:00
committed by GitHub
parent bc940784bd
commit 20a7794d66
4 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
elixir/apps/api/lib/api/gateway/views/resource.ex
View File

@@ -35,7 +35,7 @@ defmodule API.Gateway.Views.Resource do
}
end
def render_filter(%Resources.Resource.Filter{} = filter) do
def render_filter(%Resources.Resource.Filter{ports: ports} = filter) when length(ports) > 0 do
Enum.map(filter.ports, fn port ->
case String.split(port, "-") do
[port_start, port_end] ->
@@ -60,6 +60,14 @@ defmodule API.Gateway.Views.Resource do
end)
end
def render_filter(%Resources.Resource.Filter{} = filter) do
[
%{
protocol: filter.protocol
}
]
end
defp port_to_number(port) do
port |> String.trim() |> String.to_integer()
end

18
elixir/apps/api/test/api/gateway/channel_test.exs
View File

@@ -110,7 +110,8 @@ defmodule API.Gateway.ChannelTest do
filters: [
%{protocol: :tcp, port_range_end: 80, port_range_start: 80},
%{protocol: :tcp, port_range_end: 433, port_range_start: 433},
%{protocol: :udp, port_range_start: 100, port_range_end: 200}
%{protocol: :udp, port_range_start: 100, port_range_end: 200},
%{protocol: :icmp}
]
}
@@ -224,7 +225,8 @@ defmodule API.Gateway.ChannelTest do
filters: [
%{protocol: :tcp, port_range_end: 80, port_range_start: 80},
%{protocol: :tcp, port_range_end: 433, port_range_start: 433},
%{protocol: :udp, port_range_start: 100, port_range_end: 200}
%{protocol: :udp, port_range_start: 100, port_range_end: 200},
%{protocol: :icmp}
]
}
end
@@ -301,7 +303,8 @@ defmodule API.Gateway.ChannelTest do
filters: [
%{protocol: :tcp, port_range_end: 80, port_range_start: 80},
%{protocol: :tcp, port_range_end: 433, port_range_start: 433},
%{protocol: :udp, port_range_start: 100, port_range_end: 200}
%{protocol: :udp, port_range_start: 100, port_range_end: 200},
%{protocol: :icmp}
]
}
end
@@ -435,7 +438,8 @@ defmodule API.Gateway.ChannelTest do
filters: [
%{protocol: :tcp, port_range_end: 80, port_range_start: 80},
%{protocol: :tcp, port_range_end: 433, port_range_start: 433},
%{protocol: :udp, port_range_start: 100, port_range_end: 200}
%{protocol: :udp, port_range_start: 100, port_range_end: 200},
%{protocol: :icmp}
]
}
@@ -549,7 +553,8 @@ defmodule API.Gateway.ChannelTest do
filters: [
%{protocol: :tcp, port_range_end: 80, port_range_start: 80},
%{protocol: :tcp, port_range_end: 433, port_range_start: 433},
%{protocol: :udp, port_range_start: 100, port_range_end: 200}
%{protocol: :udp, port_range_start: 100, port_range_end: 200},
%{protocol: :icmp}
]
}
@@ -741,7 +746,8 @@ defmodule API.Gateway.ChannelTest do
filters: [
%{protocol: :tcp, port_range_end: 80, port_range_start: 80},
%{protocol: :tcp, port_range_end: 433, port_range_start: 433},
%{protocol: :udp, port_range_start: 100, port_range_end: 200}
%{protocol: :udp, port_range_start: 100, port_range_end: 200},
%{protocol: :icmp}
]
}
end

6
elixir/apps/domain/test/domain/resources_test.exs
View File

@@ -1002,7 +1002,8 @@ defmodule Domain.ResourcesTest do
assert [
%Domain.Resources.Resource.Filter{ports: ["80", "433"], protocol: :tcp},
%Domain.Resources.Resource.Filter{ports: ["100 - 200"], protocol: :udp}
%Domain.Resources.Resource.Filter{ports: ["100 - 200"], protocol: :udp},
%Domain.Resources.Resource.Filter{protocol: :icmp}
] = resource.filters
end
@@ -1042,7 +1043,8 @@ defmodule Domain.ResourcesTest do
assert [
%Domain.Resources.Resource.Filter{ports: ["80", "433"], protocol: :tcp},
%Domain.Resources.Resource.Filter{ports: ["100 - 200"], protocol: :udp}
%Domain.Resources.Resource.Filter{ports: ["100 - 200"], protocol: :udp},
%Domain.Resources.Resource.Filter{protocol: :icmp}
] = resource.filters
assert Repo.aggregate(Domain.Network.Address, :count) == address_count

3
elixir/apps/domain/test/support/fixtures/resources.ex
View File

@@ -12,7 +12,8 @@ defmodule Domain.Fixtures.Resources do
type: :dns,
filters: [
%{protocol: :tcp, ports: [80, 433]},
%{protocol: :udp, ports: [100..200]}
%{protocol: :udp, ports: [100..200]},
%{protocol: :icmp}
]
})
end