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

Fix dnskey adding

Browse source
This commit is contained in:
Martin Lensment 2014-10-09 16:17:12 +03:00
parent 3453b7f4a1
commit 6ab58767c3
5 changed files with 23 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/models/domain.rb
View file

@ -27,9 +27,9 @@ class Domain < ActiveRecord::Base
has_many :domain_transfers, dependent: :delete_all
has_many :dnskeys, dependent: :delete_all
accepts_nested_attributes_for :dnskeys, allow_destroy: true,
reject_if: proc { |attrs| attrs[:public_key].blank? }
has_many :delegation_signers, dependent: :delete_all
# accepts_nested_attributes_for :delegation_signers, allow_destroy: true,
# reject_if: proc { |attrs| attrs[:public_key].blank? }
delegate :code, to: :owner_contact, prefix: true
delegate :email, to: :owner_contact, prefix: true
@ -49,12 +49,12 @@ class Domain < ActiveRecord::Base
validate :validate_period
validate :validate_nameservers_count
validate :validate_admin_contacts_count
validate :validate_dnskeys_count
#validate :validate_dnskeys_count
validate :validate_nameservers_uniqueness
validate :validate_tech_contacts_uniqueness
validate :validate_admin_contacts_uniqueness
validate :validate_domain_statuses_uniqueness
validate :validate_dnskeys_uniqueness
#validate :validate_dnskeys_uniqueness
validate :validate_nameserver_ips
attr_accessor :owner_contact_typeahead

20
app/models/epp/epp_domain.rb
View file

@ -29,12 +29,6 @@ class Epp::EppDomain < Domain
max: domain_validation_sg.setting(:ns_max_count).value
}
],
[:dnskeys, :out_of_range,
{
min: domain_validation_sg.setting(:dnskeys_min_count).value,
max: domain_validation_sg.setting(:dnskeys_max_count).value
}
],
[:period, :out_of_range, { value: { obj: 'period', val: period } }]
],
'2200' => [
@ -176,9 +170,9 @@ class Epp::EppDomain < Domain
def attach_dnskeys(dnssec_data)
sg = SettingGroup.dnskeys
ds_data_allowed = sg.setting(Setting::ALLOW_DS_DATA) == '0' ? false : true
ds_data_with_keys_allowed = sg.setting(Setting::ALLOW_DS_DATA_WITH_KEYS) == '0' ? false : true
key_data_allowed = sg.setting(Setting::ALLOW_KEY_DATA) == '0' ? false : true
ds_data_allowed = sg.setting(Setting::ALLOW_DS_DATA).value == '0' ? false : true
ds_data_with_keys_allowed = sg.setting(Setting::ALLOW_DS_DATA_WITH_KEYS).value == '0' ? false : true
key_data_allowed = sg.setting(Setting::ALLOW_KEY_DATA).value == '0' ? false : true
if dnssec_data[:ds_data].any? && !ds_data_allowed
errors.add(:base, :ds_data_not_allowed)
@ -200,15 +194,11 @@ class Epp::EppDomain < Domain
end
attach_ds({
keyTag: SecureRandom.hex(5),
key_tag: SecureRandom.hex(5),
alg: 3,
digestType: sg.setting(Setting::DS_ALGORITHM),
digest_type: sg.setting(Setting::DS_ALGORITHM).value,
key_data: dnssec_data[:key_data]
})
# dnskey_list.each do |dnskey_attrs|
# dnskeys.build(dnskey_attrs)
# end
end
def attach_ds(ds_data)