Mirrors/sftpgo
1
0
Fork 0
mirror of https://github.com/drakkan/sftpgo.git synced 2025-12-07 06:40:54 +03:00
Code Issues Packages Projects Releases Wiki Activity

sftpd auto host keys: try to auto-create parent dir if missing

Browse Source
This commit is contained in:
Nicola Murino
2020-10-05 14:16:57 +02:00
parent 3e2afc35ba
commit f9827f958b
2 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sftpd/server.go
View File

@@ -482,6 +482,8 @@ func (c *Configuration) checkHostKeyAutoGeneration(configDir string) error {
logger.InfoToConsole("try to create non-existent host key %#v", k) logger.InfoToConsole("try to create non-existent host key %#v", k)
err = utils.GenerateRSAKeys(k) err = utils.GenerateRSAKeys(k)
if err != nil { if err != nil {
logger.Warn(logSender, "", "error creating host key %#v: %v", k, err)
logger.WarnToConsole("error creating host key %#v: %v", k, err)
return err return err
} }
case defaultPrivateECDSAKeyName: case defaultPrivateECDSAKeyName:
@@ -489,6 +491,8 @@ func (c *Configuration) checkHostKeyAutoGeneration(configDir string) error {
logger.InfoToConsole("try to create non-existent host key %#v", k) logger.InfoToConsole("try to create non-existent host key %#v", k)
err = utils.GenerateECDSAKeys(k) err = utils.GenerateECDSAKeys(k)
if err != nil { if err != nil {
logger.Warn(logSender, "", "error creating host key %#v: %v", k, err)
logger.WarnToConsole("error creating host key %#v: %v", k, err)
return err return err
} }
default: default:
@@ -511,6 +515,8 @@ func (c *Configuration) checkHostKeyAutoGeneration(configDir string) error {
err = utils.GenerateECDSAKeys(autoFile) err = utils.GenerateECDSAKeys(autoFile)
} }
if err != nil { if err != nil {
logger.Warn(logSender, "", "error creating host key %#v: %v", autoFile, err)
logger.WarnToConsole("error creating host key %#v: %v", autoFile, err)
return err return err
} }
} }

17
utils/utils.go
View File

@@ -188,6 +188,9 @@ func DecryptData(data string) (string, error) {
// private key to specified file and the public key to the specified // private key to specified file and the public key to the specified
// file adding the .pub suffix // file adding the .pub suffix
func GenerateRSAKeys(file string) error { func GenerateRSAKeys(file string) error {
if err := createDirPathIfMissing(file, 0700); err != nil {
return err
}
key, err := rsa.GenerateKey(rand.Reader, 4096) key, err := rsa.GenerateKey(rand.Reader, 4096)
if err != nil { if err != nil {
return err return err
@@ -219,6 +222,9 @@ func GenerateRSAKeys(file string) error {
// private key to specified file and the public key to the specified // private key to specified file and the public key to the specified
// file adding the .pub suffix // file adding the .pub suffix
func GenerateECDSAKeys(file string) error { func GenerateECDSAKeys(file string) error {
if err := createDirPathIfMissing(file, 0700); err != nil {
return err
}
key, err := ecdsa.GenerateKey(elliptic.P256(), rand.Reader) key, err := ecdsa.GenerateKey(elliptic.P256(), rand.Reader)
if err != nil { if err != nil {
return err return err
@@ -312,3 +318,14 @@ func CleanDirInput(dirInput string) string {
} }
return filepath.Clean(dirInput) return filepath.Clean(dirInput)
} }
func createDirPathIfMissing(file string, perm os.FileMode) error {
dirPath := filepath.Dir(file)
if _, err := os.Stat(dirPath); os.IsNotExist(err) {
err = os.MkdirAll(dirPath, perm)
if err != nil {
return err
}
}
return nil
}