From f733180f7fa6f85f1571da62b6f81070589a5353 Mon Sep 17 00:00:00 2001 From: Vladimir Krylov Date: Fri, 10 Jun 2016 12:14:05 +0300 Subject: [PATCH 1/4] Strory#110308584 - hostname error responds in xml way of array (cherry picked from commit 7c1c065) --- app/views/epp/error.xml.builder | 8 +++++++- spec/epp/domain_spec.rb | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/views/epp/error.xml.builder b/app/views/epp/error.xml.builder index 796856f4c..3f2aa37f0 100644 --- a/app/views/epp/error.xml.builder +++ b/app/views/epp/error.xml.builder @@ -5,7 +5,13 @@ xml.epp_head do xml.msg(x[:msg], 'lang' => 'en') xml.value('xmlns:obj' => 'urn:ietf:params:xml:ns:obj') do - xml.tag!("obj:#{x[:value][:obj]}", x[:value][:val]) + if (val = x[:value][:val]).respond_to?(:each) + val.each do |el| + xml.tag!("obj:#{x[:value][:obj]}", el) + end + else + xml.tag!("obj:#{x[:value][:obj]}", val) + end end if x[:value] x[:ext_values].each do |y| diff --git a/spec/epp/domain_spec.rb b/spec/epp/domain_spec.rb index 8e3997649..ccf13c8b5 100644 --- a/spec/epp/domain_spec.rb +++ b/spec/epp/domain_spec.rb @@ -134,7 +134,7 @@ describe 'EPP Domain', epp: true do key = d.dnskeys.last - key.ds_alg.should == 3 + key.ds_alg.should == 5 key.ds_key_tag.should_not be_blank key.ds_digest_type.should == Setting.ds_algorithm From bfc47fa21eb23d42ed28a36a401c69398027a65e Mon Sep 17 00:00:00 2001 From: Vladimir Krylov Date: Tue, 14 Jun 2016 11:19:42 +0300 Subject: [PATCH 2/4] Strory#118822101 - update how schema is generated --- app/models/epp/domain.rb | 2 +- app/views/epp/error.xml.builder | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/models/epp/domain.rb b/app/models/epp/domain.rb index c5e298cff..f97b1d164 100644 --- a/app/models/epp/domain.rb +++ b/app/models/epp/domain.rb @@ -160,7 +160,7 @@ class Epp::Domain < Domain code = registrant_frame.try(:text) if code.present? if action == 'chg' && registrant_change_prohibited? - add_epp_error('2304', nil, DomainStatus::SERVER_REGISTRANT_CHANGE_PROHIBITED, I18n.t(:object_status_prohibits_operation)) + add_epp_error('2304', "status", DomainStatus::SERVER_REGISTRANT_CHANGE_PROHIBITED, I18n.t(:object_status_prohibits_operation)) end regt = Registrant.find_by(code: code) if regt diff --git a/app/views/epp/error.xml.builder b/app/views/epp/error.xml.builder index 3f2aa37f0..ef92bdadd 100644 --- a/app/views/epp/error.xml.builder +++ b/app/views/epp/error.xml.builder @@ -7,10 +7,10 @@ xml.epp_head do xml.value('xmlns:obj' => 'urn:ietf:params:xml:ns:obj') do if (val = x[:value][:val]).respond_to?(:each) val.each do |el| - xml.tag!("obj:#{x[:value][:obj]}", el) + xml.tag!("#{controller.controller_name}:#{x[:value][:obj]}", el) end else - xml.tag!("obj:#{x[:value][:obj]}", val) + xml.tag!("#{controller.controller_name}:#{x[:value][:obj]}", val) end end if x[:value] From 8bd99a3c3b36c4133c8d2691e31ea0e8edeab8bd Mon Sep 17 00:00:00 2001 From: Vladimir Krylov Date: Tue, 14 Jun 2016 12:41:54 +0300 Subject: [PATCH 3/4] Strory#118822101 - update how schema is generated --- app/views/epp/error.xml.builder | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/app/views/epp/error.xml.builder b/app/views/epp/error.xml.builder index ef92bdadd..c090cb840 100644 --- a/app/views/epp/error.xml.builder +++ b/app/views/epp/error.xml.builder @@ -5,12 +5,16 @@ xml.epp_head do xml.msg(x[:msg], 'lang' => 'en') xml.value('xmlns:obj' => 'urn:ietf:params:xml:ns:obj') do - if (val = x[:value][:val]).respond_to?(:each) + value = x[:value][:val] + attrs = {} + attrs["s"] = value if x[:value][:obj] == "status" + + if (val = value).respond_to?(:each) val.each do |el| - xml.tag!("#{controller.controller_name}:#{x[:value][:obj]}", el) + xml.tag!("#{controller.controller_name}:#{x[:value][:obj]}", el, attrs) end else - xml.tag!("#{controller.controller_name}:#{x[:value][:obj]}", val) + xml.tag!("#{controller.controller_name}:#{x[:value][:obj]}", val, attrs) end end if x[:value] From 58bdbb3f730df67c6a7275e364c06f621187a6da Mon Sep 17 00:00:00 2001 From: Vladimir Krylov Date: Tue, 21 Jun 2016 19:38:59 +0300 Subject: [PATCH 4/4] Story#118822101 - xmlns root element is type of object --- app/views/epp/error.xml.builder | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/epp/error.xml.builder b/app/views/epp/error.xml.builder index c090cb840..43d50756f 100644 --- a/app/views/epp/error.xml.builder +++ b/app/views/epp/error.xml.builder @@ -4,7 +4,7 @@ xml.epp_head do xml.result('code' => x[:code]) do xml.msg(x[:msg], 'lang' => 'en') - xml.value('xmlns:obj' => 'urn:ietf:params:xml:ns:obj') do + xml.value("xmlns:#{controller.controller_name}" => 'https://epp.tld.ee/schema/all-ee-1.0.xsd') do value = x[:value][:val] attrs = {} attrs["s"] = value if x[:value][:obj] == "status"