zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-05-16 17:37:17 +02:00
Code Issues Projects Releases Packages Wiki Activity

Refactored contact with ability

Browse source
This commit is contained in:
Priit Tark 2015-02-17 01:38:36 +02:00
parent 62f8061e10
commit 96d1c60dd8
33 changed files with 763 additions and 1045 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Guardfile
View file

@ -3,11 +3,11 @@ group :red_green_refactor, halt_on_fail: true do
# be sure you have apache2 configured to # be sure you have apache2 configured to
# accept EPP request on port 701, what proxy to 8989. # accept EPP request on port 701, what proxy to 8989.
# port and environment is just for correct notification, all is overwritten by CLI # port and environment is just for correct notification, all is overwritten by CLI
guard :rails, port: 8989, environment: 'test' do # guard :rails, port: 8989, environment: 'test' do
# guard :rails, port: 8989, environment: 'test', CLI: 'RAILS_ENV=test unicorn -p 8989' do # # guard :rails, port: 8989, environment: 'test', CLI: 'RAILS_ENV=test unicorn -p 8989' do
watch('Gemfile.lock') # watch('Gemfile.lock')
watch(%r{^(config|lib)/.*}) # watch(%r{^(config|lib)/.*})
end # end
guard :rspec, cmd: 'spring rspec', notification: false do guard :rspec, cmd: 'spring rspec', notification: false do
watch(%r{^spec/.+_spec\.rb$}) watch(%r{^spec/.+_spec\.rb$})

1
app/controllers/admin_controller.rb
View file

@ -1,4 +1,3 @@
class AdminController < ApplicationController class AdminController < ApplicationController
before_action :authenticate_user! before_action :authenticate_user!
check_authorization
end end

24
app/controllers/application_controller.rb
View file

@ -1,4 +1,6 @@
class ApplicationController < ActionController::Base class ApplicationController < ActionController::Base
check_authorization
# Prevent CSRF attacks by raising an exception. # Prevent CSRF attacks by raising an exception.
# For APIs, you may want to use :null_session instead. # For APIs, you may want to use :null_session instead.
protect_from_forgery with: :exception protect_from_forgery with: :exception
@ -9,8 +11,22 @@ class ApplicationController < ActionController::Base
params[resource] &&= send(method) if respond_to?(method, true) params[resource] &&= send(method) if respond_to?(method, true)
end end
rescue_from CanCan::AccessDenied do |exception|
redirect_to admin_dashboard_path, alert: exception.message
end
def current_ability
if defined?(current_api_user) && current_api_user.present?
current_api_user.ability
else
current_user.ability
end
end
def after_sign_in_path_for(_resource) def after_sign_in_path_for(_resource)
return session[:user_return_to].to_s if session[:user_return_to] && session[:user_return_to] != login_path if session[:user_return_to] && session[:user_return_to] != login_path
return session[:user_return_to].to_s
end
admin_dashboard_path admin_dashboard_path
end end
@ -34,9 +50,3 @@ class ApplicationController < ActionController::Base
end end
end end
end end
class ApplicationController < ActionController::Base
rescue_from CanCan::AccessDenied do |exception|
redirect_to admin_dashboard_path, alert: exception.message
end
end

235
app/controllers/epp/contacts_controller.rb
View file

@ -1,183 +1,114 @@
class Epp::ContactsController < EppController class Epp::ContactsController < EppController
before_action :find_contact, only: [:info, :update, :delete]
before_action :find_password, only: [:info, :update, :delete]
def info def info
handle_errors(@contact) and return unless @contact && rights? authorize! :info, @contact, @password
# handle_errors(@contact) and return unless rights?
@disclosure = ContactDisclosure.default_values.merge(@contact.disclosure.try(:as_hash) || {})
@disclosure_policy = @contact.disclosure.try(:attributes_with_flag)
@owner = owner?(false)
# need to reload contact eagerly
@contact = find_contact if @owner # for clarity, could just be true
render_epp_response 'epp/contacts/info' render_epp_response 'epp/contacts/info'
end end
def create
@contact = Contact.new(contact_and_address_attributes)
@contact.registrar = current_user.registrar
render_epp_response '/epp/contacts/create' and return if @contact.save
handle_errors(@contact)
end
def update
# FIXME: Update returns 2303 update multiple times
code = params_hash['epp']['command']['update']['update'][:id]
@contact = Contact.where(code: code).first
# if update_rights? && @contact.update_attributes(contact_and_address_attributes(:update))
if owner? && @contact.update_attributes(contact_and_address_attributes(:update))
render_epp_response 'epp/contacts/update'
else
contact_exists?(code)
handle_errors(@contact) and return
end
end
# rubocop:disable Metrics/CyclomaticComplexity
def delete
@contact = find_contact
handle_errors(@contact) and return unless rights? # owner?
handle_errors(@contact) and return unless @contact
handle_errors(@contact) and return unless @contact.destroy_and_clean
render_epp_response '/epp/contacts/delete'
end
# rubocop:enable Metrics/CyclomaticComplexity
def check def check
ph = params_hash['epp']['command']['check']['check'] authorize! :check, Epp::Contact
@contacts = Contact.check_availability(ph[:id])
ids = params[:parsed_frame].css('id').map(&:text)
@results = Contact.check_availability(ids)
render_epp_response '/epp/contacts/check' render_epp_response '/epp/contacts/check'
end end
def create
authorize! :create, Epp::Contact
@contact = Epp::Contact.new(params[:parsed_frame])
@contact.registrar = current_user.registrar
if @contact.save
render_epp_response '/epp/contacts/create'
else
handle_errors(@contact)
end
end
def update
authorize! :update, @contact, @password
if @contact.update_attributes(params[:parsed_frame])
render_epp_response 'epp/contacts/update'
else
handle_errors(@contact)
end
end
def delete
authorize! :delete, @contact, @password
if @contact.destroy_and_clean
render_epp_response '/epp/contacts/delete'
else
handle_errors(@contact)
end
end
def renew def renew
authorize! :renew, Epp::Contact
epp_errors << { code: '2101', msg: t(:'errors.messages.unimplemented_command') } epp_errors << { code: '2101', msg: t(:'errors.messages.unimplemented_command') }
handle_errors handle_errors
end end
## HELPER METHODS
private private
## CREATE def find_password
def validate_create @password = params[:parsed_frame].css('authInfo pw').text
@prefix = 'create > create >' end
requires 'postalInfo > name', 'postalInfo > addr > city',
'postalInfo > addr > cc', 'ident', 'voice', 'email' def find_contact
code = params[:parsed_frame].css('id').text.strip.downcase
@contact = Epp::Contact.find_by(code: code)
if @contact.blank?
epp_errors << {
code: '2303',
msg: t('errors.messages.epp_obj_does_not_exist'),
value: { obj: 'id', val: code }
}
fail CanCan::AccessDenied
end
@contact
end
#
# Validations
#
def validate_info
@prefix = 'info > info >'
requires 'id'
end
def validate_check
@prefix = 'check > check >'
requires 'id'
end
def validate_create
@prefix = 'create > create >'
requires(
'postalInfo > name', 'postalInfo > addr > city',
'postalInfo > addr > cc', 'ident', 'voice', 'email'
)
end end
## UPDATE
def validate_update def validate_update
@prefix = 'update > update >' @prefix = 'update > update >'
requires 'id'
if element_count('chg') == 0 && element_count('rem') == 0 && element_count('add') == 0 if element_count('chg') == 0 && element_count('rem') == 0 && element_count('add') == 0
epp_errors << { epp_errors << {
code: '2003', code: '2003',
msg: I18n.t('errors.messages.required_parameter_missing', key: 'add, rem or chg') msg: I18n.t('errors.messages.required_parameter_missing', key: 'add, rem or chg')
} }
end end
requires 'id', 'authInfo > pw'
end end
def contact_exists?(code)
return true if @contact.is_a?(Contact)
epp_errors << { code: '2303', msg: t('errors.messages.epp_obj_does_not_exist'),
value: { obj: 'id', val: code } }
end
## DELETE
def validate_delete def validate_delete
@ph = params_hash['epp']['command']['delete']['delete'] @prefix = 'delete > delete >'
xml_attrs_present?(@ph, [['id']]) requires 'id', 'authInfo > pw'
end
## check
def validate_check
@ph = params_hash['epp']['command']['check']['check']
xml_attrs_present?(@ph, [['id']])
end
## info
def validate_info # and process
@ph = params_hash['epp']['command']['info']['info']
return false unless xml_attrs_present?(@ph, [['id']])
@contact = find_contact
return false unless @contact
return true if current_user.registrar == @contact.registrar || xml_attrs_present?(@ph, [%w(authInfo pw)])
false
end
## SHARED
def find_contact
contact_code = params[:parsed_frame].css('id').text.strip.downcase
contact = Contact.find_by(code: contact_code)
if contact.blank?
epp_errors << { code: '2303',
msg: t('errors.messages.epp_obj_does_not_exist'),
value: { obj: 'id', val: contact_code } }
end
contact
end
def owner?(with_errors = true)
return false unless find_contact
return true if @contact.registrar == current_user.registrar
return false unless with_errors
epp_errors << { code: '2201', msg: t('errors.messages.epp_authorization_error') }
false
end
def rights?
pw = @ph.try(:[], :authInfo).try(:[], :pw)
return true if current_user.try(:registrar) == @contact.try(:registrar)
return true if pw && @contact.auth_info_matches(pw) # @contact.try(:auth_info_matches, pw)
epp_errors << { code: '2200', msg: t('errors.messages.epp_authentication_error') }
false
end
def update_rights?
pw = @ph.try(:[], :authInfo).try(:[], :pw)
return true if pw && @contact.auth_info_matches(pw)
epp_errors << { code: '2200', msg: t('errors.messages.epp_authentication_error') }
false
end
def contact_and_address_attributes(type = :create)
case type
when :update
# TODO: support for rem/add
contact_hash = merge_attribute_hash(@ph[:chg], type).delete_if { |_k, v| v.empty? }
else
contact_hash = merge_attribute_hash(@ph, type)
end
contact_hash[:ident_type] = ident_type unless ident_type.nil?
contact_hash
end
def merge_attribute_hash(prms, type)
contact_hash = Contact.extract_attributes(prms, type)
contact_hash = contact_hash.merge(
Address.extract_attributes((prms.try(:[], :postalInfo) || []))
)
contact_hash[:disclosure_attributes] =
ContactDisclosure.extract_attributes(params[:parsed_frame])
contact_hash
end
def ident_type
result = params[:parsed_frame].css('ident').first.try(:attributes).try(:[], 'type').try(:value)
return nil unless result
Contact::IDENT_TYPES.any? { |type| return type if result.include?(type) }
nil
end
def validate_params
return true if @ph
epp_errors << { code: '2001', msg: t(:'errors.messages.epp_command_syntax_error') }
false
end end
end end

2
app/controllers/epp/domains_controller.rb
View file

@ -1,4 +1,6 @@
class Epp::DomainsController < EppController class Epp::DomainsController < EppController
skip_authorization_check # TODO: remove it
def create def create
@domain = Epp::EppDomain.new(domain_create_params) @domain = Epp::EppDomain.new(domain_create_params)

2
app/controllers/epp/errors_controller.rb
View file

@ -1,4 +1,6 @@
class Epp::ErrorsController < EppController class Epp::ErrorsController < EppController
skip_authorization_check # TODO: remove it
def error def error
epp_errors << { code: params[:code], msg: params[:msg] } epp_errors << { code: params[:code], msg: params[:msg] }
render_epp_response '/epp/error' render_epp_response '/epp/error'

2
app/controllers/epp/keyrelays_controller.rb
View file

@ -1,4 +1,6 @@
class Epp::KeyrelaysController < EppController class Epp::KeyrelaysController < EppController
skip_authorization_check # TODO: remove it
# rubocop: disable Metrics/PerceivedComplexity # rubocop: disable Metrics/PerceivedComplexity
# rubocop: disable Metrics/CyclomaticComplexity # rubocop: disable Metrics/CyclomaticComplexity
def keyrelay def keyrelay

4
app/controllers/epp/polls_controller.rb
View file

@ -1,4 +1,6 @@
class Epp::PollsController < EppController class Epp::PollsController < EppController
skip_authorization_check # TODO: remove it
def poll def poll
req_poll if params[:parsed_frame].css('poll').first['op'] == 'req' req_poll if params[:parsed_frame].css('poll').first['op'] == 'req'
ack_poll if params[:parsed_frame].css('poll').first['op'] == 'ack' ack_poll if params[:parsed_frame].css('poll').first['op'] == 'ack'
@ -38,6 +40,6 @@ class Epp::PollsController < EppController
private private
def validate_poll def validate_poll
requires_attribute 'poll', 'op', values: %(ack req) requires_attribute 'poll', 'op', values: %(ack req), allow_blank: true
end end
end end

2
app/controllers/epp/sessions_controller.rb
View file

@ -1,4 +1,6 @@
class Epp::SessionsController < EppController class Epp::SessionsController < EppController
skip_authorization_check only: [:hello, :login, :logout]
def hello def hello
render_epp_response('greeting') render_epp_response('greeting')
end end

17
app/controllers/epp_controller.rb
View file

@ -1,10 +1,23 @@
class EppController < ApplicationController class EppController < ApplicationController
layout false
protect_from_forgery with: :null_session protect_from_forgery with: :null_session
skip_before_action :verify_authenticity_token
before_action :generate_svtrid before_action :generate_svtrid
before_action :validate_request before_action :validate_request
layout false
helper_method :current_user helper_method :current_user
rescue_from CanCan::AccessDenied do |_exception|
@errors ||= []
if @errors.blank?
@errors = [{
msg: t('errors.messages.epp_authorization_error'),
code: '2201'
}]
end
render_epp_response '/epp/error'
end
def generate_svtrid def generate_svtrid
# rubocop: disable Style/VariableName # rubocop: disable Style/VariableName
@svTRID = "ccReg-#{format('%010d', rand(10**10))}" @svTRID = "ccReg-#{format('%010d', rand(10**10))}"
@ -112,7 +125,7 @@ class EppController < ApplicationController
# requires_attribute 'transfer', 'op', values: %(approve, query, reject) # requires_attribute 'transfer', 'op', values: %(approve, query, reject)
def requires_attribute(element_selector, attribute_selector, options) def requires_attribute(element_selector, attribute_selector, options)
element = requires(element_selector) element = requires(element_selector, allow_blank: options[:allow_blank])
return unless element return unless element
attribute = element[attribute_selector] attribute = element[attribute_selector]

2
app/controllers/sessions_controller.rb
View file

@ -1,4 +1,6 @@
class SessionsController < Devise::SessionsController class SessionsController < Devise::SessionsController
skip_authorization_check only: [:login, :create]
def create def create
# TODO: Create ID Card login here: # TODO: Create ID Card login here:
# this is just testing config # this is just testing config

15
app/models/ability.rb
View file

@ -2,16 +2,25 @@ class Ability
include CanCan::Ability include CanCan::Ability
def initialize(user) def initialize(user)
alias_action :create, :read, :update, :destroy, to: :crud alias_action :show, :create, :update, :destroy, to: :crud
@user = user || AdminUser.new @user = user || AdminUser.new
@user.roles.each { |role| send(role) } if @user.roles @user.roles.each { |role| send(role) } if @user.roles
return if @user.roles || @user.roles.any?
can :show, :dashboard can :show, :dashboard
end end
def epp
# Epp::Contact
can(:info, Epp::Contact) { |c, pw| c.registrar_id == @user.registrar_id || c.auth_info == pw }
can(:check, Epp::Contact)
can(:create, Epp::Contact)
can(:update, Epp::Contact) { |c, pw| c.registrar_id == @user.registrar_id && c.auth_info == pw }
can(:delete, Epp::Contact) { |c, pw| c.registrar_id == @user.registrar_id && c.auth_info == pw }
can(:renew, Epp::Contact)
can(:view_password, Epp::Contact) { |c| c.registrar_id == @user.registrar_id }
end
def user def user
can :show, :dashboard can :show, :dashboard
end end

5
app/models/api_user.rb
View file

@ -13,6 +13,11 @@ class ApiUser < User
attr_accessor :registrar_typeahead attr_accessor :registrar_typeahead
def ability
@ability ||= Ability.new(self)
end
delegate :can?, :cannot?, to: :ability
def registrar_typeahead def registrar_typeahead
@registrar_typeahead || registrar || nil @registrar_typeahead || registrar || nil
end end

2
app/models/concerns/version_session.rb
View file

@ -5,7 +5,7 @@ module VersionSession
before_save :add_session before_save :add_session
def add_session def add_session
self.session = PaperSession.session self.session = ::PaperSession.session
true true
end end
end end

8
app/models/concerns/versions.rb
View file

@ -28,9 +28,9 @@ module Versions
return nil if creator_str.blank? return nil if creator_str.blank?
if creator_str =~ /^\d-api-/ if creator_str =~ /^\d-api-/
ApiUser.find(creator_str) ApiUser.find_by(id: creator_str)
else else
AdminUser.find(creator_str) AdminUser.find_by(id: creator_str)
end end
end end
@ -38,9 +38,9 @@ module Versions
return nil if updator_str.blank? return nil if updator_str.blank?
if updator_str =~ /^\d-api-/ if updator_str =~ /^\d-api-/
ApiUser.find(updator_str) ApiUser.find_by(id: updator_str)
else else
AdminUser.find(updator_str) AdminUser.find_by(id: updator_str)
end end
end end

139
app/models/contact.rb
View file

@ -1,6 +1,5 @@
class Contact < ActiveRecord::Base class Contact < ActiveRecord::Base
include Versions # version/contact_version.rb include Versions # version/contact_version.rb
include EppErrors
has_one :address, dependent: :destroy has_one :address, dependent: :destroy
has_one :disclosure, class_name: 'ContactDisclosure', dependent: :destroy has_one :disclosure, class_name: 'ContactDisclosure', dependent: :destroy
@ -19,25 +18,20 @@ class Contact < ActiveRecord::Base
validates :phone, format: /\+[0-9]{1,3}\.[0-9]{1,14}?/ validates :phone, format: /\+[0-9]{1,3}\.[0-9]{1,14}?/
validates :email, format: /@/ validates :email, format: /@/
validates :ident, format: /\d{4}-\d{2}-\d{2}/, if: proc { |c| c.ident_type == 'birthday' } validates :ident, format: /\d{4}-\d{2}-\d{2}/, if: proc { |c| c.ident_type == 'birthday' }
validate :ident_must_be_valid validate :ident_must_be_valid
validates :code, uniqueness: { message: :epp_id_taken } validates :code, uniqueness: { message: :epp_id_taken }
delegate :city, to: :address # , prefix: true delegate :street, to: :address
delegate :street, to: :address # , prefix: true delegate :city, to: :address
delegate :zip, to: :address # , prefix: true delegate :zip, to: :address
delegate :state, to: :address
delegate :country_code, to: :address
delegate :country, to: :address
# callbacks
# TODO: remove old
# after_commit :domains_snapshot
# after_update :domains_snapshot
# after_destroy :domains_snapshot
before_create :generate_code before_create :generate_code
before_create :generate_auth_info before_create :generate_auth_info
after_create :ensure_disclosure after_create :ensure_disclosure
# scopes
scope :current_registrars, ->(id) { where(registrar_id: id) } scope :current_registrars, ->(id) { where(registrar_id: id) }
IDENT_TYPE_ICO = 'ico' IDENT_TYPE_ICO = 'ico'
@ -54,6 +48,32 @@ class Contact < ActiveRecord::Base
CONTACT_TYPE_ADMIN = 'admin' CONTACT_TYPE_ADMIN = 'admin'
CONTACT_TYPES = [CONTACT_TYPE_TECH, CONTACT_TYPE_ADMIN] CONTACT_TYPES = [CONTACT_TYPE_TECH, CONTACT_TYPE_ADMIN]
class << self
def search_by_query(query)
res = search(code_cont: query).result
res.reduce([]) { |o, v| o << { id: v[:id], display_key: "#{v.name} (#{v.code})" } }
end
def check_availability(codes)
codes = [codes] if codes.is_a?(String)
res = []
codes.each do |x|
if Contact.find_by(code: x)
res << { code: x, avail: 0, reason: 'in use' }
else
res << { code: x, avail: 1 }
end
end
res
end
end
def to_s
name
end
def ident_must_be_valid def ident_must_be_valid
# TODO: Ident can also be passport number or company registry code. # TODO: Ident can also be passport number or company registry code.
# so have to make changes to validations (and doc/schema) accordingly # so have to make changes to validations (and doc/schema) accordingly
@ -66,15 +86,6 @@ class Contact < ActiveRecord::Base
create_disclosure! unless disclosure create_disclosure! unless disclosure
end end
# TODO: remove old
# def domains_snapshot
# (domains + domains_owned).uniq.each do |domain|
# next unless domain.is_a?(Domain)
# # next if domain.versions.last == domain.create_snapshot
# domain.create_version # Method from paper_trail
# end
# end
def juridical? def juridical?
ident_type == IDENT_TYPE_ICO ident_type == IDENT_TYPE_ICO
end end
@ -83,18 +94,6 @@ class Contact < ActiveRecord::Base
ident_type != IDENT_TYPE_ICO ident_type != IDENT_TYPE_ICO
end end
def cr_id
# created_by ? created_by.username : nil
end
def up_id
# updated_by ? updated_by.username : nil
end
def auth_info_matches(pw)
auth_info == pw
end
# generate random id for contact # generate random id for contact
def generate_code def generate_code
self.code = SecureRandom.hex(4) self.code = SecureRandom.hex(4)
@ -114,6 +113,8 @@ class Contact < ActiveRecord::Base
false false
end end
# TODO: refactor, it should not allow to destroy with normal destroy,
# no need separate method
# should use only in transaction # should use only in transaction
def destroy_and_clean def destroy_and_clean
if relations_with_domain? if relations_with_domain?
@ -122,76 +123,4 @@ class Contact < ActiveRecord::Base
end end
destroy destroy
end end
def epp_code_map # rubocop:disable Metrics/MethodLength
{
'2302' => [ # Object exists
[:code, :epp_id_taken]
],
'2305' => [ # Association exists
[:domains, :exist]
],
'2005' => [ # Value syntax error
[:phone, :invalid],
[:email, :invalid],
[:ident, :invalid]
]
}
end
def to_s
name
end
# TODO: remove old
# for archiving
# def snapshot
# {
# name: name,
# phone: phone,
# code: code,
# ident: ident,
# email: email
# }
# end
class << self
# non-EPP
# EPP
def extract_attributes(ph, _type = :create)
ph[:postalInfo] = ph[:postalInfo].first if ph[:postalInfo].is_a?(Array)
contact_hash = {
phone: ph[:voice],
ident: ph[:ident],
ident_type: ph[:ident_type],
email: ph[:email],
fax: ph[:fax],
name: ph[:postalInfo].try(:[], :name),
org_name: ph[:postalInfo].try(:[], :org)
}
# contact_hash[:auth_info] = ph[:authInfo][:pw] if type == :create
contact_hash.delete_if { |_k, v| v.nil? }
end
def check_availability(codes)
codes = [codes] if codes.is_a?(String)
res = []
codes.each do |x|
if Contact.find_by(code: x)
res << { code: x, avail: 0, reason: 'in use' }
else
res << { code: x, avail: 1 }
end
end
res
end
def search_by_query(query)
res = search(code_cont: query).result
res.reduce([]) { |o, v| o << { id: v[:id], display_key: "#{v.name} (#{v.code})" } }
end
end
end end

87
app/models/epp/contact.rb Normal file
View file

@ -0,0 +1,87 @@
# rubocop: disable Metrics/ClassLength
class Epp::Contact < Contact
include EppErrors
# disable STI, there is type column present
self.inheritance_column = :sti_disabled
class << self
# rubocop: disable Metrics/PerceivedComplexity
# rubocop: disable Metrics/CyclomaticComplexity
def attrs_from(frame)
f = frame
at = {}.with_indifferent_access
at[:name] = f.css('postalInfo name').text if f.css('postalInfo name').present?
at[:org_name] = f.css('postalInfo org').text if f.css('postalInfo org').present?
at[:email] = f.css('email').text if f.css('email').present?
at[:fax] = f.css('fax').text if f.css('fax').present?
at[:phone] = f.css('voice').text if f.css('voice').present?
at[:auth_info] = f.css('authInfo pw').text if f.css('authInfo pw').present?
if f.css('ident').present? && f.css('ident').attr('type').present?
at[:ident] = f.css('ident').text
at[:ident_type] = f.css('ident').attr('type').text
end
at[:address_attributes] = {}
sat = at[:address_attributes]
sat[:city] = f.css('postalInfo addr city').text if f.css('postalInfo addr city').present?
sat[:zip] = f.css('postalInfo addr pc').text if f.css('postalInfo addr pc').present?
sat[:street] = f.css('postalInfo addr street').text if f.css('postalInfo addr street').present?
sat[:state] = f.css('postalInfo addr sp').text if f.css('postalInfo addr sp').present?
sat[:country_code] = f.css('postalInfo addr cc').text if f.css('postalInfo addr cc').present?
at.delete(:address_attributes) if at[:address_attributes].blank?
at
end
# rubocop: enable Metrics/PerceivedComplexity
# rubocop: enable Metrics/CyclomaticComplexity
def new(frame)
return super if frame.blank?
super(attrs_from(frame))
end
def parse_legal_document_from_frame(parsed_frame)
ld = parsed_frame.css('legalDocument').first
return nil unless ld
{
body: ld.text,
type: ld['type']
}
end
end
def epp_code_map # rubocop:disable Metrics/MethodLength
{
'2302' => [ # Object exists
[:code, :epp_id_taken]
],
'2305' => [ # Association exists
[:domains, :exist]
],
'2005' => [ # Value syntax error
[:phone, :invalid],
[:email, :invalid],
[:ident, :invalid]
]
}
end
def update_attributes(frame)
return super if frame.blank?
at = {}.with_indifferent_access
at.deep_merge!(self.class.attrs_from(frame.css('chg')))
super(at)
end
def attach_legal_document(legal_document_data)
return unless legal_document_data
legal_documents.build(
document_type: legal_document_data[:type],
body: legal_document_data[:body]
)
end
end
# rubocop: enable Metrics/ClassLength

10
app/views/admin/contacts/index.haml
View file

@ -22,20 +22,20 @@
%thead %thead
%tr %tr
%th{class: 'col-xs-2'} %th{class: 'col-xs-2'}
= sort_link(@q, 'name', t('name')) = sort_link(@q, 'name', t(:name))
%th{class: 'col-xs-2'} %th{class: 'col-xs-2'}
= sort_link(@q, 'code', t('code')) = sort_link(@q, 'ident', t(:identity))
%th{class: 'col-xs-2'} %th{class: 'col-xs-2'}
= sort_link(@q, 'ident', t('identity_code')) = sort_link(@q, 'email', t(:email))
%th{class: 'col-xs-2'} %th{class: 'col-xs-2'}
= sort_link(@q, 'email', t('email')) = sort_link(@q, 'code', t(:code))
%tbody %tbody
- @contacts.each do |x| - @contacts.each do |x|
%tr %tr
%td= link_to(x, admin_contact_path(x)) %td= link_to(x, admin_contact_path(x))
%td= x.code
%td= x.ident %td= x.ident
%td= x.email %td= x.email
%td= x.code
.row .row
.col-md-12 .col-md-12
= paginate @contacts = paginate @contacts

26
app/views/admin/contacts/partials/_address.haml
View file

@ -4,25 +4,17 @@
.panel-body .panel-body
- unless @contact.address.nil? - unless @contact.address.nil?
%dl.dl-horizontal %dl.dl-horizontal
%dt= t('country') %dt= t('street')
%dd= @contact.address.country %dd= @contact.street
%dt= t('city') %dt= t('city')
%dd= @contact.address.city %dd= @contact.city
%dt= t('street')
%dd= @contact.address.street
- if @contact.address.street2
%dt= t('street')
%dd= @contact.address.street2
- if @contact.address.street3
%dt= t('street')
%dd= @contact.address.street3
%dt= t('zip') %dt= t('zip')
%dd= @contact.address.zip %dd= @contact.zip
%dt= t('state')
%dd= @contact.state
%dt= t('country')
%dd= @contact.country

30
app/views/admin/contacts/partials/_general.haml
View file

@ -3,30 +3,28 @@
%h3.panel-title= t('general') %h3.panel-title= t('general')
.panel-body .panel-body
%dl.dl-horizontal %dl.dl-horizontal
%dt= t('name') %dt= t(:ident)
%dd= @contact.name %dd= @contact.ident + ' [' + @contact.ident_type + ']'
%dt= t('org_name') %br
%dd= @contact.org_name
%dt= t('code') %dt= t(:email)
%dd= @contact.code
%dt= t('ident')
%dd= @contact.ident
%dt= t('ident_type')
%dd= @contact.ident_type
%dt= t('email')
%dd= @contact.email %dd= @contact.email
%dt= t('phone') %dt= t(:phone)
%dd= @contact.phone %dd= @contact.phone
%dt= t(:org_name)
%dd= @contact.org_name
- if @contact.fax - if @contact.fax
%dt= t('fax') %dt= t(:fax)
%dd= @contact.fax %dd= @contact.fax
%br
%dt= t(:code)
%dd= @contact.code
%dt= t('password') %dt= t('password')
%dd= @contact.auth_info %dd= @contact.auth_info

2
app/views/admin/contacts/show.haml
View file

@ -1,7 +1,7 @@
.row .row
.col-sm-12 .col-sm-12
%h2.text-center-xs %h2.text-center-xs
= "#{t('contact_details')}" = @contact.name
%hr %hr
.row .row
.col-md-6= render 'admin/contacts/partials/general' .col-md-6= render 'admin/contacts/partials/general'

18
app/views/epp/contacts/_postal_info.xml.builder
View file

@ -1,13 +1,13 @@
address = @contact.address
xml.tag!('contact:postalInfo', type: 'int') do xml.tag!('contact:postalInfo', type: 'int') do
xml.tag!('contact:name', @contact.name) if @disclosure.try(:[], :name) || @owner xml.tag!('contact:name', @contact.name) #if @disclosure.try(:[], :name) || @owner
xml.tag!('contact:org', @contact.org_name) if @disclosure.try(:[], :org_name) || @owner xml.tag!('contact:org', @contact.org_name) #if @disclosure.try(:[], :org_name) || @owner
if @disclosure.try(:addr) || @owner # if @disclosure.try(:addr) || @owner
xml.tag!('contact:addr') do xml.tag!('contact:addr') do
xml.tag!('contact:street', address.street) if address xml.tag!('contact:street', @contact.street)
xml.tag!('contact:cc', address.country_code) unless address.country_code.nil? xml.tag!('contact:city', @contact.city)
xml.tag!('contact:city', address.city) if address xml.tag!('contact:pc', @contact.zip)
xml.tag!('contact:sp', @contact.state)
xml.tag!('contact:cc', @contact.country_code)
end end
end # end
end end

7
app/views/epp/contacts/check.xml.builder
View file

@ -6,11 +6,10 @@ xml.epp_head do
xml.resData do xml.resData do
xml.tag!('contact:chkData', 'xmlns:contact' => 'urn:ietf:params:xml:ns:contact-1.0') do xml.tag!('contact:chkData', 'xmlns:contact' => 'urn:ietf:params:xml:ns:contact-1.0') do
#xml.tag!('contact:id', @contact.code) @results.each do |result|
@contacts.each do |contact|
xml.tag!('contact:cd') do xml.tag!('contact:cd') do
xml.tag! "contact:id", contact[:code], avail: contact[:avail] xml.tag! "contact:id", result[:code], avail: result[:avail]
xml.tag!('contact:reason', contact[:reason]) unless contact[:avail] == 1 xml.tag!('contact:reason', result[:reason]) unless result[:avail] == 1
end end
end end
end end

19
app/views/epp/contacts/info.xml.builder
View file

@ -8,9 +8,9 @@ xml.epp_head do
xml.tag!('contact:chkData', 'xmlns:contact' => 'urn:ietf:params:xml:ns:contact-1.0') do xml.tag!('contact:chkData', 'xmlns:contact' => 'urn:ietf:params:xml:ns:contact-1.0') do
xml.tag!('contact:id', @contact.code) xml.tag!('contact:id', @contact.code)
xml << render('/epp/contacts/postal_info') xml << render('/epp/contacts/postal_info')
xml.tag!('contact:voice', @contact.phone) if @disclosure.try(:phone) || @owner xml.tag!('contact:voice', @contact.phone) #if @disclosure.try(:phone) || @owner
xml.tag!('contact:fax', @contact.fax) if @disclosure.try(:fax) || @owner xml.tag!('contact:fax', @contact.fax) #if @disclosure.try(:fax) || @owner
xml.tag!('contact:email', @contact.email) if @disclosure.try(:email) || @owner xml.tag!('contact:email', @contact.email) #if @disclosure.try(:email) || @owner
xml.tag!('contact:clID', @contact.registrar.try(:name)) xml.tag!('contact:clID', @contact.registrar.try(:name))
xml.tag!('contact:crID', @contact.creator.try(:registrar)) xml.tag!('contact:crID', @contact.creator.try(:registrar))
xml.tag!('contact:crDate', @contact.created_at) xml.tag!('contact:crDate', @contact.created_at)
@ -19,17 +19,16 @@ xml.epp_head do
xml.tag!('contact:upDate', @contact.updated_at) xml.tag!('contact:upDate', @contact.updated_at)
end end
xml.tag!('contact:ident', @contact.ident, type: @contact.ident_type) xml.tag!('contact:ident', @contact.ident, type: @contact.ident_type)
xml.tag!('contact:trDate', '123') if false # xml.tag!('contact:trDate', '123') if false
if @owner if can? :view_password, @contact
xml.tag!('contact:authInfo') do xml.tag!('contact:authInfo') do
xml.tag!('contact:pw', @contact.auth_info) # Doc says we have to return this but is it necessary? xml.tag!('contact:pw', @contact.auth_info)
end end
end end
# statuses @contact.statuses.each do |status|
@contact.statuses.each do |cs| xml.tag!('contact:status', s: status.value)
xml.tag!('contact:status', s: cs.value)
end end
xml << render('/epp/contacts/disclosure_policy') # xml << render('/epp/contacts/disclosure_policy')
end end
end end

29
config/locales/en.yml
View file

@ -1,24 +1,3 @@
# Files in the config/locales directory are used for internationalization
# and are automatically loaded by Rails. If you want to use locales other
# than English, add the necessary files in this directory.
#
# To use the locales, use `I18n.t`:
#
# I18n.t 'hello'
#
# In views, this is aliased to just `t`:
#
# <%= t('hello') %>
#
# To use a different locale, set it with `I18n.locale`:
#
# I18n.locale = :es
#
# This would use the information in config/locales/es.yml.
#
# To learn more, please read the Rails Internationalization guide
# available at http://guides.rubyonrails.org/i18n.html.
en: en:
views: views:
pagination: pagination:
@ -259,7 +238,6 @@ en:
unimplemented_command: 'Unimplemented command' unimplemented_command: 'Unimplemented command'
domain_exists_but_belongs_to_other_registrar: 'Domain exists but belongs to other registrar' domain_exists_but_belongs_to_other_registrar: 'Domain exists but belongs to other registrar'
code: 'Code' code: 'Code'
value: 'Value' value: 'Value'
action: 'Action' action: 'Action'
@ -321,7 +299,7 @@ en:
domain_status_prohibits_deleting: 'Domain status prohibits deleting' domain_status_prohibits_deleting: 'Domain status prohibits deleting'
domain_deleted: 'Domain deleted!' domain_deleted: 'Domain deleted!'
failed_to_delete_domain: 'Failed to delete domain!' failed_to_delete_domain: 'Failed to delete domain!'
email: 'Email' email: 'E-mail'
fax: 'Fax' fax: 'Fax'
contact_details: 'Contact details' contact_details: 'Contact details'
ident: 'Ident' ident: 'Ident'
@ -330,8 +308,8 @@ en:
country: 'Country' country: 'Country'
city: 'City' city: 'City'
street: 'Street' street: 'Street'
zip: 'Zip' zip: 'Postcode'
org_name: 'Organisation name' org_name: 'Org name'
failed_to_add_domain: 'Failed to add domain!' failed_to_add_domain: 'Failed to add domain!'
domain_added: 'Domain added!' domain_added: 'Domain added!'
new_contact: 'New contact' new_contact: 'New contact'
@ -501,3 +479,4 @@ en:
address_help: 'Street name, house no - apartment no, city, county, country, zip' address_help: 'Street name, house no - apartment no, city, county, country, zip'
download: 'Download' download: 'Download'
failed_to_create_certificate: 'Failed to create certificate!' failed_to_create_certificate: 'Failed to create certificate!'
contact_code: Contact code

5
db/migrate/20150212125339_add_state_to_address.rb Normal file
View file

@ -0,0 +1,5 @@
class AddStateToAddress < ActiveRecord::Migration
def change
add_column :addresses, :state, :string
end
end

862
spec/epp/contact_spec.rb
View file

@ -1,451 +1,411 @@
# require 'rails_helper' require 'rails_helper'
# describe 'EPP Contact', epp: true do describe 'EPP Contact', epp: true do
# before :all do before :all do
# create_settings create_settings
# create_disclosure_settings create_disclosure_settings
# @registrar1 = Fabricate(:registrar1) @registrar1 = Fabricate(:registrar1)
# @registrar2 = Fabricate(:registrar2) @registrar2 = Fabricate(:registrar2)
# @epp_xml = EppXml::Contact.new(cl_trid: 'ABC-12345') @epp_xml = EppXml::Contact.new(cl_trid: 'ABC-12345')
# Fabricate(:api_user, username: 'registrar1', registrar: @registrar1) Fabricate(:api_user, username: 'registrar1', registrar: @registrar1)
# Fabricate(:api_user, username: 'registrar2', registrar: @registrar2) Fabricate(:api_user, username: 'registrar2', registrar: @registrar2)
# login_as :registrar1 login_as :registrar1
# Contact.skip_callback(:create, :before, :generate_code) Contact.skip_callback(:create, :before, :generate_code)
# Contact.skip_callback(:create, :before, :generate_auth_info) Contact.skip_callback(:create, :before, :generate_auth_info)
# end
@contact = Fabricate(:contact, registrar: @registrar1)
# after :all do end
# Contact.set_callback(:create, :before, :generate_code)
# Contact.set_callback(:create, :before, :generate_auth_info) after :all do
# end Contact.set_callback(:create, :before, :generate_code)
Contact.set_callback(:create, :before, :generate_auth_info)
# context 'with valid user' do end
# context 'create command' do
# it 'fails if request xml is missing' do context 'with valid user' do
# xml = @epp_xml.create context 'create command' do
# response = epp_plain_request(xml, :xml) def create_request(overwrites = {})
# response[:results][0][:msg].should == 'Command syntax error' defaults = {
# response[:results][0][:result_code].should == '2001' postalInfo: {
name: { value: 'John Doe' },
# response[:results].count.should == 1 addr: {
# end street: { value: '123 Example' },
city: { value: 'Tallinn' },
# it 'fails if request xml is missing' do cc: { value: 'EE' }
# xml = @epp_xml.create( }
# postalInfo: { addr: { value: nil } } },
# ) voice: { value: '+372.1234567' },
# response = epp_plain_request(xml, :xml) email: { value: 'test@example.example' },
# response[:results][0][:msg].should == 'Required parameter missing: name' ident: { value: '37605030299', attrs: { type: 'priv' } }
# response[:results][1][:msg].should == 'Required parameter missing: city' }
# response[:results][2][:msg].should == 'Required parameter missing: cc' create_xml = @epp_xml.create(defaults.deep_merge(overwrites))
# response[:results][3][:msg].should == 'Required parameter missing: ident' epp_plain_request(create_xml, :xml)
# response[:results][4][:msg].should == 'Required parameter missing: voice' end
# response[:results][5][:msg].should == 'Required parameter missing: email'
it 'fails if request xml is missing' do
# response[:results][0][:result_code].should == '2003' response = epp_plain_request(@epp_xml.create, :xml)
# response[:results][1][:result_code].should == '2003' response[:results][0][:msg].should ==
# response[:results][2][:result_code].should == '2003' 'Required parameter missing: create > create > postalInfo > name'
# response[:results][3][:result_code].should == '2003' response[:results][1][:msg].should ==
# response[:results][4][:result_code].should == '2003' 'Required parameter missing: create > create > postalInfo > addr > city'
# response[:results][5][:result_code].should == '2003' response[:results][2][:msg].should ==
'Required parameter missing: create > create > postalInfo > addr > cc'
# response[:results].count.should == 6 response[:results][3][:msg].should ==
# end 'Required parameter missing: create > create > ident'
response[:results][4][:msg].should ==
# it 'successfully saves ident type' do 'Required parameter missing: create > create > voice'
# xml = { ident: { value: '1990-22-12', attrs: { type: 'birthday' } } } response[:results][5][:msg].should ==
# epp_plain_request(create_contact_xml(xml), :xml) 'Required parameter missing: create > create > email'
# Contact.last.ident_type.should == 'birthday' response[:results][0][:result_code].should == '2003'
# end response[:results][1][:result_code].should == '2003'
response[:results][2][:result_code].should == '2003'
# it 'successfully creates a contact' do response[:results][3][:result_code].should == '2003'
# response = epp_plain_request(create_contact_xml, :xml) response[:results][4][:result_code].should == '2003'
response[:results][5][:result_code].should == '2003'
# response[:msg].should == 'Command completed successfully'
# response[:result_code].should == '1000' response[:results].count.should == 6
end
# @contact = Contact.last
it 'successfully creates a contact' do
# @contact.registrar.should == @registrar1 response = create_request
# # registrar1.api_users.should include(@contact.created_by)
# # @contact.updated_by_id.should == nil response[:msg].should == 'Command completed successfully'
# @contact.ident.should == '37605030299' response[:result_code].should == '1000'
# @contact.address.street.should == '123 Example'
@contact = Contact.last
# log = ApiLog::EppLog.last
# log.request_command.should == 'create' @contact.registrar.should == @registrar1
# log.request_object.should == 'contact' @registrar1.api_users.should include(@contact.creator)
# log.request_successful.should == true @contact.ident.should == '37605030299'
# log.api_user_name.should == '1-api-registrar1' @contact.address.street.should == '123 Example'
# log.api_user_registrar.should == 'registrar1'
# end log = ApiLog::EppLog.last
log.request_command.should == 'create'
# it 'successfully adds registrar' do log.request_object.should == 'contact'
# response = epp_plain_request(create_contact_xml, :xml) log.request_successful.should == true
log.api_user_name.should == '1-api-registrar1'
# response[:msg].should == 'Command completed successfully' log.api_user_registrar.should == 'registrar1'
# response[:result_code].should == '1000' end
# Contact.last.registrar.should == @registrar1 it 'successfully saves ident type' do
# end response = create_request(
{ ident: { value: '1990-22-12', attrs: { type: 'birthday' } } }
# it 'returns result data upon success' do )
# response = epp_plain_request(create_contact_xml, :xml)
response[:msg].should == 'Command completed successfully'
# response[:msg].should == 'Command completed successfully' response[:result_code].should == '1000'
# response[:result_code].should == '1000'
Contact.last.ident_type.should == 'birthday'
# id = response[:parsed].css('resData creData id').first end
# cr_date = response[:parsed].css('resData creData crDate').first
it 'successfully adds registrar' do
# id.text.length.should == 8 response = create_request
# # 5 seconds for what-ever weird lag reasons might happen
# cr_date.text.to_time.should be_within(5).of(Time.now) response[:msg].should == 'Command completed successfully'
# end response[:result_code].should == '1000'
# it 'creates disclosure data' do Contact.last.registrar.should == @registrar1
# xml = { end
# disclose: { value: {
# voice: { value: '' }, it 'returns result data upon success' do
# addr: { value: '' }, response = create_request
# name: { value: '' },
# org_name: { value: '' }, response[:msg].should == 'Command completed successfully'
# email: { value: '' }, response[:result_code].should == '1000'
# fax: { value: '' }
# }, attrs: { flag: '1' } id = response[:parsed].css('resData creData id').first
# } cr_date = response[:parsed].css('resData creData crDate').first
# }
id.text.length.should == 8
# response = epp_plain_request(create_contact_xml(xml), :xml) # 5 seconds for what-ever weird lag reasons might happen
# response[:result_code].should == '1000' cr_date.text.to_time.should be_within(5).of(Time.now)
end
# @contact = Contact.last end
# @contact.disclosure.name.should == true
# @contact.disclosure.org_name.should == true context 'update command' do
# @contact.disclosure.phone.should == true before :all do
# @contact.disclosure.fax.should == true @contact =
# @contact.disclosure.email.should == true Fabricate(
# @contact.disclosure.address.should == true :contact,
# end # created_by_id: 1,
registrar: @registrar1,
# it 'creates disclosure data merging with defaults' do email: 'not_updated@test.test',
# xml = { code: 'sh8013',
# disclose: { value: { auth_info: 'password'
# voice: { value: '' }, )
# addr: { value: '' } end
# }, attrs: { flag: '1' }
# } def update_request(overwrites = {})
# } defaults = {
id: { value: 'asd123123er' },
# response = epp_plain_request(create_contact_xml(xml), :xml) authInfo: { pw: { value: 'password' } },
# response[:result_code].should == '1000' chg: {
postalInfo: {
# @contact = Contact.last name: { value: 'John Doe Edited' }
# @contact.disclosure.name.should == nil },
# @contact.disclosure.org_name.should == nil voice: { value: '+372.7654321' },
# @contact.disclosure.phone.should == true email: { value: 'edited@example.example' },
# @contact.disclosure.fax.should == nil disclose: {
# @contact.disclosure.email.should == nil value: {
# @contact.disclosure.address.should == true voice: { value: '' },
# end email: { value: '' }
# end }, attrs: { flag: '0' }
}
# context 'update command' do }
# before :all do }
# @contact = update_xml = @epp_xml.update(defaults.deep_merge(overwrites))
# Fabricate( epp_plain_request(update_xml, :xml)
# :contact, end
# # created_by_id: 1,
# registrar: @registrar1, it 'fails if request is invalid' do
# email: 'not_updated@test.test', response = epp_plain_request(@epp_xml.update, :xml)
# code: 'sh8013',
# auth_info: 'password' response[:results][0][:msg].should ==
# ) 'Required parameter missing: add, rem or chg'
# end response[:results][0][:result_code].should == '2003'
response[:results][1][:msg].should ==
# it 'fails if request is invalid' do 'Required parameter missing: update > update > id'
# xml = @epp_xml.update response[:results][1][:result_code].should == '2003'
# response = epp_plain_request(xml, :xml) # epp_request('contacts/update_missing_attr.xml') response[:results][2][:msg].should ==
'Required parameter missing: update > update > authInfo > pw'
# response[:results][0][:result_code].should == '2003' response[:results][2][:result_code].should == '2003'
# response[:results][0][:msg].should == 'Required parameter missing: add, rem or chg' response[:results].count.should == 3
# response[:results][1][:result_code].should == '2003' end
# response[:results][1][:msg].should == 'Required parameter missing: id'
# response[:results].count.should == 2 it 'returns error if obj doesnt exist' do
# end response = update_request({ id: { value: 'not-exists' } })
response[:msg].should == 'Object does not exist'
# it 'fails with wrong authentication info' do response[:result_code].should == '2303'
# login_as :registrar2 do response[:results].count.should == 1
# response = epp_plain_request(update_contact_xml({ id: { value: 'sh8013' } }), :xml) end
# expect(response[:msg]).to eq('Authorization error')
# expect(response[:result_code]).to eq('2201') it 'is succesful' do
# end response = update_request({ id: { value: 'sh8013' } })
# end
response[:msg].should == 'Command completed successfully'
# it 'is succesful' do @contact.reload
# response = epp_plain_request(update_contact_xml({ id: { value: 'sh8013' } }), :xml) @contact.name.should == 'John Doe Edited'
@contact.email.should == 'edited@example.example'
# response[:msg].should == 'Command completed successfully' end
# @contact.reload
# @contact.name.should == 'John Doe Edited' it 'fails with wrong authentication info' do
# @contact.email.should == 'edited@example.example' login_as :registrar2 do
# end response = update_request({ id: { value: 'sh8013' } })
response[:msg].should == 'Authorization error'
# it 'returns phone and email error' do response[:result_code].should == '2201'
# xml = { end
# id: { value: 'sh8013' }, end
# chg: {
# voice: { value: '123213' }, it 'returns phone and email error' do
# email: { value: 'aaa' } response = update_request({
# } id: { value: 'sh8013' },
# } chg: {
voice: { value: '123213' },
# response = epp_plain_request(update_contact_xml(xml), :xml) email: { value: 'wrong' }
}
# response[:results][0][:msg].should == 'Phone nr is invalid' })
# response[:results][0][:result_code].should == '2005'
response[:results][0][:msg].should == 'Phone nr is invalid'
# response[:results][1][:msg].should == 'Email is invalid' response[:results][0][:result_code].should == '2005'
# response[:results][1][:result_code].should == '2005' response[:results][1][:msg].should == 'Email is invalid'
# end response[:results][1][:result_code].should == '2005'
end
# it 'updates disclosure items' do end
# Fabricate(
# :contact, context 'delete command' do
# code: 'sh8013disclosure', before do
# auth_info: '2fooBAR', @contact = Fabricate(:contact, registrar: @registrar1)
# registrar: @registrar1, end
# # created_by_id: ApiUser.first.id,
# disclosure: Fabricate(:contact_disclosure, phone: true, email: true)) def delete_request(overwrites = {})
defaults = {
# xml = { id: { value: @contact.code },
# id: { value: 'sh8013disclosure' }, authInfo: { pw: { value: @contact.auth_info } }
# authInfo: { pw: { value: '2fooBAR' } } }
# } delete_xml = @epp_xml.delete(defaults.deep_merge(overwrites))
# @response = epp_plain_request(update_contact_xml(xml), :xml) epp_plain_request(delete_xml, :xml)
end
# @response[:results][0][:msg].should == 'Command completed successfully'
# @response[:results][0][:result_code].should == '1000' it 'fails if request is invalid' do
response = epp_plain_request(@epp_xml.delete, :xml)
# Contact.last.disclosure.phone.should == false
# Contact.last.disclosure.email.should == false response[:results][0][:msg].should ==
# end 'Required parameter missing: delete > delete > id'
# end response[:results][0][:result_code].should == '2003'
response[:results][1][:msg].should ==
# context 'delete command' do 'Required parameter missing: delete > delete > authInfo > pw'
# it 'fails if request is invalid' do response[:results][1][:result_code].should == '2003'
# xml = @epp_xml.delete({ uid: { value: '23123' } }) response[:results].count.should == 2
# response = epp_plain_request(xml, :xml) end
# response[:results][0][:msg].should == 'Required parameter missing: id' it 'returns error if obj doesnt exist' do
# response[:results][0][:result_code].should == '2003' response = delete_request({ id: { value: 'not-exists' } })
# response[:results].count.should == 1 response[:msg].should == 'Object does not exist'
# end response[:result_code].should == '2303'
response[:results].count.should == 1
# it 'deletes contact' do end
# @contact_deleted =
# # Fabricate(:contact, code: 'dwa1234', created_by_id: ApiUser.first.id, registrar: registrar1) it 'deletes contact' do
# Fabricate(:contact, code: 'dwa1234', registrar: @registrar1) response = delete_request
response[:msg].should == 'Command completed successfully'
# response = epp_plain_request(delete_contact_xml({ id: { value: 'dwa1234' } }), :xml) response[:result_code].should == '1000'
# response[:msg].should == 'Command completed successfully' response[:clTRID].should == 'ABC-12345'
# response[:result_code].should == '1000'
# response[:clTRID].should == 'ABC-12345' Contact.find_by_id(@contact.id).should == nil
end
# Contact.find_by_id(@contact_deleted.id).should == nil
# end it 'fails if contact has associated domain' do
@domain = Fabricate(:domain, registrar: @registrar1, owner_contact: @contact)
# it 'returns error if obj doesnt exist' do @domain.owner_contact.address.present?.should == true
# response = epp_plain_request(delete_contact_xml, :xml)
# response[:msg].should == 'Object does not exist' response = delete_request
# response[:result_code].should == '2303' response[:msg].should == 'Object association prohibits operation'
# end response[:result_code].should == '2305'
response[:results].count.should == 1
# it 'fails if contact has associated domain' do
# Fabricate( @domain.owner_contact.present?.should == true
# :domain, end
# registrar: @registrar1,
# owner_contact: Fabricate( it 'fails with wrong authentication info' do
# :contact, login_as :registrar2 do
# code: 'dwa1234', response = delete_request
# # created_by_id: registrar1.id, response[:msg].should == 'Authorization error'
# registrar: @registrar1) response[:result_code].should == '2201'
# ) response[:results].count.should == 1
# Domain.last.owner_contact.address.present?.should == true end
# response = epp_plain_request(delete_contact_xml({ id: { value: 'dwa1234' } }), :xml) end
end
# response[:msg].should == 'Object association prohibits operation'
# response[:result_code].should == '2305' context 'check command' do
def check_request(overwrites = {})
# Domain.last.owner_contact.present?.should == true defaults = {
# end id: { value: @contact.code },
# end authInfo: { pw: { value: @contact.auth_info } }
}
# context 'check command' do xml = @epp_xml.check(defaults.deep_merge(overwrites))
# it 'fails if request is invalid' do epp_plain_request(xml, :xml)
# xml = @epp_xml.check({ uid: { value: '123asde' } }) end
# response = epp_plain_request(xml, :xml)
it 'fails if request is invalid' do
# response[:results][0][:msg].should == 'Required parameter missing: id' response = epp_plain_request(@epp_xml.check, :xml)
# response[:results][0][:result_code].should == '2003'
# response[:results].count.should == 1 response[:results][0][:msg].should == 'Required parameter missing: check > check > id'
# end response[:results][0][:result_code].should == '2003'
response[:results].count.should == 1
# it 'returns info about contact availability' do end
# Fabricate(:contact, code: 'check-1234')
it 'returns info about contact availability' do
# response = epp_plain_request(check_multiple_contacts_xml, :xml) Fabricate(:contact, code: 'check-1234')
# response[:msg].should == 'Command completed successfully' response = epp_plain_request(check_multiple_contacts_xml, :xml)
# response[:result_code].should == '1000'
# ids = response[:parsed].css('resData chkData id') response[:msg].should == 'Command completed successfully'
response[:result_code].should == '1000'
# ids[0].attributes['avail'].text.should == '0' ids = response[:parsed].css('resData chkData id')
# ids[1].attributes['avail'].text.should == '1'
ids[0].attributes['avail'].text.should == '0'
# ids[0].text.should == 'check-1234' ids[1].attributes['avail'].text.should == '1'
# ids[1].text.should == 'check-4321'
# end ids[0].text.should == 'check-1234'
# end ids[1].text.should == 'check-4321'
end
# # context 'info command' do end
# # before :all do
# # @registrar1_contact = Fabricate(:contact, code: 'info-4444', registrar: @registrar1, context 'info command' do
# # name: 'Johnny Awesome', address: Fabricate(:address)) before :all do
# # end @registrar1_contact = Fabricate(
:contact, code: 'info-4444', registrar: @registrar1,
# # fit 'return info about contact' do name: 'Johnny Awesome', address: Fabricate(:address))
# # login_as :registrar2 do end
# # xml = @epp_xml.info(id: { value: @registrar1_contact.code })
# # response = epp_plain_request(xml, :xml) def info_request(overwrites = {})
# # response[:msg].should == 'Command completed successfully' defaults = {
# # response[:result_code].should == '1000' id: { value: @contact.code },
authInfo: { pw: { value: @contact.auth_info } }
# # contact = response[:parsed].css('resData chkData') }
# # contact.css('name').first.text.should == 'Johnny Awesome' xml = @epp_xml.info(defaults.deep_merge(overwrites))
# # end epp_plain_request(xml, :xml)
# # end end
# # it 'fails if request invalid' do it 'fails if request invalid' do
# # response = epp_plain_request(@epp_xml.info({ wrongid: { value: '123123' } }), :xml) response = epp_plain_request(@epp_xml.info, :xml)
# # response[:results][0][:msg].should == 'Required parameter missing: id' response[:results][0][:msg].should ==
# # response[:results][0][:result_code].should == '2003' 'Required parameter missing: info > info > id'
# # response[:results].count.should == 1 response[:results][0][:result_code].should == '2003'
# # end response[:results].count.should == 1
end
# # it 'returns error when object does not exist' do
# # response = epp_plain_request(info_contact_xml({ id: { value: 'no-contact' } }), :xml) it 'returns error when object does not exist' do
# # response[:msg].should == 'Object does not exist' response = info_request({ id: { value: 'no-contact' } })
# # response[:result_code].should == '2303' response[:msg].should == 'Object does not exist'
# # response[:results][0][:value].should == 'no-contact' response[:result_code].should == '2303'
# # end response[:results][0][:value].should == 'no-contact'
response[:results].count.should == 1
# # # it 'returns auth error for non-owner with wrong password' do end
# # # @contact = Fabricate(:contact,
# # # registrar: registrar2, code: 'info-4444', name: 'Johnny Awesome', auth_info: 'asde', it 'return info about contact' do
# # # address: Fabricate(:address), disclosure: Fabricate(:contact_disclosure, name: false)) response = info_request({ id: { value: @registrar1_contact.code } })
response[:msg].should == 'Command completed successfully'
# # # xml = @epp_xml.info({ id: { value: @contact.code }, authInfo: { pw: { value: 'asdesde' } } }) response[:result_code].should == '1000'
# # # response = epp_plain_request(xml, :xml, :registrar1)
contact = response[:parsed].css('resData chkData')
# # # expect(response[:result_code]).to eq('2200') contact.css('name').first.text.should == 'Johnny Awesome'
# # # expect(response[:msg]).to eq('Authentication error') end
# # # end
it 'returns no authorization error for wrong password when owner' do
# # context 'about disclose' do response = info_request({ authInfo: { pw: { value: 'wrong-pw' } } })
# # it 'discloses items with wrong password when queried by owner' do
# # @contact = Fabricate(:contact, response[:msg].should == 'Command completed successfully'
# # registrar: registrar1, code: 'info-4444', response[:result_code].should == '1000'
# # name: 'Johnny Awesome', auth_info: 'asde', response[:results].count.should == 1
# # address: Fabricate(:address), disclosure: Fabricate(:contact_disclosure, name: false)) end
# # xml = @epp_xml.info({ id: { value: @contact.code } }) it 'returns no authorization error for wrong user but correct pw' do
# # login_as :registrar1 do login_as :registrar2 do
# # response = epp_plain_request(xml, :xml) response = info_request
# # contact = response[:parsed].css('resData chkData')
response[:msg].should == 'Command completed successfully'
# # expect(response[:result_code]).to eq('1000') response[:result_code].should == '1000'
# # expect(response[:msg]).to eq('Command completed successfully') response[:results].count.should == 1
# # expect(contact.css('name').first.text).to eq('Johnny Awesome') end
# # end end
# # end
it 'returns authorization error for wrong user and wrong pw' do
# # it 'doesn\'t disclose items to non-owner with right password' do login_as :registrar2 do
# # @contact = Fabricate(:contact, registrar: registrar2, code: 'info-4444', response = info_request({ authInfo: { pw: { value: 'wrong-pw' } } })
# # name: 'Johnny Awesome', auth_info: 'password', response[:msg].should == 'Authorization error'
# # address: Fabricate(:address), disclosure: Fabricate(:contact_disclosure, name: false)) response[:result_code].should == '2201'
response[:results].count.should == 1
# # xml = @epp_xml.info({ id: { value: @contact.code }, authInfo: { pw: { value: 'password' } } }) end
# # response = epp_plain_request(xml, :xml, :registrar1) end
# # contact = response[:parsed].css('resData chkData') end
# # expect(response[:result_code]).to eq('1000') context 'renew command' do
# # expect(response[:msg]).to eq('Command completed successfully') it 'returns 2101-unimplemented command' do
# # expect(contact.css('chkData postalInfo name').first).to eq(nil) response = epp_plain_request('contacts/renew.xml')
# # end
response[:msg].should == 'Unimplemented command'
# # it 'discloses items to owner' do response[:result_code].should == '2101'
# # @contact = Fabricate(:contact, registrar: registrar1, code: 'info-4444', name: 'Johnny Awesome', end
# # auth_info: 'password', end
# # address: Fabricate(:address), disclosure: Fabricate(:contact_disclosure, name: false)) end
# # xml = @epp_xml.info({ id: { value: @contact.code } }) def check_multiple_contacts_xml
# # response = epp_plain_request(xml, :xml, :registrar1) '<?xml version="1.0" encoding="UTF-8" standalone="no"?>
# # contact = response[:parsed].css('resData chkData') <epp xmlns="urn:ietf:params:xml:ns:epp-1.0">
<command>
# # expect(response[:result_code]).to eq('1000') <check>
# # expect(response[:msg]).to eq('Command completed successfully') <contact:check
# # expect(contact.css('name').first.text).to eq('Johnny Awesome') xmlns:contact="urn:ietf:params:xml:ns:contact-1.0">
# # end <contact:id>check-1234</contact:id>
<contact:id>check-4321</contact:id>
# # it 'doesn\'t disclose private elements' do </contact:check>
# # Fabricate(:contact, code: 'info-4444', auth_info: '2fooBAR', registrar: registrar2, </check>
# # disclosure: Fabricate(:contact_disclosure, name: true, email: false, phone: false)) <clTRID>ABC-12345</clTRID>
</command>
# # xml = @epp_xml.info({ id: { value: 'info-4444' }, authInfo: { pw: { value: '2fooBAR' } } }) </epp>'
end
# # response = epp_plain_request(xml, :xml, :registrar1) end
# # contact = response[:parsed].css('resData chkData')
# # expect(response[:result_code]).to eq('1000')
# # expect(contact.css('chkData phone')).to eq(contact.css('chkData disclose phone'))
# # expect(contact.css('chkData phone').count).to eq(1)
# # expect(contact.css('chkData email')).to eq(contact.css('chkData disclose email'))
# # expect(contact.css('chkData email').count).to eq(1)
# # expect(contact.css('postalInfo name').present?).to be(true)
# # end
# # end
# # it 'does not display unassociated object without password' do
# # xml = @epp_xml.info(id: { value: @registrar1_contact.code })
# # response = epp_plain_request(xml, :xml, :registrar2)
# # expect(response[:result_code]).to eq('2003')
# # expect(response[:msg]).to eq('Required parameter missing: pw')
# # end
# # it 'does not display unassociated object with wrong password' do
# # login_as :registrar2
# # xml = @epp_xml.info(id: { value: @registrar1_contact.code },
# # authInfo: { pw: { value: 'wrong-pw' } })
# # response = epp_plain_request(xml, :xml)
# # response[:msg].should == 'Authentication error'
# # response[:result_code].should == '2200'
# # end
# # end
# context 'renew command' do
# it 'returns 2101-unimplemented command' do
# response = epp_plain_request('contacts/renew.xml')
# response[:msg].should == 'Unimplemented command'
# response[:result_code].should == '2101'
# end
# end
# end
# end

14
spec/epp/domain_spec.rb
View file

@ -206,8 +206,16 @@ describe 'EPP Domain', epp: true do
it 'does not create domain without nameservers' do it 'does not create domain without nameservers' do
xml = domain_create_xml(ns: []) xml = domain_create_xml(ns: [])
response = epp_plain_request(xml, :xml) response = epp_plain_request(xml, :xml)
response[:result_code].should == '2003'
response[:msg].should == 'Required parameter missing: create > create > ns > hostAttr' response[:results][0][:msg].should ==
'Required parameter missing: create > create > ns'
response[:results][0][:result_code].should == '2003'
response[:results][1][:msg].should ==
'Required parameter missing: create > create > ns > hostAttr'
response[:results][1][:result_code].should == '2003'
response[:results].count.should == 2
end end
it 'does not create domain with too many nameservers' do it 'does not create domain with too many nameservers' do
@ -294,8 +302,8 @@ describe 'EPP Domain', epp: true do
xml = domain_create_xml(period_value: 365, period_unit: 'd') xml = domain_create_xml(period_value: 365, period_unit: 'd')
response = epp_plain_request(xml, :xml) response = epp_plain_request(xml, :xml)
response[:result_code].should == '1000'
response[:msg].should == 'Command completed successfully' response[:msg].should == 'Command completed successfully'
response[:result_code].should == '1000'
Domain.first.valid_to.should == Date.today + 1.year Domain.first.valid_to.should == Date.today + 1.year
end end

2
spec/fabricators/domain_fabricator.rb
View file

@ -1,5 +1,5 @@
Fabricator(:domain) do Fabricator(:domain) do
name { "#{Faker::Internet.domain_word}.ee" } name { "fabricate_name#{rand(1_000_000)}.ee" }
valid_to Date.new(2014, 8, 7) valid_to Date.new(2014, 8, 7)
period 1 period 1
period_unit 'y' period_unit 'y'

91
spec/models/contact_disclosure_spec.rb
View file

@ -1,91 +0,0 @@
require 'rails_helper'
describe ContactDisclosure do
it { should belong_to(:contact) }
context 'about class' do
it 'should have versioning enabled?' do
ContactDisclosure.paper_trail_enabled_for_model?.should == true
end
it 'should have custom log prexied table name for versions table' do
ContactDisclosureVersion.table_name.should == 'log_contact_disclosures'
end
end
context 'with invalid attribute' do
before :all do
@contact_disclosure = ContactDisclosure.new
end
it 'should not be valid' do
@contact_disclosure.valid?
@contact_disclosure.errors.full_messages.should match_array([
])
end
it 'should not have any versions' do
@contact_disclosure.versions.should == []
end
end
context 'with valid attributes' do
before :all do
@contact_disclosure = Fabricate(:contact_disclosure)
end
it 'should be valid' do
@contact_disclosure.valid?
@contact_disclosure.errors.full_messages.should match_array([])
end
it 'should be valid twice' do
@contact_disclosure = Fabricate(:contact_disclosure)
@contact_disclosure.valid?
@contact_disclosure.errors.full_messages.should match_array([])
end
it 'should have one version' do
with_versioning do
@contact_disclosure.versions.should == []
@contact_disclosure.name = false
@contact_disclosure.save
@contact_disclosure.errors.full_messages.should match_array([])
@contact_disclosure.versions.size.should == 1
end
end
end
end
describe '.extract_attributes' do
it 'should return empty hash for empty arguments' do
result = ContactDisclosure.extract_attributes(Nokogiri::XML::Document.new)
expect(result).to eq({})
end
it 'should return empty hash if no disclosure' do
parsed_frame = Nokogiri::XML(create_contact_xml).remove_namespaces!
result = ContactDisclosure.extract_attributes(parsed_frame)
expect(result).to eq({})
end
# TODO: remodel create contact xml to support disclosure
it 'should return disclosure has if disclosure' do
epp_xml = EppXml::Contact.new
xml = epp_xml.create(
{
disclose: { value: {
voice: { value: '' },
addr: { value: '' },
name: { value: '' },
org_name: { value: '' },
email: { value: '' },
fax: { value: '' }
}, attrs: { flag: '0' }
} })
parsed_frame = Nokogiri::XML(xml).remove_namespaces!
result = ContactDisclosure.extract_attributes(parsed_frame)
expect(result).to eq({ phone: '0', email: '0', fax: '0', address: '0', name: '0', org_name: '0' })
end
end

47
spec/models/contact_spec.rb
View file

@ -39,11 +39,11 @@ describe Contact do
end end
it 'should not have creator' do it 'should not have creator' do
@contact.cr_id.should == nil @contact.creator.should == nil
end end
it 'should not have updater' do it 'should not have updater' do
@contact.up_id.should == nil @contact.updator.should == nil
end end
it 'phone should return false' do it 'phone should return false' do
@ -179,57 +179,18 @@ describe Contact do
end end
context 'with creator' do context 'with creator' do
before :all do
# @contact.created_by = @api_user
end
# TODO: change cr_id to something else
it 'should return username of creator' do it 'should return username of creator' do
# @contact.cr_id.should == 'gitlab' # @contact.creator_str.should == 'gitlab'
end
end
context 'with updater' do
before :all do
# @contact.updated_by = @api_user
end end
# TODO: change up_id to something else
it 'should return username of updater' do it 'should return username of updater' do
# @contact.up_id.should == 'gitlab' # @contact.updator.should == 'gitlab'
end end
end end
end end
end end
end end
# TODO: investigate it a bit more
# describe Contact, '#relations_with_domain?' do
# context 'with relation' do
# before :all do
# create_settings
# Fabricate(:domain)
# @contact = Fabricate(:contact)
# end
# it 'should have relation with domain' do
# @contact.relations_with_domain?.should == true
# end
# end
# end
describe Contact, '.extract_params' do
it 'returns params hash'do
ph = { id: '123123', email: 'jdoe@example.com', authInfo: { pw: 'asde' },
postalInfo: { name: 'fred', addr: { cc: 'EE' } } }
Contact.extract_attributes(ph).should == {
name: 'fred',
email: 'jdoe@example.com'
}
end
end
describe Contact, '.check_availability' do describe Contact, '.check_availability' do
before do before do
Fabricate(:contact, code: 'asd12') Fabricate(:contact, code: 'asd12')

2
spec/support/epp.rb
View file

@ -112,7 +112,7 @@ module Epp
end end
def next_domain_name def next_domain_name
"example#{@uniq_no.call}.ee" "example#{rand(100000000)}.ee"
end end
### REQUEST TEMPLATES ### ### REQUEST TEMPLATES ###

87
spec/support/epp_contact_xml_helper.rb
View file

@ -1,87 +0,0 @@
module EppContactXmlHelper
def create_contact_xml(xml_params = {})
defaults = {
postalInfo: {
name: { value: 'John Doe' },
addr: {
street: { value: '123 Example' },
city: { value: 'Tallinn' },
cc: { value: 'EE' }
}
},
voice: { value: '+372.1234567' },
email: { value: 'test@example.example' },
ident: { value: '37605030299', attrs: { type: 'op' } }
}
xml_params = defaults.deep_merge(xml_params)
epp_xml = EppXml::Contact.new(cl_trid: 'ABC-12345')
epp_xml.create(xml_params)
end
def update_contact_xml(xml_params = {})
defaults = {
id: { value: 'asd123123er' },
authInfo: { pw: { value: 'password' } },
chg: {
postalInfo: {
name: { value: 'John Doe Edited' }
},
voice: { value: '+372.7654321' },
email: { value: 'edited@example.example' },
disclose: {
value: {
voice: { value: '' },
email: { value: '' }
}, attrs: { flag: '0' }
}
}
}
xml_params = defaults.deep_merge(xml_params)
epp_xml = EppXml::Contact.new(cl_trid: 'ABC-12345')
epp_xml.update(xml_params)
end
def delete_contact_xml(xml_params = {})
defaults = { id: { value: 'sh8012' } }
xml_params = defaults.deep_merge(xml_params)
epp_xml = EppXml::Contact.new(cl_trid: 'ABC-12345')
epp_xml.delete(xml_params)
end
def info_contact_xml(xml_params = {})
defaults = { id: { value: 'sh8012' }, authInfo: { pw: { value: 'password' } } }
xml_params = defaults.deep_merge(xml_params)
epp_xml = EppXml::Contact.new(cl_trid: 'ABC-12345')
epp_xml.info(xml_params)
end
def check_contact_xml(xml_params = {})
defaults = {
id: { value: 'ad123c3' }
}
xml_params = defaults.deep_merge(xml_params)
epp_xml = EppXml::Contact.new(cl_trid: 'ABC-12345')
epp_xml.check(xml_params)
end
def check_multiple_contacts_xml
'<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<epp xmlns="urn:ietf:params:xml:ns:epp-1.0">
<command>
<check>
<contact:check
xmlns:contact="urn:ietf:params:xml:ns:contact-1.0">
<contact:id>check-1234</contact:id>
<contact:id>check-4321</contact:id>
</contact:check>
</check>
<clTRID>ABC-12345</clTRID>
</command>
</epp>'
end
end
RSpec.configure do |c|
c.include EppContactXmlHelper
end