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

[3006.x] Fix #66382 (nftables): Produce correct ip family for rules with saddr or daddr #66383

Merged
merged 1 commit into from May 14, 2024

Conversation

jdelic
Copy link
Contributor

@jdelic jdelic commented Apr 16, 2024

What does this PR do?

Changes nftables.build_rule so that it adds the correct family identifier to rules containing saddr or daddr parts.

What issues does this PR fix or reference?

Fixes #66382

Merge requirements satisfied?

[NOTICE] Bug fixes or features added to Salt require tests.

Commits signed with GPG?

Yes

@jdelic jdelic requested a review from a team as a code owner April 16, 2024 23:00
@jdelic jdelic requested review from whytewolf and removed request for a team April 16, 2024 23:00
@salt-project-bot-prod-environment salt-project-bot-prod-environment bot changed the title Fix #66382 (nftables): Produce correct ip family for rules with saddr or daddr [master] Fix #66382 (nftables): Produce correct ip family for rules with saddr or daddr Apr 16, 2024
@jdelic jdelic force-pushed the fix/issue66382-nftables branch 3 times, most recently from 8ffc99c to 2c5d6ff Compare April 16, 2024 23:15
@whytewolf
Copy link
Contributor

this should be against 3006.x or 3007.x if it is happening in those versions. can you rebase this fix to those versions.

@jdelic
Copy link
Contributor Author

jdelic commented Apr 16, 2024

@whytewolf I totally can. Should I close this one then?

@jdelic jdelic changed the base branch from master to 3006.x April 16, 2024 23:19
@jdelic jdelic requested a review from s0undt3ch as a code owner April 16, 2024 23:19
@salt-project-bot-prod-environment salt-project-bot-prod-environment bot changed the title [master] Fix #66382 (nftables): Produce correct ip family for rules with saddr or daddr [3006.x] Fix #66382 (nftables): Produce correct ip family for rules with saddr or daddr Apr 16, 2024
@jdelic jdelic changed the base branch from 3006.x to master April 16, 2024 23:19
@salt-project-bot-prod-environment salt-project-bot-prod-environment bot changed the title [3006.x] Fix #66382 (nftables): Produce correct ip family for rules with saddr or daddr [master] Fix #66382 (nftables): Produce correct ip family for rules with saddr or daddr Apr 16, 2024
@jdelic
Copy link
Contributor Author

jdelic commented Apr 16, 2024

Actually, let me try to change that in place

@jdelic jdelic changed the base branch from master to 3006.x April 16, 2024 23:26
@salt-project-bot-prod-environment salt-project-bot-prod-environment bot changed the title [master] Fix #66382 (nftables): Produce correct ip family for rules with saddr or daddr [3006.x] Fix #66382 (nftables): Produce correct ip family for rules with saddr or daddr Apr 16, 2024
@jdelic
Copy link
Contributor Author

jdelic commented Apr 16, 2024

@whytewolf
🚀 done and ready for review.
I rebased it to 3006.x. Will it automatically be folded into the next 3007.x release then?

@whytewolf
Copy link
Contributor

@whytewolf 🚀 done and ready for review. I rebased it to 3006.x. Will it automatically be folded into the next 3007.x release then?

we will merge it forward to handle that.

whytewolf
whytewolf previously approved these changes Apr 17, 2024
@jdelic
Copy link
Contributor Author

jdelic commented Apr 17, 2024

@whytewolf
sorry for dismissing your review, but I just realized that I hadn't changed the protocol family correctly in the tests. So I updated that. This next build should succeed at tests. 😬

@s0undt3ch s0undt3ch merged commit 9e16ab4 into saltstack:3006.x May 14, 2024
181 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[BUG] nftables.build_rule breaks ipv6 rules by using the wrong syntax for source and destination addresses
3 participants