Skip to content

Allow limited inbound ICMP to Nexus, add ICMP type/code filters to firewall rules #8194

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 20 commits into
base: main
Choose a base branch
from
Open

Allow limited inbound ICMP to Nexus, add ICMP type/code filters to firewall rules #8194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
f315451
Initial plumbing.
FelixMcFelix May 21, 2025
8a33170
More OpteHdl fixups.
FelixMcFelix May 21, 2025
38bd2ff
Parity.
FelixMcFelix May 21, 2025
c5aec33
Merge branch 'main' into felixmcfelix/icmp-for-nexus
FelixMcFelix May 21, 2025
283fc56
CRDB didn't like *that* migration.
FelixMcFelix May 21, 2025
3d13775
TODO: migration test.
FelixMcFelix May 21, 2025
da4c157
Merge branch 'main' into felixmcfelix/icmp-for-nexus
FelixMcFelix May 21, 2025
29db3dd
Iterating on launch failures.
FelixMcFelix May 22, 2025
01f0f4c
`serde_json::from_str` 🫠
FelixMcFelix May 22, 2025
3f8d07e
Merge branch 'main' into felixmcfelix/icmp-for-nexus
FelixMcFelix May 22, 2025
14804cb
Simple migration query.
FelixMcFelix May 22, 2025
983e6b7
An idempotent column rename
FelixMcFelix May 22, 2025
3d1a58e
Some control over ICMP allowance.
FelixMcFelix May 22, 2025
62a8b3d
Help the deploy job along, a little.
FelixMcFelix May 22, 2025
564424f
Last test fixup.
FelixMcFelix May 22, 2025
0c19f5f
`fmt`.
FelixMcFelix May 22, 2025
32a4914
Renaming, and some serde/integration tests.
FelixMcFelix May 23, 2025
6b9fa7a
Self-review
FelixMcFelix May 27, 2025
5c7caed
Review feedback
FelixMcFelix May 28, 2025
1fc7b2b
Review feedback, missed test fixup.
FelixMcFelix May 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/buildomat/jobs/deploy.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ z_swadm () {

# only set this if you want to override the version of opte/xde installed by the
# install_opte.sh script
OPTE_COMMIT=""
OPTE_COMMIT="792ec8a3816ba8c7c4268f65cd19dbd946a9027d"
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Noting that this needs to be removed as part of merging.

if [[ "x$OPTE_COMMIT" != "x" ]]; then
curl -sSfOL https://buildomat.eng.oxide.computer/public/file/oxidecomputer/opte/module/$OPTE_COMMIT/xde
pfexec rem_drv xde || true
Expand Down
26 changes: 9 additions & 17 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -506,8 +506,8 @@ lldp_protocol = { git = "https://github.com/oxidecomputer/lldp", package = "prot
macaddr = { version = "1.0.1", features = ["serde_std"] }
maplit = "1.0.2"
newtype_derive = "0.1.6"
mg-admin-client = { git = "https://github.com/oxidecomputer/maghemite", rev = "875ae5b7f8f0e32e9be672a36b5dda109b9b2450" }
ddm-admin-client = { git = "https://github.com/oxidecomputer/maghemite", rev = "875ae5b7f8f0e32e9be672a36b5dda109b9b2450" }
mg-admin-client = { git = "https://github.com/oxidecomputer/maghemite", rev = "ec985de970b616ee9977ac7474ab68b91b6e7614" }
ddm-admin-client = { git = "https://github.com/oxidecomputer/maghemite", rev = "ec985de970b616ee9977ac7474ab68b91b6e7614" }
multimap = "0.10.1"
nexus-auth = { path = "nexus/auth" }
nexus-background-task-interface = { path = "nexus/background-task-interface" }
Expand Down Expand Up @@ -561,7 +561,7 @@ omicron-test-utils = { path = "test-utils" }
omicron-workspace-hack = "0.1.0"
omicron-zone-package = "0.12.2"
oxide-client = { path = "clients/oxide-client" }
oxide-vpc = { git = "https://github.com/oxidecomputer/opte", rev = "9e79588b11a69ff3d40f9aa29af97e31a0045c4b", features = [ "api", "std" ] }
oxide-vpc = { git = "https://github.com/oxidecomputer/opte", rev = "792ec8a3816ba8c7c4268f65cd19dbd946a9027d", features = [ "api", "std" ] }
oxlog = { path = "dev-tools/oxlog" }
oxnet = "0.1.2"
once_cell = "1.21.3"
Expand All @@ -571,7 +571,7 @@ openapiv3 = "2.0.0"
# must match samael's crate!
openssl = "0.10"
openssl-sys = "0.9"
opte-ioctl = { git = "https://github.com/oxidecomputer/opte", rev = "9e79588b11a69ff3d40f9aa29af97e31a0045c4b" }
opte-ioctl = { git = "https://github.com/oxidecomputer/opte", rev = "792ec8a3816ba8c7c4268f65cd19dbd946a9027d" }
oso = "0.27"
owo-colors = "4.2.0"
oximeter = { path = "oximeter/oximeter" }
Expand Down
3 changes: 2 additions & 1 deletion clients/sled-agent-client/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ progenitor::generate_api!(
TypedUuidForSupportBundleKind = omicron_uuid_kinds::SupportBundleUuid,
TypedUuidForZpoolKind = omicron_uuid_kinds::ZpoolUuid,
Vni = omicron_common::api::external::Vni,
VpcFirewallIcmpFilter = omicron_common::api::external::VpcFirewallIcmpFilter,
ZpoolKind = omicron_common::zpool_name::ZpoolKind,
ZpoolName = omicron_common::zpool_name::ZpoolName,
}
Expand Down Expand Up @@ -309,7 +310,7 @@ impl From<omicron_common::api::external::VpcFirewallRuleProtocol>
match s {
Tcp => Self::Tcp,
Udp => Self::Udp,
Icmp => Self::Icmp,
Icmp(v) => Self::Icmp(v),
}
}
}
Expand Down
Loading
Loading