Merge pull request #405 from internetee/404-fix-whitelisted-info

Disclosed contact info for whitelisted users

.github/workflows/ruby.yml

@@ -17,7 +17,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-22.04]
-        ruby: ['2.7', '3.0.3']
+        ruby: ['3.0.3']
     runs-on: ${{ matrix.os }}
     continue-on-error: ${{ endsWith(matrix.ruby, 'head') || matrix.ruby == 'debug' }}
     steps:
@@ -81,7 +81,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ '2.7', '3.0.3' ]
+        ruby: [ '3.0.3' ]
     runs-on: ubuntu-22.04
 
     env:

Gemfile

@@ -5,14 +5,14 @@ gem 'bootsnap', '~> 1.18.0', require: false
 gem 'figaro', '~> 1.2.0'
 gem 'jbuilder'
 gem 'mimemagic', '~> 0.4.3'
+gem 'passenger', '>= 5.3.2', require: 'phusion_passenger/rack_handler'
 gem 'pg', '~> 1.5.0'
 gem 'rails', '>= 6.0.3.1'
 gem 'recaptcha', '~> 5.8', require: 'recaptcha/rails'
 gem 'sassc', '~> 2.4'
 gem 'sassc-rails'
 gem 'simpleidn', '0.2.1' # For Punycode
 gem 'uglifier'
-gem 'passenger', '>= 5.3.2', require: 'phusion_passenger/rack_handler'
 
 group :development do
   gem 'listen', '>= 3.0.5', '< 3.9'
@@ -21,10 +21,10 @@ end
 group :development, :test do
   gem 'apparition', github: 'twalpole/apparition', ref: 'ca86be4d54af835d531dbcd2b86e7b2c77f85f34'
   gem 'capybara'
-  gem 'pry'
-  gem 'unicorn'
   gem 'mina', '~> 1.2.4'
+  gem 'pry'
   gem 'puma'
+  gem 'unicorn'
   gem 'webmock'
 end
 

Gemfile.lock

@@ -268,4 +268,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   2.3.11
+   2.5.7

app/presenters/contact_presenter.rb

@@ -40,7 +40,7 @@ def last_update
   private
 
   def disclose_attr_for_org_registrant(attr)
-    if contact_publishable? || captcha_solved?
+    if whitelisted_user? || contact_publishable? || captcha_solved?
       contact.send(attr.to_sym)
     else
       disclosable_mask

app/presenters/registrant_presenter.rb

@@ -1,15 +1,11 @@
 class RegistrantPresenter < ContactPresenter
   def name
-    if registrant_is_org?
-      contact.name
-    else
-      disclose_data_priv_registrant('name')
-    end
+    registrant_is_org? ? contact.name : disclose_data_priv_registrant('name')
   end
 
   def email
     # publishable_attribute('email')
-    disclose_registrant_data('email')
+    registrant_is_org? ? disclose_attr('email') : disclose_data_priv_registrant('email')
   end
 
   def phone
@@ -18,29 +14,23 @@ def phone
   end
 
   def last_update
-    if captcha_solved?
-      contact.last_update
-    else
-      disclosable_mask
-    end
+    captcha_solved? ? contact.last_update : disclosable_mask
   end
 
   private
 
-  def disclose_registrant_data(attr)
-    registrant_is_org? ? disclose_attr(attr) : disclose_data_priv_registrant(attr)
-  end
-
   def disclose_attr(attr)
-    if registrant_publishable? || captcha_solved?
+    if whitelisted_user? || registrant_publishable? || captcha_solved?
       contact.send(attr.to_sym)
     else
       disclosable_mask
     end
   end
 
   def disclose_data_priv_registrant(attr)
+    return contact.send(attr.to_sym) if whitelisted_user?
     return undisclosable_mask unless contact.attribute_disclosed?(attr)
+
     disclose_attr(attr)
   end
 end

test/integration/whois_records/json_test.rb

@@ -150,9 +150,9 @@ def test_show_sensitive_data_of_private_entity_when_ip_is_in_whitelist
     get '/v1/privatedomain.test', params: { format: :json }
     response_json = JSON.parse(response.body, symbolize_names: true)
 
-    assert_equal 'Not Disclosed', response_json[:registrant]
-    assert_equal 'Not Disclosed', response_json[:email]
-    assert_equal 'Not Disclosed', response_json[:phone]
+    assert_equal 'test', response_json[:registrant]
+    assert_equal '[email protected]', response_json[:email]
+    assert_equal '+555.555', response_json[:phone]
     assert_equal '2018-04-25T14:10:39+00:00', response_json[:registrant_changed]
 
     expected_admin_contacts = [
@@ -178,8 +178,8 @@ def test_show_sensitive_data_of_legal_entity_when_ip_is_in_whitelist
     response_json = JSON.parse(response.body, symbolize_names: true)
 
     assert_equal 'test', response_json[:registrant]
-    assert_equal 'Not Disclosed - Visit www.internet.ee for web-based WHOIS', response_json[:email]
-    assert_equal 'Not Disclosed', response_json[:phone]
+    assert_equal '[email protected]', response_json[:email]
+    assert_equal '+555.555', response_json[:phone]
     assert_equal '2018-04-25T14:10:39+00:00', response_json[:registrant_changed]
 
     expected_admin_contacts = [

test/system/whois_records/details/base_test.rb

@@ -51,9 +51,9 @@ def test_registrant_details
     visit whois_record_url(name: @whois_record.name)
 
     within '.registrant' do
-      assert_text 'Name Not Disclosed'
-      assert_text 'Email Not Disclosed'
-      assert_text 'Phone Not Disclosed'
+      assert_text 'Name John'
+      assert_text 'Email [email protected]'
+      assert_text '+555.555'
       assert_text 'Last update Not Disclosed - Visit www.internet.ee for web-based WHOIS'
     end
   end