From 0ef8a643489ad1a3da4431155326f0a6e206d870 Mon Sep 17 00:00:00 2001
From: Pawel Chojnacki <pawel@chojnacki.ws>
Date: Mon, 20 Feb 2017 15:09:05 +0100
Subject: Remove unecessary calls to limit_user!, UniqueIps Middleware, and
 address MR review

 - cleanup formating in haml
 - clarify time window is in seconds
 - cleanup straneous chunks in db/schema
 - rename count_uniqe_ips to update_and_return_ips_count
 - other
---
 lib/gitlab/auth.rb                    |  3 +--
 lib/gitlab/auth/too_many_ips.rb       | 17 +++++++++++++++++
 lib/gitlab/auth/unique_ips_limiter.rb | 34 +++-------------------------------
 lib/gitlab/request_context.rb         |  1 -
 4 files changed, 21 insertions(+), 34 deletions(-)
 create mode 100644 lib/gitlab/auth/too_many_ips.rb

(limited to 'lib')

diff --git a/lib/gitlab/auth.rb b/lib/gitlab/auth.rb
index 8e2aee2d7a0..0a0bd0e781c 100644
--- a/lib/gitlab/auth.rb
+++ b/lib/gitlab/auth.rb
@@ -22,9 +22,8 @@ module Gitlab
           user_with_password_for_git(login, password) ||
           Gitlab::Auth::Result.new
 
-        Gitlab::Auth::UniqueIpsLimiter.limit_user!(result.actor)
-
         rate_limit!(ip, success: result.success?, login: login)
+        Gitlab::Auth::UniqueIpsLimiter.limit_user!(result.actor)
 
         result
       end
diff --git a/lib/gitlab/auth/too_many_ips.rb b/lib/gitlab/auth/too_many_ips.rb
new file mode 100644
index 00000000000..ed862791551
--- /dev/null
+++ b/lib/gitlab/auth/too_many_ips.rb
@@ -0,0 +1,17 @@
+module Gitlab
+  module Auth
+    class TooManyIps < StandardError
+      attr_reader :user_id, :ip, :unique_ips_count
+
+      def initialize(user_id, ip, unique_ips_count)
+        @user_id = user_id
+        @ip = ip
+        @unique_ips_count = unique_ips_count
+      end
+
+      def message
+        "User #{user_id} from IP: #{ip} tried logging from too many ips: #{unique_ips_count}"
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/auth/unique_ips_limiter.rb b/lib/gitlab/auth/unique_ips_limiter.rb
index 4b2b758be8a..7b1aa736769 100644
--- a/lib/gitlab/auth/unique_ips_limiter.rb
+++ b/lib/gitlab/auth/unique_ips_limiter.rb
@@ -1,19 +1,5 @@
 module Gitlab
   module Auth
-    class TooManyIps < StandardError
-      attr_reader :user_id, :ip, :unique_ips_count
-
-      def initialize(user_id, ip, unique_ips_count)
-        @user_id = user_id
-        @ip = ip
-        @unique_ips_count = unique_ips_count
-      end
-
-      def message
-        "User #{user_id} from IP: #{ip} tried logging from too many ips: #{unique_ips_count}"
-      end
-    end
-
     class UniqueIpsLimiter
       USER_UNIQUE_IPS_PREFIX = 'user_unique_ips'
 
@@ -21,7 +7,7 @@ module Gitlab
         def limit_user_id!(user_id)
           if config.unique_ips_limit_enabled
             ip = RequestContext.client_ip
-            unique_ips = count_unique_ips(user_id, ip)
+            unique_ips = update_and_return_ips_count(user_id, ip)
             raise TooManyIps.new(user_id, ip, unique_ips) if unique_ips > config.unique_ips_limit_per_user
           end
         end
@@ -36,8 +22,8 @@ module Gitlab
           Gitlab::CurrentSettings.current_application_settings
         end
 
-        def count_unique_ips(user_id, ip)
-          time = Time.now.to_i
+        def update_and_return_ips_count(user_id, ip)
+          time = Time.now.utc.to_i
           key = "#{USER_UNIQUE_IPS_PREFIX}:#{user_id}"
 
           Gitlab::Redis.with do |redis|
@@ -51,20 +37,6 @@ module Gitlab
           end
         end
       end
-
-      def initialize(app)
-        @app = app
-      end
-
-      def call(env)
-        begin
-          @app.call(env)
-        rescue TooManyIps => ex
-
-          Rails.logger.info ex.message
-          [403, { 'Content-Type' => 'text/plain', 'Retry-After' => UniqueIpsLimiter.config.unique_ips_limit_time_window }, ["Too many logins from different IPs\n"]]
-        end
-      end
     end
   end
 end
diff --git a/lib/gitlab/request_context.rb b/lib/gitlab/request_context.rb
index 36a5d94d98a..548adf4775a 100644
--- a/lib/gitlab/request_context.rb
+++ b/lib/gitlab/request_context.rb
@@ -14,7 +14,6 @@ module Gitlab
     end
 
     def call(env)
-      raise RequestStoreNotActive.new unless RequestStore.active?
       req = Rack::Request.new(env)
 
       RequestStore[:client_ip] = req.ip
-- 
cgit v1.2.3