enable scp in default configuration

remove the deprecated enable_scp setting
This commit is contained in:
Nicola Murino
2020-03-26 23:38:24 +01:00
parent 4759254e10
commit f284008fb5
6 changed files with 5 additions and 15 deletions

View File

@@ -63,10 +63,6 @@ type Configuration struct {
Actions Actions `json:"actions" mapstructure:"actions"`
// Keys are a list of host keys
Keys []Key `json:"keys" mapstructure:"keys"`
// IsSCPEnabled determines if experimental SCP support is enabled.
// This setting is deprecated and will be removed in future versions,
// please add "scp" to the EnabledSSHCommands list to enable it.
IsSCPEnabled bool `json:"enable_scp" mapstructure:"enable_scp"`
// KexAlgorithms specifies the available KEX (Key Exchange) algorithms in
// preference order.
KexAlgorithms []string `json:"kex_algorithms" mapstructure:"kex_algorithms"`
@@ -502,9 +498,6 @@ func (c *Configuration) checkSSHCommands() {
return
}
sshCommands := []string{}
if c.IsSCPEnabled {
sshCommands = append(sshCommands, "scp")
}
for _, command := range c.EnabledSSHCommands {
if utils.IsStringInSlice(command, supportedSSHCommands) {
sshCommands = append(sshCommands, command)