Skip to content
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.

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

policy: Fix Unspecified Protocol Type #28703

Merged
merged 1 commit into from
Oct 23, 2023

Conversation

nathanjsweet
Copy link
Member

According to the policy API documentation, if a
protocol is not specified in a PortProtocol type its protocol is supposed to be presumed as "ANY". The
policy package inconsistently enforces this logic. As a result, empty Protocol fields are validated as "ANY", but in the actual rule logic that splits
the "ANY" protocol into the supported protocol
types, the comparison was made only to the actual
"ANY" protocol constant. This is fixed with the
L4Proto method IsAny that does both the constant and empty string comparison.

Fixes: #28136

policy: Fixed a bug that incorrectly omitted port-protocol policy rules that omitted the "protocol" field. An omitted "protocol" field now, correctly, is the same as using the "ANY" protocol.

According to the policy API documentation, if a
protocol is not specified in a PortProtocol type its
protocol is supposed to be presumed as "ANY". The
policy package inconsistently enforces this logic.
As a result, empty Protocol fields are validated as
"ANY", but, in the actual rule logic that splits
the "ANY" protocol into the supported protocol
types, the comparison was made only to the actual
"ANY" protocol constant. This is fixed with an
L4Proto method `IsAny` that does both the constant
and empty string comparison.

Signed-off-by: Nate Sweet <nathanjsweet@pm.me>
@nathanjsweet nathanjsweet added the release-note/minor This PR changes functionality that users may find relevant to operating Cilium. label Oct 19, 2023
@nathanjsweet nathanjsweet requested review from a team as code owners October 19, 2023 20:06
@nathanjsweet nathanjsweet added needs-backport/1.12 needs-backport/1.13 This PR / issue needs backporting to the v1.13 branch needs-backport/1.14 This PR / issue needs backporting to the v1.14 branch labels Oct 19, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot added this to Needs backport from main in 1.14.4 Oct 19, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot added this to Needs backport from main in 1.13.9 Oct 19, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot added this to Needs backport from main in 1.12.16 Oct 19, 2023
@nathanjsweet
Copy link
Member Author

/test

@christarazi christarazi added the sig/policy Impacts whether traffic is allowed or denied based on user-defined policies. label Oct 23, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot added ready-to-merge This PR has passed all tests and received consensus from code owners to merge. labels Oct 23, 2023
@nathanjsweet nathanjsweet merged commit 58b67dc into main Oct 23, 2023
212 of 215 checks passed
@nathanjsweet nathanjsweet deleted the pr/nathanjsweet/fix-unspecified-l4-protocol-type branch October 23, 2023 22:53
@tklauser tklauser added backport-pending/1.14 The backport for Cilium 1.14.x for this PR is in progress. and removed needs-backport/1.14 This PR / issue needs backporting to the v1.14 branch labels Oct 24, 2023
@tklauser tklauser added backport-pending/1.13 The backport for Cilium 1.13.x for this PR is in progress. and removed needs-backport/1.13 This PR / issue needs backporting to the v1.13 branch labels Oct 24, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Needs backport from main to Backport pending to v1.14 in 1.14.4 Oct 24, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Needs backport from main to Backport pending to v1.13 in 1.13.9 Oct 24, 2023
@tklauser tklauser mentioned this pull request Oct 24, 2023
6 tasks
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Needs backport from main to Backport pending to v1.12 in 1.12.16 Oct 24, 2023
@tklauser tklauser added backport-done/1.14 The backport for Cilium 1.14.x for this PR is done. and removed backport-pending/1.14 The backport for Cilium 1.14.x for this PR is in progress. labels Oct 25, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Backport pending to v1.14 to Backport done to v1.14 in 1.14.4 Oct 25, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Backport pending to v1.14 to Backport done to v1.14 in 1.14.4 Oct 25, 2023
@tklauser tklauser added backport-done/1.13 The backport for Cilium 1.13.x for this PR is done. and removed backport-pending/1.13 The backport for Cilium 1.13.x for this PR is in progress. labels Oct 25, 2023
@julianwiedmann julianwiedmann added backport-done/1.12 The backport for Cilium 1.12.x for this PR is done. and removed backport-pending/1.12 labels Oct 26, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Backport pending to v1.13 to Backport done to v1.13 in 1.13.9 Oct 26, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Backport pending to v1.12 to Backport done to v1.12 in 1.12.16 Oct 26, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-done/1.12 The backport for Cilium 1.12.x for this PR is done. backport-done/1.13 The backport for Cilium 1.13.x for this PR is done. backport-done/1.14 The backport for Cilium 1.14.x for this PR is done. ready-to-merge This PR has passed all tests and received consensus from code owners to merge. release-note/minor This PR changes functionality that users may find relevant to operating Cilium. sig/policy Impacts whether traffic is allowed or denied based on user-defined policies.
Projects
No open projects
1.12.16
Backport done to v1.12
1.13.9
Backport done to v1.13
1.14.4
Backport done to v1.14
Development

Successfully merging this pull request may close these issues.

CiliumNetworkPolicy egressDeny blocking non-matching traffic
5 participants