Revert "PERF: improve speed of rate limiter"

This reverts commit a9bcdd7f279827e86ec474bcf4c9ed96bc1c0060.

spec/components/auth/default_current_user_provider_spec.rb

@@ -172,47 +172,38 @@ describe Auth::DefaultCurrentUserProvider do
 
   end
 
-  context "rate limiting" do
+  it "can only try 10 bad cookies a minute" do
+    user = Fabricate(:user)
+    token = UserAuthToken.generate!(user_id: user.id)
 
-    before do
-      RateLimiter.enable
+    provider('/').log_on_user(user, {}, {})
+
+    RateLimiter.stubs(:disabled?).returns(false)
+
+    RateLimiter.new(nil, "cookie_auth_10.0.0.1", 10, 60).clear!
+    RateLimiter.new(nil, "cookie_auth_10.0.0.2", 10, 60).clear!
+
+    ip = "10.0.0.1"
+    env = { "HTTP_COOKIE" => "_t=#{SecureRandom.hex}", "REMOTE_ADDR" => ip }
+
+    10.times do
+      provider('/', env).current_user
     end
 
-    after do
-      RateLimiter.disable
-    end
+    expect {
+      provider('/', env).current_user
+    }.to raise_error(Discourse::InvalidAccess)
 
-    it "can only try 10 bad cookies a minute" do
-      user = Fabricate(:user)
-      token = UserAuthToken.generate!(user_id: user.id)
+    expect {
+      env["HTTP_COOKIE"] = "_t=#{token.unhashed_auth_token}"
+      provider("/", env).current_user
+    }.to raise_error(Discourse::InvalidAccess)
 
-      provider('/').log_on_user(user, {}, {})
+    env["REMOTE_ADDR"] = "10.0.0.2"
 
-      RateLimiter.new(nil, "cookie_auth_10.0.0.1", 10, 60).clear!
-      RateLimiter.new(nil, "cookie_auth_10.0.0.2", 10, 60).clear!
-
-      ip = "10.0.0.1"
-      env = { "HTTP_COOKIE" => "_t=#{SecureRandom.hex}", "REMOTE_ADDR" => ip }
-
-      10.times do
-        provider('/', env).current_user
-      end
-
-      expect {
-        provider('/', env).current_user
-      }.to raise_error(Discourse::InvalidAccess)
-
-      expect {
-        env["HTTP_COOKIE"] = "_t=#{token.unhashed_auth_token}"
-        provider("/", env).current_user
-      }.to raise_error(Discourse::InvalidAccess)
-
-      env["REMOTE_ADDR"] = "10.0.0.2"
-
-      expect {
-        provider('/', env).current_user
-      }.not_to raise_error
-    end
+    expect {
+      provider('/', env).current_user
+    }.not_to raise_error
   end
 
   it "correctly removes invalid cookies" do
@@ -304,53 +295,44 @@ describe Auth::DefaultCurrentUserProvider do
 
     end
 
-    context "rate limiting" do
+    it "rate limits api usage" do
 
-      before do
-        RateLimiter.enable
+      RateLimiter.stubs(:disabled?).returns(false)
+      limiter1 = RateLimiter.new(nil, "user_api_day_#{api_key.key}", 10, 60)
+      limiter2 = RateLimiter.new(nil, "user_api_min_#{api_key.key}", 10, 60)
+      limiter1.clear!
+      limiter2.clear!
+
+      SiteSetting.max_user_api_reqs_per_day = 3
+      SiteSetting.max_user_api_reqs_per_minute = 4
+
+      params = {
+        "REQUEST_METHOD" => "GET",
+        "HTTP_USER_API_KEY" => api_key.key,
+      }
+
+      3.times do
+        provider("/", params).current_user
       end
 
-      after do
-        RateLimiter.disable
+      expect {
+        provider("/", params).current_user
+      }.to raise_error(RateLimiter::LimitExceeded)
+
+      SiteSetting.max_user_api_reqs_per_day = 4
+      SiteSetting.max_user_api_reqs_per_minute = 3
+
+      limiter1.clear!
+      limiter2.clear!
+
+      3.times do
+        provider("/", params).current_user
       end
 
-      it "rate limits api usage" do
-        limiter1 = RateLimiter.new(nil, "user_api_day_#{api_key.key}", 10, 60)
-        limiter2 = RateLimiter.new(nil, "user_api_min_#{api_key.key}", 10, 60)
-        limiter1.clear!
-        limiter2.clear!
+      expect {
+        provider("/", params).current_user
+      }.to raise_error(RateLimiter::LimitExceeded)
 
-        SiteSetting.max_user_api_reqs_per_day = 3
-        SiteSetting.max_user_api_reqs_per_minute = 4
-
-        params = {
-          "REQUEST_METHOD" => "GET",
-          "HTTP_USER_API_KEY" => api_key.key,
-        }
-
-        3.times do
-          provider("/", params).current_user
-        end
-
-        expect {
-          provider("/", params).current_user
-        }.to raise_error(RateLimiter::LimitExceeded)
-
-        SiteSetting.max_user_api_reqs_per_day = 4
-        SiteSetting.max_user_api_reqs_per_minute = 3
-
-        limiter1.clear!
-        limiter2.clear!
-
-        3.times do
-          provider("/", params).current_user
-        end
-
-        expect {
-          provider("/", params).current_user
-        }.to raise_error(RateLimiter::LimitExceeded)
-
-      end
     end
   end
 end