mirror of
https://github.com/octoleo/syncthing.git
synced 2024-09-19 21:29:01 +00:00
We haven't had cleartext passwords in the config for ages
This commit is contained in:
parent
686f91777c
commit
435c29755d
@ -21,7 +21,6 @@ import (
|
|||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/syncthing/syncthing/lib/protocol"
|
"github.com/syncthing/syncthing/lib/protocol"
|
||||||
"golang.org/x/crypto/bcrypt"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
@ -203,16 +202,6 @@ func (cfg *Configuration) prepare(myID protocol.DeviceID) {
|
|||||||
convertV11V12(cfg)
|
convertV11V12(cfg)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Hash old cleartext passwords
|
|
||||||
if len(cfg.GUI.Password) > 0 && cfg.GUI.Password[0] != '$' {
|
|
||||||
hash, err := bcrypt.GenerateFromPassword([]byte(cfg.GUI.Password), 0)
|
|
||||||
if err != nil {
|
|
||||||
l.Warnln("bcrypting password:", err)
|
|
||||||
} else {
|
|
||||||
cfg.GUI.Password = string(hash)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Build a list of available devices
|
// Build a list of available devices
|
||||||
existingDevices := make(map[protocol.DeviceID]bool)
|
existingDevices := make(map[protocol.DeviceID]bool)
|
||||||
for _, device := range cfg.Devices {
|
for _, device := range cfg.Devices {
|
||||||
|
Loading…
Reference in New Issue
Block a user