Merge pull request #1782 from internetee/fix-repp-registrar-bridge

Registrar portal: Fix REPP bridge
2025-07-22 18:56:05 +02:00 · 2020-12-23 12:36:58 +02:00 · 2020-12-23 12:36:58 +02:00 · 3462d1b451
commit 3462d1b451
parent 1d3c70ae34 db4f57308b
12 changed files with 70 additions and 35 deletions
--- a/app/controllers/registrar/domain_transfers_controller.rb
+++ b/app/controllers/registrar/domain_transfers_controller.rb
@ -55,10 +55,12 @@ class Registrar
        parsed_response = JSON.parse(response.body, symbolize_names: true)

        if response.code == '200'
-          flash[:notice] = t '.transferred', count: parsed_response[:data].size
+          failed = parsed_response[:data][:failed].each(&:domain_name).join(', ')
+          flash[:notice] = t('.transferred', count: parsed_response[:data][:success].size,
+                                             failed: failed)
          redirect_to registrar_domains_url
        else
-          @api_errors = parsed_response[:errors]
+          @api_errors = parsed_response[:message]
          render file: 'registrar/bulk_change/new', locals: { active_tab: :bulk_transfer }
        end
      else
--- a/app/controllers/registrar/nameservers_controller.rb
+++ b/app/controllers/registrar/nameservers_controller.rb
@ -49,12 +49,13 @@ class Registrar

      if response.code == '200'
        notices = [t('.replaced')]
-        notices << "#{t('.affected_domains')}: #{parsed_response[:affected_domains].join(', ')}"
+        notices << "#{t('.affected_domains')}: " \
+                   "#{parsed_response[:data][:affected_domains].join(', ')}"

-        flash[:notice] = notices
+        flash[:notice] = notices.join(', ')
        redirect_to registrar_domains_url
      else
-        @api_errors = parsed_response[:errors]
+        @api_errors = parsed_response[:message]
        render file: 'registrar/bulk_change/new', locals: { active_tab: :nameserver }
      end
    end
--- a/app/controllers/registrar/tech_contacts_controller.rb
+++ b/app/controllers/registrar/tech_contacts_controller.rb
@ -43,16 +43,18 @@ class Registrar
      if response.code == '200'
        notices = [t('.replaced')]

-        notices << "#{t('.affected_domains')}: #{parsed_response[:affected_domains].join(', ')}"
+        notices << "#{t('.affected_domains')}: " \
+                   "#{parsed_response[:data][:affected_domains].join(', ')}"

-        if parsed_response[:skipped_domains]
-          notices << "#{t('.skipped_domains')}: #{parsed_response[:skipped_domains].join(', ')}"
+        if parsed_response[:data][:skipped_domains]
+          notices << "#{t('.skipped_domains')}: " \
+                     "#{parsed_response[:data][:skipped_domains].join(', ')}"
        end

-        flash[:notice] = notices
+        flash[:notice] = notices.join(', ')
        redirect_to registrar_domains_url
      else
-        @error = parsed_response[:error]
+        @error = response.code == '404' ? 'Contact(s) not found' : parsed_response[:message]
        render file: 'registrar/bulk_change/new', locals: { active_tab: :technical_contact }
      end
    end
--- a/app/controllers/repp/v1/base_controller.rb
+++ b/app/controllers/repp/v1/base_controller.rb
@ -3,6 +3,7 @@ module Repp
    class BaseController < ActionController::API
      rescue_from ActiveRecord::RecordNotFound, with: :not_found_error
      before_action :authenticate_user
+      before_action :validate_webclient_ca
      before_action :check_ip_restriction
      attr_reader :current_user

@ -93,15 +94,33 @@ module Repp
      end

      def check_ip_restriction
-        allowed = @current_user.registrar.api_ip_white?(request.ip)
-
-        return if allowed
+        return if webclient_request?
+        return if @current_user.registrar.api_ip_white?(request.ip)

        @response = { code: 2202,
                      message: I18n.t('registrar.authorization.ip_not_allowed', ip: request.ip) }
        render(json: @response, status: :unauthorized)
      end

+      def webclient_request?
+        return if Rails.env.test?
+
+        ENV['webclient_ips'].split(',').map(&:strip).include?(request.ip)
+      end
+
+      def validate_webclient_ca
+        return unless webclient_request?
+
+        request_name = request.env['HTTP_SSL_CLIENT_S_DN_CN']
+        webclient_cn = ENV['webclient_cert_common_name'] || 'webclient'
+        return if request_name == webclient_cn
+
+        @response = { code: 2202,
+                      message: I18n.t('registrar.authorization.ip_not_allowed', ip: request.ip) }
+
+        render(json: @response, status: :unauthorized)
+      end
+
      def not_found_error
        @response = { code: 2303, message: 'Object does not exist' }
        render(json: @response, status: :not_found)
--- a/app/models/tech_domain_contact.rb
+++ b/app/models/tech_domain_contact.rb
@ -5,19 +5,20 @@ class TechDomainContact < DomainContact
    skipped_domains = []
    tech_contacts = where(contact: current_contact)

-    transaction do
    tech_contacts.each do |tech_contact|
      if tech_contact.domain.discarded?
        skipped_domains << tech_contact.domain.name
        next
      end
-
+      begin
        tech_contact.contact = new_contact
        tech_contact.save!
        affected_domains << tech_contact.domain.name
+      rescue ActiveRecord::RecordNotUnique
+        skipped_domains << tech_contact.domain.name
      end
    end

-    return affected_domains.sort, skipped_domains.sort
+    [affected_domains.sort, skipped_domains.sort]
  end
 end
--- a/app/views/registrar/bulk_change/_api_errors.html.erb
+++ b/app/views/registrar/bulk_change/_api_errors.html.erb
@ -1,9 +1,13 @@
 <% if @api_errors %>
    <div class="alert alert-danger">
        <ul>
+            <% if @api_errors.is_a?(String) %>
+            <li><%= @api_errors %></li>
+            <% else %>
            <% @api_errors.each do |error| %>
                <li><%= error[:title] %></li>
            <% end %>
+            <% end %>
        </ul>
    </div>
 <% end %>
--- a/app/views/registrar/bulk_change/_tech_contact_form.html.erb
+++ b/app/views/registrar/bulk_change/_tech_contact_form.html.erb
@ -1,7 +1,7 @@
 <%= form_tag registrar_tech_contacts_path, method: :patch, class: 'form-horizontal' do %>
    <% if @error %>
        <div class="alert alert-danger">
-            <%= @error[:message] %>
+            <%= @error %>
        </div>
    <% end %>

--- a/app/views/registrar/domain_transfers/form/_api_errors.html.erb
+++ b/app/views/registrar/domain_transfers/form/_api_errors.html.erb
@ -1,9 +1,13 @@
 <% if @api_errors %>
    <div class="alert alert-danger">
        <ul>
+            <% if @api_errors.is_a?(String) %>
+            <li><%= @api_errors %></li>
+            <% else %>
            <% @api_errors.each do |error| %>
                <li><%= error[:title] %></li>
            <% end %>
+            <% end %>
        </ul>
    </div>
 <% end %>
--- a/config/locales/registrar/domain_transfers.en.yml
+++ b/config/locales/registrar/domain_transfers.en.yml
@ -6,7 +6,7 @@ en:

      create:
        header: Domain transfer
-        transferred: "%{count} domains have been successfully transferred"
+        transferred: "%{count} domains have been successfully transferred. Failed domains: %{failed}"

      form:
        submit_btn: Transfer
--- a/test/system/registrar_area/bulk_change/bulk_transfer_test.rb
+++ b/test/system/registrar_area/bulk_change/bulk_transfer_test.rb
@ -11,9 +11,9 @@ class RegistrarAreaBulkTransferTest < ApplicationSystemTestCase
    request_stub = stub_request(:post, /domains\/transfer/).with(body: request_body,
                                                                headers: headers,
                                                                basic_auth: ['test_goodnames', 'testtest'])
-                     .to_return(body: { data: [{
-                                                 type: 'domain_transfer'
-                                               }] }.to_json, status: 200)
+                     .to_return(body: { data: { success: [{ type: 'domain_transfer', domain_name: 'shop.test' }],
+                                                failed: []
+                                               } }.to_json, status: 200)

    visit registrar_domains_url
    click_link 'Bulk change'
@ -27,7 +27,7 @@ class RegistrarAreaBulkTransferTest < ApplicationSystemTestCase
  end

  def test_fail_gracefully
-    body = { errors: [{ title: 'epic fail' }] }.to_json
+    body = { message: 'epic fail' }.to_json
    headers = { 'Content-type' => Mime[:json] }
    stub_request(:post, /domains\/transfer/).to_return(status: 400, body: body, headers: headers)

--- a/test/system/registrar_area/bulk_change/nameserver_test.rb
+++ b/test/system/registrar_area/bulk_change/nameserver_test.rb
@ -15,10 +15,12 @@ class RegistrarAreaNameserverBulkChangeTest < ApplicationSystemTestCase
    request_stub = stub_request(:put, /registrar\/nameservers/).with(body: request_body,
                                                                     headers: { 'Content-type' => Mime[:json] },
                                                                     basic_auth: ['test_goodnames', 'testtest'])
-                     .to_return(body: { data: [{
+                     .to_return(body: { data: {
                                            type: 'nameserver',
-                                                 id: 'new-ns.bestnames.test'}],
-                                        affected_domains: ["airport.test", "shop.test"]}.to_json, status: 200)
+                                            id: 'new-ns.bestnames.test',
+                                            affected_domains: ["airport.test", "shop.test"]
+                                        }
+                                      }.to_json, status: 200)

    visit registrar_domains_url
    click_link 'Bulk change'
@ -38,7 +40,7 @@ class RegistrarAreaNameserverBulkChangeTest < ApplicationSystemTestCase

  def test_fails_gracefully
    stub_request(:put, /registrar\/nameservers/).to_return(status: 400,
-                                                           body: { errors: [{ title: 'epic fail' }] }.to_json,
+                                                           body: { message: 'epic fail' }.to_json,
                                                           headers: { 'Content-type' => Mime[:json] })

    visit registrar_domains_url
--- a/test/system/registrar_area/bulk_change/tech_contact_test.rb
+++ b/test/system/registrar_area/bulk_change/tech_contact_test.rb
@ -9,8 +9,8 @@ class RegistrarAreaTechContactBulkChangeTest < ApplicationSystemTestCase
    request_stub = stub_request(:patch, /domains\/contacts/)
                     .with(body: { current_contact_id: 'william-001', new_contact_id: 'john-001' },
                           basic_auth: ['test_bestnames', 'testtest'])
-                     .to_return(body: { affected_domains: %w[foo.test bar.test],
-                                        skipped_domains: %w[baz.test qux.test] }.to_json,
+                     .to_return(body: { data: { affected_domains: %w[foo.test bar.test],
+                                        skipped_domains: %w[baz.test qux.test] } }.to_json,
                                status: 200)

    visit registrar_domains_url
@ -30,7 +30,7 @@ class RegistrarAreaTechContactBulkChangeTest < ApplicationSystemTestCase
  def test_fails_gracefully
    stub_request(:patch, /domains\/contacts/)
      .to_return(status: 400,
-                 body: { error: { message: 'epic fail' } }.to_json,
+                 body: { message: 'epic fail' }.to_json,
                 headers: { 'Content-type' => Mime[:json] })

    visit registrar_domains_url