mirror of
https://github.com/shazow/ssh-chat.git
synced 2026-11-16 02:42:42 +03:00
Mitigate DoS by limiting concurrent handshakes
This commit introduces mechanism to limit the number of concurrent SSH
handshakes to prevent resource exhaustion (goroutines/memory) during a
SYN flood or connection flood attack.
1. **Global Limit:** A semaphore limits total concurrent handshakes to 20.
This applies backpressure to the `Accept` loop.
2. **Per-IP Limit:** Using `github.com/sethvargo/go-limiter`, we now
limit the rate of connection attempts per IP to 3 per second.
3. **Timeout:** The initial handshake timeout is reduced from 20s to 10s.
The global semaphore is acquired before the handshake and released
immediately after the handshake completes (or fails), ensuring that
long-lived sessions do not consume a handshake slot.
This commit is contained in:
1 parent
f3bf6842b3
commit
709ec3818d
3 files changed
+42
-29
No files matched your search
@@ -11,4 +11,15 @@ require (
|
||||
golang.org/x/text v0.14.0
|
||||
)
|
||||
|
||||
go 1.13
|
||||
require (
|
||||
github.com/sethvargo/go-limiter v1.1.0 // indirect
|
||||
github.com/yuin/goldmark v1.4.13 // indirect
|
||||
golang.org/x/mod v0.8.0 // indirect
|
||||
golang.org/x/net v0.10.0 // indirect
|
||||
golang.org/x/tools v0.6.0 // indirect
|
||||
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7 // indirect
|
||||
)
|
||||
|
||||
go 1.22
|
||||
|
||||
toolchain go1.24.3
|
||||
@@ -2,6 +2,8 @@ github.com/alexcesaro/log v0.0.0-20150915221235-61e686294e58 h1:MkpmYfld/S8kXqTY
|
||||
github.com/alexcesaro/log v0.0.0-20150915221235-61e686294e58/go.mod h1:YNfsMyWSs+h+PaYkxGeMVmVCX75Zj/pqdjbu12ciCYE=
|
||||
github.com/jessevdk/go-flags v1.5.0 h1:1jKYvbxEjfUl0fmqTCOfonvskHHXMjBySTLW4y9LFvc=
|
||||
github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4=
|
||||
github.com/sethvargo/go-limiter v1.1.0 h1:eLeZVQ2zqJOiEs03GguqmBVG6/T6lsZB+6PP1t7J6fA=
|
||||
github.com/sethvargo/go-limiter v1.1.0/go.mod h1:01b6tW25Ap+MeLYBuD4aHunMrJoNO5PVUFdS9rac3II=
|
||||
github.com/shazow/rateio v0.0.0-20200113175441-4461efc8bdc4 h1:zwQ1HBo5FYwn1ksMd19qBCKO8JAWE9wmHivEpkw/DvE=
|
||||
github.com/shazow/rateio v0.0.0-20200113175441-4461efc8bdc4/go.mod h1:vt2jWY/3Qw1bIzle5thrJWucsLuuX9iUNnp20CqCciI=
|
||||
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
|
||||
|
||||
+28
-28
@@ -1,10 +1,12 @@
|
||||
package sshd
|
||||
|
||||
import (
|
||||
"context"
|
||||
"net"
|
||||
"sync"
|
||||
"time"
|
||||
|
||||
"github.com/sethvargo/go-limiter"
|
||||
"github.com/sethvargo/go-limiter/memorystore"
|
||||
"github.com/shazow/rateio"
|
||||
"golang.org/x/crypto/ssh"
|
||||
)
|
||||
@@ -20,9 +22,8 @@ type SSHListener struct {
|
||||
// handshakeLimit is a semaphore to limit concurrent handshakes globally
|
||||
handshakeLimit chan struct{}
|
||||
|
||||
// connLimit tracks concurrent handshakes per IP
|
||||
connLimitMutex sync.Mutex
|
||||
connLimit map[string]int
|
||||
// limiter is the per-IP rate limiter
|
||||
limiter limiter.Store
|
||||
}
|
||||
|
||||
// ListenSSH makes an SSH listener socket
|
||||
@@ -31,11 +32,24 @@ func ListenSSH(laddr string, config *ssh.ServerConfig) (*SSHListener, error) {
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
// Create a rate limiter: 3 attempts per second per IP?
|
||||
// The user wanted to "throttle many connections".
|
||||
// 3 per second is generous for a chat server.
|
||||
// If an IP connects >3 times in a second, it's likely a bot or flood.
|
||||
store, err := memorystore.New(&memorystore.Config{
|
||||
Tokens: 3,
|
||||
Interval: time.Second,
|
||||
})
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
l := SSHListener{
|
||||
Listener: socket,
|
||||
config: config,
|
||||
handshakeLimit: make(chan struct{}, 20),
|
||||
connLimit: make(map[string]int),
|
||||
limiter: store,
|
||||
}
|
||||
return &l, nil
|
||||
}
|
||||
@@ -74,23 +88,22 @@ func (l *SSHListener) Serve() {
|
||||
break
|
||||
}
|
||||
|
||||
// Check per-IP limit
|
||||
// Check per-IP limit using go-limiter
|
||||
host, _, err := net.SplitHostPort(conn.RemoteAddr().String())
|
||||
if err != nil {
|
||||
// If we can't parse the IP, we assume it's unique or just let it through to the global limiter
|
||||
// but best effort is to log and proceed.
|
||||
logger.Printf("Failed to split remote addr: %v", err)
|
||||
} else {
|
||||
l.connLimitMutex.Lock()
|
||||
count := l.connLimit[host]
|
||||
if count >= 3 {
|
||||
l.connLimitMutex.Unlock()
|
||||
logger.Printf("[%s] Rejected connection: too many concurrent handshakes", conn.RemoteAddr())
|
||||
// Context with timeout is not strictly needed for memory store, but good practice
|
||||
// Although Take is non-blocking for memory store usually.
|
||||
_, _, _, ok, err := l.limiter.Take(context.Background(), host)
|
||||
if err != nil {
|
||||
// Store error (shouldn't happen with memory store unless closed)
|
||||
logger.Printf("Rate limiter error: %v", err)
|
||||
} else if !ok {
|
||||
logger.Printf("[%s] Rejected connection: rate limit exceeded", conn.RemoteAddr())
|
||||
conn.Close()
|
||||
continue
|
||||
}
|
||||
l.connLimit[host]++
|
||||
l.connLimitMutex.Unlock()
|
||||
}
|
||||
|
||||
// Acquire global semaphore
|
||||
@@ -100,9 +113,6 @@ func (l *SSHListener) Serve() {
|
||||
go func() {
|
||||
// Ensure limits are released when this goroutine finishes (in case of panic)
|
||||
// OR explicitly release them after handshake.
|
||||
// Ideally we release them as soon as handshake is done.
|
||||
|
||||
// We need a way to ensure release happens exactly once.
|
||||
released := false
|
||||
release := func() {
|
||||
if released {
|
||||
@@ -112,16 +122,6 @@ func (l *SSHListener) Serve() {
|
||||
|
||||
// Release global semaphore
|
||||
<-l.handshakeLimit
|
||||
|
||||
// Release per-IP limit
|
||||
if host != "" {
|
||||
l.connLimitMutex.Lock()
|
||||
l.connLimit[host]--
|
||||
if l.connLimit[host] == 0 {
|
||||
delete(l.connLimit, host)
|
||||
}
|
||||
l.connLimitMutex.Unlock()
|
||||
}
|
||||
}
|
||||
|
||||
// Defer release in case of panic or early return
|
||||
|
||||
Reference in new issue
Block a user