mirror of
https://github.com/slackhq/nebula.git
synced 2026-11-16 08:56:52 +01:00
Compare commits
3
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
aa880d85b6 | ||
|
|
553e874122 | ||
|
|
f62c54a4f2 |
No files matched your search
@@ -13,6 +13,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
|||||||
down with it. A hostinfo returned by StartHandshake had no RemoteList until the handshake loop's first
|
down with it. A hostinfo returned by StartHandshake had no RemoteList until the handshake loop's first
|
||||||
pass attached one, and `create-tunnel -address` set the remote before that. The list is now attached when
|
pass attached one, and `create-tunnel -address` set the remote before that. The list is now attached when
|
||||||
the handshake starts, so a pending hostinfo never exists without one.
|
the handshake starts, so a pending hostinfo never exists without one.
|
||||||
|
- A firewall rule with `group: []`, `groups:` with no value, or a `groups` entry that isn't a string, such as
|
||||||
|
`groups: [1, 2]`, no longer crashes Nebula on startup or reload. A null `group` or `groups` means none was
|
||||||
|
provided. An unquoted int or bool group, such as `group: 7`, is still read as a string but logs a warning to
|
||||||
|
quote it, since YAML has already turned a value like `007` into `7`. A float, a date, an empty array, a null
|
||||||
|
entry, a nested array, or a map is rejected with an error.
|
||||||
|
|
||||||
## [1.11.1] - 2026-08-21
|
## [1.11.1] - 2026-08-21
|
||||||
|
|
||||||
|
|||||||
+65
-17
@@ -967,33 +967,54 @@ func convertRule(l *slog.Logger, p any, table string, i int) (rule, error) {
|
|||||||
r.CAName = toString("ca_name", m)
|
r.CAName = toString("ca_name", m)
|
||||||
r.CASha = toString("ca_sha", m)
|
r.CASha = toString("ca_sha", m)
|
||||||
|
|
||||||
// Make sure group isn't an array
|
// A null value, `group:` with nothing after it, is the same as no group
|
||||||
if v, ok := m["group"].([]any); ok {
|
var singleGroup string
|
||||||
if len(v) > 1 {
|
if g, ok := m["group"]; ok && g != nil {
|
||||||
return r, errors.New("group should contain a single value, an array with more than one entry was provided")
|
// Make sure group isn't an array
|
||||||
|
v, isArray := g.([]any)
|
||||||
|
if isArray {
|
||||||
|
if len(v) > 1 {
|
||||||
|
return r, errors.New("group should contain a single value, an array with more than one entry was provided")
|
||||||
|
}
|
||||||
|
if len(v) == 0 {
|
||||||
|
return r, errors.New("group should contain a single value, an empty array was provided")
|
||||||
|
}
|
||||||
|
g = v[0]
|
||||||
}
|
}
|
||||||
|
|
||||||
l.Warn("group was an array with a single value, converting to simple value",
|
var err error
|
||||||
"table", table,
|
singleGroup, err = groupName(l, g, table, i)
|
||||||
"rule", i,
|
if err != nil {
|
||||||
)
|
return r, fmt.Errorf("group should contain a single value, %w", err)
|
||||||
m["group"] = v[0]
|
}
|
||||||
|
|
||||||
|
if isArray {
|
||||||
|
l.Warn("group was an array with a single value, converting to simple value",
|
||||||
|
"table", table,
|
||||||
|
"rule", i,
|
||||||
|
)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
singleGroup := toString("group", m)
|
// A null value, `groups:` with nothing after it, is the same as no groups
|
||||||
|
if rg, ok := m["groups"]; ok && rg != nil {
|
||||||
if rg, ok := m["groups"]; ok {
|
|
||||||
switch reflect.TypeOf(rg).Kind() {
|
switch reflect.TypeOf(rg).Kind() {
|
||||||
case reflect.Slice:
|
case reflect.Slice:
|
||||||
v := reflect.ValueOf(rg)
|
v := reflect.ValueOf(rg)
|
||||||
r.Groups = make([]string, v.Len())
|
r.Groups = make([]string, v.Len())
|
||||||
for i := 0; i < v.Len(); i++ {
|
for gi := 0; gi < v.Len(); gi++ {
|
||||||
r.Groups[i] = v.Index(i).Interface().(string)
|
name, err := groupName(l, v.Index(gi).Interface(), table, i)
|
||||||
|
if err != nil {
|
||||||
|
return r, fmt.Errorf("groups entry #%d should contain a single value, %w", gi, err)
|
||||||
|
}
|
||||||
|
r.Groups[gi] = name
|
||||||
}
|
}
|
||||||
case reflect.String:
|
|
||||||
r.Groups = []string{rg.(string)}
|
|
||||||
default:
|
default:
|
||||||
r.Groups = []string{fmt.Sprintf("%v", rg)}
|
name, err := groupName(l, rg, table, i)
|
||||||
|
if err != nil {
|
||||||
|
return r, fmt.Errorf("groups should contain an array or a single value, %w", err)
|
||||||
|
}
|
||||||
|
r.Groups = []string{name}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1009,6 +1030,33 @@ func convertRule(l *slog.Logger, p any, table string, i int) (rule, error) {
|
|||||||
return r, nil
|
return r, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// groupName reads a group name from config. YAML has already parsed an unquoted value by the time we see it, so `007`
|
||||||
|
// arrives as 7, `1.10` as 1.1, and a date as a time.Time, and the text that was written is gone. Strings are used as
|
||||||
|
// is. Ints and bools are converted so `group: 7` keeps working, with a warning to quote them. Anything else would
|
||||||
|
// become a name that may not match what was written, or matches nothing like "<nil>" or "map[a:b]", so it is rejected.
|
||||||
|
func groupName(l *slog.Logger, v any, table string, i int) (string, error) {
|
||||||
|
if v == nil {
|
||||||
|
return "", errors.New("a null was provided")
|
||||||
|
}
|
||||||
|
switch reflect.TypeOf(v).Kind() {
|
||||||
|
case reflect.String:
|
||||||
|
return reflect.ValueOf(v).String(), nil
|
||||||
|
case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64,
|
||||||
|
reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Bool:
|
||||||
|
l.Warn("group was not a string and should be quoted to match as written",
|
||||||
|
"table", table,
|
||||||
|
"rule", i,
|
||||||
|
"group", v,
|
||||||
|
)
|
||||||
|
return fmt.Sprintf("%v", v), nil
|
||||||
|
case reflect.Slice, reflect.Array:
|
||||||
|
return "", errors.New("an array was provided")
|
||||||
|
case reflect.Map:
|
||||||
|
return "", errors.New("a map was provided")
|
||||||
|
}
|
||||||
|
return "", fmt.Errorf("%v was read as a %T, quote it to use it as a group name", v, v)
|
||||||
|
}
|
||||||
|
|
||||||
// sanity returns an error if the rule would be evaluated in a way that would short-circuit a configured check on a wildcard value
|
// sanity returns an error if the rule would be evaluated in a way that would short-circuit a configured check on a wildcard value
|
||||||
// rules are evaluated as "port AND proto AND (ca_sha OR ca_name) AND (host OR group OR groups OR cidr) AND local_cidr"
|
// rules are evaluated as "port AND proto AND (ca_sha OR ca_name) AND (host OR group OR groups OR cidr) AND local_cidr"
|
||||||
func (r *rule) sanity() error {
|
func (r *rule) sanity() error {
|
||||||
|
|||||||
@@ -1439,6 +1439,56 @@ func TestAddFirewallRulesFromConfig(t *testing.T) {
|
|||||||
require.NoError(t, AddFirewallRulesFromConfig(l, true, conf, mf))
|
require.NoError(t, AddFirewallRulesFromConfig(l, true, conf, mf))
|
||||||
assert.Equal(t, addRuleCall{incoming: true, proto: firewall.ProtoAny, startPort: 1, endPort: 1, groups: []string{"a", "b"}, ip: "", localIp: ""}, mf.lastCall)
|
assert.Equal(t, addRuleCall{incoming: true, proto: firewall.ProtoAny, startPort: 1, endPort: 1, groups: []string{"a", "b"}, ip: "", localIp: ""}, mf.lastCall)
|
||||||
|
|
||||||
|
// Test group and groups values that used to crash or become a group that matches nothing: an empty array,
|
||||||
|
// a null, an array, or a map is rejected
|
||||||
|
badGroups := []struct {
|
||||||
|
key string
|
||||||
|
value any
|
||||||
|
err string
|
||||||
|
}{
|
||||||
|
{"group", []any{}, "group should contain a single value, an empty array was provided"},
|
||||||
|
{"group", []any{nil}, "group should contain a single value, a null was provided"},
|
||||||
|
{"group", []any{[]any{"a"}}, "group should contain a single value, an array was provided"},
|
||||||
|
{"group", map[string]any{"a": "b"}, "group should contain a single value, a map was provided"},
|
||||||
|
{"groups", []any{nil}, "groups entry #0 should contain a single value, a null was provided"},
|
||||||
|
{"groups", []any{"a", []any{"b"}}, "groups entry #1 should contain a single value, an array was provided"},
|
||||||
|
{"groups", []any{map[string]any{"a": "b"}}, "groups entry #0 should contain a single value, a map was provided"},
|
||||||
|
{"groups", map[string]any{"a": "b"}, "groups should contain an array or a single value, a map was provided"},
|
||||||
|
{"group", 1.1, "group should contain a single value, 1.1 was read as a float64, quote it to use it as a group name"},
|
||||||
|
{"group", []any{1.1}, "group should contain a single value, 1.1 was read as a float64, quote it to use it as a group name"},
|
||||||
|
{"groups", []any{"a", 1.1}, "groups entry #1 should contain a single value, 1.1 was read as a float64, quote it to use it as a group name"},
|
||||||
|
{"groups", time.Date(2001, 12, 14, 0, 0, 0, 0, time.UTC), "groups should contain an array or a single value, 2001-12-14 00:00:00 +0000 UTC was read as a time.Time, quote it to use it as a group name"},
|
||||||
|
}
|
||||||
|
for _, tc := range badGroups {
|
||||||
|
conf = config.NewC(test.NewLogger())
|
||||||
|
mf = &mockFirewall{}
|
||||||
|
conf.Settings["firewall"] = map[string]any{"inbound": []any{map[string]any{"port": "1", "proto": "any", tc.key: tc.value}}}
|
||||||
|
require.EqualError(t, AddFirewallRulesFromConfig(l, true, conf, mf), "firewall.inbound rule #0; "+tc.err, "%s: %v", tc.key, tc.value)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Test int and bool groups entries are read as strings
|
||||||
|
conf = config.NewC(test.NewLogger())
|
||||||
|
mf = &mockFirewall{}
|
||||||
|
conf.Settings["firewall"] = map[string]any{"inbound": []any{map[string]any{"port": "1", "proto": "any", "groups": []any{1, true}}}}
|
||||||
|
require.NoError(t, AddFirewallRulesFromConfig(l, true, conf, mf))
|
||||||
|
assert.Equal(t, []string{"1", "true"}, mf.lastCall.groups)
|
||||||
|
|
||||||
|
conf = config.NewC(test.NewLogger())
|
||||||
|
mf = &mockFirewall{}
|
||||||
|
conf.Settings["firewall"] = map[string]any{"inbound": []any{map[string]any{"port": "1", "proto": "any", "group": 1}}}
|
||||||
|
require.NoError(t, AddFirewallRulesFromConfig(l, true, conf, mf))
|
||||||
|
assert.Equal(t, []string{"1"}, mf.lastCall.groups)
|
||||||
|
|
||||||
|
// Test a null group or groups is the same as not providing it
|
||||||
|
for _, key := range []string{"group", "groups"} {
|
||||||
|
conf = config.NewC(test.NewLogger())
|
||||||
|
mf = &mockFirewall{}
|
||||||
|
conf.Settings["firewall"] = map[string]any{"inbound": []any{map[string]any{"port": "1", "proto": "any", key: nil, "host": "a"}}}
|
||||||
|
require.NoError(t, AddFirewallRulesFromConfig(l, true, conf, mf))
|
||||||
|
assert.Empty(t, mf.lastCall.groups)
|
||||||
|
assert.Equal(t, "a", mf.lastCall.host)
|
||||||
|
}
|
||||||
|
|
||||||
// Test Add error
|
// Test Add error
|
||||||
conf = config.NewC(test.NewLogger())
|
conf = config.NewC(test.NewLogger())
|
||||||
mf = &mockFirewall{}
|
mf = &mockFirewall{}
|
||||||
|
|||||||
Reference in new issue
Block a user