Add progressive throttle for follows ACL mode (v0.48.10)
Some checks failed
Go / build-and-release (push) Has been cancelled
Some checks failed
Go / build-and-release (push) Has been cancelled
- Add progressive throttle feature for follows ACL mode, allowing non-followed users to write with increasing delay instead of blocking - Delay increases linearly per event (default 200ms) and decays at 1:1 ratio with elapsed time, capping at configurable max (default 60s) - Track both IP and pubkey independently to prevent evasion - Add periodic cleanup to remove fully-decayed throttle entries - Fix BBolt serial resolver to return proper errors when buckets or entries are not found Files modified: - app/config/config.go: Add ORLY_FOLLOWS_THROTTLE_* env vars - app/handle-event.go: Apply throttle delay before event processing - app/listener.go: Add getFollowsThrottleDelay helper method - pkg/acl/follows.go: Integrate throttle with follows ACL - pkg/acl/follows_throttle.go: New progressive throttle implementation - pkg/bbolt/save-event.go: Return errors from serial lookups - pkg/version/version: Bump to v0.48.10 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
@@ -45,6 +45,8 @@ type Follows struct {
|
||||
lastFollowListFetch time.Time
|
||||
// Callback for external notification of follow list changes
|
||||
onFollowListUpdate func()
|
||||
// Progressive throttle for non-followed users (nil if disabled)
|
||||
throttle *ProgressiveThrottle
|
||||
}
|
||||
|
||||
func (f *Follows) Configure(cfg ...any) (err error) {
|
||||
@@ -131,6 +133,22 @@ func (f *Follows) Configure(cfg ...any) (err error) {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Initialize progressive throttle if enabled
|
||||
if f.cfg.FollowsThrottleEnabled {
|
||||
perEvent := f.cfg.FollowsThrottlePerEvent
|
||||
if perEvent == 0 {
|
||||
perEvent = 200 * time.Millisecond
|
||||
}
|
||||
maxDelay := f.cfg.FollowsThrottleMaxDelay
|
||||
if maxDelay == 0 {
|
||||
maxDelay = 60 * time.Second
|
||||
}
|
||||
f.throttle = NewProgressiveThrottle(perEvent, maxDelay)
|
||||
log.I.F("follows ACL: progressive throttle enabled (increment: %v, max: %v)",
|
||||
perEvent, maxDelay)
|
||||
}
|
||||
|
||||
return
|
||||
}
|
||||
|
||||
@@ -155,6 +173,10 @@ func (f *Follows) GetAccessLevel(pub []byte, address string) (level string) {
|
||||
if f.cfg == nil {
|
||||
return "write"
|
||||
}
|
||||
// If throttle enabled, non-followed users get write access (with delay applied in handle-event)
|
||||
if f.throttle != nil {
|
||||
return "write"
|
||||
}
|
||||
return "read"
|
||||
}
|
||||
|
||||
@@ -165,6 +187,41 @@ func (f *Follows) GetACLInfo() (name, description, documentation string) {
|
||||
|
||||
func (f *Follows) Type() string { return "follows" }
|
||||
|
||||
// GetThrottleDelay returns the progressive throttle delay for this event.
|
||||
// Returns 0 if throttle is disabled or if the user is exempt (owner/admin/followed).
|
||||
func (f *Follows) GetThrottleDelay(pubkey []byte, ip string) time.Duration {
|
||||
if f.throttle == nil {
|
||||
return 0
|
||||
}
|
||||
|
||||
// Check if user is exempt from throttling
|
||||
f.followsMx.RLock()
|
||||
defer f.followsMx.RUnlock()
|
||||
|
||||
// Owners bypass throttle
|
||||
for _, v := range f.owners {
|
||||
if utils.FastEqual(v, pubkey) {
|
||||
return 0
|
||||
}
|
||||
}
|
||||
// Admins bypass throttle
|
||||
for _, v := range f.admins {
|
||||
if utils.FastEqual(v, pubkey) {
|
||||
return 0
|
||||
}
|
||||
}
|
||||
// Followed users bypass throttle
|
||||
for _, v := range f.follows {
|
||||
if utils.FastEqual(v, pubkey) {
|
||||
return 0
|
||||
}
|
||||
}
|
||||
|
||||
// Non-followed users get throttled
|
||||
pubkeyHex := hex.EncodeToString(pubkey)
|
||||
return f.throttle.GetDelay(ip, pubkeyHex)
|
||||
}
|
||||
|
||||
func (f *Follows) adminRelays() (urls []string) {
|
||||
f.followsMx.RLock()
|
||||
admins := make([][]byte, len(f.admins))
|
||||
@@ -353,6 +410,29 @@ func (f *Follows) Syncer() {
|
||||
|
||||
// Start periodic follow list and metadata fetching
|
||||
go f.startPeriodicFollowListFetching()
|
||||
|
||||
// Start throttle cleanup goroutine if throttle is enabled
|
||||
if f.throttle != nil {
|
||||
go f.throttleCleanup()
|
||||
}
|
||||
}
|
||||
|
||||
// throttleCleanup periodically removes fully-decayed throttle entries
|
||||
func (f *Follows) throttleCleanup() {
|
||||
ticker := time.NewTicker(10 * time.Minute)
|
||||
defer ticker.Stop()
|
||||
|
||||
for {
|
||||
select {
|
||||
case <-f.Ctx.Done():
|
||||
return
|
||||
case <-ticker.C:
|
||||
f.throttle.Cleanup()
|
||||
ipCount, pubkeyCount := f.throttle.Stats()
|
||||
log.T.F("follows throttle: cleanup complete, tracking %d IPs and %d pubkeys",
|
||||
ipCount, pubkeyCount)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// startPeriodicFollowListFetching starts periodic fetching of admin follow lists
|
||||
|
||||
Reference in New Issue
Block a user