Update ACL syntax and add support for protocol filtering #618
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
Implements #617. Tailscale has changed the format of their ACLs to use a more firewall-y terms ("users" & "ports" -> "src" & "dst"). They have also started using all-lowercase tags. This PR applies these changes.
|
Also addresses #572 |
juanfont
changed the title
|
We had luck using this ACL on this PR; great work. |
restanrm
previously approved these changes
Jun 9, 2022
acls_test.go
Outdated
| @@ -143,7 +143,7 @@ func (s *Suite) TestValidExpandTagOwnersInUsers(c *check.C) { | |||
|
|
|||
| // this test should validate that we can expand a group in a TagOWner section and | |||
| // match properly the IP's of the related hosts. The owner is valid and the tag is also valid. | |||
| // the tag is matched in the Ports section. | |||
| // the tag is matched in the Destinations section. | |||
| func (s *Suite) TestValidExpandTagOwnersInPorts(c *check.C) { | |||
There was a problem hiding this comment.
Shouldn't you rename this as well ?
| @@ -628,7 +642,8 @@ func Test_expandTagOwners(t *testing.T) { | |||
|
|
|||
| func Test_expandPorts(t *testing.T) { | |||
There was a problem hiding this comment.
Maybe it should be renamed too
There was a problem hiding this comment.
No, that one actually expands ports :)
kradalby
reviewed
Jun 10, 2022
| // Also returns a boolean indicating if the protocol | ||
| // requires all the destinations to use wildcard as port number (only TCP, | ||
| // UDP and SCTP support specifying ports). | ||
| func parseProtocol(protocol string) ([]int, bool, error) { |
There was a problem hiding this comment.
All of these numbers will trigger "magicnumber" when the linter is up and running, and in any case, it would be better to probably have constants for these
acls_test.go
Outdated
| c.Assert(rules, check.NotNil) | ||
|
|
||
| c.Assert(rules, check.HasLen, 3) | ||
| c.Assert(rules[0].IPProto[0], check.Equals, 6) // tcp |
There was a problem hiding this comment.
This is why we want constants.
acls.go
Outdated
| if err != nil { | ||
| return nil, false, err | ||
| } | ||
| needsWildcard := protocolNumber != 6 && protocolNumber != 17 && protocolNumber != 132 // nolint |
There was a problem hiding this comment.
Suggested change
| needsWildcard := protocolNumber != 6 && protocolNumber != 17 && protocolNumber != 132 // nolint | |
| needsWildcard := protocolNumber != 6 && protocolNumber != 17 && protocolNumber != 132 |
That wont do ;)
kradalby
approved these changes
Jun 11, 2022
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.
Implements #617.
Tailscale has changed the format of their ACLs to use a more firewall-y terms ("users" & "ports" -> "src" & "dst"). They have also started using all-lowercase tags.
Also, protocol filtering support :)
This PR implements these changes.