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

remove check for cache key collisions

Browse Source 
we use sha256 keys now

Signed-off-by: Nicola Murino <nicola.murino@gmail.com>
This commit is contained in:
Nicola Murino
2025-01-15 19:46:54 +01:00
parent e2b21ad946
commit 24215dc734
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
internal/vfs/sftpfs.go
View File

@@ -1167,11 +1167,10 @@ func (c *sftpConnectionsCache) Get(config *SFTPFsConfig, sessionID string) (*sft
c.Lock() c.Lock()
defer c.Unlock() defer c.Unlock()
var oldKey string
for { for {
if val, ok := c.items[key]; ok { if val, ok := c.items[key]; ok {
activeSessions := val.ActiveSessions() activeSessions := val.ActiveSessions()
if activeSessions < maxSessionsPerConnection || key == oldKey { if activeSessions < maxSessionsPerConnection {
logger.Debug(logSenderSFTPCache, "", logger.Debug(logSenderSFTPCache, "",
"reusing connection for session ID %q, key %s, active sessions %d, active connections: %d", "reusing connection for session ID %q, key %s, active sessions %d, active connections: %d",
sessionID, key, activeSessions+1, len(c.items)) sessionID, key, activeSessions+1, len(c.items))
@@ -1179,11 +1178,10 @@ func (c *sftpConnectionsCache) Get(config *SFTPFsConfig, sessionID string) (*sft
return val, nil return val, nil
} }
partition++ partition++
oldKey = key
key = config.getUniqueID(partition) key = config.getUniqueID(partition)
logger.Debug(logSenderSFTPCache, "", logger.Debug(logSenderSFTPCache, "",
"connection full, generated new key for partition: %d, active sessions: %d, key: %s, old key: %s", "connection full, generated new key for partition: %d, active sessions: %d, key: %s",
partition, activeSessions, oldKey, key) partition, activeSessions, key)
} else { } else {
conn := newSFTPConnection(config, sessionID) conn := newSFTPConnection(config, sessionID)
signer, err := config.getKeySigner() signer, err := config.getKeySigner()