Add auth
This commit is contained in:
parent
0cb8a810e6
commit
6b7d68d960
19 changed files with 1154 additions and 69 deletions
|
|
@ -6,6 +6,8 @@ import (
|
|||
"log"
|
||||
"net/http"
|
||||
"os"
|
||||
|
||||
"golang.org/x/crypto/bcrypt"
|
||||
)
|
||||
|
||||
var buildVersion = "dev"
|
||||
|
|
@ -55,12 +57,43 @@ func Main() int {
|
|||
return cliMountpointInfo(options.args[1])
|
||||
case cliIntentDiagnose:
|
||||
runDiagnostic()
|
||||
case cliIntentSecretMake:
|
||||
key, err := makeAuthSecretKey(AUTH_SECRET_KEY_LENGTH)
|
||||
if err != nil {
|
||||
fmt.Printf("Failed to make secret key: %v\n", err)
|
||||
return 1
|
||||
}
|
||||
|
||||
fmt.Println(key)
|
||||
case cliIntentPasswordHash:
|
||||
password := options.args[1]
|
||||
|
||||
if password == "" {
|
||||
fmt.Println("Password cannot be empty")
|
||||
return 1
|
||||
}
|
||||
|
||||
if len(password) < 6 {
|
||||
fmt.Println("Password must be at least 6 characters long")
|
||||
return 1
|
||||
}
|
||||
|
||||
hashedPassword, err := bcrypt.GenerateFromPassword([]byte(password), bcrypt.DefaultCost)
|
||||
if err != nil {
|
||||
fmt.Printf("Failed to hash password: %v\n", err)
|
||||
return 1
|
||||
}
|
||||
|
||||
fmt.Println(string(hashedPassword))
|
||||
}
|
||||
|
||||
return 0
|
||||
}
|
||||
|
||||
func serveApp(configPath string) error {
|
||||
// TODO: refactor if this gets any more complex, the current implementation is
|
||||
// difficult to reason about due to all of the callbacks and simultaneous operations,
|
||||
// use a single goroutine and a channel to initiate synchronous changes to the server
|
||||
exitChannel := make(chan struct{})
|
||||
hadValidConfigOnStartup := false
|
||||
var stopServer func() error
|
||||
|
|
@ -79,16 +112,23 @@ func serveApp(configPath string) error {
|
|||
}
|
||||
|
||||
return
|
||||
} else if !hadValidConfigOnStartup {
|
||||
hadValidConfigOnStartup = true
|
||||
}
|
||||
|
||||
app, err := newApplication(config)
|
||||
if err != nil {
|
||||
log.Printf("Failed to create application: %v", err)
|
||||
|
||||
if !hadValidConfigOnStartup {
|
||||
close(exitChannel)
|
||||
}
|
||||
|
||||
return
|
||||
}
|
||||
|
||||
if !hadValidConfigOnStartup {
|
||||
hadValidConfigOnStartup = true
|
||||
}
|
||||
|
||||
if stopServer != nil {
|
||||
if err := stopServer(); err != nil {
|
||||
log.Printf("Error while trying to stop server: %v", err)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue