2024-08-27 18:54:28 +02:00
|
|
|
|
package db
|
|
|
|
|
|
|
|
|
|
import (
|
|
|
|
|
"fmt"
|
|
|
|
|
"io"
|
|
|
|
|
"net/netip"
|
|
|
|
|
"os"
|
|
|
|
|
"path/filepath"
|
2024-09-29 13:00:27 +02:00
|
|
|
|
"slices"
|
|
|
|
|
"sort"
|
2024-08-27 18:54:28 +02:00
|
|
|
|
"testing"
|
Redo OIDC configuration (#2020)
expand user, add claims to user
This commit expands the user table with additional fields that
can be retrieved from OIDC providers (and other places) and
uses this data in various tailscale response objects if it is
available.
This is the beginning of implementing
https://docs.google.com/document/d/1X85PMxIaVWDF6T_UPji3OeeUqVBcGj_uHRM5CI-AwlY/edit
trying to make OIDC more coherant and maintainable in addition
to giving the user a better experience and integration with a
provider.
remove usernames in magic dns, normalisation of emails
this commit removes the option to have usernames as part of MagicDNS
domains and headscale will now align with Tailscale, where there is a
root domain, and the machine name.
In addition, the various normalisation functions for dns names has been
made lighter not caring about username and special character that wont
occur.
Email are no longer normalised as part of the policy processing.
untagle oidc and regcache, use typed cache
This commits stops reusing the registration cache for oidc
purposes and switches the cache to be types and not use any
allowing the removal of a bunch of casting.
try to make reauth/register branches clearer in oidc
Currently there was a function that did a bunch of stuff,
finding the machine key, trying to find the node, reauthing
the node, returning some status, and it was called validate
which was very confusing.
This commit tries to split this into what to do if the node
exists, if it needs to register etc.
Signed-off-by: Kristoffer Dalby <kristoffer@tailscale.com>
2024-10-02 14:50:17 +02:00
|
|
|
|
"time"
|
2024-08-27 18:54:28 +02:00
|
|
|
|
|
|
|
|
|
"github.com/google/go-cmp/cmp"
|
|
|
|
|
"github.com/google/go-cmp/cmp/cmpopts"
|
|
|
|
|
"github.com/juanfont/headscale/hscontrol/types"
|
2024-10-02 11:41:58 +02:00
|
|
|
|
"github.com/juanfont/headscale/hscontrol/util"
|
2024-08-27 18:54:28 +02:00
|
|
|
|
"github.com/stretchr/testify/assert"
|
2024-11-22 16:54:58 +01:00
|
|
|
|
"github.com/stretchr/testify/require"
|
2024-08-27 18:54:28 +02:00
|
|
|
|
"gorm.io/gorm"
|
Redo OIDC configuration (#2020)
expand user, add claims to user
This commit expands the user table with additional fields that
can be retrieved from OIDC providers (and other places) and
uses this data in various tailscale response objects if it is
available.
This is the beginning of implementing
https://docs.google.com/document/d/1X85PMxIaVWDF6T_UPji3OeeUqVBcGj_uHRM5CI-AwlY/edit
trying to make OIDC more coherant and maintainable in addition
to giving the user a better experience and integration with a
provider.
remove usernames in magic dns, normalisation of emails
this commit removes the option to have usernames as part of MagicDNS
domains and headscale will now align with Tailscale, where there is a
root domain, and the machine name.
In addition, the various normalisation functions for dns names has been
made lighter not caring about username and special character that wont
occur.
Email are no longer normalised as part of the policy processing.
untagle oidc and regcache, use typed cache
This commits stops reusing the registration cache for oidc
purposes and switches the cache to be types and not use any
allowing the removal of a bunch of casting.
try to make reauth/register branches clearer in oidc
Currently there was a function that did a bunch of stuff,
finding the machine key, trying to find the node, reauthing
the node, returning some status, and it was called validate
which was very confusing.
This commit tries to split this into what to do if the node
exists, if it needs to register etc.
Signed-off-by: Kristoffer Dalby <kristoffer@tailscale.com>
2024-10-02 14:50:17 +02:00
|
|
|
|
"zgo.at/zcache/v2"
|
2024-08-27 18:54:28 +02:00
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
func TestMigrations(t *testing.T) {
|
2024-10-02 11:41:58 +02:00
|
|
|
|
ipp := func(p string) netip.Prefix {
|
|
|
|
|
return netip.MustParsePrefix(p)
|
2024-08-27 18:54:28 +02:00
|
|
|
|
}
|
|
|
|
|
r := func(id uint64, p string, a, e, i bool) types.Route {
|
|
|
|
|
return types.Route{
|
|
|
|
|
NodeID: id,
|
|
|
|
|
Prefix: ipp(p),
|
|
|
|
|
Advertised: a,
|
|
|
|
|
Enabled: e,
|
|
|
|
|
IsPrimary: i,
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
tests := []struct {
|
|
|
|
|
dbPath string
|
|
|
|
|
wantFunc func(*testing.T, *HSDatabase)
|
|
|
|
|
wantErr string
|
|
|
|
|
}{
|
|
|
|
|
{
|
|
|
|
|
dbPath: "testdata/0-22-3-to-0-23-0-routes-are-dropped-2063.sqlite",
|
|
|
|
|
wantFunc: func(t *testing.T, h *HSDatabase) {
|
|
|
|
|
routes, err := Read(h.DB, func(rx *gorm.DB) (types.Routes, error) {
|
|
|
|
|
return GetRoutes(rx)
|
|
|
|
|
})
|
2024-11-22 16:54:58 +01:00
|
|
|
|
require.NoError(t, err)
|
2024-08-27 18:54:28 +02:00
|
|
|
|
|
|
|
|
|
assert.Len(t, routes, 10)
|
|
|
|
|
want := types.Routes{
|
|
|
|
|
r(1, "0.0.0.0/0", true, true, false),
|
|
|
|
|
r(1, "::/0", true, true, false),
|
|
|
|
|
r(1, "10.9.110.0/24", true, true, true),
|
|
|
|
|
r(26, "172.100.100.0/24", true, true, true),
|
|
|
|
|
r(26, "172.100.100.0/24", true, false, false),
|
|
|
|
|
r(31, "0.0.0.0/0", true, true, false),
|
|
|
|
|
r(31, "0.0.0.0/0", true, false, false),
|
|
|
|
|
r(31, "::/0", true, true, false),
|
|
|
|
|
r(31, "::/0", true, false, false),
|
|
|
|
|
r(32, "192.168.0.24/32", true, true, true),
|
|
|
|
|
}
|
2024-10-02 11:41:58 +02:00
|
|
|
|
if diff := cmp.Diff(want, routes, cmpopts.IgnoreFields(types.Route{}, "Model", "Node"), util.PrefixComparer); diff != "" {
|
2024-08-27 18:54:28 +02:00
|
|
|
|
t.Errorf("TestMigrations() mismatch (-want +got):\n%s", diff)
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
dbPath: "testdata/0-22-3-to-0-23-0-routes-fail-foreign-key-2076.sqlite",
|
|
|
|
|
wantFunc: func(t *testing.T, h *HSDatabase) {
|
|
|
|
|
routes, err := Read(h.DB, func(rx *gorm.DB) (types.Routes, error) {
|
|
|
|
|
return GetRoutes(rx)
|
|
|
|
|
})
|
2024-11-22 16:54:58 +01:00
|
|
|
|
require.NoError(t, err)
|
2024-08-27 18:54:28 +02:00
|
|
|
|
|
|
|
|
|
assert.Len(t, routes, 4)
|
|
|
|
|
want := types.Routes{
|
|
|
|
|
// These routes exists, but have no nodes associated with them
|
|
|
|
|
// when the migration starts.
|
|
|
|
|
// r(1, "0.0.0.0/0", true, true, false),
|
|
|
|
|
// r(1, "::/0", true, true, false),
|
|
|
|
|
// r(3, "0.0.0.0/0", true, true, false),
|
|
|
|
|
// r(3, "::/0", true, true, false),
|
|
|
|
|
// r(5, "0.0.0.0/0", true, true, false),
|
|
|
|
|
// r(5, "::/0", true, true, false),
|
|
|
|
|
// r(6, "0.0.0.0/0", true, true, false),
|
|
|
|
|
// r(6, "::/0", true, true, false),
|
|
|
|
|
// r(6, "10.0.0.0/8", true, false, false),
|
|
|
|
|
// r(7, "0.0.0.0/0", true, true, false),
|
|
|
|
|
// r(7, "::/0", true, true, false),
|
|
|
|
|
// r(7, "10.0.0.0/8", true, false, false),
|
|
|
|
|
// r(9, "0.0.0.0/0", true, true, false),
|
|
|
|
|
// r(9, "::/0", true, true, false),
|
|
|
|
|
// r(9, "10.0.0.0/8", true, true, false),
|
|
|
|
|
// r(11, "0.0.0.0/0", true, true, false),
|
|
|
|
|
// r(11, "::/0", true, true, false),
|
|
|
|
|
// r(11, "10.0.0.0/8", true, true, true),
|
|
|
|
|
// r(12, "0.0.0.0/0", true, true, false),
|
|
|
|
|
// r(12, "::/0", true, true, false),
|
|
|
|
|
// r(12, "10.0.0.0/8", true, false, false),
|
|
|
|
|
//
|
|
|
|
|
// These nodes exists, so routes should be kept.
|
|
|
|
|
r(13, "10.0.0.0/8", true, false, false),
|
|
|
|
|
r(13, "0.0.0.0/0", true, true, false),
|
|
|
|
|
r(13, "::/0", true, true, false),
|
|
|
|
|
r(13, "10.18.80.2/32", true, true, true),
|
|
|
|
|
}
|
2024-10-02 11:41:58 +02:00
|
|
|
|
if diff := cmp.Diff(want, routes, cmpopts.IgnoreFields(types.Route{}, "Model", "Node"), util.PrefixComparer); diff != "" {
|
2024-08-27 18:54:28 +02:00
|
|
|
|
t.Errorf("TestMigrations() mismatch (-want +got):\n%s", diff)
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
},
|
2024-09-29 13:00:27 +02:00
|
|
|
|
// at 14:15:06 ❯ go run ./cmd/headscale preauthkeys list
|
|
|
|
|
// ID | Key | Reusable | Ephemeral | Used | Expiration | Created | Tags
|
|
|
|
|
// 1 | 09b28f.. | false | false | false | 2024-09-27 | 2024-09-27 | tag:derp
|
|
|
|
|
// 2 | 3112b9.. | false | false | false | 2024-09-27 | 2024-09-27 | tag:derp
|
|
|
|
|
// 3 | 7c23b9.. | false | false | false | 2024-09-27 | 2024-09-27 | tag:derp,tag:merp
|
|
|
|
|
// 4 | f20155.. | false | false | false | 2024-09-27 | 2024-09-27 | tag:test
|
|
|
|
|
// 5 | b212b9.. | false | false | false | 2024-09-27 | 2024-09-27 | tag:test,tag:woop,tag:dedu
|
|
|
|
|
{
|
|
|
|
|
dbPath: "testdata/0-23-0-to-0-24-0-preauthkey-tags-table.sqlite",
|
|
|
|
|
wantFunc: func(t *testing.T, h *HSDatabase) {
|
|
|
|
|
keys, err := Read(h.DB, func(rx *gorm.DB) ([]types.PreAuthKey, error) {
|
2024-11-18 03:40:06 +01:00
|
|
|
|
kratest, err := ListPreAuthKeysByUser(rx, 1) // kratest
|
2024-09-29 13:00:27 +02:00
|
|
|
|
if err != nil {
|
|
|
|
|
return nil, err
|
|
|
|
|
}
|
|
|
|
|
|
2024-11-18 03:40:06 +01:00
|
|
|
|
testkra, err := ListPreAuthKeysByUser(rx, 2) // testkra
|
2024-09-29 13:00:27 +02:00
|
|
|
|
if err != nil {
|
|
|
|
|
return nil, err
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return append(kratest, testkra...), nil
|
|
|
|
|
})
|
2024-11-22 16:54:58 +01:00
|
|
|
|
require.NoError(t, err)
|
2024-09-29 13:00:27 +02:00
|
|
|
|
|
|
|
|
|
assert.Len(t, keys, 5)
|
|
|
|
|
want := []types.PreAuthKey{
|
|
|
|
|
{
|
|
|
|
|
ID: 1,
|
|
|
|
|
Tags: []string{"tag:derp"},
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
ID: 2,
|
|
|
|
|
Tags: []string{"tag:derp"},
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
ID: 3,
|
|
|
|
|
Tags: []string{"tag:derp", "tag:merp"},
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
ID: 4,
|
|
|
|
|
Tags: []string{"tag:test"},
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
ID: 5,
|
|
|
|
|
Tags: []string{"tag:test", "tag:woop", "tag:dedu"},
|
|
|
|
|
},
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if diff := cmp.Diff(want, keys, cmp.Comparer(func(a, b []string) bool {
|
|
|
|
|
sort.Sort(sort.StringSlice(a))
|
|
|
|
|
sort.Sort(sort.StringSlice(b))
|
|
|
|
|
return slices.Equal(a, b)
|
|
|
|
|
}), cmpopts.IgnoreFields(types.PreAuthKey{}, "Key", "UserID", "User", "CreatedAt", "Expiration")); diff != "" {
|
|
|
|
|
t.Errorf("TestMigrations() mismatch (-want +got):\n%s", diff)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if h.DB.Migrator().HasTable("pre_auth_key_acl_tags") {
|
|
|
|
|
t.Errorf("TestMigrations() table pre_auth_key_acl_tags should not exist")
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
},
|
2024-10-02 11:41:58 +02:00
|
|
|
|
{
|
|
|
|
|
dbPath: "testdata/0-23-0-to-0-24-0-no-more-special-types.sqlite",
|
|
|
|
|
wantFunc: func(t *testing.T, h *HSDatabase) {
|
|
|
|
|
nodes, err := Read(h.DB, func(rx *gorm.DB) (types.Nodes, error) {
|
|
|
|
|
return ListNodes(rx)
|
|
|
|
|
})
|
2024-11-22 16:54:58 +01:00
|
|
|
|
require.NoError(t, err)
|
2024-10-02 11:41:58 +02:00
|
|
|
|
|
|
|
|
|
for _, node := range nodes {
|
|
|
|
|
assert.Falsef(t, node.MachineKey.IsZero(), "expected non zero machinekey")
|
|
|
|
|
assert.Contains(t, node.MachineKey.String(), "mkey:")
|
|
|
|
|
assert.Falsef(t, node.NodeKey.IsZero(), "expected non zero nodekey")
|
|
|
|
|
assert.Contains(t, node.NodeKey.String(), "nodekey:")
|
|
|
|
|
assert.Falsef(t, node.DiscoKey.IsZero(), "expected non zero discokey")
|
|
|
|
|
assert.Contains(t, node.DiscoKey.String(), "discokey:")
|
|
|
|
|
assert.NotNil(t, node.IPv4)
|
|
|
|
|
assert.NotNil(t, node.IPv4)
|
|
|
|
|
assert.Len(t, node.Endpoints, 1)
|
|
|
|
|
assert.NotNil(t, node.Hostinfo)
|
|
|
|
|
assert.NotNil(t, node.MachineKey)
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
},
|
2024-08-27 18:54:28 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
for _, tt := range tests {
|
|
|
|
|
t.Run(tt.dbPath, func(t *testing.T) {
|
|
|
|
|
dbPath, err := testCopyOfDatabase(tt.dbPath)
|
|
|
|
|
if err != nil {
|
|
|
|
|
t.Fatalf("copying db for test: %s", err)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
hsdb, err := NewHeadscaleDatabase(types.DatabaseConfig{
|
|
|
|
|
Type: "sqlite3",
|
|
|
|
|
Sqlite: types.SqliteConfig{
|
|
|
|
|
Path: dbPath,
|
|
|
|
|
},
|
Redo OIDC configuration (#2020)
expand user, add claims to user
This commit expands the user table with additional fields that
can be retrieved from OIDC providers (and other places) and
uses this data in various tailscale response objects if it is
available.
This is the beginning of implementing
https://docs.google.com/document/d/1X85PMxIaVWDF6T_UPji3OeeUqVBcGj_uHRM5CI-AwlY/edit
trying to make OIDC more coherant and maintainable in addition
to giving the user a better experience and integration with a
provider.
remove usernames in magic dns, normalisation of emails
this commit removes the option to have usernames as part of MagicDNS
domains and headscale will now align with Tailscale, where there is a
root domain, and the machine name.
In addition, the various normalisation functions for dns names has been
made lighter not caring about username and special character that wont
occur.
Email are no longer normalised as part of the policy processing.
untagle oidc and regcache, use typed cache
This commits stops reusing the registration cache for oidc
purposes and switches the cache to be types and not use any
allowing the removal of a bunch of casting.
try to make reauth/register branches clearer in oidc
Currently there was a function that did a bunch of stuff,
finding the machine key, trying to find the node, reauthing
the node, returning some status, and it was called validate
which was very confusing.
This commit tries to split this into what to do if the node
exists, if it needs to register etc.
Signed-off-by: Kristoffer Dalby <kristoffer@tailscale.com>
2024-10-02 14:50:17 +02:00
|
|
|
|
}, "", emptyCache())
|
2024-08-27 18:54:28 +02:00
|
|
|
|
if err != nil && tt.wantErr != err.Error() {
|
|
|
|
|
t.Errorf("TestMigrations() unexpected error = %v, wantErr %v", err, tt.wantErr)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if tt.wantFunc != nil {
|
|
|
|
|
tt.wantFunc(t, hsdb)
|
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func testCopyOfDatabase(src string) (string, error) {
|
|
|
|
|
sourceFileStat, err := os.Stat(src)
|
|
|
|
|
if err != nil {
|
|
|
|
|
return "", err
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if !sourceFileStat.Mode().IsRegular() {
|
|
|
|
|
return "", fmt.Errorf("%s is not a regular file", src)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
source, err := os.Open(src)
|
|
|
|
|
if err != nil {
|
|
|
|
|
return "", err
|
|
|
|
|
}
|
|
|
|
|
defer source.Close()
|
|
|
|
|
|
|
|
|
|
tmpDir, err := os.MkdirTemp("", "hsdb-test-*")
|
|
|
|
|
if err != nil {
|
|
|
|
|
return "", err
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fn := filepath.Base(src)
|
|
|
|
|
dst := filepath.Join(tmpDir, fn)
|
|
|
|
|
|
|
|
|
|
destination, err := os.Create(dst)
|
|
|
|
|
if err != nil {
|
|
|
|
|
return "", err
|
|
|
|
|
}
|
|
|
|
|
defer destination.Close()
|
|
|
|
|
_, err = io.Copy(destination, source)
|
|
|
|
|
return dst, err
|
|
|
|
|
}
|
Redo OIDC configuration (#2020)
expand user, add claims to user
This commit expands the user table with additional fields that
can be retrieved from OIDC providers (and other places) and
uses this data in various tailscale response objects if it is
available.
This is the beginning of implementing
https://docs.google.com/document/d/1X85PMxIaVWDF6T_UPji3OeeUqVBcGj_uHRM5CI-AwlY/edit
trying to make OIDC more coherant and maintainable in addition
to giving the user a better experience and integration with a
provider.
remove usernames in magic dns, normalisation of emails
this commit removes the option to have usernames as part of MagicDNS
domains and headscale will now align with Tailscale, where there is a
root domain, and the machine name.
In addition, the various normalisation functions for dns names has been
made lighter not caring about username and special character that wont
occur.
Email are no longer normalised as part of the policy processing.
untagle oidc and regcache, use typed cache
This commits stops reusing the registration cache for oidc
purposes and switches the cache to be types and not use any
allowing the removal of a bunch of casting.
try to make reauth/register branches clearer in oidc
Currently there was a function that did a bunch of stuff,
finding the machine key, trying to find the node, reauthing
the node, returning some status, and it was called validate
which was very confusing.
This commit tries to split this into what to do if the node
exists, if it needs to register etc.
Signed-off-by: Kristoffer Dalby <kristoffer@tailscale.com>
2024-10-02 14:50:17 +02:00
|
|
|
|
|
|
|
|
|
func emptyCache() *zcache.Cache[string, types.Node] {
|
|
|
|
|
return zcache.New[string, types.Node](time.Minute, time.Hour)
|
|
|
|
|
}
|