Merge pull request #885 from alphagov/revert-884-dont-allow-list-crea…

…tor-and-sponsor-domains Revert "Don't apply domain allow list to creators, sponsors and feedback"
alphagov · Nov 8, 2023 · 00d8b66 · 00d8b66
2 parents ced6264 + 37706e2
commit 00d8b66
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 15 deletions.
diff --git a/app/models/feedback.rb b/app/models/feedback.rb
@@ -34,10 +34,6 @@ def domain
     nil
   end
 
-  def allowed_domains?
-    false
-  end
-
   private
 
   def rate_limit

diff --git a/app/models/rate_limit.rb b/app/models/rate_limit.rb
@@ -93,10 +93,7 @@ def exceeded?(signature)
     return true if ip_geoblocked?(signature.ip_address)
     return true if domain_blocked?(signature.domain)
     return false if ip_allowed?(signature.ip_address)
-
-    if signature.allowed_domains?
-      return false if domain_allowed?(signature.domain)
-    end
+    return false if domain_allowed?(signature.domain)
 
     if signature.is_a?(Feedback)
       feedback_rate_exceeded?(signature)

diff --git a/app/models/signature.rb b/app/models/signature.rb
@@ -758,10 +758,6 @@ def rate(window = 5.minutes)
     end
   end
 
-  def allowed_domains?
-    !(creator? || sponsor?)
-  end
-
   def update_uuid
     update_column(:uuid, generate_uuid)
   end

diff --git a/features/charlie_creates_a_petition.feature b/features/charlie_creates_a_petition.feature
@@ -205,7 +205,7 @@ Scenario: Charlie creates a petition when blocked
 Scenario: Charlie creates a petition when his IP address is rate limited
   Given the creator rate limit is 1 per hour
   And there are no allowed IPs
-  And the domain "wimbledon.com" is allowed
+  And there are no blocked IPs
   And there are 2 petitions created from this IP address
   And I start a new petition
   And I fill in the petition details

diff --git a/features/laura_signs_charlies_petition_as_a_sponsor.feature b/features/laura_signs_charlies_petition_as_a_sponsor.feature
@@ -90,7 +90,7 @@ Feature: As Laura, a sponsor of my friend Charlie's petition
   Scenario: Laura does not get an email when IP address is rate limited
     Given the sponsor rate limit is 1 per hour
     And there are no allowed IPs
-    And the domain "example.com" is allowed
+    And there are no allowed domains
     And there is a sponsor already from this IP address
     When I visit the "sponsor this petition" url I was given
     And I fill in my details as a sponsor

diff --git a/features/user_sends_feedback.feature b/features/user_sends_feedback.feature
@@ -36,7 +36,7 @@ Feature: User sends feedback
   Scenario: User is blocked by IP address rate limiting
     Given the feedback rate limit is 1 per hour
     And there are no allowed IPs
-    And the domain "example.com" is allowed
+    And there are no allowed domains
     And there are 2 feedbacks created from this IP address
     And I am on the feedback page
     When I fill in "Comments" with "I must protest"
-Original file line number
+Diff line change
@@ Expand Up / @@ -34,10 +34,6 @@ def domain @@
         nil
       end
-      def allowed_domains?
-        false
-      end
       private
       def rate_limit
@@ Expand Down @@