fix regression on rate calculations (#2705)

There are cases where apiLimit was nil resulting into tests to panic This handles nil apiLimit and avoid division by zero
TykTechnologies · Nov 28, 2019 · b51e391 · b51e391
1 parent 0750612
commit b51e391
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/cli/lint/schema.go b/cli/lint/schema.go
@@ -224,6 +224,9 @@ const confSchema = `{
 	"drl_notification_frequency": {
 		"type": "integer"
 	},
+	"drl_threshold": {
+		"type": "number"
+	},
 	"enable_analytics": {
 		"type": "boolean"
 	},

diff --git a/session_manager.go b/session_manager.go
@@ -219,7 +219,18 @@ func (l *SessionLimiter) ForwardMessage(r *http.Request, currentSession *user.Se
 			if DRLManager.Servers != nil {
 				n = float64(DRLManager.Servers.Count())
 			}
-			rate := apiLimit.Rate / apiLimit.Per
+			var rate float64
+			if apiLimit == nil {
+				rate = currentSession.Rate
+				if currentSession.Per != 0 {
+					rate /= currentSession.Per
+				}
+			} else {
+				rate = apiLimit.Rate
+				if apiLimit.Per != 0 {
+					rate /= apiLimit.Per
+				}
+			}
 			c := globalConf.DRLThreshold
 			if c == 0 {
 				// defaults to 5