Whitelist failsafe port response traffic in the raw table only #1718
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This should ensure that failsafe traffic always gets conntracked.
nelljerram
requested changes
Mar 5, 2018
fv/donottrack_test.go
Outdated
| @@ -0,0 +1,275 @@ | |||
| // +build fvtests | |||
|
|
|||
| // Copyright (c) 2017-2018 Tigera, Inc. All rights reserved. | |||
There was a problem hiding this comment.
Just 2018, unless you secretly have a TARDIS.
fv/donottrack_test.go
Outdated
| fmt.Sprintf("host%d", ii), | ||
| "", // No interface name means "run in the host's namespace" | ||
| felixes[ii].IP, | ||
| "8055,2379,22", // Extra ports are out/in and inbound failsafes. |
There was a problem hiding this comment.
I'm not sure what is meant here by "out/in and inbound".
There was a problem hiding this comment.
Ah, I see now, but I think better to be more explicit here: "2379 is a failsafe port both inbound and outbound; 22 is a failsafe port for inbound only; 8055 is not a failsafe."
fv/donottrack_test.go
Outdated
| host0Pol, err = client.GlobalNetworkPolicies().Update(ctx, host0Pol, options.SetOptions{}) | ||
| Expect(err).NotTo(HaveOccurred()) | ||
|
|
||
| host1Pol, err = client.GlobalNetworkPolicies().Update(ctx, host1Pol, options.SetOptions{}) |
There was a problem hiding this comment.
Does this update do anything?
| @@ -492,5 +500,5 @@ func (c *ConnectivityChecker) CheckConnectivityWithTimeout(timeout time.Duration | |||
| strings.Join(actualConn, "\n "), | |||
| strings.Join(expConnectivity, "\n "), | |||
| ) | |||
| Fail(message, 1) | |||
| Fail(message, callerSkip) | |||
There was a problem hiding this comment.
Note: I think default callerSkip here has changed from 1 to 2 - but I presume that that is what you want (for nicest debugging/reporting).
There was a problem hiding this comment.
Yes, exactly, I want it to report the failure on the test case line, not in workload.go.
nelljerram
approved these changes
Mar 5, 2018
fasaxc
added a commit
to fasaxc/felix
that referenced
this pull request
Mar 23, 2018
(cherry-picked from commit da11a06) Whitelist failsafe port response traffic in the raw table only
5 tasks
fasaxc
added a commit
to fasaxc/felix
that referenced
this pull request
Apr 6, 2018
This fixes a nasty interaction between do-not-track policy and failsafe ports. Previously, adding do-not-track policy to a host endpoint resulted in failsafe port traffic being blocked because one leg of the connection would get conntracked, but the return leg would hit the do-not-track policy, which would either drop it (thus breaking the failsafe port) or mark it as NOTRACK, which results in future outbound packets failing the --ctstate INVALID test (because conntrack has only seen an outbound SYN, it isn't expecting the outbound to move past the SYN stage of the handshake). This change whitelists the response traffic in the raw table only so that failsafe ports are now forced to be conntracked, bypassing any do-not-track policy in both directions. Since the change is made only in the raw table (and we don't mark failsafe port traffic with the accepted mark), the response traffic still has to pass the --ctstate ESTABLISHED test in the filter table. Merge pull request projectcalico#1718 from fasaxc/failsafe-donottrack (cherry picked from commit da11a06) Whitelist failsafe port response traffic in the raw table only
fasaxc
added a commit
to fasaxc/felix
that referenced
this pull request
Apr 10, 2018
This fixes a nasty interaction between do-not-track policy and failsafe ports. Previously, adding do-not-track policy to a host endpoint resulted in failsafe port traffic being blocked because one leg of the connection would get conntracked, but the return leg would hit the do-not-track policy, which would either drop it (thus breaking the failsafe port) or mark it as NOTRACK, which results in future outbound packets failing the --ctstate INVALID test (because conntrack has only seen an outbound SYN, it isn't expecting the outbound to move past the SYN stage of the handshake). This change whitelists the response traffic in the raw table only so that failsafe ports are now forced to be conntracked, bypassing any do-not-track policy in both directions. Since the change is made only in the raw table (and we don't mark failsafe port traffic with the accepted mark), the response traffic still has to pass the --ctstate ESTABLISHED test in the filter table. Merge pull request projectcalico#1718 from fasaxc/failsafe-donottrack (cherry picked from commit da11a06) Whitelist failsafe port response traffic in the raw table only
fasaxc
added a commit
to fasaxc/felix
that referenced
this pull request
Apr 10, 2018
This fixes a nasty interaction between do-not-track policy and failsafe ports. Previously, adding do-not-track policy to a host endpoint resulted in failsafe port traffic being blocked because one leg of the connection would get conntracked, but the return leg would hit the do-not-track policy, which would either drop it (thus breaking the failsafe port) or mark it as NOTRACK, which results in future outbound packets failing the --ctstate INVALID test (because conntrack has only seen an outbound SYN, it isn't expecting the outbound to move past the SYN stage of the handshake). This change whitelists the response traffic in the raw table only so that failsafe ports are now forced to be conntracked, bypassing any do-not-track policy in both directions. Since the change is made only in the raw table (and we don't mark failsafe port traffic with the accepted mark), the response traffic still has to pass the --ctstate ESTABLISHED test in the filter table. Merge pull request projectcalico#1718 from fasaxc/failsafe-donottrack (cherry picked from commit da11a06) Whitelist failsafe port response traffic in the raw table only
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This fixes a nasty interaction between do-not-track policy and failsafe ports. Previously, adding do-not-track policy to a host endpoint resulted in failsafe port traffic being blocked because one leg of the connection would get conntracked, but the return leg would hit the do-not-track policy, which would either drop it (thus breaking the failsafe port) or mark it as NOTRACK, which results in future outbound packets failing the
--ctstate INVALIDtest (because conntrack has only seen an outbound SYN, it isn't expecting the outbound to move past the SYN stage of the handshake).This change whitelists the response traffic in the raw table only so that failsafe ports are now forced to be conntracked, bypassing any do-not-track policy in both directions. Since the change is made only in the raw table (and we don't mark failsafe port traffic with the accepted mark), the response traffic still has to pass the
--ctstate ESTABLISHEDtest in the filter table.Todos
Release Note