2023-05-21 16:37:59 +00:00
|
|
|
package db
|
2020-06-21 10:32:08 +00:00
|
|
|
|
|
|
|
import (
|
2022-07-06 11:39:10 +00:00
|
|
|
"context"
|
2023-11-19 21:37:04 +00:00
|
|
|
"database/sql"
|
2024-09-29 11:00:27 +00:00
|
|
|
"encoding/json"
|
2020-06-21 10:32:08 +00:00
|
|
|
"errors"
|
2022-03-01 16:31:25 +00:00
|
|
|
"fmt"
|
2024-04-17 05:03:06 +00:00
|
|
|
"net/netip"
|
2024-02-17 12:36:19 +00:00
|
|
|
"path/filepath"
|
2024-02-09 06:27:00 +00:00
|
|
|
"strconv"
|
2023-11-16 16:55:29 +00:00
|
|
|
"strings"
|
2022-02-23 16:15:20 +00:00
|
|
|
"time"
|
2020-06-21 10:32:08 +00:00
|
|
|
|
2022-02-22 16:18:25 +00:00
|
|
|
"github.com/glebarez/sqlite"
|
2023-12-10 14:46:14 +00:00
|
|
|
"github.com/go-gormigrate/gormigrate/v2"
|
2024-07-22 06:56:00 +00:00
|
|
|
"github.com/juanfont/headscale/hscontrol/types"
|
|
|
|
"github.com/juanfont/headscale/hscontrol/util"
|
2022-02-28 18:05:03 +00:00
|
|
|
"github.com/rs/zerolog/log"
|
2021-06-24 13:44:19 +00:00
|
|
|
"gorm.io/driver/postgres"
|
|
|
|
"gorm.io/gorm"
|
2021-07-11 11:13:36 +00:00
|
|
|
"gorm.io/gorm/logger"
|
2024-10-02 09:41:58 +00:00
|
|
|
"gorm.io/gorm/schema"
|
2024-09-29 11:00:27 +00:00
|
|
|
"tailscale.com/util/set"
|
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 12:50:17 +00:00
|
|
|
"zgo.at/zcache/v2"
|
2020-06-21 10:32:08 +00:00
|
|
|
)
|
|
|
|
|
2024-10-02 09:41:58 +00:00
|
|
|
func init() {
|
|
|
|
schema.RegisterSerializer("text", TextSerialiser{})
|
|
|
|
}
|
|
|
|
|
2023-12-10 14:46:14 +00:00
|
|
|
var errDatabaseNotSupported = errors.New("database type not supported")
|
2020-06-21 10:32:08 +00:00
|
|
|
|
2021-02-23 19:11:30 +00:00
|
|
|
// KV is a key-value store in a psql table. For future use...
|
2023-05-11 07:09:18 +00:00
|
|
|
// TODO(kradalby): Is this used for anything?
|
2020-06-21 10:32:08 +00:00
|
|
|
type KV struct {
|
|
|
|
Key string
|
|
|
|
Value string
|
|
|
|
}
|
|
|
|
|
2023-05-11 07:09:18 +00:00
|
|
|
type HSDatabase struct {
|
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 12:50:17 +00:00
|
|
|
DB *gorm.DB
|
|
|
|
cfg *types.DatabaseConfig
|
|
|
|
regCache *zcache.Cache[string, types.Node]
|
2023-05-11 07:09:18 +00:00
|
|
|
|
2023-06-12 13:29:34 +00:00
|
|
|
baseDomain string
|
2023-05-11 07:09:18 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// TODO(kradalby): assemble this struct from toptions or something typed
|
|
|
|
// rather than arguments.
|
|
|
|
func NewHeadscaleDatabase(
|
2024-02-09 06:27:00 +00:00
|
|
|
cfg types.DatabaseConfig,
|
2023-05-11 07:09:18 +00:00
|
|
|
baseDomain string,
|
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 12:50:17 +00:00
|
|
|
regCache *zcache.Cache[string, types.Node],
|
2023-05-11 07:09:18 +00:00
|
|
|
) (*HSDatabase, error) {
|
2024-02-09 06:27:00 +00:00
|
|
|
dbConn, err := openDB(cfg)
|
2020-06-21 10:32:08 +00:00
|
|
|
if err != nil {
|
2023-05-11 07:09:18 +00:00
|
|
|
return nil, err
|
2020-06-21 10:32:08 +00:00
|
|
|
}
|
2021-07-04 19:40:46 +00:00
|
|
|
|
2024-02-09 16:34:28 +00:00
|
|
|
migrations := gormigrate.New(
|
|
|
|
dbConn,
|
|
|
|
gormigrate.DefaultOptions,
|
|
|
|
[]*gormigrate.Migration{
|
2024-08-27 16:54:28 +00:00
|
|
|
// New migrations must be added as transactions at the end of this list.
|
|
|
|
// The initial migration here is quite messy, completely out of order and
|
2024-02-09 16:34:28 +00:00
|
|
|
// has no versioning and is the tech debt of not having versioned migrations
|
|
|
|
// prior to this point. This first migration is all DB changes to bring a DB
|
|
|
|
// up to 0.23.0.
|
|
|
|
{
|
|
|
|
ID: "202312101416",
|
|
|
|
Migrate: func(tx *gorm.DB) error {
|
|
|
|
if cfg.Type == types.DatabasePostgres {
|
|
|
|
tx.Exec(`create extension if not exists "uuid-ossp";`)
|
|
|
|
}
|
|
|
|
|
|
|
|
_ = tx.Migrator().RenameTable("namespaces", "users")
|
|
|
|
|
|
|
|
// the big rename from Machine to Node
|
|
|
|
_ = tx.Migrator().RenameTable("machines", "nodes")
|
|
|
|
_ = tx.Migrator().
|
|
|
|
RenameColumn(&types.Route{}, "machine_id", "node_id")
|
|
|
|
|
|
|
|
err = tx.AutoMigrate(types.User{})
|
|
|
|
if err != nil {
|
|
|
|
return err
|
2023-12-10 14:46:14 +00:00
|
|
|
}
|
|
|
|
|
2024-02-09 16:34:28 +00:00
|
|
|
_ = tx.Migrator().
|
|
|
|
RenameColumn(&types.Node{}, "namespace_id", "user_id")
|
|
|
|
_ = tx.Migrator().
|
|
|
|
RenameColumn(&types.PreAuthKey{}, "namespace_id", "user_id")
|
|
|
|
|
|
|
|
_ = tx.Migrator().
|
|
|
|
RenameColumn(&types.Node{}, "ip_address", "ip_addresses")
|
|
|
|
_ = tx.Migrator().RenameColumn(&types.Node{}, "name", "hostname")
|
|
|
|
|
|
|
|
// GivenName is used as the primary source of DNS names, make sure
|
|
|
|
// the field is populated and normalized if it was not when the
|
|
|
|
// node was registered.
|
|
|
|
_ = tx.Migrator().
|
|
|
|
RenameColumn(&types.Node{}, "nickname", "given_name")
|
|
|
|
|
2024-05-16 00:40:14 +00:00
|
|
|
dbConn.Model(&types.Node{}).Where("auth_key_id = ?", 0).Update("auth_key_id", nil)
|
2024-05-27 10:53:37 +00:00
|
|
|
// If the Node table has a column for registered,
|
2024-02-09 16:34:28 +00:00
|
|
|
// find all occourences of "false" and drop them. Then
|
|
|
|
// remove the column.
|
|
|
|
if tx.Migrator().HasColumn(&types.Node{}, "registered") {
|
2023-12-10 14:46:14 +00:00
|
|
|
log.Info().
|
2024-02-09 16:34:28 +00:00
|
|
|
Msg(`Database has legacy "registered" column in node, removing...`)
|
|
|
|
|
|
|
|
nodes := types.Nodes{}
|
|
|
|
if err := tx.Not("registered").Find(&nodes).Error; err != nil {
|
|
|
|
log.Error().Err(err).Msg("Error accessing db")
|
|
|
|
}
|
|
|
|
|
|
|
|
for _, node := range nodes {
|
|
|
|
log.Info().
|
2023-12-10 14:46:14 +00:00
|
|
|
Str("node", node.Hostname).
|
|
|
|
Str("machine_key", node.MachineKey.ShortString()).
|
2024-02-09 16:34:28 +00:00
|
|
|
Msg("Deleting unregistered node")
|
|
|
|
if err := tx.Delete(&types.Node{}, node.ID).Error; err != nil {
|
|
|
|
log.Error().
|
|
|
|
Err(err).
|
|
|
|
Str("node", node.Hostname).
|
|
|
|
Str("machine_key", node.MachineKey.ShortString()).
|
|
|
|
Msg("Error deleting unregistered node")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
err := tx.Migrator().DropColumn(&types.Node{}, "registered")
|
|
|
|
if err != nil {
|
|
|
|
log.Error().Err(err).Msg("Error dropping registered column")
|
2023-12-10 14:46:14 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2024-08-30 06:08:54 +00:00
|
|
|
// Remove any invalid routes associated with a node that does not exist.
|
2024-08-27 16:54:28 +00:00
|
|
|
if tx.Migrator().HasTable(&types.Route{}) && tx.Migrator().HasTable(&types.Node{}) {
|
|
|
|
err := tx.Exec("delete from routes where node_id not in (select id from nodes)").Error
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
}
|
2024-08-30 06:08:54 +00:00
|
|
|
err = tx.AutoMigrate(&types.Route{})
|
|
|
|
if err != nil {
|
|
|
|
return err
|
2023-12-10 14:46:14 +00:00
|
|
|
}
|
|
|
|
|
2024-02-09 16:34:28 +00:00
|
|
|
err = tx.AutoMigrate(&types.Node{})
|
|
|
|
if err != nil {
|
|
|
|
return err
|
2023-12-10 14:46:14 +00:00
|
|
|
}
|
|
|
|
|
2024-02-09 16:34:28 +00:00
|
|
|
// Ensure all keys have correct prefixes
|
|
|
|
// https://github.com/tailscale/tailscale/blob/main/types/key/node.go#L35
|
|
|
|
type result struct {
|
|
|
|
ID uint64
|
|
|
|
MachineKey string
|
|
|
|
NodeKey string
|
|
|
|
DiscoKey string
|
|
|
|
}
|
|
|
|
var results []result
|
|
|
|
err = tx.Raw("SELECT id, node_key, machine_key, disco_key FROM nodes").
|
|
|
|
Find(&results).
|
|
|
|
Error
|
2023-12-10 14:46:14 +00:00
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
2022-11-23 18:50:30 +00:00
|
|
|
|
2024-02-09 16:34:28 +00:00
|
|
|
for _, node := range results {
|
|
|
|
mKey := node.MachineKey
|
|
|
|
if !strings.HasPrefix(node.MachineKey, "mkey:") {
|
|
|
|
mKey = "mkey:" + node.MachineKey
|
|
|
|
}
|
|
|
|
nKey := node.NodeKey
|
|
|
|
if !strings.HasPrefix(node.NodeKey, "nodekey:") {
|
|
|
|
nKey = "nodekey:" + node.NodeKey
|
|
|
|
}
|
2023-12-10 14:46:14 +00:00
|
|
|
|
2024-02-09 16:34:28 +00:00
|
|
|
dKey := node.DiscoKey
|
|
|
|
if !strings.HasPrefix(node.DiscoKey, "discokey:") {
|
|
|
|
dKey = "discokey:" + node.DiscoKey
|
|
|
|
}
|
2023-12-10 14:46:14 +00:00
|
|
|
|
2024-02-09 16:34:28 +00:00
|
|
|
err := tx.Exec(
|
|
|
|
"UPDATE nodes SET machine_key = @mKey, node_key = @nKey, disco_key = @dKey WHERE ID = @id",
|
|
|
|
sql.Named("mKey", mKey),
|
|
|
|
sql.Named("nKey", nKey),
|
|
|
|
sql.Named("dKey", dKey),
|
|
|
|
sql.Named("id", node.ID),
|
|
|
|
).Error
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
2023-12-10 14:46:14 +00:00
|
|
|
}
|
|
|
|
|
2024-02-09 16:34:28 +00:00
|
|
|
if tx.Migrator().HasColumn(&types.Node{}, "enabled_routes") {
|
|
|
|
log.Info().
|
|
|
|
Msgf("Database has legacy enabled_routes column in node, migrating...")
|
2023-12-10 14:46:14 +00:00
|
|
|
|
2024-02-09 16:34:28 +00:00
|
|
|
type NodeAux struct {
|
|
|
|
ID uint64
|
2024-10-02 09:41:58 +00:00
|
|
|
EnabledRoutes []netip.Prefix `gorm:"serializer:json"`
|
2024-02-09 16:34:28 +00:00
|
|
|
}
|
2023-12-10 14:46:14 +00:00
|
|
|
|
2024-02-09 16:34:28 +00:00
|
|
|
nodesAux := []NodeAux{}
|
|
|
|
err := tx.Table("nodes").
|
|
|
|
Select("id, enabled_routes").
|
|
|
|
Scan(&nodesAux).
|
|
|
|
Error
|
|
|
|
if err != nil {
|
|
|
|
log.Fatal().Err(err).Msg("Error accessing db")
|
|
|
|
}
|
|
|
|
for _, node := range nodesAux {
|
|
|
|
for _, prefix := range node.EnabledRoutes {
|
|
|
|
if err != nil {
|
|
|
|
log.Error().
|
|
|
|
Err(err).
|
|
|
|
Str("enabled_route", prefix.String()).
|
|
|
|
Msg("Error parsing enabled_route")
|
|
|
|
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
|
|
|
|
err = tx.Preload("Node").
|
2024-10-02 09:41:58 +00:00
|
|
|
Where("node_id = ? AND prefix = ?", node.ID, prefix).
|
2024-02-09 16:34:28 +00:00
|
|
|
First(&types.Route{}).
|
|
|
|
Error
|
|
|
|
if err == nil {
|
|
|
|
log.Info().
|
|
|
|
Str("enabled_route", prefix.String()).
|
|
|
|
Msg("Route already migrated to new table, skipping")
|
|
|
|
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
|
|
|
|
route := types.Route{
|
|
|
|
NodeID: node.ID,
|
|
|
|
Advertised: true,
|
|
|
|
Enabled: true,
|
2024-10-02 09:41:58 +00:00
|
|
|
Prefix: prefix,
|
2024-02-09 16:34:28 +00:00
|
|
|
}
|
|
|
|
if err := tx.Create(&route).Error; err != nil {
|
|
|
|
log.Error().Err(err).Msg("Error creating route")
|
|
|
|
} else {
|
|
|
|
log.Info().
|
|
|
|
Uint64("node_id", route.NodeID).
|
|
|
|
Str("prefix", prefix.String()).
|
|
|
|
Msg("Route migrated")
|
|
|
|
}
|
2023-12-10 14:46:14 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2024-02-09 16:34:28 +00:00
|
|
|
err = tx.Migrator().DropColumn(&types.Node{}, "enabled_routes")
|
|
|
|
if err != nil {
|
|
|
|
log.Error().
|
|
|
|
Err(err).
|
|
|
|
Msg("Error dropping enabled_routes column")
|
|
|
|
}
|
2023-12-10 14:46:14 +00:00
|
|
|
}
|
|
|
|
|
2024-02-09 16:34:28 +00:00
|
|
|
if tx.Migrator().HasColumn(&types.Node{}, "given_name") {
|
|
|
|
nodes := types.Nodes{}
|
|
|
|
if err := tx.Find(&nodes).Error; err != nil {
|
|
|
|
log.Error().Err(err).Msg("Error accessing db")
|
|
|
|
}
|
2023-12-10 14:46:14 +00:00
|
|
|
|
2024-02-09 16:34:28 +00:00
|
|
|
for item, node := range nodes {
|
|
|
|
if node.GivenName == "" {
|
|
|
|
if err != nil {
|
|
|
|
log.Error().
|
|
|
|
Caller().
|
|
|
|
Str("hostname", node.Hostname).
|
|
|
|
Err(err).
|
|
|
|
Msg("Failed to normalize node hostname in DB migration")
|
|
|
|
}
|
|
|
|
|
|
|
|
err = tx.Model(nodes[item]).Updates(types.Node{
|
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 12:50:17 +00:00
|
|
|
GivenName: node.Hostname,
|
2024-02-09 16:34:28 +00:00
|
|
|
}).Error
|
|
|
|
if err != nil {
|
|
|
|
log.Error().
|
|
|
|
Caller().
|
|
|
|
Str("hostname", node.Hostname).
|
|
|
|
Err(err).
|
|
|
|
Msg("Failed to save normalized node name in DB migration")
|
|
|
|
}
|
2023-12-10 14:46:14 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2022-11-23 18:50:30 +00:00
|
|
|
|
2024-02-09 16:34:28 +00:00
|
|
|
err = tx.AutoMigrate(&KV{})
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
2022-11-23 18:50:30 +00:00
|
|
|
|
2024-02-09 16:34:28 +00:00
|
|
|
err = tx.AutoMigrate(&types.PreAuthKey{})
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
2022-05-23 16:33:07 +00:00
|
|
|
|
2024-09-29 11:00:27 +00:00
|
|
|
type preAuthKeyACLTag struct {
|
|
|
|
ID uint64 `gorm:"primary_key"`
|
|
|
|
PreAuthKeyID uint64
|
|
|
|
Tag string
|
|
|
|
}
|
|
|
|
err = tx.AutoMigrate(&preAuthKeyACLTag{})
|
2024-02-09 16:34:28 +00:00
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
2022-05-23 16:33:07 +00:00
|
|
|
|
2024-02-09 16:34:28 +00:00
|
|
|
_ = tx.Migrator().DropTable("shared_machines")
|
2022-01-30 13:06:49 +00:00
|
|
|
|
2024-02-09 16:34:28 +00:00
|
|
|
err = tx.AutoMigrate(&types.APIKey{})
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
2020-06-21 10:32:08 +00:00
|
|
|
|
2024-02-09 16:34:28 +00:00
|
|
|
return nil
|
|
|
|
},
|
|
|
|
Rollback: func(tx *gorm.DB) error {
|
|
|
|
return nil
|
|
|
|
},
|
2023-12-10 14:46:14 +00:00
|
|
|
},
|
2024-02-09 16:34:28 +00:00
|
|
|
{
|
|
|
|
// drop key-value table, it is not used, and has not contained
|
|
|
|
// useful data for a long time or ever.
|
|
|
|
ID: "202312101430",
|
|
|
|
Migrate: func(tx *gorm.DB) error {
|
|
|
|
return tx.Migrator().DropTable("kvs")
|
|
|
|
},
|
|
|
|
Rollback: func(tx *gorm.DB) error {
|
|
|
|
return nil
|
|
|
|
},
|
2023-12-10 14:46:14 +00:00
|
|
|
},
|
2024-02-18 22:22:07 +00:00
|
|
|
{
|
|
|
|
// remove last_successful_update from node table,
|
|
|
|
// no longer used.
|
|
|
|
ID: "202402151347",
|
|
|
|
Migrate: func(tx *gorm.DB) error {
|
2024-05-27 10:53:37 +00:00
|
|
|
_ = tx.Migrator().DropColumn(&types.Node{}, "last_successful_update")
|
|
|
|
return nil
|
2024-02-18 22:22:07 +00:00
|
|
|
},
|
|
|
|
Rollback: func(tx *gorm.DB) error {
|
|
|
|
return nil
|
|
|
|
},
|
|
|
|
},
|
2024-04-17 05:03:06 +00:00
|
|
|
{
|
|
|
|
// Replace column with IP address list with dedicated
|
|
|
|
// IP v4 and v6 column.
|
|
|
|
// Note that previously, the list _could_ contain more
|
|
|
|
// than two addresses, which should not really happen.
|
2024-07-22 06:56:00 +00:00
|
|
|
// In that case, the first occurrence of each type will
|
2024-04-17 05:03:06 +00:00
|
|
|
// be kept.
|
|
|
|
ID: "2024041121742",
|
|
|
|
Migrate: func(tx *gorm.DB) error {
|
|
|
|
_ = tx.Migrator().AddColumn(&types.Node{}, "ipv4")
|
|
|
|
_ = tx.Migrator().AddColumn(&types.Node{}, "ipv6")
|
|
|
|
|
|
|
|
type node struct {
|
|
|
|
ID uint64 `gorm:"column:id"`
|
|
|
|
Addresses string `gorm:"column:ip_addresses"`
|
|
|
|
}
|
|
|
|
|
|
|
|
var nodes []node
|
|
|
|
|
|
|
|
_ = tx.Raw("SELECT id, ip_addresses FROM nodes").Scan(&nodes).Error
|
|
|
|
|
|
|
|
for _, node := range nodes {
|
|
|
|
addrs := strings.Split(node.Addresses, ",")
|
|
|
|
|
|
|
|
if len(addrs) == 0 {
|
2024-04-17 09:09:22 +00:00
|
|
|
return fmt.Errorf("no addresses found for node(%d)", node.ID)
|
2024-04-17 05:03:06 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
var v4 *netip.Addr
|
|
|
|
var v6 *netip.Addr
|
|
|
|
|
|
|
|
for _, addrStr := range addrs {
|
|
|
|
addr, err := netip.ParseAddr(addrStr)
|
|
|
|
if err != nil {
|
|
|
|
return fmt.Errorf("parsing IP for node(%d) from database: %w", node.ID, err)
|
|
|
|
}
|
|
|
|
|
|
|
|
if addr.Is4() && v4 == nil {
|
|
|
|
v4 = &addr
|
|
|
|
}
|
|
|
|
|
|
|
|
if addr.Is6() && v6 == nil {
|
|
|
|
v6 = &addr
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2024-04-17 13:23:29 +00:00
|
|
|
if v4 != nil {
|
|
|
|
err = tx.Model(&types.Node{}).Where("id = ?", node.ID).Update("ipv4", v4.String()).Error
|
|
|
|
if err != nil {
|
|
|
|
return fmt.Errorf("saving ip addresses to new columns: %w", err)
|
|
|
|
}
|
2024-04-17 09:09:22 +00:00
|
|
|
}
|
|
|
|
|
2024-04-17 13:23:29 +00:00
|
|
|
if v6 != nil {
|
|
|
|
err = tx.Model(&types.Node{}).Where("id = ?", node.ID).Update("ipv6", v6.String()).Error
|
|
|
|
if err != nil {
|
|
|
|
return fmt.Errorf("saving ip addresses to new columns: %w", err)
|
|
|
|
}
|
2024-04-17 05:03:06 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
_ = tx.Migrator().DropColumn(&types.Node{}, "ip_addresses")
|
|
|
|
|
|
|
|
return nil
|
|
|
|
},
|
|
|
|
Rollback: func(tx *gorm.DB) error {
|
|
|
|
return nil
|
|
|
|
},
|
|
|
|
},
|
2024-07-18 05:38:25 +00:00
|
|
|
{
|
|
|
|
ID: "202406021630",
|
|
|
|
Migrate: func(tx *gorm.DB) error {
|
|
|
|
err := tx.AutoMigrate(&types.Policy{})
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
return nil
|
|
|
|
},
|
|
|
|
Rollback: func(db *gorm.DB) error { return nil },
|
|
|
|
},
|
2024-09-29 11:00:27 +00:00
|
|
|
// denormalise the ACL tags for preauth keys back onto
|
|
|
|
// the preauth key table. We dont normalise or reuse and
|
|
|
|
// it is just a bunch of work for extra work.
|
|
|
|
{
|
|
|
|
ID: "202409271400",
|
|
|
|
Migrate: func(tx *gorm.DB) error {
|
|
|
|
preauthkeyTags := map[uint64]set.Set[string]{}
|
|
|
|
|
|
|
|
type preAuthKeyACLTag struct {
|
|
|
|
ID uint64 `gorm:"primary_key"`
|
|
|
|
PreAuthKeyID uint64
|
|
|
|
Tag string
|
|
|
|
}
|
|
|
|
|
|
|
|
var aclTags []preAuthKeyACLTag
|
|
|
|
if err := tx.Find(&aclTags).Error; err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
// Store the current tags.
|
|
|
|
for _, tag := range aclTags {
|
|
|
|
if preauthkeyTags[tag.PreAuthKeyID] == nil {
|
|
|
|
preauthkeyTags[tag.PreAuthKeyID] = set.SetOf([]string{tag.Tag})
|
|
|
|
} else {
|
|
|
|
preauthkeyTags[tag.PreAuthKeyID].Add(tag.Tag)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Add tags column and restore the tags.
|
|
|
|
_ = tx.Migrator().AddColumn(&types.PreAuthKey{}, "tags")
|
|
|
|
for keyID, tags := range preauthkeyTags {
|
|
|
|
s := tags.Slice()
|
|
|
|
j, err := json.Marshal(s)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
if err := tx.Model(&types.PreAuthKey{}).Where("id = ?", keyID).Update("tags", string(j)).Error; err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Drop the old table.
|
|
|
|
_ = tx.Migrator().DropTable(&preAuthKeyACLTag{})
|
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 12:50:17 +00:00
|
|
|
return nil
|
|
|
|
},
|
|
|
|
Rollback: func(db *gorm.DB) error { return nil },
|
|
|
|
},
|
|
|
|
{
|
|
|
|
ID: "202407191627",
|
|
|
|
Migrate: func(tx *gorm.DB) error {
|
|
|
|
err := tx.AutoMigrate(&types.User{})
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
2024-09-29 11:00:27 +00:00
|
|
|
|
|
|
|
return nil
|
|
|
|
},
|
|
|
|
Rollback: func(db *gorm.DB) error { return nil },
|
|
|
|
},
|
2023-12-10 14:46:14 +00:00
|
|
|
},
|
2024-02-09 16:34:28 +00:00
|
|
|
)
|
2023-12-10 14:46:14 +00:00
|
|
|
|
2024-08-30 06:08:54 +00:00
|
|
|
if err := runMigrations(cfg, dbConn, migrations); err != nil {
|
2023-12-10 14:46:14 +00:00
|
|
|
log.Fatal().Err(err).Msgf("Migration failed: %v", err)
|
2022-08-25 10:03:38 +00:00
|
|
|
}
|
|
|
|
|
2023-12-10 14:46:14 +00:00
|
|
|
db := HSDatabase{
|
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 12:50:17 +00:00
|
|
|
DB: dbConn,
|
|
|
|
cfg: &cfg,
|
|
|
|
regCache: regCache,
|
2021-09-02 14:57:26 +00:00
|
|
|
|
2023-12-10 14:46:14 +00:00
|
|
|
baseDomain: baseDomain,
|
2022-01-25 22:11:05 +00:00
|
|
|
}
|
|
|
|
|
2023-05-11 07:09:18 +00:00
|
|
|
return &db, err
|
2020-06-21 10:32:08 +00:00
|
|
|
}
|
|
|
|
|
2024-02-09 06:27:00 +00:00
|
|
|
func openDB(cfg types.DatabaseConfig) (*gorm.DB, error) {
|
|
|
|
// TODO(kradalby): Integrate this with zerolog
|
2023-05-11 07:09:18 +00:00
|
|
|
var dbLogger logger.Interface
|
2024-02-09 06:27:00 +00:00
|
|
|
if cfg.Debug {
|
2024-08-19 09:47:52 +00:00
|
|
|
dbLogger = util.NewDBLogWrapper(&log.Logger, cfg.Gorm.SlowThreshold, cfg.Gorm.SkipErrRecordNotFound, cfg.Gorm.ParameterizedQueries)
|
2021-07-11 11:13:36 +00:00
|
|
|
} else {
|
2023-05-11 07:09:18 +00:00
|
|
|
dbLogger = logger.Default.LogMode(logger.Silent)
|
2021-07-11 11:13:36 +00:00
|
|
|
}
|
|
|
|
|
2024-02-09 06:27:00 +00:00
|
|
|
switch cfg.Type {
|
|
|
|
case types.DatabaseSqlite:
|
2024-02-17 12:36:19 +00:00
|
|
|
dir := filepath.Dir(cfg.Sqlite.Path)
|
|
|
|
err := util.EnsureDir(dir)
|
|
|
|
if err != nil {
|
|
|
|
return nil, fmt.Errorf("creating directory for sqlite: %w", err)
|
|
|
|
}
|
|
|
|
|
2024-02-18 18:31:29 +00:00
|
|
|
log.Info().
|
|
|
|
Str("database", types.DatabaseSqlite).
|
|
|
|
Str("path", cfg.Sqlite.Path).
|
|
|
|
Msg("Opening database")
|
|
|
|
|
2023-05-11 07:09:18 +00:00
|
|
|
db, err := gorm.Open(
|
2024-06-23 20:06:59 +00:00
|
|
|
sqlite.Open(cfg.Sqlite.Path),
|
2022-02-23 16:15:20 +00:00
|
|
|
&gorm.Config{
|
2024-08-19 09:47:52 +00:00
|
|
|
PrepareStmt: cfg.Gorm.PrepareStmt,
|
|
|
|
Logger: dbLogger,
|
2022-02-23 16:15:20 +00:00
|
|
|
},
|
|
|
|
)
|
|
|
|
|
2024-06-23 20:06:59 +00:00
|
|
|
if err := db.Exec(`
|
|
|
|
PRAGMA foreign_keys=ON;
|
|
|
|
PRAGMA busy_timeout=10000;
|
|
|
|
PRAGMA auto_vacuum=INCREMENTAL;
|
|
|
|
PRAGMA synchronous=NORMAL;
|
|
|
|
`).Error; err != nil {
|
|
|
|
return nil, fmt.Errorf("enabling foreign keys: %w", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
if cfg.Sqlite.WriteAheadLog {
|
|
|
|
if err := db.Exec(`
|
|
|
|
PRAGMA journal_mode=WAL;
|
|
|
|
PRAGMA wal_autocheckpoint=0;
|
|
|
|
`).Error; err != nil {
|
|
|
|
return nil, fmt.Errorf("setting WAL mode: %w", err)
|
|
|
|
}
|
|
|
|
}
|
2022-02-23 16:15:20 +00:00
|
|
|
|
|
|
|
// The pure Go SQLite library does not handle locking in
|
|
|
|
// the same way as the C based one and we cant use the gorm
|
|
|
|
// connection pool as of 2022/02/23.
|
2022-02-22 19:04:52 +00:00
|
|
|
sqlDB, _ := db.DB()
|
2022-02-23 16:15:20 +00:00
|
|
|
sqlDB.SetMaxIdleConns(1)
|
2022-02-22 19:04:52 +00:00
|
|
|
sqlDB.SetMaxOpenConns(1)
|
2022-02-23 16:15:20 +00:00
|
|
|
sqlDB.SetConnMaxIdleTime(time.Hour)
|
|
|
|
|
2023-05-11 07:09:18 +00:00
|
|
|
return db, err
|
|
|
|
|
2024-02-09 06:27:00 +00:00
|
|
|
case types.DatabasePostgres:
|
|
|
|
dbString := fmt.Sprintf(
|
|
|
|
"host=%s dbname=%s user=%s",
|
|
|
|
cfg.Postgres.Host,
|
|
|
|
cfg.Postgres.Name,
|
|
|
|
cfg.Postgres.User,
|
|
|
|
)
|
|
|
|
|
2024-02-18 18:31:29 +00:00
|
|
|
log.Info().
|
|
|
|
Str("database", types.DatabasePostgres).
|
|
|
|
Str("path", dbString).
|
|
|
|
Msg("Opening database")
|
|
|
|
|
2024-02-09 06:27:00 +00:00
|
|
|
if sslEnabled, err := strconv.ParseBool(cfg.Postgres.Ssl); err == nil {
|
|
|
|
if !sslEnabled {
|
|
|
|
dbString += " sslmode=disable"
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
dbString += fmt.Sprintf(" sslmode=%s", cfg.Postgres.Ssl)
|
|
|
|
}
|
|
|
|
|
|
|
|
if cfg.Postgres.Port != 0 {
|
|
|
|
dbString += fmt.Sprintf(" port=%d", cfg.Postgres.Port)
|
|
|
|
}
|
|
|
|
|
|
|
|
if cfg.Postgres.Pass != "" {
|
|
|
|
dbString += fmt.Sprintf(" password=%s", cfg.Postgres.Pass)
|
|
|
|
}
|
|
|
|
|
2024-02-09 16:34:28 +00:00
|
|
|
db, err := gorm.Open(postgres.Open(dbString), &gorm.Config{
|
2024-05-16 00:40:14 +00:00
|
|
|
Logger: dbLogger,
|
2021-06-24 21:05:26 +00:00
|
|
|
})
|
2024-02-09 16:34:28 +00:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
sqlDB, _ := db.DB()
|
|
|
|
sqlDB.SetMaxIdleConns(cfg.Postgres.MaxIdleConnections)
|
|
|
|
sqlDB.SetMaxOpenConns(cfg.Postgres.MaxOpenConnections)
|
|
|
|
sqlDB.SetConnMaxIdleTime(
|
|
|
|
time.Duration(cfg.Postgres.ConnMaxIdleTimeSecs) * time.Second,
|
|
|
|
)
|
|
|
|
|
|
|
|
return db, nil
|
2021-06-24 13:44:19 +00:00
|
|
|
}
|
|
|
|
|
2023-05-11 07:09:18 +00:00
|
|
|
return nil, fmt.Errorf(
|
|
|
|
"database of type %s is not supported: %w",
|
2024-02-09 06:27:00 +00:00
|
|
|
cfg.Type,
|
2023-05-11 07:09:18 +00:00
|
|
|
errDatabaseNotSupported,
|
|
|
|
)
|
|
|
|
}
|
2021-07-11 11:13:36 +00:00
|
|
|
|
2024-08-30 06:08:54 +00:00
|
|
|
func runMigrations(cfg types.DatabaseConfig, dbConn *gorm.DB, migrations *gormigrate.Gormigrate) error {
|
|
|
|
// Turn off foreign keys for the duration of the migration if using sqllite to
|
|
|
|
// prevent data loss due to the way the GORM migrator handles certain schema
|
|
|
|
// changes.
|
|
|
|
if cfg.Type == types.DatabaseSqlite {
|
|
|
|
var fkEnabled int
|
|
|
|
if err := dbConn.Raw("PRAGMA foreign_keys").Scan(&fkEnabled).Error; err != nil {
|
|
|
|
return fmt.Errorf("checking foreign key status: %w", err)
|
|
|
|
}
|
|
|
|
if fkEnabled == 1 {
|
|
|
|
if err := dbConn.Exec("PRAGMA foreign_keys = OFF").Error; err != nil {
|
|
|
|
return fmt.Errorf("disabling foreign keys: %w", err)
|
|
|
|
}
|
|
|
|
defer dbConn.Exec("PRAGMA foreign_keys = ON")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if err := migrations.Migrate(); err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
// Since we disabled foreign keys for the migration, we need to check for
|
|
|
|
// constraint violations manually at the end of the migration.
|
|
|
|
if cfg.Type == types.DatabaseSqlite {
|
|
|
|
type constraintViolation struct {
|
|
|
|
Table string
|
|
|
|
RowID int
|
|
|
|
Parent string
|
|
|
|
ConstraintIndex int
|
|
|
|
}
|
|
|
|
|
|
|
|
var violatedConstraints []constraintViolation
|
|
|
|
|
|
|
|
rows, err := dbConn.Raw("PRAGMA foreign_key_check").Rows()
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
for rows.Next() {
|
|
|
|
var violation constraintViolation
|
|
|
|
if err := rows.Scan(&violation.Table, &violation.RowID, &violation.Parent, &violation.ConstraintIndex); err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
violatedConstraints = append(violatedConstraints, violation)
|
|
|
|
}
|
|
|
|
_ = rows.Close()
|
|
|
|
|
|
|
|
if len(violatedConstraints) > 0 {
|
|
|
|
for _, violation := range violatedConstraints {
|
|
|
|
log.Error().
|
|
|
|
Str("table", violation.Table).
|
|
|
|
Int("row_id", violation.RowID).
|
|
|
|
Str("parent", violation.Parent).
|
|
|
|
Msg("Foreign key constraint violated")
|
|
|
|
}
|
|
|
|
|
|
|
|
return fmt.Errorf("foreign key constraints violated")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2023-05-21 16:37:59 +00:00
|
|
|
func (hsdb *HSDatabase) PingDB(ctx context.Context) error {
|
2022-09-04 09:43:09 +00:00
|
|
|
ctx, cancel := context.WithTimeout(ctx, time.Second)
|
2022-07-06 11:39:10 +00:00
|
|
|
defer cancel()
|
2024-02-08 16:28:19 +00:00
|
|
|
sqlDB, err := hsdb.DB.DB()
|
2022-07-06 11:39:10 +00:00
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
2023-05-11 07:09:18 +00:00
|
|
|
return sqlDB.PingContext(ctx)
|
2022-07-06 11:39:10 +00:00
|
|
|
}
|
|
|
|
|
2023-05-21 16:37:59 +00:00
|
|
|
func (hsdb *HSDatabase) Close() error {
|
2024-02-08 16:28:19 +00:00
|
|
|
db, err := hsdb.DB.DB()
|
2023-05-21 16:37:59 +00:00
|
|
|
if err != nil {
|
|
|
|
return err
|
2022-03-01 16:31:25 +00:00
|
|
|
}
|
|
|
|
|
2024-10-02 09:41:58 +00:00
|
|
|
if hsdb.cfg.Type == types.DatabaseSqlite && hsdb.cfg.Sqlite.WriteAheadLog {
|
|
|
|
db.Exec("VACUUM")
|
|
|
|
}
|
|
|
|
|
2023-05-21 16:37:59 +00:00
|
|
|
return db.Close()
|
2022-03-01 16:31:25 +00:00
|
|
|
}
|
2024-02-08 16:28:19 +00:00
|
|
|
|
|
|
|
func (hsdb *HSDatabase) Read(fn func(rx *gorm.DB) error) error {
|
|
|
|
rx := hsdb.DB.Begin()
|
|
|
|
defer rx.Rollback()
|
|
|
|
return fn(rx)
|
|
|
|
}
|
|
|
|
|
|
|
|
func Read[T any](db *gorm.DB, fn func(rx *gorm.DB) (T, error)) (T, error) {
|
|
|
|
rx := db.Begin()
|
|
|
|
defer rx.Rollback()
|
|
|
|
ret, err := fn(rx)
|
|
|
|
if err != nil {
|
|
|
|
var no T
|
|
|
|
return no, err
|
|
|
|
}
|
|
|
|
return ret, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func (hsdb *HSDatabase) Write(fn func(tx *gorm.DB) error) error {
|
|
|
|
tx := hsdb.DB.Begin()
|
|
|
|
defer tx.Rollback()
|
|
|
|
if err := fn(tx); err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
return tx.Commit().Error
|
|
|
|
}
|
|
|
|
|
|
|
|
func Write[T any](db *gorm.DB, fn func(tx *gorm.DB) (T, error)) (T, error) {
|
|
|
|
tx := db.Begin()
|
|
|
|
defer tx.Rollback()
|
|
|
|
ret, err := fn(tx)
|
|
|
|
if err != nil {
|
|
|
|
var no T
|
|
|
|
return no, err
|
|
|
|
}
|
|
|
|
return ret, tx.Commit().Error
|
|
|
|
}
|