From 999c161c8ec052272dc64c3d11dcda6fdaaa2585 Mon Sep 17 00:00:00 2001 From: Vladimir Krylov Date: Mon, 13 Jun 2016 13:17:01 +0300 Subject: [PATCH 1/7] Story#120095555 - glue nameserver may have IPv4 or IPv6 --- app/models/domain.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/models/domain.rb b/app/models/domain.rb index 5959cbb90..76cb23ff0 100644 --- a/app/models/domain.rb +++ b/app/models/domain.rb @@ -478,9 +478,11 @@ class Domain < ActiveRecord::Base def validate_nameserver_ips nameservers.to_a.reject(&:marked_for_destruction?).each do |ns| next unless ns.hostname.end_with?(".#{name}") - next if ns.ipv4.present? + next if ns.ipv4.present? || ns.ipv6.present? + errors.add(:nameservers, :invalid) if errors[:nameservers].blank? ns.errors.add(:ipv4, :blank) + ns.errors.add(:ipv6, :blank) end end From a3f903b717c006b0255aa03512b42c36b1e32ae3 Mon Sep 17 00:00:00 2001 From: Stas Date: Fri, 3 Jun 2016 14:25:10 +0300 Subject: [PATCH 2/7] 120828283-fix_for_empty_hello (cherry picked from commit e6710e5) --- lib/epp_constraint.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/epp_constraint.rb b/lib/epp_constraint.rb index 9cd68c121..992b5e37c 100644 --- a/lib/epp_constraint.rb +++ b/lib/epp_constraint.rb @@ -11,7 +11,7 @@ class EppConstraint # creates parsed_frame, detects epp request object def matches?(request) # TODO: Maybe move this to controller to keep params clean - request.params[:raw_frame] = request.params[:raw_frame].gsub!(/(?<=>)(.*?)(?=<)/) { |s| s.strip} + request.params[:raw_frame] = request.params[:raw_frame].gsub!(/(?<=>)(.*?)(?=<)/) { |s| s.strip} if request.params[:raw_frame] request.params[:nokogiri_frame] ||= Nokogiri::XML(request.params[:raw_frame]) request.params[:parsed_frame] ||= request.params[:nokogiri_frame].dup.remove_namespaces! From 002fbf5107eb359cf58c1fe39831b1975763416c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20V=C3=B5hmar?= Date: Tue, 14 Jun 2016 15:31:26 +0300 Subject: [PATCH 3/7] Update CHANGELOG.md changes deployed to production on 14.06.2016 --- CHANGELOG.md | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ce74bbb10..367baec10 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,22 @@ -20.05.2016 +14.06.2016 +* Portal for registrants + * Notice on login screen on limited access to Estonian electronic IDs (#120182999) +* Admin interface: + * epp log view has now reference to the object name for better usability (#118912395) + * BUG: dnssec data missing from domain history view (#115762063) + * BUG: internal error in doamin history view in case some contact has been deleted (#118300251) +* Registry: + * all values sent over epp are now trimmed of beginning and trailing spaces (#117690107) + * typo and form fixes for automated e-mail messages sent to domain contacts +* EPP: + * BUG: error 2005 on adding IDN nameservers (#114677695) + * BUG: nameserver lable maximum 63 char length validation handled inproperly (#114677695) - support currently limited to Estonian IDN characters. + * BUG: validation passes out of range ident_type values - now limited to org, priv and birthday (#111601356) + * BUG: internal error on hello (#120828283) +* Deploy: + * BUG: incorrect version in commit message on deploy - config/deploy-example.rb (#120259603) +20.05.2016 * Portal for registrars * domain details view new displays contact name in addition to ID (#117226457) * added an option to set veryfied = "yes" parameter to GUI for registrant change and domain delete opertions (#116209751) From 37952d22edb5c5c3ddcb14915cced1baf0410c0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20V=C3=B5hmar?= Date: Wed, 15 Jun 2016 10:44:41 +0300 Subject: [PATCH 4/7] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 367baec10..bd5256897 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -14.06.2016 +15.06.2016 * Portal for registrants * Notice on login screen on limited access to Estonian electronic IDs (#120182999) * Admin interface: From 67e32f3a3648168ffb3451dd551bc3d73e1fe08e Mon Sep 17 00:00:00 2001 From: Vladimir Krylov Date: Wed, 15 Jun 2016 11:36:57 +0300 Subject: [PATCH 5/7] better error on validating glue IP address --- app/models/domain.rb | 1 - app/models/nameserver.rb | 2 +- config/locales/en.yml | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/models/domain.rb b/app/models/domain.rb index 76cb23ff0..3751da5b6 100644 --- a/app/models/domain.rb +++ b/app/models/domain.rb @@ -482,7 +482,6 @@ class Domain < ActiveRecord::Base errors.add(:nameservers, :invalid) if errors[:nameservers].blank? ns.errors.add(:ipv4, :blank) - ns.errors.add(:ipv6, :blank) end end diff --git a/app/models/nameserver.rb b/app/models/nameserver.rb index 9ca1bebf7..86cd7e002 100644 --- a/app/models/nameserver.rb +++ b/app/models/nameserver.rb @@ -32,7 +32,7 @@ class Nameserver < ActiveRecord::Base [:ipv4, :invalid, { value: { obj: 'hostAddr', val: ipv4 } }], [:ipv6, :invalid, { value: { obj: 'hostAddr', val: ipv6 } }] ], - '2306' => [ + '2003' => [ [:ipv4, :blank] ] } diff --git a/config/locales/en.yml b/config/locales/en.yml index 400985d16..f2f4d061f 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -136,7 +136,7 @@ en: taken: 'Nameserver already exists on this domain' puny_to_long: 'Hostname puny label is too long (maximum is 63 characters)' ipv4: - blank: 'IPv4 is missing' + blank: 'IP is missing' invalid: 'IPv4 is invalid' ipv6: invalid: 'IPv6 is invalid' From 371ec46f420a769b4d3d9357e31b6a62e5fc8908 Mon Sep 17 00:00:00 2001 From: Vladimir Krylov Date: Wed, 15 Jun 2016 17:28:49 +0300 Subject: [PATCH 6/7] Story#121580929 fix when incoming frame is empty --- CHANGELOG.md | 1 + lib/epp_constraint.rb | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bd5256897..f3537fd1a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ * BUG: nameserver lable maximum 63 char length validation handled inproperly (#114677695) - support currently limited to Estonian IDN characters. * BUG: validation passes out of range ident_type values - now limited to org, priv and birthday (#111601356) * BUG: internal error on hello (#120828283) + * BUG: internal error broken incoming frame (#121580929) * Deploy: * BUG: incorrect version in commit message on deploy - config/deploy-example.rb (#120259603) diff --git a/lib/epp_constraint.rb b/lib/epp_constraint.rb index 992b5e37c..4463a7a04 100644 --- a/lib/epp_constraint.rb +++ b/lib/epp_constraint.rb @@ -12,8 +12,8 @@ class EppConstraint def matches?(request) # TODO: Maybe move this to controller to keep params clean request.params[:raw_frame] = request.params[:raw_frame].gsub!(/(?<=>)(.*?)(?=<)/) { |s| s.strip} if request.params[:raw_frame] - request.params[:nokogiri_frame] ||= Nokogiri::XML(request.params[:raw_frame]) - request.params[:parsed_frame] ||= request.params[:nokogiri_frame].dup.remove_namespaces! + request.params[:nokogiri_frame] ||= Nokogiri::XML(request.params[:raw_frame] || request.params[:frame]) + request.params[:parsed_frame] ||= request.params[:nokogiri_frame].dup.remove_namespaces! unless [:keyrelay, :poll, :session, :not_found].include?(@type) element = "//#{@type}:#{request.params[:action]}" From d6e490d40211a568290780d58cd1c240e5251ccf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20V=C3=B5hmar?= Date: Thu, 16 Jun 2016 11:12:34 +0300 Subject: [PATCH 7/7] Update CHANGELOG.md --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f3537fd1a..99534b676 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +16.06.2016 +* EPP + * BUG: XML syntax error for poll and logout if optional clTRID is missing (#121580929) + * support for glue records with ipv6 addresses only (#120095555) + 15.06.2016 * Portal for registrants * Notice on login screen on limited access to Estonian electronic IDs (#120182999)