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

add remote address to transfer and commands logs

Browse Source
This commit is contained in:
Nicola Murino
2021-06-01 22:28:43 +02:00
parent 969c992bfd
commit 575bcf1f03
22 changed files with 134 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
common/common_test.go
View File

@@ -239,7 +239,7 @@ func TestMaxConnections(t *testing.T) {
Config.MaxPerHostConnections = perHost
assert.True(t, Connections.IsNewConnectionAllowed(ipAddr))
c := NewBaseConnection("id", ProtocolSFTP, dataprovider.User{})
c := NewBaseConnection("id", ProtocolSFTP, "", dataprovider.User{})
fakeConn := &fakeConnection{
BaseConnection: c,
}
@@ -310,7 +310,7 @@ func TestIdleConnections(t *testing.T) {
user := dataprovider.User{
Username: username,
}
c := NewBaseConnection(sshConn1.id+"_1", ProtocolSFTP, user)
c := NewBaseConnection(sshConn1.id+"_1", ProtocolSFTP, "", user)
c.lastActivity = time.Now().Add(-24 * time.Hour).UnixNano()
fakeConn := &fakeConnection{
BaseConnection: c,
@@ -322,7 +322,7 @@ func TestIdleConnections(t *testing.T) {
Connections.AddSSHConnection(sshConn1)
Connections.Add(fakeConn)
assert.Equal(t, Connections.GetActiveSessions(username), 1)
c = NewBaseConnection(sshConn2.id+"_1", ProtocolSSH, user)
c = NewBaseConnection(sshConn2.id+"_1", ProtocolSSH, "", user)
fakeConn = &fakeConnection{
BaseConnection: c,
}
@@ -330,7 +330,7 @@ func TestIdleConnections(t *testing.T) {
Connections.Add(fakeConn)
assert.Equal(t, Connections.GetActiveSessions(username), 2)
cFTP := NewBaseConnection("id2", ProtocolFTP, dataprovider.User{})
cFTP := NewBaseConnection("id2", ProtocolFTP, "", dataprovider.User{})
cFTP.lastActivity = time.Now().UnixNano()
fakeConn = &fakeConnection{
BaseConnection: cFTP,
@@ -370,7 +370,7 @@ func TestIdleConnections(t *testing.T) {
}
func TestCloseConnection(t *testing.T) {
c := NewBaseConnection("id", ProtocolSFTP, dataprovider.User{})
c := NewBaseConnection("id", ProtocolSFTP, "", dataprovider.User{})
fakeConn := &fakeConnection{
BaseConnection: c,
}
@@ -386,7 +386,7 @@ func TestCloseConnection(t *testing.T) {
}
func TestSwapConnection(t *testing.T) {
c := NewBaseConnection("id", ProtocolFTP, dataprovider.User{})
c := NewBaseConnection("id", ProtocolFTP, "", dataprovider.User{})
fakeConn := &fakeConnection{
BaseConnection: c,
}
@@ -394,7 +394,7 @@ func TestSwapConnection(t *testing.T) {
if assert.Len(t, Connections.GetStats(), 1) {
assert.Equal(t, "", Connections.GetStats()[0].Username)
}
c = NewBaseConnection("id", ProtocolFTP, dataprovider.User{
c = NewBaseConnection("id", ProtocolFTP, "", dataprovider.User{
Username: userTestUsername,
})
fakeConn = &fakeConnection{
@@ -431,7 +431,7 @@ func TestConnectionStatus(t *testing.T) {
Username: username,
}
fs := vfs.NewOsFs("", os.TempDir(), "")
c1 := NewBaseConnection("id1", ProtocolSFTP, user)
c1 := NewBaseConnection("id1", ProtocolSFTP, "", user)
fakeConn1 := &fakeConnection{
BaseConnection: c1,
}
@@ -439,12 +439,12 @@ func TestConnectionStatus(t *testing.T) {
t1.BytesReceived = 123
t2 := NewBaseTransfer(nil, c1, nil, "/p2", "/p2", "/r2", TransferDownload, 0, 0, 0, true, fs)
t2.BytesSent = 456
c2 := NewBaseConnection("id2", ProtocolSSH, user)
c2 := NewBaseConnection("id2", ProtocolSSH, "", user)
fakeConn2 := &fakeConnection{
BaseConnection: c2,
command: "md5sum",
}
c3 := NewBaseConnection("id3", ProtocolWebDAV, user)
c3 := NewBaseConnection("id3", ProtocolWebDAV, "", user)
fakeConn3 := &fakeConnection{
BaseConnection: c3,
command: "PROPFIND",
@@ -677,7 +677,7 @@ func TestCachedFs(t *testing.T) {
user := dataprovider.User{
HomeDir: filepath.Clean(os.TempDir()),
}
conn := NewBaseConnection("id", ProtocolSFTP, user)
conn := NewBaseConnection("id", ProtocolSFTP, "", user)
// changing the user should not affect the connection
user.HomeDir = filepath.Join(os.TempDir(), "temp")
err := os.Mkdir(user.HomeDir, os.ModePerm)