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

sftpd actions: add support for pre-delete action

Browse Source 
Fixes #121
This commit is contained in:
Nicola Murino
2020-05-24 23:31:14 +02:00
parent c27e3ef436
commit dc011af90d
7 changed files with 90 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
sftpd/sftpd_test.go
View File

@@ -116,6 +116,7 @@ var (
scpPath string
gitPath string
sshPath string
hookCmdPath string
pubKeyPath string
privateKeyPath string
trustedCAUserKey string
@@ -134,7 +135,6 @@ func TestMain(m *testing.M) {
err := ioutil.WriteFile(loginBannerFile, []byte("simple login banner\n"), 0777)
if err != nil {
logger.WarnToConsole("error creating login banner: %v", err)
os.Exit(1)
}
err = config.LoadConfig(configDir, "")
if err != nil {
@@ -169,21 +169,15 @@ func TestMain(m *testing.M) {
// work in non atomic mode too
sftpdConf.UploadMode = 2
homeBasePath = os.TempDir()
checkSystemCommands()
var scriptArgs string
if runtime.GOOS == osWindows {
scriptArgs = "%*"
} else {
sftpdConf.Actions.ExecuteOn = []string{"download", "upload", "rename", "delete", "ssh_cmd"}
sftpdConf.Actions.Hook = "/bin/true"
sftpdConf.Actions.Hook = hookCmdPath
scriptArgs = "$@"
scpPath, err = exec.LookPath("scp")
if err != nil {
logger.Warn(logSender, "", "unable to get scp command. SCP tests will be skipped, err: %v", err)
logger.WarnToConsole("unable to get scp command. SCP tests will be skipped, err: %v", err)
scpPath = ""
}
}
checkGitCommand()
keyIntAuthPath = filepath.Join(homeBasePath, "keyintauth.sh")
err = ioutil.WriteFile(keyIntAuthPath, getKeyboardInteractiveScriptContent([]string{"1", "2"}, 0, false, 1), 0755)
@@ -4447,7 +4441,7 @@ func waitQuotaScans() error {
return nil
}
func checkGitCommand() {
func checkSystemCommands() {
var err error
gitPath, err = exec.LookPath("git")
if err != nil {
@@ -4462,6 +4456,21 @@ func checkGitCommand() {
logger.WarnToConsole("unable to get ssh command. GIT tests will be skipped, err: %v", err)
gitPath = ""
}
hookCmdPath, err = exec.LookPath("true")
if err != nil {
logger.Warn(logSender, "", "unable to get hook command: %v", err)
logger.WarnToConsole("unable to get hook command: %v", err)
}
if runtime.GOOS == osWindows {
scpPath = ""
} else {
scpPath, err = exec.LookPath("scp")
if err != nil {
logger.Warn(logSender, "", "unable to get scp command. SCP tests will be skipped, err: %v", err)
logger.WarnToConsole("unable to get scp command. SCP tests will be skipped, err: %v", err)
scpPath = ""
}
}
}
func initGitRepo(path string) ([]byte, error) {