Merge branch 'master' of github.com:domify/registry

app/models/ability.rb

@@ -107,6 +107,7 @@ class Ability
     customer_service
     can :manage, Setting
     can :manage, BlockedDomain
+    can :manage, ReservedDomain
     can :manage, ZonefileSetting
     can :manage, DomainVersion
     can :manage, Pricelist

app/models/depp/domain.rb

@@ -79,7 +79,8 @@ module Depp
     end
 
     def transfer(params)
-      op = params[:query] ? 'query' : nil
+      op = params[:request] ? 'request' : nil
+      op = params[:query] ? 'query' : op
       op = params[:approve] ? 'approve' : op
       op = params[:reject] ? 'reject' : op
 
@@ -132,7 +133,7 @@ module Depp
 
       # rubocop:disable Metrics/MethodLength
       # rubocop:disable Metrics/AbcSize
-      def construct_params_from_server_data(data) 
+      def construct_params_from_server_data(data)
         ret = default_params
         ret[:name] = data.css('name').text
         ret[:registrant] = data.css('registrant').text
@@ -182,16 +183,18 @@ module Depp
       # rubocop:enable Metrics/AbcSize
 
       def construct_custom_params_hash(domain_params)
-        custom_params = {}
+        custom_params = { _anonymus: [] }
         if domain_params[:legal_document].present?
           type = domain_params[:legal_document].original_filename.split('.').last.downcase
-          custom_params = {
-            _anonymus: [
-              legalDocument: { value: Base64.encode64(domain_params[:legal_document].read), attrs: { type:  type } }
-            ]
+          custom_params[:_anonymus] << {
+            legalDocument: { value: Base64.encode64(domain_params[:legal_document].read), attrs: { type:  type } }
           }
         end
 
+        if domain_params[:reserved_pw].present?
+          custom_params[:_anonymus] << { reserved: { pw: { value: domain_params[:reserved_pw] } } }
+        end
+
         custom_params
       end
 

app/models/domain.rb

@@ -61,6 +61,7 @@ class Domain < ActiveRecord::Base
 
   before_create :generate_auth_info
   before_create :set_validity_dates
+  before_create -> { self.reserved = in_reserved_list?; nil }
   before_update :manage_statuses
   def manage_statuses
     return unless registrant_id_changed?
@@ -78,12 +79,32 @@ class Domain < ActiveRecord::Base
 
   after_initialize -> { self.statuses = [] if statuses.nil? }
 
+  after_create :update_reserved_domains
+  def update_reserved_domains
+    return unless in_reserved_list?
+    rd = ReservedDomain.first
+    rd.names[name] = SecureRandom.hex
+    rd.save
+  end
+
   validates :name_dirty, domain_name: true, uniqueness: true
   validates :puny_label, length: { maximum: 63 }
   validates :period, numericality: { only_integer: true }
   validates :registrant, :registrar, presence: true
 
   validate :validate_period
+  validate :validate_reservation
+  def validate_reservation
+    return if persisted? || !in_reserved_list?
+
+    if reserved_pw.blank?
+      errors.add(:base, :required_parameter_missing_reserved)
+      return false
+    end
+
+    return if ReservedDomain.pw_for(name) == reserved_pw
+    errors.add(:base, :invalid_auth_information_reserved)
+  end
 
   validates :nameservers, object_count: {
     min: -> { Setting.ns_min_count },
@@ -134,7 +155,7 @@ class Domain < ActiveRecord::Base
   end
 
   attr_accessor :registrant_typeahead, :update_me, :deliver_emails,
-    :epp_pending_update, :epp_pending_delete
+    :epp_pending_update, :epp_pending_delete, :reserved_pw
 
   def subordinate_nameservers
     nameservers.select { |x| x.hostname.end_with?(name) }
@@ -247,6 +268,10 @@ class Domain < ActiveRecord::Base
     @registrant_typeahead || registrant.try(:name) || nil
   end
 
+  def in_reserved_list?
+    ReservedDomain.pw_for(name).present?
+  end
+
   def pending_transfer
     domain_transfers.find_by(status: DomainTransfer::PENDING)
   end

app/models/domain_status.rb

@@ -71,6 +71,7 @@ class DomainStatus < ActiveRecord::Base
   FORCE_DELETE = 'forceDelete'
   DELETE_CANDIDATE = 'deleteCandidate'
   EXPIRED = 'expired'
+  RESERVED = 'reserved'
 
   STATUSES = [
     CLIENT_DELETE_PROHIBITED, SERVER_DELETE_PROHIBITED, CLIENT_HOLD, SERVER_HOLD,

app/models/epp/domain.rb

@@ -25,7 +25,8 @@ class Epp::Domain < Domain
       ],
       '2003' => [ # Required parameter missing
         [:registrant, :blank],
-        [:registrar, :blank]
+        [:registrar, :blank],
+        [:base, :required_parameter_missing_reserved]
       ],
       '2004' => [ # Parameter value range error
         [:nameservers, :out_of_range,
@@ -60,6 +61,9 @@ class Epp::Domain < Domain
       '2201' => [ # Authorisation error
         [:auth_info, :wrong_pw]
       ],
+      '2202' => [
+        [:base, :invalid_auth_information_reserved]
+      ],
       '2302' => [ # Object exists
         [:name_dirty, :taken, { value: { obj: 'name', val: name_dirty } }],
         [:name_dirty, :reserved, { value: { obj: 'name', val: name_dirty } }],
@@ -112,6 +116,8 @@ class Epp::Domain < Domain
 
     at[:period_unit] = Epp::Domain.parse_period_unit_from_frame(frame) || 'y'
 
+    at[:reserved_pw] = frame.css('reserved > pw').text
+
     # at[:statuses] = domain_statuses_attrs(frame, action)
     # binding.pry
     at[:nameservers_attributes] = nameservers_attrs(frame, action)
@@ -455,6 +461,8 @@ class Epp::Domain < Domain
   def transfer(frame, action, current_user)
     case action
     when 'query'
+      return domain_transfers.last if domain_transfers.any?
+    when 'request'
       return pending_transfer if pending_transfer
       return query_transfer(frame, current_user)
     when 'approve'
@@ -462,7 +470,7 @@ class Epp::Domain < Domain
     when 'reject'
       return reject_transfer(frame, current_user) if pending_transfer
     end
-    add_epp_error('2303', nil, nil, I18n.t('pending_transfer_was_not_found'))
+    add_epp_error('2303', nil, nil, I18n.t('no_transfers_found'))
   end
 
   # TODO: Eager load problems here. Investigate how it's possible not to query contact again
@@ -742,7 +750,7 @@ class Epp::Domain < Domain
           next
         end
 
-        unless DomainNameValidator.validate_reservation(x)
+        if ReservedDomain.pw_for(x).present?
           res << { name: x, avail: 0, reason: I18n.t('errors.messages.epp_domain_reserved') }
           next
         end

app/models/reserved_domain.rb

@@ -1,3 +1,9 @@
 class ReservedDomain < ActiveRecord::Base
   include Versions # version/reserved_domain_version.rb
+
+  class << self
+    def pw_for(domain_name)
+      select("names -> '#{domain_name}' AS pw").first.try(:pw)
+    end
+  end
 end