scottk/databunker
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/databunker.git synced 2025-11-03 19:37:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

add variable for root token

Browse Source
This commit is contained in:
root
2021-04-16 14:35:27 +00:00
parent f62e07c8af
commit 5f45d54b64
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/bunker.go
View File

@@ -406,7 +406,7 @@ func setupDB(dbPtr *string, masterKeyPtr *string, customRootToken string) (*dbco
fmt.Printf("\nDatabunker init\n\n") fmt.Printf("\nDatabunker init\n\n")
var masterKey []byte var masterKey []byte
var err error var err error
if masterkeyProvided(masterKeyPtr) == true { if variableProvided("DATABUNKER_MASTERKEY", masterKeyPtr) == true {
masterKey, err = masterkeyGet(masterKeyPtr) masterKey, err = masterkeyGet(masterKeyPtr)
if err != nil { if err != nil {
fmt.Printf("Failed to parse master key: %s", err) fmt.Printf("Failed to parse master key: %s", err)
@@ -445,11 +445,11 @@ func setupDB(dbPtr *string, masterKeyPtr *string, customRootToken string) (*dbco
return db, rootToken, err return db, rootToken, err
} }
func masterkeyProvided(masterKeyPtr *string) bool { func variableProvided(vname string, masterKeyPtr *string) bool {
if masterKeyPtr != nil && len(*masterKeyPtr) > 0 { if masterKeyPtr != nil && len(*masterKeyPtr) > 0 {
return true return true
} }
if len(os.Getenv("DATABUNKER_MASTERKEY")) > 0 { if len(os.Getenv(vname)) > 0 {
return true return true
} }
return false return false
@@ -496,9 +496,13 @@ func main() {
readEnv(&cfg) readEnv(&cfg)
customRootToken := "" customRootToken := ""
if *demoPtr { if *demoPtr {
customRootToken = "DEMO" customRootToken = "DEMO"
} else if rootTokenKeyPtr != nil && len(*rootTokenKeyPtr) > 0 { } else if variableProvided("DATABUNKER_ROOTTOKEN", rootTokenKeyPtr) == true {
customRootToken = *rootTokenKeyPtr if rootTokenKeyPtr != nil && len(*rootTokenKeyPtr) > 0 {
customRootToken = *rootTokenKeyPtr
} else {
customRootToken = os.Getenv("DATABUNKER_ROOTTOKEN")
}
} }
if *initPtr || *demoPtr { if *initPtr || *demoPtr {
if storage.DBExists(dbPtr) == true { if storage.DBExists(dbPtr) == true {