Introduce 'optional' validator to epp controllers

app/controllers/epp/keyrelays_controller.rb

@@ -21,18 +21,9 @@ class Epp::KeyrelaysController < EppController
       'authInfo', 'authInfo > pw'
     )
 
+    optional 'expiry > relative', duration_iso8601: true
+    optional 'expiry > absolute', date_time_iso8601: true
     exactly_one_of 'expiry > relative', 'expiry > absolute'
-
-    begin
-      abs_datetime = params[:parsed_frame].css('absolute').text
-      abs_datetime = DateTime.parse(abs_datetime) if abs_datetime.present?
-    rescue => _e
-      epp_errors << {
-        code: '2005',
-        msg: I18n.t('unknown_expiry_absolute_pattern'),
-        value: { obj: 'expiry_absolute', val: abs_datetime }
-      }
-    end
   end
   # rubocop: enable Metrics/PerceivedComplexity
   # rubocop: enable Metrics/CyclomaticComplexity

app/controllers/epp_controller.rb

@@ -92,6 +92,19 @@ class EppController < ApplicationController
     }
   end
 
+  def optional(selector, *validations)
+    full_selector = [@prefix, selector].join(' ')
+    el = params[:parsed_frame].css(full_selector).first
+    return unless el && el.text.present?
+    value = el.text
+
+    validations.each do |x|
+      validator = "#{x.first[0]}_validator".camelize.constantize
+      err = validator.validate_epp(selector.split(' ').last, value)
+      epp_errors << err if err
+    end
+  end
+
   def xml_attrs_present?(ph, attributes) # TODO: THIS IS DEPRECATED AND WILL BE REMOVED IN FUTURE
     attributes.each do |x|
       epp_errors << {

app/validators/date_time_iso8601_validator.rb

@@ -0,0 +1,30 @@
+class DateTimeIso8601Validator < ActiveModel::EachValidator
+  def validate_each(record, attribute, value)
+    return if self.class.validate(value)
+    record.errors[attribute] << (options[:message] || I18n.t('unknown_expiry_absolute_pattern'))
+  end
+
+  class << self
+    def validate(value)
+      return true if value.empty?
+
+      begin
+        DateTime.parse(value)
+      rescue => _e
+        return false
+      end
+
+      true
+    end
+
+    def validate_epp(obj, value)
+      return if validate(value)
+
+      {
+        code: '2005',
+        msg: I18n.t(:unknown_expiry_absolute_pattern),
+        value: { obj: obj, val: value }
+      }
+    end
+  end
+end

app/validators/duration_iso8601_validator.rb

@@ -1,9 +1,30 @@
 class DurationIso8601Validator < ActiveModel::EachValidator
   def validate_each(record, attribute, value)
-    return unless value.present?
-
-    ISO8601::Duration.new(value)
-    rescue => _e
+    return if self.class.validate(value)
     record.errors[attribute] << (options[:message] || record.errors.generate_message(attribute, :unknown_pattern))
   end
+
+  class << self
+    def validate(value)
+      return true if value.empty?
+
+      begin
+        ISO8601::Duration.new(value)
+      rescue => _e
+        return false
+      end
+
+      true
+    end
+
+    def validate_epp(obj, value)
+      return if validate(value)
+
+      {
+        code: '2003',
+        msg: I18n.t(:unknown_expiry_relative_pattern),
+        value: { obj: obj, val: value }
+      }
+    end
+  end
 end

config/locales/en.yml

@@ -472,7 +472,6 @@ en:
   requester: 'Requester'
   accepter: 'Accepter'
   keyrelay_details: 'Keyrelay details'
-  unknown_expiry_absolute_pattern: 'Expiry absolute must be compatible to ISO 8601'
   domain_name: 'Domain name'
   created_at: 'Created at'
   type: 'Type'
@@ -500,3 +499,5 @@ en:
   repp_log: 'REPP log'
   repp_logs: 'REPP logs'
   could_not_determine_object_type_check_xml_format_and_namespaces: 'Could not determine object type. Check XML format and namespaces.'
+  unknown_expiry_relative_pattern: 'Expiry relative must be compatible to ISO 8601'
+  unknown_expiry_absolute_pattern: 'Expiry absolute must be compatible to ISO 8601'

spec/epp/keyrelay_spec.rb

@@ -112,6 +112,30 @@ describe 'EPP Keyrelay', epp: true do
       expect(zone.messages.queued.count).to eq(0)
     end
 
+    it 'returns an error on invalid absolute expiry' do
+      xml = epp_xml.keyrelay({
+        name: { value: 'example.ee' },
+        keyData: {
+          flags: { value: '256' },
+          protocol: { value: '3' },
+          alg: { value: '8' },
+          pubKey: { value: 'cmlraXN0aGViZXN0' }
+        },
+        authInfo: {
+          pw: { value: domain.auth_info }
+        },
+        expiry: {
+          absolute: { value: 'Invalid Absolute' }
+        }
+      })
+
+      response = epp_request(xml, :xml, :elkdata)
+      expect(response[:msg]).to eq('Expiry absolute must be compatible to ISO 8601')
+      expect(response[:results][0][:value]).to eq('Invalid Absolute')
+
+      expect(zone.messages.queued.count).to eq(0)
+    end
+
     it 'does not allow both relative and absolute' do
       xml = epp_xml.keyrelay({
         name: { value: 'example.ee' },