diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2ef45bf81..58ae259b2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,35 @@
+13.11.2020
+* Fixed per registrar epp session limit [#729](https://github.com/internetee/registry/issues/729)
+* Correct error code is returned on reaching session limit [#587](https://github.com/internetee/registry/issues/587)
+* No logins within active session [#1313](https://github.com/internetee/registry/issues/1313)
+
+06.11.2020
+* Csv option to limit list of domains for bulk nameserver change in registrar portal [#1737](https://github.com/internetee/registry/issues/1737)
+* New forceDelete email template for invalid contact data [#1178](https://github.com/internetee/registry/issues/1178)
+
+05.11.2020
+* Registrant API contact name update feature [#1724](https://github.com/internetee/registry/issues/1724)
+* New email template for expired domains in forceDelete [#1725](https://github.com/internetee/registry/issues/1725)
+* Cancelling forceDelete (FD) restores the state of the domain prior application of FD [#1136](https://github.com/internetee/registry/issues/1136)
+
+04.11.2020
+* Email notification templates for forceDelete are now automatically selected according to registrant type [#442](https://github.com/internetee/registry/issues/442)
+
+03.11.2020
+* Fixed registrant confirmation while forcedelete is set on a domain [#1729](https://github.com/internetee/registry/issues/1729)
+* Fixed search in registrar domain view [#262](https://github.com/internetee/registry/issues/262)
+* Fixed double status issue on setting forceDelete [#1135](https://github.com/internetee/registry/issues/1135)
+
+28.10.2020
+* Domain renew now canceles pending delete process [#1664](https://github.com/internetee/registry/issues/1664)
+* Added multi-language support to whois disclaimer [#1703](https://github.com/internetee/registry/issues/1703)
+
+27.10.2020
+* Fixed 1 day delay in force delete for multi year registrations [#1720](https://github.com/internetee/registry/issues/1720)
+
+20.10.2020
+* ForceDelete mailer now respects option to not notify registrant [#1719](https://github.com/internetee/registry/pull/1719)
+
19.10.2020
* Improved logging for LHV-connect messages [#1712](https://github.com/internetee/registry/issues/1712)
* LHV-connect gem update to handle blank descriptions [#1714](https://github.com/internetee/registry/issues/1714)
diff --git a/app/controllers/admin/domains/force_delete_controller.rb b/app/controllers/admin/domains/force_delete_controller.rb
index c61f050d2..6a111926f 100644
--- a/app/controllers/admin/domains/force_delete_controller.rb
+++ b/app/controllers/admin/domains/force_delete_controller.rb
@@ -22,7 +22,7 @@ module Admin
send_email
domain.update(contact_notification_sent_date: Time.zone.today)
else
- domain.update(template_name: params[:template_name])
+ domain.update(template_name: domain.notification_template)
end
end
@@ -46,7 +46,7 @@ module Admin
DomainDeleteMailer.forced(domain: domain,
registrar: domain.registrar,
registrant: domain.registrant,
- template_name: params[:template_name]).deliver_now
+ template_name: domain.notification_template).deliver_now
end
def force_delete_type
diff --git a/app/controllers/admin/domains_controller.rb b/app/controllers/admin/domains_controller.rb
index 2b94607c5..4a8e5961e 100644
--- a/app/controllers/admin/domains_controller.rb
+++ b/app/controllers/admin/domains_controller.rb
@@ -2,7 +2,6 @@ module Admin
class DomainsController < BaseController
before_action :set_domain, only: %i[show edit update keep]
authorize_resource
- helper_method :force_delete_templates
def index
params[:q] ||= {}
@@ -105,9 +104,5 @@ module Admin
params[:q][:valid_to_lteq] = ca_cache
end
-
- def force_delete_templates
- DomainDeleteMailer.force_delete_templates
- end
end
end
diff --git a/app/controllers/epp/sessions_controller.rb b/app/controllers/epp/sessions_controller.rb
index b1c7fbbfb..04603dbe7 100644
--- a/app/controllers/epp/sessions_controller.rb
+++ b/app/controllers/epp/sessions_controller.rb
@@ -79,19 +79,32 @@ module Epp
if success && EppSession.limit_reached?(@api_user.registrar)
epp_errors << {
- msg: 'Authentication error; server closing connection (connection limit reached)',
- code: '2501'
+ msg: 'Session limit exceeded; server closing connection (connection limit reached)',
+ code: '2502',
}
success = false
end
if success
- if params[:parsed_frame].css('newPW').first
- unless @api_user.update(plain_text_password: params[:parsed_frame].css('newPW').first.text)
- handle_errors(@api_user) and return
+ new_password = params[:parsed_frame].at_css('newPW')&.text
+ password_change = new_password.present?
+
+ if password_change
+ @api_user.plain_text_password = new_password
+ @api_user.save!
+ end
+
+ already_authenticated = EppSession.exists?(session_id: epp_session_id)
+
+ if already_authenticated
+ epp_errors << {
+ msg: 'Command use error; Already authenticated',
+ code: 2002,
+ }
+ handle_errors
+ return
end
- end
epp_session = EppSession.new
epp_session.session_id = epp_session_id
@@ -100,8 +113,8 @@ module Epp
render_epp_response('login_success')
else
handle_errors
+ end
end
- end
def ip_white?
webclient_request = ENV['webclient_ips'].split(',').map(&:strip).include?(request.ip)
@@ -125,7 +138,7 @@ module Epp
@api_user = current_user # cache current_user for logging
epp_session.destroy
render_epp_response('logout')
- end
+ end
### HELPER METHODS ###
diff --git a/app/controllers/registrar/domains_controller.rb b/app/controllers/registrar/domains_controller.rb
index 50ad0bd10..1a46da463 100644
--- a/app/controllers/registrar/domains_controller.rb
+++ b/app/controllers/registrar/domains_controller.rb
@@ -11,26 +11,27 @@ class Registrar
search_params[:name_matches].present?
domain = Domain.find_by(name: search_params[:name_matches])
- if domain
- redirect_to info_registrar_domains_url(domain_name: domain.name) and return
- end
+ redirect_to info_registrar_domains_url(domain_name: domain.name) and return if domain
end
- if params[:statuses_contains]
- domains = current_registrar_user.registrar.domains.includes(:registrar, :registrant).where(
- "statuses @> ?::varchar[]", "{#{params[:statuses_contains].join(',')}}"
- )
- else
- domains = current_registrar_user.registrar.domains.includes(:registrar, :registrant)
+ domains = if params[:statuses_contains]
+ current_domain_scope.where('domains.statuses @> ?::varchar[]',
+ "{#{params[:statuses_contains].join(',')}}")
+ else
+ current_domain_scope
+ end
+
+ if params[:contacts_ident_eq]
+ domains = domains.where(contacts: { ident: params[:contacts_ident_eq] })
end
normalize_search_parameters do
- @q = domains.search(search_params)
+ @q = domains.search(search_params.except(:contacts_ident_eq))
@domains = @q.result.page(params[:page])
# if we do not get any results, add wildcards to the name field and search again
if @domains.count == 0 && search_params[:name_matches] !~ /^%.+%$/
- new_search_params = search_params.to_h
+ new_search_params = search_params.to_h.except(:contacts_ident_eq)
new_search_params[:name_matches] = "%#{new_search_params[:name_matches]}%"
@q = domains.search(new_search_params)
@domains = @q.result.page(params[:page])
@@ -56,6 +57,10 @@ class Registrar
end
end
+ def current_domain_scope
+ current_registrar_user.registrar.domains.includes(:registrar, :registrant)
+ end
+
def info
authorize! :info, Depp::Domain
@data = @domain.info(params[:domain_name]) if params[:domain_name]
diff --git a/app/controllers/registrar/nameservers_controller.rb b/app/controllers/registrar/nameservers_controller.rb
index 95da7e329..c8c88c8ca 100644
--- a/app/controllers/registrar/nameservers_controller.rb
+++ b/app/controllers/registrar/nameservers_controller.rb
@@ -6,9 +6,12 @@ class Registrar
ipv4 = params[:ipv4].split("\r\n")
ipv6 = params[:ipv6].split("\r\n")
+ domains = domain_list_from_csv
+
uri = URI.parse("#{ENV['repp_url']}registrar/nameservers")
request = Net::HTTP::Put.new(uri, 'Content-Type' => 'application/json')
request.body = { data: { type: 'nameserver', id: params[:old_hostname],
+ domains: domains,
attributes: { hostname: params[:new_hostname],
ipv4: ipv4,
ipv6: ipv6 } } }.to_json
@@ -55,5 +58,13 @@ class Registrar
render file: 'registrar/bulk_change/new', locals: { active_tab: :nameserver }
end
end
+
+ def domain_list_from_csv
+ return [] if params[:puny_file].blank?
+
+ domains = []
+ CSV.read(params[:puny_file].path, headers: true).each { |b| domains << b['domain_name'] }
+ domains
+ end
end
end
diff --git a/app/controllers/repp/v1/registrar/nameservers_controller.rb b/app/controllers/repp/v1/registrar/nameservers_controller.rb
index 1af85b760..fb00d92c0 100644
--- a/app/controllers/repp/v1/registrar/nameservers_controller.rb
+++ b/app/controllers/repp/v1/registrar/nameservers_controller.rb
@@ -5,10 +5,13 @@ module Repp
before_action :verify_nameserver_existance, only: %i[update]
def update
- domains = current_user.registrar
- .replace_nameservers(hostname, hostname_params[:data][:attributes])
+ domains = params[:data][:domains] || []
+ affected = current_user.registrar
+ .replace_nameservers(hostname,
+ hostname_params[:data][:attributes],
+ domains: domains)
- render_success(data: data_format_for_success(domains))
+ render_success(data: data_format_for_success(affected))
rescue ActiveRecord::RecordInvalid => e
handle_errors(e.record)
end
@@ -16,15 +19,23 @@ module Repp
private
def data_format_for_success(affected_domains)
- { type: 'nameserver', id: params[:data][:attributes][:hostname],
- attributes: params[:data][:attributes], affected_domains: affected_domains }
+ {
+ type: 'nameserver',
+ id: params[:data][:attributes][:hostname],
+ attributes: params[:data][:attributes],
+ affected_domains: affected_domains,
+ }
end
def hostname_params
params.require(:data).require(%i[type id])
params.require(:data).require(:attributes).require([:hostname])
- params.permit(data: [:type, :id, attributes: [:hostname, ipv4: [], ipv6: []]])
+ params.permit(data: [
+ :type, :id,
+ { domains: [],
+ attributes: [:hostname, { ipv4: [], ipv6: [] }] },
+ ])
end
def hostname
diff --git a/app/jobs/domain_expire_email_job.rb b/app/jobs/domain_expire_email_job.rb
index 9b70a54e6..94bd8670c 100644
--- a/app/jobs/domain_expire_email_job.rb
+++ b/app/jobs/domain_expire_email_job.rb
@@ -4,6 +4,10 @@ class DomainExpireEmailJob < Que::Job
return if domain.registered?
- DomainExpireMailer.expired(domain: domain, registrar: domain.registrar).deliver_now
+ if domain.force_delete_scheduled?
+ DomainExpireMailer.expired_soft(domain: domain, registrar: domain.registrar).deliver_now
+ else
+ DomainExpireMailer.expired(domain: domain, registrar: domain.registrar).deliver_now
+ end
end
end
diff --git a/app/mailers/domain_delete_mailer.rb b/app/mailers/domain_delete_mailer.rb
index 1f08204bf..dbacab68d 100644
--- a/app/mailers/domain_delete_mailer.rb
+++ b/app/mailers/domain_delete_mailer.rb
@@ -1,8 +1,4 @@
class DomainDeleteMailer < ApplicationMailer
- def self.force_delete_templates
- %w[private_person legal_person]
- end
-
def confirmation_request(domain:, registrar:, registrant:)
@domain = DomainPresenter.new(domain: domain, view: view_context)
@registrar = RegistrarPresenter.new(registrar: registrar, view: view_context)
diff --git a/app/mailers/domain_expire_mailer.rb b/app/mailers/domain_expire_mailer.rb
index ecbd8ee3d..229120825 100644
--- a/app/mailers/domain_expire_mailer.rb
+++ b/app/mailers/domain_expire_mailer.rb
@@ -1,19 +1,38 @@
class DomainExpireMailer < ApplicationMailer
+ attr_accessor :domain, :registrar
+
def expired(domain:, registrar:)
- @domain = domain_presenter(domain: domain)
- @registrar = registrar_presenter(registrar: registrar)
+ process_mail(domain: domain, registrar: registrar, method_name: __method__.to_s)
+ end
- recipient = filter_invalid_emails(emails: domain.primary_contact_emails, domain: domain)
- subject = default_i18n_subject(domain_name: domain.name)
-
- logger.info("Send DomainExpireMailer#expired email for domain #{domain.name} (##{domain.id})" \
- " to #{recipient.join(', ')}")
-
- mail(to: recipient, subject: subject)
+ def expired_soft(domain:, registrar:)
+ process_mail(domain: domain, registrar: registrar, method_name: __method__.to_s)
end
private
+ def process_mail(domain:, registrar:, method_name:)
+ init(domain, registrar)
+
+ logger.info("Send DomainExpireMailer##{method_name} email for #{domain.name} (##{domain.id})" \
+ " to #{recipient(domain).join(', ')}")
+
+ mail(to: recipient(domain), subject: subject(method_name))
+ end
+
+ def init(domain, registrar)
+ @domain = domain_presenter(domain: domain)
+ @registrar = registrar_presenter(registrar: registrar)
+ end
+
+ def recipient(domain)
+ filter_invalid_emails(emails: domain.primary_contact_emails, domain: @domain)
+ end
+
+ def subject(method_name)
+ I18n.t("domain_expire_mailer.#{method_name}.subject", domain_name: @domain.name)
+ end
+
def domain_presenter(domain:)
DomainPresenter.new(domain: domain, view: view_context)
end
diff --git a/app/models/concerns/domain/force_delete.rb b/app/models/concerns/domain/force_delete.rb
index af3aaa7c7..f3bf96975 100644
--- a/app/models/concerns/domain/force_delete.rb
+++ b/app/models/concerns/domain/force_delete.rb
@@ -19,6 +19,16 @@ module Concerns::Domain::ForceDelete # rubocop:disable Metrics/ModuleLength
end
end
+ def notification_template
+ if contact_emails_verification_failed.present?
+ 'invalid_email'
+ elsif registrant.org?
+ 'legal_person'
+ else
+ 'private_person'
+ end
+ end
+
def force_delete_scheduled?
statuses.include?(DomainStatus::FORCE_DELETE)
end
@@ -80,8 +90,8 @@ module Concerns::Domain::ForceDelete # rubocop:disable Metrics/ModuleLength
end
def cancel_force_delete
- restore_statuses_before_force_delete
remove_force_delete_statuses
+ restore_statuses_before_force_delete
clear_force_delete_data
self.force_delete_date = nil
self.force_delete_start = nil
@@ -106,7 +116,7 @@ module Concerns::Domain::ForceDelete # rubocop:disable Metrics/ModuleLength
end
def soft_delete_dates(years)
- self.force_delete_start = valid_to - years.years + 1.day
+ self.force_delete_start = valid_to - years.years
self.force_delete_date = force_delete_start + Setting.expire_warning_period.days +
Setting.redemption_grace_period.days
end
@@ -119,7 +129,7 @@ module Concerns::Domain::ForceDelete # rubocop:disable Metrics/ModuleLength
end
def preserve_current_statuses_for_force_delete
- self.statuses_before_force_delete = statuses.clone
+ update(statuses_before_force_delete: statuses)
end
def restore_statuses_before_force_delete
@@ -128,9 +138,9 @@ module Concerns::Domain::ForceDelete # rubocop:disable Metrics/ModuleLength
end
def add_force_delete_statuses
- statuses << DomainStatus::FORCE_DELETE
- statuses << DomainStatus::SERVER_RENEW_PROHIBITED
- statuses << DomainStatus::SERVER_TRANSFER_PROHIBITED
+ self.statuses |= [DomainStatus::FORCE_DELETE,
+ DomainStatus::SERVER_RENEW_PROHIBITED,
+ DomainStatus::SERVER_TRANSFER_PROHIBITED]
end
def remove_force_delete_statuses
diff --git a/app/models/concerns/email_verifable.rb b/app/models/concerns/email_verifable.rb
index dc512b2c8..d0bb6aecb 100644
--- a/app/models/concerns/email_verifable.rb
+++ b/app/models/concerns/email_verifable.rb
@@ -15,6 +15,10 @@ module Concerns
domain: domain(billing_email))
end
+ def email_verification_failed?
+ email_verification&.failed?
+ end
+
class_methods do
def domain(email)
Mail::Address.new(email).domain&.downcase || 'not_found'
diff --git a/app/models/concerns/job/force_delete_notify.rb b/app/models/concerns/job/force_delete_notify.rb
index 658c7a315..bc291354e 100644
--- a/app/models/concerns/job/force_delete_notify.rb
+++ b/app/models/concerns/job/force_delete_notify.rb
@@ -15,7 +15,7 @@ module Concerns
domain.registrar.notifications.create!(text: I18n.t('grace_period_started_domain',
domain_name: domain.name,
date: domain.force_delete_start))
- send_mail(domain)
+ send_mail(domain) if domain.template_name.present?
domain.update(contact_notification_sent_date: Time.zone.today)
end
diff --git a/app/models/domain.rb b/app/models/domain.rb
index 391c9c030..b15bb7c55 100644
--- a/app/models/domain.rb
+++ b/app/models/domain.rb
@@ -320,8 +320,8 @@ class Domain < ApplicationRecord
def renew_blocking_statuses
disallowed = [DomainStatus::DELETE_CANDIDATE, DomainStatus::PENDING_RENEW,
DomainStatus::PENDING_TRANSFER, DomainStatus::CLIENT_RENEW_PROHIBITED,
- DomainStatus::PENDING_UPDATE, DomainStatus::PENDING_DELETE,
- DomainStatus::PENDING_DELETE_CONFIRMATION, DomainStatus::SERVER_RENEW_PROHIBITED]
+ DomainStatus::PENDING_UPDATE, DomainStatus::SERVER_RENEW_PROHIBITED,
+ DomainStatus::PENDING_DELETE_CONFIRMATION]
(statuses & disallowed)
end
@@ -384,7 +384,7 @@ class Domain < ApplicationRecord
end
def registrant_update_confirmable?(token)
- return false if (statuses & [DomainStatus::FORCE_DELETE, DomainStatus::DELETE_CANDIDATE]).any?
+ return false if statuses.include? DomainStatus::DELETE_CANDIDATE
return false unless pending_update?
return false unless registrant_verification_asked?
return false unless registrant_verification_token == token
@@ -642,6 +642,10 @@ class Domain < ApplicationRecord
DNS::DomainName.new(name)
end
+ def contact_emails_verification_failed
+ contacts.select(&:email_verification_failed?)&.map(&:email)&.uniq
+ end
+
def self.to_csv
CSV.generate do |csv|
csv << column_names
diff --git a/app/models/epp/domain.rb b/app/models/epp/domain.rb
index 530e54a0f..c46732712 100644
--- a/app/models/epp/domain.rb
+++ b/app/models/epp/domain.rb
@@ -612,6 +612,7 @@ class Epp::Domain < Domain
statuses.delete(DomainStatus::SERVER_HOLD)
statuses.delete(DomainStatus::EXPIRED)
statuses.delete(DomainStatus::SERVER_UPDATE_PROHIBITED)
+ cancel_pending_delete
save
end
diff --git a/app/models/epp/response/result/code.rb b/app/models/epp/response/result/code.rb
index 1be4a3f7c..10edf0a35 100644
--- a/app/models/epp/response/result/code.rb
+++ b/app/models/epp/response/result/code.rb
@@ -30,6 +30,7 @@ module Epp
data_management_policy_violation: 2308,
command_failed: 2400,
authentication_error_server_closing_connection: 2501,
+ session_limit_exceeded_server_closing_connection: 2502,
}.freeze
private_constant :KEY_TO_VALUE
@@ -59,6 +60,7 @@ module Epp
2308 => 'Data management policy violation',
2400 => 'Command failed',
2501 => 'Authentication error; server closing connection',
+ 2502 => 'Session limit exceeded; server closing connection',
}.freeze
private_constant :DEFAULT_DESCRIPTIONS
diff --git a/app/models/epp_session.rb b/app/models/epp_session.rb
index f1b641aa0..a6fb97ed2 100644
--- a/app/models/epp_session.rb
+++ b/app/models/epp_session.rb
@@ -6,19 +6,26 @@ class EppSession < ApplicationRecord
class_attribute :timeout
self.timeout = (ENV['epp_session_timeout_seconds'] || 300).to_i.seconds
+ class_attribute :sessions_per_registrar
+ self.sessions_per_registrar = (ENV['epp_sessions_per_registrar'] || 4).to_i
+
alias_attribute :last_access, :updated_at
- def self.limit_per_registrar
- 4
- end
+ scope :not_expired,
+ lambda {
+ where(':now <= (updated_at + interval :interval)', now: Time.zone.now, interval: interval)
+ }
def self.limit_reached?(registrar)
- count = where(user_id: registrar.api_users.ids).where('updated_at >= ?', Time.zone.now - 1.second).count
- count >= limit_per_registrar
+ count = where(user_id: registrar.api_users.ids).not_expired.count
+ count >= sessions_per_registrar
+ end
+
+ def self.interval
+ "#{timeout.parts.first.second} #{timeout.parts.first.first}"
end
def self.expired
- interval = "#{timeout.parts.first.second} #{timeout.parts.first.first}"
where(':now > (updated_at + interval :interval)', now: Time.zone.now, interval: interval)
end
diff --git a/app/models/registrant_user.rb b/app/models/registrant_user.rb
index c0addb5cd..aa41ccff8 100644
--- a/app/models/registrant_user.rb
+++ b/app/models/registrant_user.rb
@@ -54,14 +54,25 @@ class RegistrantUser < User
username.split.second
end
+ def update_related_contacts
+ contacts = Contact.where(ident: ident, ident_country_code: country.alpha2)
+ .where('UPPER(name) != UPPER(?)', username)
+
+ contacts.each do |contact|
+ contact.update(name: username)
+ action = actions.create!(contact: contact, operation: :update)
+ contact.registrar.notify(action)
+ end
+ end
+
class << self
def find_or_create_by_api_data(user_data = {})
return false unless user_data[:ident]
return false unless user_data[:first_name]
return false unless user_data[:last_name]
- user_data.each_value { |v| v.upcase! if v.is_a?(String) }
user_data[:country_code] ||= 'EE'
+ %i[ident country_code].each { |f| user_data[f].upcase! if user_data[f].is_a?(String) }
find_or_create_by_user_data(user_data)
end
@@ -91,6 +102,7 @@ class RegistrantUser < User
user.username = "#{user_data[:first_name]} #{user_data[:last_name]}"
user.save
+ user.update_related_contacts
user
end
end
diff --git a/app/models/registrar.rb b/app/models/registrar.rb
index e2ffcbfd4..040c7886b 100644
--- a/app/models/registrar.rb
+++ b/app/models/registrar.rb
@@ -141,11 +141,13 @@ class Registrar < ApplicationRecord
end
# Audit log is needed, therefore no raw SQL
- def replace_nameservers(hostname, new_attributes)
+ def replace_nameservers(hostname, new_attributes, domains: [])
transaction do
domain_list = []
nameservers.where(hostname: hostname).find_each do |original_nameserver|
+ next unless domains.include?(original_nameserver.domain.name_puny) || domains.empty?
+
new_nameserver = Nameserver.new
new_nameserver.domain = original_nameserver.domain
new_nameserver.attributes = new_attributes
diff --git a/app/presenters/domain_presenter.rb b/app/presenters/domain_presenter.rb
index 0915722b1..bcbd5d600 100644
--- a/app/presenters/domain_presenter.rb
+++ b/app/presenters/domain_presenter.rb
@@ -52,6 +52,10 @@ class DomainPresenter
end
end
+ def contact_emails_verification_failed
+ domain.contact_emails_verification_failed.join(', ')
+ end
+
def remove_registry_lock_btn
return unless domain.locked_by_registrant?
diff --git a/app/views/admin/domains/_force_delete_dialog.html.erb b/app/views/admin/domains/_force_delete_dialog.html.erb
index a76c14edd..932a3f75c 100644
--- a/app/views/admin/domains/_force_delete_dialog.html.erb
+++ b/app/views/admin/domains/_force_delete_dialog.html.erb
@@ -33,12 +33,6 @@
-
<% end %>
<%= render 'form' %>
-<%= render 'force_delete_dialog', domain: @domain, templates: force_delete_templates %>
+<%= render 'force_delete_dialog', domain: @domain %>
diff --git a/app/views/mailers/domain_delete_mailer/forced/invalid_email.html.erb b/app/views/mailers/domain_delete_mailer/forced/invalid_email.html.erb
new file mode 100644
index 000000000..817538afd
--- /dev/null
+++ b/app/views/mailers/domain_delete_mailer/forced/invalid_email.html.erb
@@ -0,0 +1,47 @@
+Lugupeetud domeeni <%= @domain.name %> registreerija/halduskontakt
+
+Eesti Interneti Sihtasutusele (EIS) on saanud teatavaks, et domeeni <%= @domain.name %> kontaktandmed on puudulikud - eposti aadress <%= @domain.contact_emails_verification_failed %>.
+
+Et see olukord on vastuolus .ee domeenireeglitega algatas EIS <%= @delete_period_length %> päeva pikkuse kustutusmenetluse. Menetluse käigus on domeen <%= @expire_warning_period %> esimest päeva internetis kättesaadav.
+
+Andmete parandamiseks pöörduge palun oma registripidaja <%= @registrar.name %> poole või isiklike ja oma ettevõtte andmete puhul registreerija portaali.
+
+Kui kontaktandmed ei ole <%= @delete_period_length %> päeva jooksul parandatud, läheb domeen <%= @domain.name %> <%= @domain.force_delete_date %> domeenioksjonile .ee oksjonikeskkonda. Juhul kui domeenile <%= @domain.name %> ei tehta oksjonil 24h möödudes pakkumist, domeen vabaneb ja on registreerimiseks vabalt kättesaadav kõigile huvilistele. Muude võimalike oksjoni tulemuste kohta loe siit.
+
+Lisaküsimuste korral võtke palun ühendust oma registripidajaga:
+<%= render 'mailers/shared/registrar/registrar.et.html', registrar: @registrar %>
+
+<%= render 'mailers/shared/signatures/signature.et.html' %>
+
+
+
+Dear registrant/administrative contact of .ee domain,
+
+Estonian Internet Foundation has learned that contact data of the domain <%= @domain.name %> s invalid - email(s) <%= @domain.contact_emails_verification_failed %>.
+
+Since this is a violation of Estonian domain regulations, <%= @delete_period_length %>-day deletion process has started for the <%= @domain.name %> domain. For the first <%= @expire_warning_period %> days the domain will remain available on the Internet during the deletion process.
+
+Please, contact your registrar <%= @registrar.name %> with updated contact data, or in case of your personal or business data use .ee portal for registrants
+
+If the data is not fixed within <%= @delete_period_length %> days, the domain <%= @domain.name %> will go to domain auction on <%= @domain.force_delete_date %> in the .ee auction environment. If no offer is made for the domain <%= @domain.name %> at auction within 24 hours, the domain will be released and made freely available for registration to anyone interested on a first-come, first-served basis. Read more about other potential auction results here.
+
+Should you have additional questions, please contact your registrar:
+<%= render 'mailers/shared/registrar/registrar.en.html', registrar: @registrar %>
+
+<%= render 'mailers/shared/signatures/signature.en.html' %>
+
+
+Уважаемый регистрант/административный контакт домена .ee
+
+Целевому учреждению Eesti Internet (EIS) стало известно, что контактные данные домена <%= @registrant.reg_no %> неверны - электронная почта <%= @domain.contact_emails_verification_failed %>.
+
+Так как это является нарушением Правил домена .ee, <%= @delete_period_length %>-дневный процесс удаления начат для доменного имени <%= @domain.name %>. В течение первых <%= @expire_warning_period %> дней домен будет доступен в интернете.
+
+Для уточнения контактных данных, пожалуйста, свяжитесь с регистратором <%= @registrar.name %>, либо воспользуйтесь порталом для регистрантов
+
+Если контактные данные не будут исправлены в течение <%= @delete_period_length %> дней, домен <%= @domain.name %> отправится <%= @domain.force_delete_date %> на доменный аукцион в аукционной среде.ee. Если в течение 24 часов в отношении домена <%= @domain.name %> е поступит предложений, домен освободится и станет доступным для всех желающих по принципу «кто раньше». О других возможных результатах аукциона читайте здесь.
+
+В случае возникновения дополнительных вопросов свяжитесь, пожалуйста, со своим регистратором:
+<%= render 'mailers/shared/registrar/registrar.ru.html', registrar: @registrar %>
+
+<%= render 'mailers/shared/signatures/signature.ru.html' %>
diff --git a/app/views/mailers/domain_delete_mailer/forced/invalid_email.text.erb b/app/views/mailers/domain_delete_mailer/forced/invalid_email.text.erb
new file mode 100644
index 000000000..8d2fc58ce
--- /dev/null
+++ b/app/views/mailers/domain_delete_mailer/forced/invalid_email.text.erb
@@ -0,0 +1,47 @@
+Lugupeetud domeeni <%= @domain.name %> registreerija/halduskontakt
+
+Eesti Interneti Sihtasutusele (EIS) on saanud teatavaks, et domeeni <%= @domain.name %> kontaktandmed on puudulikud - eposti aadress <%= @domain.contact_emails_verification_failed %>
+
+Et see olukord on vastuolus .ee domeenireeglitega algatas EIS <%= @delete_period_length %> päeva pikkuse kustutusmenetluse. Menetluse käigus on domeen <%= @expire_warning_period %> esimest päeva internetis kättesaadav.
+
+Andmete parandamiseks pöörduge palun oma registripidaja <%= @registrar.name %> poole või isiklike ja oma ettevõtte andmete puhul registreerija portaali.
+
+Kui kontaktandmed ei ole <%= @delete_period_length %> päeva jooksul parandatud, läheb domeen <%= @domain.name %> <%= @domain.force_delete_date %> domeenioksjonile .ee oksjonikeskkonda. Juhul kui domeenile <%= @domain.name %> ei tehta oksjonil 24h möödudes pakkumist, domeen vabaneb ja on registreerimiseks vabalt kättesaadav kõigile huvilistele. Muude võimalike oksjoni tulemuste kohta loe siit.
+
+Lisaküsimuste korral võtke palun ühendust oma registripidajaga:
+<%= render 'mailers/shared/registrar/registrar.et.html', registrar: @registrar %>
+
+<%= render 'mailers/shared/signatures/signature.et.html' %>
+
+
+
+Dear registrant/administrative contact of .ee domain,
+
+Estonian Internet Foundation has learned that contact data of the domain <%= @domain.name %> s invalid - email(s) <%= @domain.contact_emails_verification_failed %>.
+
+Since this is a violation of Estonian domain regulations, <%= @delete_period_length %>-day deletion process has started for the <%= @domain.name %> domain. For the first <%= @expire_warning_period %> days the domain will remain available on the Internet during the deletion process.
+
+Please, contact your registrar <%= @registrar.name %> with updated contact data, or in case of your personal or business data use .ee portal for registrants
+
+If the data is not fixed within <%= @delete_period_length %> days, the domain <%= @domain.name %> will go to domain auction on <%= @domain.force_delete_date %> in the .ee auction environment. If no offer is made for the domain <%= @domain.name %> at auction within 24 hours, the domain will be released and made freely available for registration to anyone interested on a first-come, first-served basis. Read more about other potential auction results here.
+
+Should you have additional questions, please contact your registrar:
+<%= render 'mailers/shared/registrar/registrar.en.html', registrar: @registrar %>
+
+<%= render 'mailers/shared/signatures/signature.en.html' %>
+
+
+Уважаемый регистрант/административный контакт домена .ee
+
+Целевому учреждению Eesti Internet (EIS) стало известно, что контактные данные домена <%= @registrant.reg_no %> неверны - электронная почта <%= @domain.contact_emails_verification_failed %>.
+
+Так как это является нарушением Правил домена .ee, <%= @delete_period_length %>-дневный процесс удаления начат для доменного имени <%= @domain.name %>. В течение первых <%= @expire_warning_period %> дней домен будет доступен в интернете.
+
+Для уточнения контактных данных, пожалуйста, свяжитесь с регистратором <%= @registrar.name %>, либо воспользуйтесь порталом для регистрантов
+
+Если контактные данные не будут исправлены в течение <%= @delete_period_length %> дней, домен <%= @domain.name %> отправится <%= @domain.force_delete_date %> на доменный аукцион в аукционной среде.ee. Если в течение 24 часов в отношении домена <%= @domain.name %> е поступит предложений, домен освободится и станет доступным для всех желающих по принципу «кто раньше». О других возможных результатах аукциона читайте здесь.
+
+В случае возникновения дополнительных вопросов свяжитесь, пожалуйста, со своим регистратором:
+ <%= render 'mailers/shared/registrar/registrar.ru.html', registrar: @registrar %>
+
+<%= render 'mailers/shared/signatures/signature.ru.html' %>
diff --git a/app/views/mailers/domain_expire_mailer/expired_soft.html.erb b/app/views/mailers/domain_expire_mailer/expired_soft.html.erb
new file mode 100644
index 000000000..1dd661a38
--- /dev/null
+++ b/app/views/mailers/domain_expire_mailer/expired_soft.html.erb
@@ -0,0 +1,48 @@
+Domeen <%= @domain.name %> on aegunud ning suunatud kustutusmenetlusse kuna oleme tuvastanud domeeniga seotud kontaktides olulisi puudusi.
+
+Lugupeetud .ee domeeni registreerija/halduskontakt
+
+Domeeninimi <%= @domain.name %> on aegunud ja ei ole alates <%= @domain.on_hold_date %> internetis kättesaadav. Domeeniga on seotud puudulike kontakti objekte, milles tulenevalt on Eesti Interneti SA blokeerinud domeeni pikendamise ja registripidaja vahetuse, kuniks kontaktandmed korrastatakse. Andmete korrastamiseks ja registreeringu pikendamiseks pöörduge palun oma registripidaja poole.
+
+<%= @domain.name %> pikendamata jätmisel domeen kustub ja läheb <%= @domain.delete_date %> oksjonile .ee oksjonikeskkonda. Domeenioksjonite kohta loe lähemalt siit.
+
+Domeeni <%= @domain.name %> registripidaja:
+<%= render 'mailers/shared/registrar/registrar.et.html', registrar: @registrar %>
+
+Ülevaate kõikidest endaga seotud domeenidest saate registreerija portaalist.
+
+<%= render 'mailers/shared/signatures/signature.et.html' %>
+
+
+
+Domain <%= @domain.name %> has expired
+
+Dear registrant/administrative contact of .ee domain,
+
+The domain name <%= @domain.name %> has expired and since <%= @domain.on_hold_date %> is no longer available on the Internet. Domain registration has invalid contact data. Renewal and registrar transfer is therefore prohibited until contact data has been fixed. To correct the data and renew your domain registration, please contact your registrar.
+
+If you do not renew the <%= @domain.name %> domain registration, it is deleted and put on auction to .ee domain auction environment at <%= @domain.delete_date %>. Read more about .ee domain auctions here.
+
+Registrar of the <%= @domain.name %>:
+<%= render 'mailers/shared/registrar/registrar.en.html', registrar: @registrar %>
+
+You can find an overview of all your domains at the registrant's portal.
+
+<%= render 'mailers/shared/signatures/signature.en.html' %>
+
+
+
+Срок действия домена <%= @domain.name %> истек
+
+Уважаемый регистрант/административный контакт домена .ee
+
+Срок действия доменного имени <%= @domain.name %> истек, и с <%= @domain.on_hold_date %> оно больше не доступно в интернете. У домена указаны неверные контактные данные. Обновление и перенос к другому регистратору заблокированы до исправления контактных данных. Для исправления контактных данных и обновления регистрации вашего домена, пожалуйста, обратитесь в вашему регистратору.
+
+Если доменное имя не продлено, домен <%= @domain.name %> будет удален и <%= @domain.delete_date %> идет на аукцион в .ee среду аукциона. О проведении доменных аукционов читайте здесь.
+
+Pегистратор домена <%= @domain.name %>:
+<%= render 'mailers/shared/registrar/registrar.ru.html', registrar: @registrar %>
+
+Обзор всех связанных с вами доменов можете получить на портале регистратора.
+
+<%= render 'mailers/shared/signatures/signature.ru.html' %>
diff --git a/app/views/mailers/domain_expire_mailer/expired_soft.text.erb b/app/views/mailers/domain_expire_mailer/expired_soft.text.erb
new file mode 100644
index 000000000..0e6d9c953
--- /dev/null
+++ b/app/views/mailers/domain_expire_mailer/expired_soft.text.erb
@@ -0,0 +1,48 @@
+Domeen <%= @domain.name %> on aegunud ning suunatud kustutusmenetlusse kuna oleme tuvastanud domeeniga seotud kontaktides olulisi puudusi.
+
+Lugupeetud .ee domeeni registreerija/halduskontakt
+
+Domeeninimi <%= @domain.name %> on aegunud ja ei ole alates <%= @domain.on_hold_date %> internetis kättesaadav. Domeeniga on seotud puudulike kontakti objekte, milles tulenevalt on Eesti Interneti SA blokeerinud domeeni pikendamise ja registripidaja vahetuse, kuniks kontaktandmed korrastatakse. Andmete korrastamiseks ja registreeringu pikendamiseks pöörduge palun oma registripidaja poole.
+
+<%= @domain.name %> pikendamata jätmisel domeen kustub ja läheb <%= @domain.delete_date %> oksjonile .ee oksjonikeskkonda. Domeenioksjonite kohta loe lähemalt siit https://www.internet.ee/domeenioksjonid.
+
+Domeeni <%= @domain.name %> registripidaja:
+<%= render 'mailers/shared/registrar/registrar.et.html', registrar: @registrar %>
+
+Ülevaate kõikidest endaga seotud domeenidest saate registreerija portaalist https://registrant.internet.ee/registrant/.
+
+<%= render 'mailers/shared/signatures/signature.et.html' %>
+
+--------------------------------------
+
+Domain <%= @domain.name %> has expired
+
+Dear registrant/administrative contact of .ee domain,
+
+The domain name <%= @domain.name %> has expired and since <%= @domain.on_hold_date %> is no longer available on the Internet. Domain registration has invalid contact data. Renewal and registrar transfer is therefore prohibited until contact data has been fixed. To correct the data and renew your domain registration, please contact your registrar.
+
+If you do not renew the <%= @domain.name %> domain registration, it is deleted and put on auction to .ee domain auction environment at <%= @domain.delete_date %>. Read more about .ee domain auctions here https://www.internet.ee/domains/auction-environment-user-agreement#3-terms-and-conditions-for-participation-in-the-auction-of-the-auction-environment.
+
+Registrar of the <%= @domain.name %>:
+<%= render 'mailers/shared/registrar/registrar.en.html', registrar: @registrar %>
+
+You can find an overview of all your domains at the registrant's portal https://registrant.internet.ee/registrant/.
+
+<%= render 'mailers/shared/signatures/signature.en.html' %>
+
+--------------------------------------
+
+Срок действия домена <%= @domain.name %> истек
+
+Уважаемый регистрант/административный контакт домена .ee
+
+Срок действия доменного имени <%= @domain.name %> истек, и с <%= @domain.on_hold_date %> оно больше не доступно в интернете. У домена указаны неверные контактные данные. Обновление и перенос к другому регистратору заблокированы до исправления контактных данных. Для исправления контактных данных и обновления регистрации вашего домена, пожалуйста, обратитесь в вашему регистратору.
+
+Если доменное имя не продлено, домен <%= @domain.name %> будет удален и <%= @domain.delete_date %> идет на аукцион в .ee среду аукциона. О проведении доменных аукционов читайте здесь https://www.internet.ee/domeny/dogovor-pol-zovatelya-aukcionnoj-sredy#3-usloviya-uchastiya-v-aukcione.
+
+Pегистратор домена <%= @domain.name %>:
+<%= render 'mailers/shared/registrar/registrar.ru.html', registrar: @registrar %>
+
+Обзор всех связанных с вами доменов можете получить на портале регистратора https://registrant.internet.ee/registrant/.
+
+<%= render 'mailers/shared/signatures/signature.ru.html' %>
diff --git a/app/views/registrar/bulk_change/_nameserver_form.html.erb b/app/views/registrar/bulk_change/_nameserver_form.html.erb
index e3f4a0214..782076358 100644
--- a/app/views/registrar/bulk_change/_nameserver_form.html.erb
+++ b/app/views/registrar/bulk_change/_nameserver_form.html.erb
@@ -1,4 +1,4 @@
-<%= form_tag registrar_nameservers_path, method: :patch, class: 'form-horizontal' do %>
+<%= form_tag registrar_nameservers_path, multipart: true, method: :patch, class: 'form-horizontal' do %>
<%= render 'registrar/domain_transfers/form/api_errors' %>
@@ -44,6 +44,16 @@
+
+