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: minor improvements and docs for the prefix middleware

Browse Source
This commit is contained in:
Nicola Murino
2021-07-29 20:12:23 +02:00
parent 4781921336
commit f778e47d22
6 changed files with 168 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
sftpd/sftpd_test.go
View File

@@ -277,6 +277,26 @@ func TestMain(m *testing.M) {
waitTCPListening(sftpdConf.Bindings[0].GetAddress())
getHostKeysFingerprints(sftpdConf.HostKeys)
prefixedConf := sftpdConf
prefixedConf.Bindings = []sftpd.Binding{
{
Port: 2226,
ApplyProxyConfig: false,
},
}
prefixedConf.PasswordAuthentication = true
prefixedConf.FolderPrefix = "/prefix/files"
go func() {
logger.Debug(logSender, "", "initializing SFTP server with config %+v and proxy protocol %v",
prefixedConf, common.Config.ProxyProtocol)
if err := prefixedConf.Initialize(configDir); err != nil {
logger.ErrorToConsole("could not start SFTP server with proxy protocol 2: %v", err)
os.Exit(1)
}
}()
waitTCPListening(prefixedConf.Bindings[0].GetAddress())
exitCode := m.Run()
os.Remove(logFilePath)
os.Remove(loginBannerFile)
@@ -481,6 +501,56 @@ func TestBasicSFTPFsHandling(t *testing.T) {
assert.NoError(t, err)
}
func TestFolderPrefix(t *testing.T) {
usePubKey := true
u := getTestUser(usePubKey)
u.QuotaFiles = 1000
user, _, err := httpdtest.AddUser(u, http.StatusCreated)
assert.NoError(t, err)
err = os.RemoveAll(user.GetHomeDir())
assert.NoError(t, err)
conn, client, err := getSftpClientWithAddr(user, usePubKey, "127.0.0.1:2226")
if assert.NoError(t, err) {
defer conn.Close()
defer client.Close()
err = checkBasicSFTP(client)
assert.NoError(t, err)
_, err = client.Stat("path")
assert.ErrorIs(t, err, os.ErrPermission)
_, err = client.Stat("/prefix/path")
assert.ErrorIs(t, err, os.ErrPermission)
_, err = client.Stat("/prefix/files1")
assert.ErrorIs(t, err, os.ErrPermission)
contents, err := client.ReadDir("/")
if assert.NoError(t, err) {
if assert.Len(t, contents, 1) {
assert.Equal(t, "prefix", contents[0].Name())
}
}
contents, err = client.ReadDir("/prefix")
if assert.NoError(t, err) {
if assert.Len(t, contents, 1) {
assert.Equal(t, "files", contents[0].Name())
}
}
_, err = client.OpenFile(testFileName, os.O_WRONLY)
assert.ErrorIs(t, err, os.ErrPermission)
_, err = client.OpenFile(testFileName, os.O_RDONLY)
assert.ErrorIs(t, err, os.ErrPermission)
f, err := client.OpenFile(path.Join("prefix", "files", testFileName), os.O_WRONLY)
assert.NoError(t, err)
_, err = f.Write([]byte("test"))
assert.NoError(t, err)
err = f.Close()
assert.NoError(t, err)
}
_, err = httpdtest.RemoveUser(user, http.StatusOK)
assert.NoError(t, err)
err = os.RemoveAll(user.GetHomeDir())
assert.NoError(t, err)
}
func TestLoginNonExistentUser(t *testing.T) {
usePubKey := true
user := getTestUser(usePubKey)