Merge pull request TykTechnologies#49 from weters/master

TykTechnologies#48: Fix off-by-one error with rate limiting
Koulio · Mar 13, 2015 · 8af69bd · 8af69bd
2 parents ec7ec06 + 4e341e7
commit 8af69bd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/gateway_test.go b/gateway_test.go
@@ -418,6 +418,10 @@ func TestThrottling(t *testing.T) {
 	secondRecorder := httptest.NewRecorder()
 	chain.ServeHTTP(secondRecorder, req)
 
+	if secondRecorder.Code != 200 {
+		t.Error("Second request failed with non-200 code: \n", secondRecorder.Code)
+	}
+
 	thirdRecorder := httptest.NewRecorder()
 	chain.ServeHTTP(thirdRecorder, req)
 

diff --git a/session_manager.go b/session_manager.go
@@ -69,7 +69,7 @@ func (l SessionLimiter) ForwardMessage(currentSession *SessionState, key string,
 	rateLimiterKey := RateLimitKeyPrefix + key
 	ratePerPeriodNow := store.IncrememntWithExpire(rateLimiterKey, int64(currentSession.Per))
 
-	if ratePerPeriodNow >= (int64(currentSession.Rate)) {
+	if ratePerPeriodNow > (int64(currentSession.Rate)) {
 		return false, 1
 	}