From 2db401fd98221b5e8da5760fd20411d9d8825e36 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Mon, 26 Feb 2018 10:30:46 +0200 Subject: [PATCH] Add registrar nameserver replacement UI #661 --- app/api/repp/nameservers_v1.rb | 2 +- .../registrar_nameservers_controller.rb | 59 +++++++++++++++++++ app/views/registrar/domains/index.html.erb | 6 +- .../registrar_nameservers/_form.html.erb | 50 ++++++++++++++++ .../registrar_nameservers/edit.html.erb | 11 ++++ config/locales/registrar/domains.en.yml | 1 + .../registrar/registrar_nameservers.en.yml | 12 ++++ config/routes.rb | 2 + doc/repp/v1/nameservers.md | 4 +- .../{patch_test.rb => put_test.rb} | 12 ++-- .../registrar/nameserver_replacement_test.rb | 49 +++++++++++++++ 11 files changed, 197 insertions(+), 11 deletions(-) create mode 100644 app/controllers/registrar/registrar_nameservers_controller.rb create mode 100644 app/views/registrar/registrar_nameservers/_form.html.erb create mode 100644 app/views/registrar/registrar_nameservers/edit.html.erb create mode 100644 config/locales/registrar/registrar_nameservers.en.yml rename test/integration/api/nameservers/{patch_test.rb => put_test.rb} (82%) create mode 100644 test/integration/registrar/nameserver_replacement_test.rb diff --git a/app/api/repp/nameservers_v1.rb b/app/api/repp/nameservers_v1.rb index fe391b704..cbc58eece 100644 --- a/app/api/repp/nameservers_v1.rb +++ b/app/api/repp/nameservers_v1.rb @@ -2,7 +2,7 @@ module Repp class NameserversV1 < Grape::API version 'v1', using: :path - resource :nameservers do + resource 'registrar/nameservers' do put '/' do params do requires :data, type: Hash do diff --git a/app/controllers/registrar/registrar_nameservers_controller.rb b/app/controllers/registrar/registrar_nameservers_controller.rb new file mode 100644 index 000000000..b4776f70e --- /dev/null +++ b/app/controllers/registrar/registrar_nameservers_controller.rb @@ -0,0 +1,59 @@ +class Registrar + class RegistrarNameserversController < DeppController + def edit + authorize! :manage, :repp + end + + def update + authorize! :manage, :repp + + ipv4 = params[:ipv4].split("\r\n") + ipv6 = params[:ipv6].split("\r\n") + + uri = URI.parse("#{ENV['repp_url']}registrar/nameservers") + request = Net::HTTP::Post.new(uri, 'Content-Type' => 'application/json') + request.body = { data: { type: 'nameserver', id: params[:old_hostname], + attributes: { hostname: params[:new_hostname], + ipv4: ipv4, + ipv6: ipv6 } } }.to_json + request.basic_auth(current_user.username, current_user.password) + + if Rails.env.test? + response = Net::HTTP.start(uri.hostname, uri.port, + use_ssl: (uri.scheme == 'https'), + verify_mode: OpenSSL::SSL::VERIFY_NONE) do |http| + http.request(request) + end + elsif Rails.env.development? + client_cert = File.read(ENV['cert_path']) + client_key = File.read(ENV['key_path']) + response = Net::HTTP.start(uri.hostname, uri.port, + use_ssl: (uri.scheme == 'https'), + verify_mode: OpenSSL::SSL::VERIFY_NONE, + cert: OpenSSL::X509::Certificate.new(client_cert), + key: OpenSSL::PKey::RSA.new(client_key)) do |http| + http.request(request) + end + else + client_cert = File.read(ENV['cert_path']) + client_key = File.read(ENV['key_path']) + response = Net::HTTP.start(uri.hostname, uri.port, + use_ssl: (uri.scheme == 'https'), + cert: OpenSSL::X509::Certificate.new(client_cert), + key: OpenSSL::PKey::RSA.new(client_key)) do |http| + http.request(request) + end + end + + parsed_response = JSON.parse(response.body, symbolize_names: true) + + if response.code == '200' + flash[:notice] = t '.replaced' + redirect_to registrar_domains_url + else + @api_errors = parsed_response[:errors] + render :edit + end + end + end +end diff --git a/app/views/registrar/domains/index.html.erb b/app/views/registrar/domains/index.html.erb index a62619ca4..319f0d04f 100644 --- a/app/views/registrar/domains/index.html.erb +++ b/app/views/registrar/domains/index.html.erb @@ -1,12 +1,14 @@
-
+

<%= t '.header' %>

-
+
<%= link_to t('.new_btn'), new_registrar_domain_path, class: 'btn btn-primary' %> <%= link_to t('.transfer_btn'), new_registrar_domain_transfer_path, class: 'btn btn-default' %> + <%= link_to t('.replace_nameserver_btn'), registrar_edit_registrar_nameserver_path, + class: 'btn btn-default' %>
diff --git a/app/views/registrar/registrar_nameservers/_form.html.erb b/app/views/registrar/registrar_nameservers/_form.html.erb new file mode 100644 index 000000000..bc748d412 --- /dev/null +++ b/app/views/registrar/registrar_nameservers/_form.html.erb @@ -0,0 +1,50 @@ +<%= form_tag registrar_update_registrar_nameserver_path, method: :put, class: 'form-horizontal' do %> +
+
+ <%= label_tag :old_hostname, nil %> +
+ +
+ <%= text_field_tag :old_hostname, nil, autofocus: true, required: true, + class: 'form-control' %> +
+
+ +
+
+ <%= label_tag :new_hostname, nil %> +
+ +
+ <%= text_field_tag :new_hostname, nil, required: true, class: 'form-control' %> +
+
+ +
+
+ <%= label_tag :ipv4, nil %> +
+ +
+ <%= text_area_tag :ipv4, nil, class: 'form-control' %> +
+
+ +
+
+ <%= label_tag :ipv6, nil %> +
+ +
+ <%= text_area_tag :ipv6, nil, class: 'form-control' %> +
+
+ +
+
+ +
+
+<% end %> diff --git a/app/views/registrar/registrar_nameservers/edit.html.erb b/app/views/registrar/registrar_nameservers/edit.html.erb new file mode 100644 index 000000000..0903f1556 --- /dev/null +++ b/app/views/registrar/registrar_nameservers/edit.html.erb @@ -0,0 +1,11 @@ +
    +
  1. <%= link_to t('registrar.domains.index.header'), registrar_domains_path %>
    2. +
+ +
+

<%= t '.header' %>

+
+ +<%= render 'registrar/domain_transfers/form/api_errors' %> + +<%= render 'form' %> diff --git a/config/locales/registrar/domains.en.yml b/config/locales/registrar/domains.en.yml index 6ff110694..ddd30676d 100644 --- a/config/locales/registrar/domains.en.yml +++ b/config/locales/registrar/domains.en.yml @@ -5,6 +5,7 @@ en: header: Domains new_btn: New domain transfer_btn: Transfer + replace_nameserver_btn: Replace nameserver csv: domain_name: Domain transfer_code: Transfer code diff --git a/config/locales/registrar/registrar_nameservers.en.yml b/config/locales/registrar/registrar_nameservers.en.yml new file mode 100644 index 000000000..6d783f564 --- /dev/null +++ b/config/locales/registrar/registrar_nameservers.en.yml @@ -0,0 +1,12 @@ +en: + registrar: + registrar_nameservers: + edit: + header: Replace nameserver + replace_btn: Replace + + form: + replace_btn: Replace nameserver + + update: + replaced: Nameserver have been successfully replaced diff --git a/config/routes.rb b/config/routes.rb index c49399573..27ee8464f 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -62,6 +62,8 @@ Rails.application.routes.draw do end end resources :domain_transfers, only: %i[new create] + get 'registrar/nameservers', to: 'registrar_nameservers#edit', as: :edit_registrar_nameserver + put 'registrar/nameservers', to: 'registrar_nameservers#update', as: :update_registrar_nameserver resources :contacts, constraints: {:id => /[^\/]+(?=#{ ActionController::Renderers::RENDERERS.map{|e| "\\.#{e}\\z"}.join("|") })|[^\/]+/} do member do diff --git a/doc/repp/v1/nameservers.md b/doc/repp/v1/nameservers.md index 9c3fc9561..702a0c186 100644 --- a/doc/repp/v1/nameservers.md +++ b/doc/repp/v1/nameservers.md @@ -1,11 +1,11 @@ # Nameservers -## PATCH /repp/v1/nameservers +## PUT /repp/v1/registrar/nameservers Replaces all name servers of current registrar domains. #### Request ``` -PATCH /repp/v1/nameservers +PUT /repp/v1/registrar/nameservers Accept: application/json Content-Type: application/json Authorization: Basic dGVzdDp0ZXN0dGVzdA== diff --git a/test/integration/api/nameservers/patch_test.rb b/test/integration/api/nameservers/put_test.rb similarity index 82% rename from test/integration/api/nameservers/patch_test.rb rename to test/integration/api/nameservers/put_test.rb index 1633cc9d1..d048c29fe 100644 --- a/test/integration/api/nameservers/patch_test.rb +++ b/test/integration/api/nameservers/put_test.rb @@ -1,12 +1,12 @@ require 'test_helper' -class APINameserversPatchTest < ActionDispatch::IntegrationTest +class APINameserversPutTest < ActionDispatch::IntegrationTest def test_replaces_current_registrar_nameservers request_params = { format: :json, data: { type: 'nameserver', id: 'ns1.bestnames.test', attributes: { hostname: 'ns55.bestnames.test', ipv4: ['192.0.2.55'], ipv6: ['2001:db8::55'] } } } - put '/repp/v1/nameservers', request_params, { 'HTTP_AUTHORIZATION' => http_auth_key } + put '/repp/v1/registrar/nameservers', request_params, { 'HTTP_AUTHORIZATION' => http_auth_key } new_nameserver = registrars(:bestnames).nameservers.find_by(hostname: 'ns55.bestnames.test') assert_nil registrars(:bestnames).nameservers.find_by(hostname: 'ns1.bestnames.test') @@ -24,14 +24,14 @@ class APINameserversPatchTest < ActionDispatch::IntegrationTest def test_honors_optional_params request_params = { format: :json, data: { type: 'nameserver', id: 'ns1.bestnames.test', attributes: { hostname: 'ns55.bestnames.test' } } } - put '/repp/v1/nameservers', request_params, { 'HTTP_AUTHORIZATION' => http_auth_key } + put '/repp/v1/registrar/nameservers', request_params, { 'HTTP_AUTHORIZATION' => http_auth_key } assert_response 200 end def test_non_existent_nameserver_hostname request_params = { format: :json, data: { type: 'nameserver', id: 'non-existent.test', attributes: { hostname: 'any.bestnames.test' } } } - put '/repp/v1/nameservers', request_params, { 'HTTP_AUTHORIZATION' => http_auth_key } + put '/repp/v1/registrar/nameservers', request_params, { 'HTTP_AUTHORIZATION' => http_auth_key } assert_response 404 assert_equal ({ errors: [{ title: 'Hostname non-existent.test does not exist' }] }), @@ -41,7 +41,7 @@ class APINameserversPatchTest < ActionDispatch::IntegrationTest def test_invalid_request_params request_params = { format: :json, data: { type: 'nameserver', id: 'ns1.bestnames.test', attributes: { hostname: '' } } } - put '/repp/v1/nameservers', request_params, { 'HTTP_AUTHORIZATION' => http_auth_key } + put '/repp/v1/registrar/nameservers', request_params, { 'HTTP_AUTHORIZATION' => http_auth_key } assert_response 400 assert_equal ({ errors: [{ title: 'Invalid params' }] }), @@ -49,7 +49,7 @@ class APINameserversPatchTest < ActionDispatch::IntegrationTest end def test_unauthenticated - put '/repp/v1/nameservers' + put '/repp/v1/registrar/nameservers' assert_response 401 end diff --git a/test/integration/registrar/nameserver_replacement_test.rb b/test/integration/registrar/nameserver_replacement_test.rb new file mode 100644 index 000000000..bf0c1e44e --- /dev/null +++ b/test/integration/registrar/nameserver_replacement_test.rb @@ -0,0 +1,49 @@ +require 'test_helper' + +class RegistrarNameserverReplacementTest < ActionDispatch::IntegrationTest + def setup + WebMock.reset! + login_as users(:api_goodnames) + end + + def test_replaces_current_registrar_nameservers + request_body = { data: { type: 'nameserver', + id: 'ns1.bestnames.test', + attributes: { hostname: 'new-ns.bestnames.test', + ipv4: %w[192.0.2.55 192.0.2.56], + ipv6: %w[2001:db8::55 2001:db8::56] } } } + request_stub = stub_request(:post, /registrar\/nameservers/).with(body: request_body, + headers: { 'Content-type' => 'application/json' }, + basic_auth: ['test_goodnames', 'testtest']) + .to_return(body: { data: [{ + type: 'nameserver', + id: 'new-ns.bestnames.test' + }] }.to_json, status: 200) + + visit registrar_domains_url + click_link 'Replace nameserver' + + fill_in 'Old hostname', with: 'ns1.bestnames.test' + fill_in 'New hostname', with: 'new-ns.bestnames.test' + fill_in 'ipv4', with: "192.0.2.55\n192.0.2.56" + fill_in 'ipv6', with: "2001:db8::55\n2001:db8::56" + click_on 'Replace nameserver' + + assert_requested request_stub + assert_current_path registrar_domains_path + assert_text 'Nameserver have been successfully replaced' + end + + def test_fails_gracefully + stub_request(:post, /registrar\/nameservers/).to_return(status: 400, + body: { errors: [{ title: 'epic fail' }] }.to_json, + headers: { 'Content-type' => 'application/json' }) + + visit registrar_domains_url + click_link 'Replace nameserver' + + click_on 'Replace nameserver' + + assert_text 'epic fail' + end +end