mirror of
https://github.com/internetee/registry.git
synced 2025-07-24 19:48:28 +02:00
Do not validate domain presence in dnskey
This commit is contained in:
parent
ea28a351d6
commit
f6bd518750
3 changed files with 33 additions and 32 deletions
|
@ -23,9 +23,9 @@ class EppController < ApplicationController
|
||||||
|
|
||||||
def current_api_user
|
def current_api_user
|
||||||
@current_api_user ||= ApiUser.find_by_id(epp_session[:api_user_id])
|
@current_api_user ||= ApiUser.find_by_id(epp_session[:api_user_id])
|
||||||
# by default PaperTrail uses before filter and at that
|
# by default PaperTrail uses before filter and at that
|
||||||
# time current_api_user is not yet present
|
# time current_api_user is not yet present
|
||||||
::PaperTrail.whodunnit = api_user_log_str(@current_api_user)
|
::PaperTrail.whodunnit = api_user_log_str(@current_api_user)
|
||||||
::PaperSession.session = epp_session.session_id if epp_session.session_id.present?
|
::PaperSession.session = epp_session.session_id if epp_session.session_id.present?
|
||||||
@current_api_user
|
@current_api_user
|
||||||
end
|
end
|
||||||
|
|
|
@ -4,11 +4,11 @@ class Dnskey < ActiveRecord::Base
|
||||||
|
|
||||||
belongs_to :domain
|
belongs_to :domain
|
||||||
|
|
||||||
validates :domain, :alg, :protocol, :flags, :public_key, presence: true, if: :validate_key_data
|
validates :alg, :protocol, :flags, :public_key, presence: true, if: :validate_key_data
|
||||||
validate :validate_algorithm
|
validate :validate_algorithm
|
||||||
validate :validate_protocol
|
validate :validate_protocol
|
||||||
validate :validate_flags
|
validate :validate_flags
|
||||||
|
|
||||||
|
|
||||||
before_save -> { generate_digest if public_key_changed? && !ds_digest_changed? }
|
before_save -> { generate_digest if public_key_changed? && !ds_digest_changed? }
|
||||||
|
|
||||||
|
|
|
@ -74,43 +74,44 @@ describe 'EPP Domain', epp: true do
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'with citizen as an owner' do
|
context 'with citizen as an owner' do
|
||||||
# it 'creates a domain' do
|
it 'creates a domain' do
|
||||||
# dn = next_domain_name
|
dn = next_domain_name
|
||||||
# response = epp_plain_request(domain_create_xml({
|
response = epp_plain_request(domain_create_xml({
|
||||||
# name: { value: dn }
|
name: { value: dn }
|
||||||
# }), :xml)
|
}), :xml)
|
||||||
# d = Domain.last
|
|
||||||
# response[:msg].should == 'Command completed successfully'
|
|
||||||
# response[:result_code].should == '1000'
|
|
||||||
|
|
||||||
# cre_data = response[:parsed].css('creData')
|
d = Domain.last
|
||||||
|
response[:msg].should == 'Command completed successfully'
|
||||||
|
response[:result_code].should == '1000'
|
||||||
|
|
||||||
# cre_data.css('name').text.should == dn
|
cre_data = response[:parsed].css('creData')
|
||||||
# cre_data.css('crDate').text.should == d.created_at.to_time.utc.to_s
|
|
||||||
# cre_data.css('exDate').text.should == d.valid_to.to_time.utc.to_s
|
|
||||||
|
|
||||||
# response[:clTRID].should == 'ABC-12345'
|
cre_data.css('name').text.should == dn
|
||||||
|
cre_data.css('crDate').text.should == d.created_at.to_time.utc.to_s
|
||||||
|
cre_data.css('exDate').text.should == d.valid_to.to_time.utc.to_s
|
||||||
|
|
||||||
# d.registrar.name.should == 'Registrar 0'
|
response[:clTRID].should == 'ABC-12345'
|
||||||
# d.tech_contacts.count.should == 2
|
|
||||||
# d.admin_contacts.count.should == 1
|
|
||||||
|
|
||||||
# d.nameservers.count.should == 2
|
d.registrar.name.should == 'registrar1'
|
||||||
# d.auth_info.should_not be_empty
|
d.tech_contacts.count.should == 2
|
||||||
|
d.admin_contacts.count.should == 1
|
||||||
|
|
||||||
# d.dnskeys.count.should == 1
|
d.nameservers.count.should == 2
|
||||||
|
d.auth_info.should_not be_empty
|
||||||
|
|
||||||
# key = d.dnskeys.last
|
d.dnskeys.count.should == 1
|
||||||
|
|
||||||
# key.ds_alg.should == 3
|
key = d.dnskeys.last
|
||||||
# key.ds_key_tag.should_not be_blank
|
|
||||||
|
|
||||||
# key.ds_digest_type.should == Setting.ds_algorithm
|
key.ds_alg.should == 3
|
||||||
# key.flags.should == 257
|
key.ds_key_tag.should_not be_blank
|
||||||
# key.protocol.should == 3
|
|
||||||
# key.alg.should == 5
|
key.ds_digest_type.should == Setting.ds_algorithm
|
||||||
# key.public_key.should == 'AwEAAddt2AkLfYGKgiEZB5SmIF8EvrjxNMH6HtxWEA4RJ9Ao6LCWheg8'
|
key.flags.should == 257
|
||||||
# end
|
key.protocol.should == 3
|
||||||
|
key.alg.should == 5
|
||||||
|
key.public_key.should == 'AwEAAddt2AkLfYGKgiEZB5SmIF8EvrjxNMH6HtxWEA4RJ9Ao6LCWheg8'
|
||||||
|
end
|
||||||
|
|
||||||
it 'creates a domain with legal document' do
|
it 'creates a domain with legal document' do
|
||||||
response = epp_plain_request(domain_create_xml_with_legal_doc, :xml)
|
response = epp_plain_request(domain_create_xml_with_legal_doc, :xml)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue