Daily traffic limit

2025-05-25 00:07:36 +02:00 · 2022-01-12 18:52:07 -05:00 · 2022-01-12 18:52:07 -05:00 · aa94410308
commit aa94410308
parent c76e55a1c8
7 changed files with 170 additions and 88 deletions
--- a/server/config.go
+++ b/server/config.go
@ -4,7 +4,7 @@ import (
 	"time"
 )

-// Defines default config settings
+// Defines default config settings (excluding limits, see below)
 const (
 	DefaultListenHTTP                = ":80"
 	DefaultCacheDuration             = 12 * time.Hour
@ -13,97 +13,107 @@ const (
 	DefaultAtSenderInterval          = 10 * time.Second
 	DefaultMinDelay                  = 10 * time.Second
 	DefaultMaxDelay                  = 3 * 24 * time.Hour
-	DefaultMessageLimit              = 4096                      // Bytes
-	DefaultAttachmentTotalSizeLimit  = int64(1024 * 1024 * 1024) // 1 GB
-	DefaultAttachmentFileSizeLimit   = int64(15 * 1024 * 1024)   // 15 MB
-	DefaultAttachmentExpiryDuration  = 3 * time.Hour
 	DefaultFirebaseKeepaliveInterval = 3 * time.Hour // Not too frequently to save battery
 )

-// Defines all the limits
+// Defines all global and per-visitor limits
+// - message size limit: the max number of bytes for a message
 // - total topic limit: max number of topics overall
+// - various attachment limits
+const (
+	DefaultMessageLengthLimit       = 4096 // Bytes
+	DefaultTotalTopicLimit          = 15000
+	DefaultAttachmentTotalSizeLimit = int64(10 * 1024 * 1024 * 1024) // 10 GB
+	DefaultAttachmentFileSizeLimit  = int64(15 * 1024 * 1024)        // 15 MB
+	DefaultAttachmentExpiryDuration = 3 * time.Hour
+)
+
+// Defines all per-visitor limits
 // - per visitor subscription limit: max number of subscriptions (active HTTP connections) per per-visitor/IP
 // - per visitor request limit: max number of PUT/GET/.. requests (here: 60 requests bucket, replenished at a rate of one per 10 seconds)
 // - per visitor email limit: max number of emails (here: 16 email bucket, replenished at a rate of one per hour)
-// - per visitor attachment size limit:
+// - per visitor attachment size limit: total per-visitor attachment size in bytes to be stored on the server
+// - per visitor attachment daily traffic limit: number of bytes that can be transferred to/from the server
 const (
-	DefaultTotalTopicLimit                 = 5000
-	DefaultVisitorSubscriptionLimit        = 30
-	DefaultVisitorRequestLimitBurst        = 60
-	DefaultVisitorRequestLimitReplenish    = 10 * time.Second
-	DefaultVisitorEmailLimitBurst          = 16
-	DefaultVisitorEmailLimitReplenish      = time.Hour
-	DefaultVisitorAttachmentTotalSizeLimit = 50 * 1024 * 1024
+	DefaultVisitorSubscriptionLimit           = 30
+	DefaultVisitorRequestLimitBurst           = 60
+	DefaultVisitorRequestLimitReplenish       = 10 * time.Second
+	DefaultVisitorEmailLimitBurst             = 16
+	DefaultVisitorEmailLimitReplenish         = time.Hour
+	DefaultVisitorAttachmentTotalSizeLimit    = 100 * 1024 * 1024 // 100 MB
+	DefaultVisitorAttachmentDailyTrafficLimit = 500 * 1024 * 1024 // 500 MB
 )

 // Config is the main config struct for the application. Use New to instantiate a default config struct.
 type Config struct {
-	BaseURL                         string
-	ListenHTTP                      string
-	ListenHTTPS                     string
-	KeyFile                         string
-	CertFile                        string
-	FirebaseKeyFile                 string
-	CacheFile                       string
-	CacheDuration                   time.Duration
-	AttachmentCacheDir              string
-	AttachmentTotalSizeLimit        int64
-	AttachmentFileSizeLimit         int64
-	AttachmentExpiryDuration        time.Duration
-	KeepaliveInterval               time.Duration
-	ManagerInterval                 time.Duration
-	AtSenderInterval                time.Duration
-	FirebaseKeepaliveInterval       time.Duration
-	SMTPSenderAddr                  string
-	SMTPSenderUser                  string
-	SMTPSenderPass                  string
-	SMTPSenderFrom                  string
-	SMTPServerListen                string
-	SMTPServerDomain                string
-	SMTPServerAddrPrefix            string
-	MessageLimit                    int
-	MinDelay                        time.Duration
-	MaxDelay                        time.Duration
-	TotalTopicLimit                 int
-	TotalAttachmentSizeLimit        int64
-	VisitorSubscriptionLimit        int
-	VisitorAttachmentTotalSizeLimit int64
-	VisitorRequestLimitBurst        int
-	VisitorRequestLimitReplenish    time.Duration
-	VisitorEmailLimitBurst          int
-	VisitorEmailLimitReplenish      time.Duration
-	BehindProxy                     bool
+	BaseURL                            string
+	ListenHTTP                         string
+	ListenHTTPS                        string
+	KeyFile                            string
+	CertFile                           string
+	FirebaseKeyFile                    string
+	CacheFile                          string
+	CacheDuration                      time.Duration
+	AttachmentCacheDir                 string
+	AttachmentTotalSizeLimit           int64
+	AttachmentFileSizeLimit            int64
+	AttachmentExpiryDuration           time.Duration
+	KeepaliveInterval                  time.Duration
+	ManagerInterval                    time.Duration
+	AtSenderInterval                   time.Duration
+	FirebaseKeepaliveInterval          time.Duration
+	SMTPSenderAddr                     string
+	SMTPSenderUser                     string
+	SMTPSenderPass                     string
+	SMTPSenderFrom                     string
+	SMTPServerListen                   string
+	SMTPServerDomain                   string
+	SMTPServerAddrPrefix               string
+	MessageLimit                       int
+	MinDelay                           time.Duration
+	MaxDelay                           time.Duration
+	TotalTopicLimit                    int
+	TotalAttachmentSizeLimit           int64
+	VisitorSubscriptionLimit           int
+	VisitorAttachmentTotalSizeLimit    int64
+	VisitorAttachmentDailyTrafficLimit int
+	VisitorRequestLimitBurst           int
+	VisitorRequestLimitReplenish       time.Duration
+	VisitorEmailLimitBurst             int
+	VisitorEmailLimitReplenish         time.Duration
+	BehindProxy                        bool
 }

 // NewConfig instantiates a default new server config
 func NewConfig() *Config {
 	return &Config{
-		BaseURL:                         "",
-		ListenHTTP:                      DefaultListenHTTP,
-		ListenHTTPS:                     "",
-		KeyFile:                         "",
-		CertFile:                        "",
-		FirebaseKeyFile:                 "",
-		CacheFile:                       "",
-		CacheDuration:                   DefaultCacheDuration,
-		AttachmentCacheDir:              "",
-		AttachmentTotalSizeLimit:        DefaultAttachmentTotalSizeLimit,
-		AttachmentFileSizeLimit:         DefaultAttachmentFileSizeLimit,
-		AttachmentExpiryDuration:        DefaultAttachmentExpiryDuration,
-		KeepaliveInterval:               DefaultKeepaliveInterval,
-		ManagerInterval:                 DefaultManagerInterval,
-		MessageLimit:                    DefaultMessageLimit,
-		MinDelay:                        DefaultMinDelay,
-		MaxDelay:                        DefaultMaxDelay,
-		AtSenderInterval:                DefaultAtSenderInterval,
-		FirebaseKeepaliveInterval:       DefaultFirebaseKeepaliveInterval,
-		TotalTopicLimit:                 DefaultTotalTopicLimit,
-		VisitorSubscriptionLimit:        DefaultVisitorSubscriptionLimit,
-		VisitorAttachmentTotalSizeLimit: DefaultVisitorAttachmentTotalSizeLimit,
-		VisitorRequestLimitBurst:        DefaultVisitorRequestLimitBurst,
-		VisitorRequestLimitReplenish:    DefaultVisitorRequestLimitReplenish,
-		VisitorEmailLimitBurst:          DefaultVisitorEmailLimitBurst,
-		VisitorEmailLimitReplenish:      DefaultVisitorEmailLimitReplenish,
-		BehindProxy:                     false,
+		BaseURL:                            "",
+		ListenHTTP:                         DefaultListenHTTP,
+		ListenHTTPS:                        "",
+		KeyFile:                            "",
+		CertFile:                           "",
+		FirebaseKeyFile:                    "",
+		CacheFile:                          "",
+		CacheDuration:                      DefaultCacheDuration,
+		AttachmentCacheDir:                 "",
+		AttachmentTotalSizeLimit:           DefaultAttachmentTotalSizeLimit,
+		AttachmentFileSizeLimit:            DefaultAttachmentFileSizeLimit,
+		AttachmentExpiryDuration:           DefaultAttachmentExpiryDuration,
+		KeepaliveInterval:                  DefaultKeepaliveInterval,
+		ManagerInterval:                    DefaultManagerInterval,
+		MessageLimit:                       DefaultMessageLengthLimit,
+		MinDelay:                           DefaultMinDelay,
+		MaxDelay:                           DefaultMaxDelay,
+		AtSenderInterval:                   DefaultAtSenderInterval,
+		FirebaseKeepaliveInterval:          DefaultFirebaseKeepaliveInterval,
+		TotalTopicLimit:                    DefaultTotalTopicLimit,
+		VisitorSubscriptionLimit:           DefaultVisitorSubscriptionLimit,
+		VisitorAttachmentTotalSizeLimit:    DefaultVisitorAttachmentTotalSizeLimit,
+		VisitorAttachmentDailyTrafficLimit: DefaultVisitorAttachmentDailyTrafficLimit,
+		VisitorRequestLimitBurst:           DefaultVisitorRequestLimitBurst,
+		VisitorRequestLimitReplenish:       DefaultVisitorRequestLimitReplenish,
+		VisitorEmailLimitBurst:             DefaultVisitorEmailLimitBurst,
+		VisitorEmailLimitReplenish:         DefaultVisitorEmailLimitReplenish,
+		BehindProxy:                        false,
 	}
 }