Add rate limits to the fountain by @travisperson
This commit is contained in:
parent
b8b081faa6
commit
d753c39133
@ -5,6 +5,7 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
"net/http"
|
"net/http"
|
||||||
"os"
|
"os"
|
||||||
|
"time"
|
||||||
|
|
||||||
rice "github.com/GeertJohan/go.rice"
|
rice "github.com/GeertJohan/go.rice"
|
||||||
logging "github.com/ipfs/go-log"
|
logging "github.com/ipfs/go-log"
|
||||||
@ -88,6 +89,22 @@ var runCmd = &cli.Command{
|
|||||||
ctx: ctx,
|
ctx: ctx,
|
||||||
api: nodeApi,
|
api: nodeApi,
|
||||||
from: from,
|
from: from,
|
||||||
|
limiter: NewLimiter(LimiterConfig{
|
||||||
|
TotalRate: time.Second,
|
||||||
|
TotalBurst: 20,
|
||||||
|
IPRate: 5 * time.Minute,
|
||||||
|
IPBurst: 5,
|
||||||
|
WalletRate: time.Hour,
|
||||||
|
WalletBurst: 1,
|
||||||
|
}),
|
||||||
|
colLimiter: NewLimiter(LimiterConfig{
|
||||||
|
TotalRate: time.Second,
|
||||||
|
TotalBurst: 20,
|
||||||
|
IPRate: 24 * time.Hour,
|
||||||
|
IPBurst: 1,
|
||||||
|
WalletRate: 24 * 364 * time.Hour,
|
||||||
|
WalletBurst: 1,
|
||||||
|
}),
|
||||||
}
|
}
|
||||||
|
|
||||||
http.Handle("/", http.FileServer(rice.MustFindBox("site").HTTPBox()))
|
http.Handle("/", http.FileServer(rice.MustFindBox("site").HTTPBox()))
|
||||||
@ -110,9 +127,25 @@ type handler struct {
|
|||||||
api api.FullNode
|
api api.FullNode
|
||||||
|
|
||||||
from address.Address
|
from address.Address
|
||||||
|
|
||||||
|
limiter *Limiter
|
||||||
|
colLimiter *Limiter
|
||||||
}
|
}
|
||||||
|
|
||||||
func (h *handler) send(w http.ResponseWriter, r *http.Request) {
|
func (h *handler) send(w http.ResponseWriter, r *http.Request) {
|
||||||
|
// General limiter to allow throttling all messages that can make it into the mpool
|
||||||
|
if !h.limiter.Allow() {
|
||||||
|
http.Error(w, http.StatusText(http.StatusTooManyRequests), http.StatusTooManyRequests)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Limit based on IP
|
||||||
|
limiter := h.limiter.GetIPLimiter(r.RemoteAddr)
|
||||||
|
if !limiter.Allow() {
|
||||||
|
http.Error(w, http.StatusText(http.StatusTooManyRequests), http.StatusTooManyRequests)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
to, err := address.NewFromString(r.FormValue("address"))
|
to, err := address.NewFromString(r.FormValue("address"))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
w.WriteHeader(400)
|
w.WriteHeader(400)
|
||||||
@ -120,6 +153,13 @@ func (h *handler) send(w http.ResponseWriter, r *http.Request) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Limit based on wallet address
|
||||||
|
limiter = h.limiter.GetWalletLimiter(to.String())
|
||||||
|
if !limiter.Allow() {
|
||||||
|
http.Error(w, http.StatusText(http.StatusTooManyRequests), http.StatusTooManyRequests)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
smsg, err := h.api.MpoolPushMessage(h.ctx, &types.Message{
|
smsg, err := h.api.MpoolPushMessage(h.ctx, &types.Message{
|
||||||
Value: sendPerRequest,
|
Value: sendPerRequest,
|
||||||
From: h.from,
|
From: h.from,
|
||||||
|
95
cmd/lotus-fountain/rate_limiter.go
Normal file
95
cmd/lotus-fountain/rate_limiter.go
Normal file
@ -0,0 +1,95 @@
|
|||||||
|
|
||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"sync"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"golang.org/x/time/rate"
|
||||||
|
)
|
||||||
|
|
||||||
|
type Limiter struct {
|
||||||
|
control *rate.Limiter
|
||||||
|
|
||||||
|
ips map[string]*rate.Limiter
|
||||||
|
wallets map[string]*rate.Limiter
|
||||||
|
mu *sync.RWMutex
|
||||||
|
|
||||||
|
config LimiterConfig
|
||||||
|
}
|
||||||
|
|
||||||
|
type LimiterConfig struct {
|
||||||
|
TotalRate time.Duration
|
||||||
|
TotalBurst int
|
||||||
|
|
||||||
|
IPRate time.Duration
|
||||||
|
IPBurst int
|
||||||
|
|
||||||
|
WalletRate time.Duration
|
||||||
|
WalletBurst int
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewLimiter(c LimiterConfig) *Limiter {
|
||||||
|
return &Limiter{
|
||||||
|
control: rate.NewLimiter(rate.Every(c.TotalRate), c.TotalBurst),
|
||||||
|
mu: &sync.RWMutex{},
|
||||||
|
ips: make(map[string]*rate.Limiter),
|
||||||
|
wallets: make(map[string]*rate.Limiter),
|
||||||
|
|
||||||
|
config: c,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (i *Limiter) Allow() bool {
|
||||||
|
return i.control.Allow()
|
||||||
|
}
|
||||||
|
|
||||||
|
func (i *Limiter) AddIPLimiter(ip string) *rate.Limiter {
|
||||||
|
i.mu.Lock()
|
||||||
|
defer i.mu.Unlock()
|
||||||
|
|
||||||
|
limiter := rate.NewLimiter(rate.Every(i.config.IPRate), i.config.IPBurst)
|
||||||
|
|
||||||
|
i.ips[ip] = limiter
|
||||||
|
|
||||||
|
return limiter
|
||||||
|
}
|
||||||
|
|
||||||
|
func (i *Limiter) GetIPLimiter(ip string) *rate.Limiter {
|
||||||
|
i.mu.Lock()
|
||||||
|
limiter, exists := i.ips[ip]
|
||||||
|
|
||||||
|
if !exists {
|
||||||
|
i.mu.Unlock()
|
||||||
|
return i.AddIPLimiter(ip)
|
||||||
|
}
|
||||||
|
|
||||||
|
i.mu.Unlock()
|
||||||
|
|
||||||
|
return limiter
|
||||||
|
}
|
||||||
|
|
||||||
|
func (i *Limiter) AddWalletLimiter(addr string) *rate.Limiter {
|
||||||
|
i.mu.Lock()
|
||||||
|
defer i.mu.Unlock()
|
||||||
|
|
||||||
|
limiter := rate.NewLimiter(rate.Every(i.config.WalletRate), i.config.WalletBurst)
|
||||||
|
|
||||||
|
i.wallets[addr] = limiter
|
||||||
|
|
||||||
|
return limiter
|
||||||
|
}
|
||||||
|
|
||||||
|
func (i *Limiter) GetWalletLimiter(wallet string) *rate.Limiter {
|
||||||
|
i.mu.Lock()
|
||||||
|
limiter, exists := i.wallets[wallet]
|
||||||
|
|
||||||
|
if !exists {
|
||||||
|
i.mu.Unlock()
|
||||||
|
return i.AddWalletLimiter(wallet)
|
||||||
|
}
|
||||||
|
|
||||||
|
i.mu.Unlock()
|
||||||
|
|
||||||
|
return limiter
|
||||||
|
}
|
38
cmd/lotus-fountain/rate_limiter_test.go
Normal file
38
cmd/lotus-fountain/rate_limiter_test.go
Normal file
@ -0,0 +1,38 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/stretchr/testify/assert"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestRateLimit(t *testing.T) {
|
||||||
|
limiter := NewLimiter(LimiterConfig{
|
||||||
|
TotalRate: time.Second,
|
||||||
|
TotalBurst: 20,
|
||||||
|
IPRate: time.Second,
|
||||||
|
IPBurst: 1,
|
||||||
|
WalletRate: time.Second,
|
||||||
|
WalletBurst: 1,
|
||||||
|
})
|
||||||
|
|
||||||
|
for i := 0; i < 20; i++ {
|
||||||
|
assert.True(t, limiter.Allow())
|
||||||
|
}
|
||||||
|
|
||||||
|
assert.False(t, limiter.Allow())
|
||||||
|
|
||||||
|
time.Sleep(time.Second)
|
||||||
|
assert.True(t, limiter.Allow())
|
||||||
|
|
||||||
|
assert.True(t, limiter.GetIPLimiter("127.0.0.1").Allow())
|
||||||
|
assert.False(t, limiter.GetIPLimiter("127.0.0.1").Allow())
|
||||||
|
time.Sleep(time.Second)
|
||||||
|
assert.True(t, limiter.GetIPLimiter("127.0.0.1").Allow())
|
||||||
|
|
||||||
|
assert.True(t, limiter.GetWalletLimiter("abc123").Allow())
|
||||||
|
assert.False(t, limiter.GetWalletLimiter("abc123").Allow())
|
||||||
|
time.Sleep(time.Second)
|
||||||
|
assert.True(t, limiter.GetWalletLimiter("abc123").Allow())
|
||||||
|
}
|
1
go.mod
1
go.mod
@ -83,6 +83,7 @@ require (
|
|||||||
go4.org v0.0.0-20190313082347-94abd6928b1d // indirect
|
go4.org v0.0.0-20190313082347-94abd6928b1d // indirect
|
||||||
golang.org/x/crypto v0.0.0-20190829043050-9756ffdc2472 // indirect
|
golang.org/x/crypto v0.0.0-20190829043050-9756ffdc2472 // indirect
|
||||||
golang.org/x/sys v0.0.0-20190904154756-749cb33beabd // indirect
|
golang.org/x/sys v0.0.0-20190904154756-749cb33beabd // indirect
|
||||||
|
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c
|
||||||
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7
|
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7
|
||||||
google.golang.org/api v0.9.0 // indirect
|
google.golang.org/api v0.9.0 // indirect
|
||||||
gopkg.in/cheggaaa/pb.v1 v1.0.28
|
gopkg.in/cheggaaa/pb.v1 v1.0.28
|
||||||
|
1
go.sum
1
go.sum
@ -640,6 +640,7 @@ golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
|||||||
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
||||||
golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
|
golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
|
||||||
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
|
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
|
||||||
|
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c h1:fqgJT0MGcGpPgpWU7VRdRjuArfcOvC4AoJmILihzhDg=
|
||||||
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
|
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
|
||||||
golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
|
golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
|
||||||
golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
|
golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
|
||||||
|
Loading…
Reference in New Issue
Block a user