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.

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

Jump to bottom

Update ACL syntax and add support for protocol filtering #618

Merged
merged 14 commits into from
Jun 11, 2022
Merged

Update ACL syntax and add support for protocol filtering #618

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
3e35300
Migrate ACLs syntax to new Tailscale format
juanfont Jun 8, 2022
ab1aac9
Improve ACLs by adding protocol parsing support
juanfont Jun 8, 2022
8287ba2
Do not lint the protocol magic numbers
juanfont Jun 8, 2022
39f03b8
Added ACL test file
juanfont Jun 8, 2022
c47354b
Update internal docs to the new syntax
juanfont Jun 8, 2022
818d26b
Updated changelog
juanfont Jun 8, 2022
5bc1189
Update internal docs with protocol usage
juanfont Jun 8, 2022
19b9688
Added missing file
juanfont Jun 8, 2022
80ad1db
Merge branch 'main' into acl-syntax-fixes
juanfont Jun 9, 2022
735a6aa
Use const for IANA protcol numbers
juanfont Jun 11, 2022
cdf41bd
Merge branch 'acl-syntax-fixes' of https://github.com/juanfont/headsc…
juanfont Jun 11, 2022
3d7be5b
Minor rename
juanfont Jun 11, 2022
7cd0f5e
Merge branch 'main' into acl-syntax-fixes
kradalby Jun 11, 2022
569f3ca
Use constants in tests
kradalby Jun 11, 2022
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
14 changes: 14 additions & 0 deletions acls_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,6 +321,20 @@ func (s *Suite) TestPortRange(c *check.C) {
c.Assert(rules[0].DstPorts[0].Ports.Last, check.Equals, uint16(5500))
}

func (s *Suite) TestProtocolParsing(c *check.C) {
err := app.LoadACLPolicy("./tests/acls/acl_policy_basic_protocols.hujson")
c.Assert(err, check.IsNil)

rules, err := app.generateACLRules()
c.Assert(err, check.IsNil)
c.Assert(rules, check.NotNil)

c.Assert(rules, check.HasLen, 3)
c.Assert(rules[0].IPProto[0], check.Equals, 6) // tcp
Copy link
Collaborator

Choose a reason for hiding this comment

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

This is why we want constants.

c.Assert(rules[1].IPProto[0], check.Equals, 17) // udp
c.Assert(rules[2].IPProto[1], check.Equals, 58) // icmp v4
}

func (s *Suite) TestPortWildcard(c *check.C) {
err := app.LoadACLPolicy("./tests/acls/acl_policy_basic_wildcards.hujson")
c.Assert(err, check.IsNil)
Expand Down
1 change: 0 additions & 1 deletion tests/acls/acl_policy_1.hujson
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
// ports on git-server or ci-server.
{
"action": "accept",
"protocol": "tcp",
"src": [
"group:example2",
"192.168.1.0/24"
Expand Down