zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-06-07 05:05:45 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix CC issues

Browse source
This commit is contained in:
Alex Sherman 2021-05-05 17:31:13 +05:00
parent d4dc39bf22
commit 11d97358c1
16 changed files with 78 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Gemfile.lock
View file

@ -561,7 +561,7 @@ DEPENDENCIES
puma puma
que que
que-web que-web
rails (~> 6.1) rails (~> 6.0)
ransack (~> 2.3) ransack (~> 2.3)
rest-client rest-client
rexml rexml
@ -580,4 +580,4 @@ DEPENDENCIES
wkhtmltopdf-binary (~> 0.12.5.1) wkhtmltopdf-binary (~> 0.12.5.1)
BUNDLED WITH BUNDLED WITH
2.2.15 2.2.16

4
app/controllers/admin/billing/prices_controller.rb
View file

@ -81,7 +81,9 @@ module Admin
] ]
allowed = params.require(:price).permit(*allowed_params) allowed = params.require(:price).permit(*allowed_params)
allowed[:duration] = ActiveSupport::Duration.build(allowed[:duration].to_i) if allowed[:duration] if allowed[:duration]
allowed[:duration] = ActiveSupport::Duration.build(allowed[:duration].to_i)
end
allowed allowed
end end

18
app/controllers/epp/base_controller.rb
View file

@ -163,9 +163,12 @@ module Epp
else else
missing = el.present? ? el.text.blank? : true missing = el.present? ? el.text.blank? : true
end end
next unless missing
epp_errors.add(:epp_errors, epp_errors.add(:epp_errors,
code: '2003', code: '2003',
message: I18n.t('errors.messages.required_parameter_missing', key: "#{full_selector} [#{attr}]")) if missing message: I18n.t('errors.messages.required_parameter_missing',
key: "#{full_selector} [#{attr}]"))
end end
missing ? false : el # return last selector if it was present missing ? false : el # return last selector if it was present
@ -185,7 +188,8 @@ module Epp
unless attribute unless attribute
epp_errors.add(:epp_errors, epp_errors.add(:epp_errors,
code: '2003', code: '2003',
msg: I18n.t('errors.messages.required_parameter_missing', key: attribute_selector)) msg: I18n.t('errors.messages.required_parameter_missing',
key: attribute_selector))
return return
end end
@ -221,7 +225,8 @@ module Epp
epp_errors.add(:epp_errors, epp_errors.add(:epp_errors,
code: '2306', code: '2306',
msg: I18n.t(:exactly_one_parameter_required, params: full_selectors.join(' OR '))) msg: I18n.t(:exactly_one_parameter_required,
params: full_selectors.join(' OR ')))
end end
def mutually_exclusive(*selectors) def mutually_exclusive(*selectors)
@ -230,7 +235,8 @@ module Epp
epp_errors.add(:epp_errors, epp_errors.add(:epp_errors,
code: '2306', code: '2306',
msg: I18n.t(:mutally_exclusive_params, params: full_selectors.join(', '))) msg: I18n.t(:mutally_exclusive_params,
params: full_selectors.join(', ')))
end end
def optional(selector, *validations) def optional(selector, *validations)
@ -273,9 +279,11 @@ module Epp
def xml_attrs_present?(ph, attributes) # TODO: THIS IS DEPRECATED AND WILL BE REMOVED IN FUTURE def xml_attrs_present?(ph, attributes) # TODO: THIS IS DEPRECATED AND WILL BE REMOVED IN FUTURE
attributes.each do |x| attributes.each do |x|
next if has_attribute(ph, x)
epp_errors.add(:epp_errors, epp_errors.add(:epp_errors,
code: '2003', code: '2003',
msg: I18n.t('errors.messages.required_parameter_missing', key: x.last)) unless has_attribute(ph, x) msg: I18n.t('errors.messages.required_parameter_missing', key: x.last))
end end
epp_errors.empty? epp_errors.empty?
end end

6
app/controllers/epp/contacts_controller.rb
View file

@ -173,8 +173,7 @@ module Epp
epp_errors.add(:epp_errors, epp_errors.add(:epp_errors,
code: '2306', code: '2306',
msg: "#{I18n.t(:contact_org_error)}: postalInfo > org [org]" msg: "#{I18n.t(:contact_org_error)}: postalInfo > org [org]")
)
end end
def fax_disabled def fax_disabled
@ -190,8 +189,7 @@ module Epp
return true if params[:parsed_frame].css('status').empty? return true if params[:parsed_frame].css('status').empty?
epp_errors.add(:epp_errors, epp_errors.add(:epp_errors,
code: '2306', code: '2306',
msg: "#{I18n.t(:client_side_status_editing_error)}: status [status]" msg: "#{I18n.t(:client_side_status_editing_error)}: status [status]")
)
end end
def address_given? def address_given?

3
app/controllers/epp/domains_controller.rb
View file

@ -218,8 +218,7 @@ module Epp
return true if params[:parsed_frame].css('status').empty? return true if params[:parsed_frame].css('status').empty?
epp_errors.add(:epp_errors, epp_errors.add(:epp_errors,
code: '2306', code: '2306',
msg: "#{I18n.t(:client_side_status_editing_error)}: status [status]" msg: "#{I18n.t(:client_side_status_editing_error)}: status [status]")
)
end end
def check_client_hold def check_client_hold

21
app/controllers/epp/sessions_controller.rb
View file

@ -20,8 +20,9 @@ module Epp
server_md5 = Certificate.parse_md_from_string(File.read(ENV['cert_path'])) server_md5 = Certificate.parse_md_from_string(File.read(ENV['cert_path']))
if client_md5 != server_md5 if client_md5 != server_md5
msg = 'Authentication error; server closing connection (certificate is not valid)'
epp_errors.add(:epp_errors, epp_errors.add(:epp_errors,
msg: 'Authentication error; server closing connection (certificate is not valid)', msg: msg,
code: '2501') code: '2501')
success = false success = false
@ -31,8 +32,9 @@ module Epp
if !Rails.env.development? && (!webclient_request && @api_user) if !Rails.env.development? && (!webclient_request && @api_user)
unless @api_user.pki_ok?(request.env['HTTP_SSL_CLIENT_CERT'], unless @api_user.pki_ok?(request.env['HTTP_SSL_CLIENT_CERT'],
request.env['HTTP_SSL_CLIENT_S_DN_CN']) request.env['HTTP_SSL_CLIENT_S_DN_CN'])
msg = 'Authentication error; server closing connection (certificate is not valid)'
epp_errors.add(:epp_errors, epp_errors.add(:epp_errors,
msg: 'Authentication error; server closing connection (certificate is not valid)', msg: msg,
code: '2501') code: '2501')
success = false success = false
@ -40,40 +42,45 @@ module Epp
end end
if success && !@api_user if success && !@api_user
msg = 'Authentication error; server closing connection (API user not found)'
epp_errors.add(:epp_errors, epp_errors.add(:epp_errors,
msg: 'Authentication error; server closing connection (API user not found)', msg: msg,
code: '2501') code: '2501')
success = false success = false
end end
if success && !@api_user.try(:active) if success && !@api_user.try(:active)
msg = 'Authentication error; server closing connection (API user is not active)'
epp_errors.add(:epp_errors, epp_errors.add(:epp_errors,
msg: 'Authentication error; server closing connection (API user is not active)', msg: msg,
code: '2501') code: '2501')
success = false success = false
end end
if success && @api_user.cannot?(:create, :epp_login) if success && @api_user.cannot?(:create, :epp_login)
msg = 'Authentication error; server closing connection (API user does not have epp role)'
epp_errors.add(:epp_errors, epp_errors.add(:epp_errors,
msg: 'Authentication error; server closing connection (API user does not have epp role)', msg: msg,
code: '2501') code: '2501')
success = false success = false
end end
if success && !ip_white? if success && !ip_white?
msg = 'Authentication error; server closing connection (IP is not whitelisted)'
epp_errors.add(:epp_errors, epp_errors.add(:epp_errors,
msg: 'Authentication error; server closing connection (IP is not whitelisted)', msg: msg,
code: '2501') code: '2501')
success = false success = false
end end
if success && EppSession.limit_reached?(@api_user.registrar) if success && EppSession.limit_reached?(@api_user.registrar)
msg = 'Session limit exceeded; server closing connection (connection limit reached)'
epp_errors.add(:epp_errors, epp_errors.add(:epp_errors,
msg: 'Session limit exceeded; server closing connection (connection limit reached)', msg: msg,
code: '2502') code: '2502')
success = false success = false

6
app/controllers/repp/v1/base_controller.rb
View file

@ -63,7 +63,7 @@ module Repp
@epp_errors ||= ActiveModel::Errors.new(self) @epp_errors ||= ActiveModel::Errors.new(self)
end end
def handle_errors(obj = nil, update: false) def handle_errors(obj = nil)
@epp_errors ||= ActiveModel::Errors.new(self) @epp_errors ||= ActiveModel::Errors.new(self)
if obj if obj
@ -78,8 +78,8 @@ module Repp
@epp_errors ||= ActiveModel::Errors.new(self) @epp_errors ||= ActiveModel::Errors.new(self)
@epp_errors.add(:epp_errors, msg: 'Command failed', code: '2304') if data != {} @epp_errors.add(:epp_errors, msg: 'Command failed', code: '2304') if data != {}
error_options = @epp_errors.errors.uniq. error_options = @epp_errors.errors.uniq
select { |error| error.options[:code].present? }[0].options .select { |error| error.options[:code].present? }[0].options
@response = { code: error_options[:code].to_i, message: error_options[:msg], data: data } @response = { code: error_options[:code].to_i, message: error_options[:msg], data: data }
render(json: @response, status: status) render(json: @response, status: status)

4
app/controllers/repp/v1/domains/base_contacts_controller.rb
View file

@ -16,12 +16,12 @@ module Repp
def update def update
@epp_errors ||= ActiveModel::Errors.new(self) @epp_errors ||= ActiveModel::Errors.new(self)
if @new_contact.invalid? return unless @new_contact.invalid?
@epp_errors.add(:epp_errors, @epp_errors.add(:epp_errors,
msg: 'New contact must be valid', msg: 'New contact must be valid',
code: '2304') code: '2304')
end end
end
private private

4
app/controllers/repp/v1/domains/renews_controller.rb
View file

@ -78,12 +78,12 @@ module Repp
bulk_renew_params[:domains].each do |idn| bulk_renew_params[:domains].each do |idn|
domain = Epp::Domain.find_by(name: idn) domain = Epp::Domain.find_by(name: idn)
domains << domain if domain domains << domain if domain
unless domain next if domain
@epp_errors.add(:epp_errors, @epp_errors.add(:epp_errors,
msg: "Object does not exist: #{idn}", msg: "Object does not exist: #{idn}",
code: '2304') code: '2304')
end end
end
domains domains
end end

4
app/controllers/repp/v1/domains_controller.rb
View file

@ -194,7 +194,9 @@ module Repp
return if @domain.registrar == current_user.registrar return if @domain.registrar == current_user.registrar
return if @domain.transfer_code.eql?(request.headers['Auth-Code']) return if @domain.transfer_code.eql?(request.headers['Auth-Code'])
@epp_errors.add(:epp_errors, code: 2202, msg: I18n.t('errors.messages.epp_authorization_error')) @epp_errors.add(:epp_errors,
code: 2202,
msg: I18n.t('errors.messages.epp_authorization_error'))
handle_errors handle_errors
end end

6
app/interactions/domains/check_balance/mass.rb
View file

@ -20,10 +20,8 @@ module Domains
def calculate_total_price def calculate_total_price
@total_price = 0 @total_price = 0
domains.each do |domain| domains.each do |domain|
task = Domains::CheckBalance::SingleDomain.run(domain: domain, task = Domains::CheckBalance::SingleDomain.run(domain: domain, operation: 'renew',
operation: 'renew', period: period, unit: unit)
period: period,
unit: unit)
if task.valid? if task.valid?
@total_price += task.result @total_price += task.result

5
app/models/concerns/epp_errors.rb
View file

@ -49,13 +49,16 @@ module EppErrors
multi = [:has_and_belongs_to_many, :has_many] multi = [:has_and_belongs_to_many, :has_many]
epp_errors = ActiveModel::Errors.new(self) epp_errors = ActiveModel::Errors.new(self)
if multi.include?(macro)
send(attr).each do |x| send(attr).each do |x|
x.errors.each do |error| x.errors.each do |error|
x.collect_parent_errors(error.attribute, error.message).each do |parent_error| x.collect_parent_errors(error.attribute, error.message).each do |parent_error|
epp_errors.import parent_error epp_errors.import parent_error
end end
end end
end if multi.include?(macro) end
end
epp_errors epp_errors
end end

1
app/views/epp/error.xml.builder
View file

@ -3,6 +3,7 @@ xml.epp_head do
@errors.each do |error| @errors.each do |error|
x = error&.options x = error&.options
next if x.empty? || x == { value: nil } next if x.empty? || x == { value: nil }
xml.result('code' => x[:code]) do xml.result('code' => x[:code]) do
xml.msg(x[:msg], 'lang' => 'en') xml.msg(x[:msg], 'lang' => 'en')
model_name = resource ? resource.model_name.singular.sub('epp_','') : controller.controller_name.singularize model_name = resource ? resource.model_name.singular.sub('epp_','') : controller.controller_name.singularize