Merge pull request #2106 from dolthub/daylon/fix-2097

Fixed issue #2097

Author: Hydrocharged

server/auth/database.go

@@ -16,15 +16,18 @@ package auth
 
 import (
 	"os"
+	"path/filepath"
 	"sync"
 	"sync/atomic"
 
 	"github.com/dolthub/dolt/go/libraries/doltcore/env"
 	"github.com/dolthub/dolt/go/libraries/utils/filesys"
+
+	doltgresservercfg "github.com/dolthub/doltgresql/servercfg"
 )
 
 // authFileName is the name of the file that contains all authorization-related data.
-const authFileName = "auth.db"
+var authFileName = "auth.db"
 
 var (
 	globalDatabase Database
@@ -128,7 +131,7 @@ func LockWrite(f func()) {
 
 // dbInit handle the global database initialization. Panics if an error occurs, since it points to something going
 // terribly wrong.
-func dbInit(dEnv *env.DoltEnv) {
+func dbInit(dEnv *env.DoltEnv, cfg *doltgresservercfg.DoltgresConfig) {
 	globalDatabase = Database{
 		rolesByName:        make(map[string]RoleID),
 		rolesByID:          make(map[RoleID]Role),
@@ -140,10 +143,16 @@ func dbInit(dEnv *env.DoltEnv) {
 	globalLock = &sync.RWMutex{}
 	if dEnv != nil {
 		if _, ok := dEnv.FS.(*filesys.InMemFS); !ok {
+			if cfg != nil && cfg.AuthFile != nil && len(*cfg.AuthFile) > 0 {
+				authFileName = *cfg.AuthFile
+			}
 			fileSystem = dEnv.FS
 			authData, err := fileSystem.ReadFile(authFileName)
 			if os.IsNotExist(err) {
 				dbInitDefault()
+				if err = dbInitCreateAuthDirectory(authFileName); err != nil {
+					panic(err)
+				}
 				if err = fileSystem.WriteFile(authFileName, globalDatabase.serialize(), 0644); err != nil {
 					panic(err)
 				}
@@ -179,3 +188,20 @@ func dbInitDefault() {
 	}
 	SetRole(superUser)
 }
+
+// dbInitCreateAuthDirectory creates the directory structure pointed to by the auth file if it does not already exist.
+func dbInitCreateAuthDirectory(authFileName string) error {
+	dir, _ := filepath.Split(authFileName)
+	// If there's no directory, then we have nothing to create
+	if len(dir) == 0 {
+		return nil
+	}
+	fullDir, err := fileSystem.Abs(dir)
+	if err != nil {
+		return err
+	}
+	if exists, _ := fileSystem.Exists(fullDir); !exists {
+		return fileSystem.MkDirs(fullDir)
+	}
+	return nil
+}

server/auth/init.go

@@ -19,6 +19,8 @@ import (
 
 	"github.com/dolthub/dolt/go/libraries/doltcore/env"
 	"github.com/dolthub/go-mysql-server/sql"
+
+	doltgresservercfg "github.com/dolthub/doltgresql/servercfg"
 )
 
 // doltgresPasswordEnvVar is the name of the environment variable that can be used to set the password for the
@@ -30,8 +32,8 @@ const doltgresPasswordEnvVar = "DOLTGRES_PASSWORD"
 const doltgresUserEnvVar = "DOLTGRES_USER"
 
 // Init handles all initialization needs in this package.
-func Init(dEnv *env.DoltEnv) {
-	dbInit(dEnv)
+func Init(dEnv *env.DoltEnv, cfg *doltgresservercfg.DoltgresConfig) {
+	dbInit(dEnv, cfg)
 	sql.SetAuthorizationHandlerFactory(AuthorizationHandlerFactory{})
 }
 

server/initialization/initialization.go

@@ -43,11 +43,11 @@ import (
 var once = &sync.Once{}
 
 // Initialize initializes each package across the project. This function should be used instead of an init() function.
-func Initialize(dEnv *env.DoltEnv) {
+func Initialize(dEnv *env.DoltEnv, cfg *doltgresservercfg.DoltgresConfig) {
 	once.Do(func() {
 		core.Init()
 		rootobject.Init()
-		auth.Init(dEnv)
+		auth.Init(dEnv, cfg)
 		analyzer.Init()
 		config.Init()
 		binary.Init()

server/server.go

@@ -88,7 +88,7 @@ func RunInMemory(cfg *servercfg.DoltgresConfig, protocolListenerFactory server.P
 // runServer starts the server based on the given args, using the provided file system as the backing store.
 // The returned WaitGroup may be used to wait for the server to close.
 func runServer(ctx context.Context, cfg *servercfg.DoltgresConfig, dEnv *env.DoltEnv, protocolListenerFactory server.ProtocolListenerFunc) (*svcs.Controller, error) {
-	initialization.Initialize(dEnv)
+	initialization.Initialize(dEnv, cfg)
 
 	if dEnv.HasDoltDataDir() {
 		cwd, _ := dEnv.FS.Abs(".")

servercfg/config.go

@@ -61,6 +61,7 @@ const (
 	DefaultDataDir                    = "."
 	DefaultCfgDir                     = ".doltcfg"
 	DefaultPrivilegeFilePath          = "privileges.db"
+	DefaultAuthFilePath               = "auth.db"
 	DefaultBranchControlFilePath      = "branch_control.db"
 	DefaultMetricsHost                = ""
 	DefaultMetricsPort                = -1
@@ -175,6 +176,7 @@ type DoltgresConfig struct {
 	MetricsConfig     *DoltgesMetricsConfig      `yaml:"metrics,omitempty" minver:"0.7.4"`
 	RemotesapiConfig  *DoltgresRemotesapiConfig  `yaml:"remotesapi,omitempty" minver:"0.7.4"`
 	PrivilegeFile     *string                    `yaml:"privilege_file,omitempty" minver:"0.7.4"`
+	AuthFile          *string                    `yaml:"auth_file,omitempty" minver:"0.54.4"`
 	BranchControlFile *string                    `yaml:"branch_control_file,omitempty" minver:"0.7.4"`
 
 	// TODO: Rename to UserVars_
@@ -587,6 +589,7 @@ func DefaultServerConfig() *DoltgresConfig {
 		DataDirStr:        Ptr(dataDir),
 		CfgDirStr:         Ptr(filepath.Join(DefaultDataDir, DefaultCfgDir)),
 		PrivilegeFile:     Ptr(filepath.Join(DefaultDataDir, DefaultCfgDir, DefaultPrivilegeFilePath)),
+		AuthFile:          Ptr(filepath.Join(DefaultDataDir, DefaultCfgDir, DefaultAuthFilePath)),
 		BranchControlFile: Ptr(filepath.Join(DefaultDataDir, DefaultCfgDir, DefaultBranchControlFilePath)),
 	}
 }

servercfg/testdata/minver_validation.txt

@@ -36,6 +36,7 @@ RemotesapiConfig *servercfg.DoltgresRemotesapiConfig 0.7.4 remotesapi,omitempty
 -Port *int 0.7.4 port,omitempty
 -ReadOnly *bool 0.7.4 read_only,omitempty
 PrivilegeFile *string 0.7.4 privilege_file,omitempty
+AuthFile *string 0.54.4 auth_file,omitempty
 BranchControlFile *string 0.7.4 branch_control_file,omitempty
 Vars []servercfg.DoltgresUserSessionVars 0.7.4 user_session_vars,omitempty
 -Name string 0.0.0 name

testing/bats/doltgres.bats

@@ -315,6 +315,8 @@ remotesapi: {}
 
 privilege_file: .doltcfg/privileges.db
 
+auth_file: .doltcfg/auth.db
+
 branch_control_file: .doltcfg/branch_control.db
 
 user_session_vars: []
@@ -332,6 +334,9 @@ EOF
     run query_server -c "select * from t1" -t
     [ "$status" -eq 0 ]
     [[ "$output" =~ "1 | 2" ]] || false
+
+    run test -f ".doltcfg/auth.db"
+    [ "$status" -eq 0 ]
 }
 
 @test 'doltgres: DOLTGRES_DATA_DIR set to current dir' {

testing/dataloader/csvdataloader_test.go

@@ -29,13 +29,14 @@ import (
 	"github.com/dolthub/doltgresql/core/dataloader"
 	"github.com/dolthub/doltgresql/server/initialization"
 	"github.com/dolthub/doltgresql/server/types"
+	doltgresservercfg "github.com/dolthub/doltgresql/servercfg"
 )
 
 // TestCsvDataLoader tests the CsvDataLoader implementation.
 func TestCsvDataLoader(t *testing.T) {
 	db := memory.NewDatabase("mydb")
 	provider := memory.NewDBProvider(db)
-	initialization.Initialize(nil)
+	initialization.Initialize(nil, doltgresservercfg.DefaultServerConfig())
 
 	ctx := &sql.Context{
 		Context: context.Background(),

testing/dataloader/tabdataloader_test.go

@@ -28,12 +28,13 @@ import (
 	"github.com/dolthub/doltgresql/core/dataloader"
 	"github.com/dolthub/doltgresql/server/initialization"
 	"github.com/dolthub/doltgresql/server/types"
+	doltgresservercfg "github.com/dolthub/doltgresql/servercfg"
 )
 
 func TestTabDataLoader(t *testing.T) {
 	db := memory.NewDatabase("mydb")
 	provider := memory.NewDBProvider(db)
-	initialization.Initialize(nil)
+	initialization.Initialize(nil, doltgresservercfg.DefaultServerConfig())
 
 	ctx := &sql.Context{
 		Context: context.Background(),

testing/generation/function_coverage/main.go

@@ -22,6 +22,7 @@ import (
 
 	"github.com/dolthub/doltgresql/server/functions/framework"
 	"github.com/dolthub/doltgresql/server/initialization"
+	doltgresservercfg "github.com/dolthub/doltgresql/servercfg"
 	"github.com/dolthub/doltgresql/testing/generation/utils"
 )
 
@@ -33,7 +34,7 @@ type Assertion struct {
 }
 
 func main() {
-	initialization.Initialize(nil)
+	initialization.Initialize(nil, doltgresservercfg.DefaultServerConfig())
 	rootFolder, err := utils.GetRootFolder()
 	if err != nil {
 		fmt.Printf("%s\n", err.Error())