fix: validate rate limiter (#1392)

* fix: validate rate limiter Signed-off-by: Gaius <[email protected]>
dragonflyoss · Jun 16, 2022 · 8a8eb25 · 8a8eb25
1 parent 2b42308
commit 8a8eb25
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 2 deletions.
diff --git a/client/config/constants.go b/client/config/constants.go
@@ -49,7 +49,7 @@ const (
 	DefaultPerPeerDownloadLimit = 20 * unit.MB
 	DefaultTotalDownloadLimit   = 100 * unit.MB
 	DefaultUploadLimit          = 100 * unit.MB
-	DefaultMinRate              = 64 * unit.KB
+	DefaultMinRate              = 20 * unit.MB
 )
 
 /* others */

diff --git a/client/config/dfget.go b/client/config/dfget.go
@@ -163,6 +163,10 @@ func (cfg *ClientOption) Validate() error {
 		return errors.Wrapf(dferrors.ErrInvalidHeader, "output: %v", err)
 	}
 
+	if int64(cfg.RateLimit.Limit) < DefaultMinRate.ToNumber() {
+		return errors.Wrapf(dferrors.ErrInvalidArgument, "rate limit must be greater than %s", DefaultMinRate.String())
+	}
+
 	return nil
 }
 

diff --git a/client/config/dfget_linux.go b/client/config/dfget_linux.go
@@ -19,7 +19,11 @@
 
 package config
 
-import "d7y.io/dragonfly/v2/client/clientutil"
+import (
+	"golang.org/x/time/rate"
+
+	"d7y.io/dragonfly/v2/client/clientutil"
+)
 
 var dfgetConfig = ClientOption{
 	URL:     "",

diff --git a/client/config/peerhost.go b/client/config/peerhost.go
@@ -129,6 +129,15 @@ func (p *DaemonOption) Validate() error {
 	if len(p.Scheduler.NetAddrs) == 0 {
 		return errors.New("empty schedulers and config server is not specified")
 	}
+
+	if int64(p.Download.TotalRateLimit.Limit) < DefaultMinRate.ToNumber() {
+		return errors.Errorf("rate limit must be greater than %s", DefaultMinRate.String())
+	}
+
+	if int64(p.Upload.RateLimit.Limit) < DefaultMinRate.ToNumber() {
+		return errors.Errorf("rate limit must be greater than %s", DefaultMinRate.String())
+	}
+
 	switch p.Download.DefaultPattern {
 	case PatternP2P, PatternSeedPeer, PatternSource:
 	default: