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

script based hooks: don't propagate global env vars

Browse Source 
env vars must be explicitly set

Signed-off-by: Nicola Murino <nicola.murino@gmail.com>
This commit is contained in:
Nicola Murino
2022-10-19 09:29:40 +02:00
parent 7e0b62b703
commit 47842ae614
13 changed files with 38 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
internal/command/command.go
View File

@@ -17,7 +17,6 @@ package command
import (
"fmt"
"os"
"strings"
"time"
@@ -60,7 +59,7 @@ type Command struct {
// Do not use variables with the SFTPGO_ prefix to avoid conflicts with env
// vars that SFTPGo sets
Timeout int `json:"timeout" mapstructure:"timeout"`
// Env defines additional environment variable for the command.
// Env defines environment variable for the command.
// Each entry is of the form "key=value".
// These values are added to the global environment variables if any
Env []string `json:"env" mapstructure:"env"`
@@ -75,7 +74,7 @@ type Command struct {
type Config struct {
// Timeout specifies a global time limit, in seconds, for the external commands execution
Timeout int `json:"timeout" mapstructure:"timeout"`
// Env defines additional environment variable for the commands.
// Env defines environment variable for the commands.
// Each entry is of the form "key=value".
// Do not use variables with the SFTPGO_ prefix to avoid conflicts with env
// vars that SFTPGo sets
@@ -96,7 +95,7 @@ func (c Config) Initialize() error {
return fmt.Errorf("invalid timeout %v", c.Timeout)
}
for _, env := range c.Env {
if len(strings.Split(env, "=")) != 2 {
if len(strings.SplitN(env, "=", 2)) != 2 {
return fmt.Errorf("invalid env var %#v", env)
}
}
@@ -112,7 +111,7 @@ func (c Config) Initialize() error {
}
}
for _, env := range cmd.Env {
if len(strings.Split(env, "=")) != 2 {
if len(strings.SplitN(env, "=", 2)) != 2 {
return fmt.Errorf("invalid env var %#v for command %#v", env, cmd.Path)
}
}
@@ -129,7 +128,7 @@ func (c Config) Initialize() error {
// GetConfig returns the configuration for the specified command
func GetConfig(command, hook string) (time.Duration, []string, []string) {
env := os.Environ()
env := []string{}
var args []string
timeout := time.Duration(config.Timeout) * time.Second
env = append(env, config.Env...)