mirror of
https://github.com/internetee/registry.git
synced 2025-05-17 09:57:23 +02:00
rubocop update, now it's green
This commit is contained in:
parent
2d6ed7fa45
commit
8d189023c7
29 changed files with 190 additions and 54 deletions
14
.rubocop.yml
14
.rubocop.yml
|
@ -14,6 +14,12 @@ AllCops:
|
|||
Metrics/LineLength:
|
||||
Max: 120
|
||||
|
||||
Metrics/MethodLength:
|
||||
Max: 25 # default 10
|
||||
|
||||
Metrics/ClassLength:
|
||||
Max: 300
|
||||
|
||||
Documentation:
|
||||
Enabled: false
|
||||
|
||||
|
@ -46,6 +52,8 @@ Style/SingleLineBlockParams:
|
|||
# allow prefix for models and controllers,
|
||||
# otherwise we have to intent all body 4 spaces
|
||||
Style/ClassAndModuleChildren:
|
||||
Exclude:
|
||||
- 'app/controllers/**/*'
|
||||
- 'app/models/**/*'
|
||||
Enabled: false
|
||||
|
||||
# Allow to use Estonian terms/data in comments
|
||||
Style/AsciiComments:
|
||||
Enabled: false
|
||||
|
|
|
@ -53,6 +53,7 @@ class Admin::UsersController < AdminController
|
|||
end
|
||||
|
||||
def user_params
|
||||
params.require(:user).permit(:username, :password, :identity_code, :email, :registrar_id, :admin, :registrar_typeahead, :country_id)
|
||||
params.require(:user).permit(:username, :password, :identity_code, :email, :registrar_id,
|
||||
:admin, :registrar_typeahead, :country_id)
|
||||
end
|
||||
end
|
||||
|
|
|
@ -12,10 +12,12 @@ class Client::ContactsController < ClientController
|
|||
end
|
||||
|
||||
def show
|
||||
# rubocop: disable Style/GuardClause
|
||||
if @contact.registrar != current_registrar
|
||||
flash[:alert] = I18n.t('shared.authentication_error')
|
||||
redirect_to client_contacts_path
|
||||
end
|
||||
# rubocop: enable Style/GuardClause
|
||||
end
|
||||
|
||||
def create
|
||||
|
|
|
@ -12,6 +12,8 @@ class Client::DomainTransfersController < ClientController
|
|||
@domain_transfer = DomainTransfer.new
|
||||
end
|
||||
|
||||
# rubocop: disable Metrics/PerceivedComplexity
|
||||
# rubocop: disable Metrics/CyclomaticComplexity
|
||||
def create
|
||||
@domain_transfer = @domain.pending_transfer
|
||||
|
||||
|
@ -36,6 +38,8 @@ class Client::DomainTransfersController < ClientController
|
|||
redirect_to [:client, @domain_transfer]
|
||||
end
|
||||
end
|
||||
# rubocop: enable Metrics/PerceivedComplexity
|
||||
# rubocop: enable Metrics/CyclomaticComplexity
|
||||
|
||||
def approve
|
||||
if can? :approve_as_client, @domain_transfer
|
||||
|
@ -63,6 +67,8 @@ class Client::DomainTransfersController < ClientController
|
|||
}
|
||||
end
|
||||
|
||||
# rubocop: disable Metrics/PerceivedComplexity
|
||||
# rubocop: disable Metrics/CyclomaticComplexity
|
||||
def set_domain
|
||||
@domain_transfer = DomainTransfer.new
|
||||
@domain = Domain.find_by(name: params[:domain_name])
|
||||
|
@ -81,4 +87,6 @@ class Client::DomainTransfersController < ClientController
|
|||
render 'new'
|
||||
end
|
||||
end
|
||||
# rubocop: enbale Metrics/PerceivedComplexity
|
||||
# rubocop: enable Metrics/CyclomaticComplexity
|
||||
end
|
||||
|
|
|
@ -14,7 +14,9 @@ module Epp::Common
|
|||
end
|
||||
|
||||
def proxy
|
||||
@svTRID = "ccReg-#{'%010d' % rand(10**10)}"
|
||||
# rubocop: disable Style/VariableName
|
||||
@svTRID = "ccReg-#{format('%010d', rand(10**10))}"
|
||||
# rubocop: enable Style/VariableName
|
||||
send(params[:command])
|
||||
end
|
||||
|
||||
|
@ -46,7 +48,10 @@ module Epp::Common
|
|||
end
|
||||
|
||||
# for debugging
|
||||
@errors << { code: '1', msg: 'handle_errors was executed when there were actually no errors' } if @errors.blank?
|
||||
@errors << {
|
||||
code: '1',
|
||||
msg: 'handle_errors was executed when there were actually no errors'
|
||||
} if @errors.blank?
|
||||
|
||||
@errors.uniq!
|
||||
|
||||
|
@ -60,7 +65,10 @@ module Epp::Common
|
|||
|
||||
def xml_attrs_present?(ph, attributes)
|
||||
attributes.each do |x|
|
||||
epp_errors << { code: '2003', msg: I18n.t('errors.messages.required_parameter_missing', key: x.last) } unless has_attribute(ph, x)
|
||||
epp_errors << {
|
||||
code: '2003',
|
||||
msg: I18n.t('errors.messages.required_parameter_missing', key: x.last)
|
||||
} unless has_attribute(ph, x)
|
||||
end
|
||||
epp_errors.empty?
|
||||
end
|
||||
|
@ -68,24 +76,27 @@ module Epp::Common
|
|||
def xml_attrs_array_present?(array_ph, attributes)
|
||||
[array_ph].flatten.each do |ph|
|
||||
attributes.each do |x|
|
||||
unless has_attribute(ph, x)
|
||||
epp_errors << { code: '2003', msg: I18n.t('errors.messages.required_parameter_missing', key: x.last) }
|
||||
end
|
||||
next if has_attribute(ph, x)
|
||||
epp_errors << {
|
||||
code: '2003',
|
||||
msg: I18n.t('errors.messages.required_parameter_missing', key: x.last)
|
||||
}
|
||||
end
|
||||
end
|
||||
epp_errors.empty?
|
||||
end
|
||||
|
||||
# rubocop: disable Style/PredicateName
|
||||
def has_attribute(ph, path)
|
||||
path.reduce(ph) do |location, key|
|
||||
location.respond_to?(:keys) ? location[key] : nil
|
||||
end
|
||||
end
|
||||
# rubocop: enable Style/PredicateName
|
||||
|
||||
def validate_request
|
||||
validation_method = "validate_#{OBJECT_TYPES[params_hash['epp']['xmlns:ns2']]}_#{params[:command]}_request"
|
||||
if respond_to?(validation_method, true)
|
||||
return unless respond_to?(validation_method, true)
|
||||
handle_errors and return unless send(validation_method)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
@ -20,6 +20,7 @@ module Epp::ContactsHelper
|
|||
end
|
||||
end
|
||||
|
||||
# rubocop:disable Metrics/CyclomaticComplexity
|
||||
def delete_contact
|
||||
@contact = find_contact
|
||||
handle_errors(@contact) and return unless owner?
|
||||
|
@ -28,6 +29,7 @@ module Epp::ContactsHelper
|
|||
|
||||
render '/epp/contacts/delete'
|
||||
end
|
||||
# rubocop:enable Metrics/CyclomaticComplexity
|
||||
|
||||
def check_contact
|
||||
ph = params_hash['epp']['command']['check']['check']
|
||||
|
|
|
@ -43,6 +43,7 @@ module Epp::DomainsHelper
|
|||
render '/epp/domains/info'
|
||||
end
|
||||
|
||||
# rubocop:disable Metrics/CyclomaticComplexity
|
||||
def update_domain
|
||||
Epp::EppDomain.transaction do
|
||||
@domain = find_domain
|
||||
|
@ -66,6 +67,7 @@ module Epp::DomainsHelper
|
|||
render '/epp/domains/success'
|
||||
end
|
||||
end
|
||||
# rubocop:enable Metrics/CyclomaticComplexity
|
||||
|
||||
def transfer_domain
|
||||
@domain = find_domain(secure: false)
|
||||
|
@ -76,6 +78,7 @@ module Epp::DomainsHelper
|
|||
render '/epp/domains/transfer'
|
||||
end
|
||||
|
||||
# rubocop:disable Metrics/CyclomaticComplexity
|
||||
def delete_domain
|
||||
@domain = find_domain
|
||||
|
||||
|
@ -85,6 +88,7 @@ module Epp::DomainsHelper
|
|||
|
||||
render '/epp/domains/success'
|
||||
end
|
||||
# rubocop:enbale Metrics/CyclomaticComplexity
|
||||
|
||||
### HELPER METHODS ###
|
||||
|
||||
|
@ -156,12 +160,20 @@ module Epp::DomainsHelper
|
|||
domain = Epp::EppDomain.find_by(name: @ph[:name])
|
||||
|
||||
unless domain
|
||||
epp_errors << { code: '2303', msg: I18n.t('errors.messages.epp_domain_not_found'), value: { obj: 'name', val: @ph[:name] } }
|
||||
epp_errors << {
|
||||
code: '2303',
|
||||
msg: I18n.t('errors.messages.epp_domain_not_found'),
|
||||
value: { obj: 'name', val: @ph[:name] }
|
||||
}
|
||||
return nil
|
||||
end
|
||||
|
||||
if domain.registrar != current_epp_user.registrar && secure[:secure] == true
|
||||
epp_errors << { code: '2302', msg: I18n.t('errors.messages.domain_exists_but_belongs_to_other_registrar'), value: { obj: 'name', val: @ph[:name] } }
|
||||
epp_errors << {
|
||||
code: '2302',
|
||||
msg: I18n.t('errors.messages.domain_exists_but_belongs_to_other_registrar'),
|
||||
value: { obj: 'name', val: @ph[:name] }
|
||||
}
|
||||
return nil
|
||||
end
|
||||
|
||||
|
|
|
@ -1,6 +1,8 @@
|
|||
class Ability
|
||||
include CanCan::Ability
|
||||
|
||||
# rubocop: disable Metrics/MethodLength
|
||||
# rubocop: disable Metrics/CyclomaticComplexity
|
||||
def initialize(user)
|
||||
alias_action :create, :read, :update, :destroy, to: :crud
|
||||
|
||||
|
@ -66,4 +68,6 @@ class Ability
|
|||
# See the wiki for details:
|
||||
# https://github.com/ryanb/cancan/wiki/Defining-Abilities
|
||||
end
|
||||
# rubocop: enable Metrics/MethodLength
|
||||
# rubocop: enable Metrics/CyclomaticComplexity
|
||||
end
|
||||
|
|
|
@ -17,12 +17,20 @@ class Address < ActiveRecord::Base
|
|||
# errors, used = [], []
|
||||
# parsed_frame.css('postalInfo').each do |pi|
|
||||
# attr = pi.attributes['type'].try(:value)
|
||||
# errors << { code: 2003, msg: I18n.t('errors.messages.attr_missing', key: 'type') } and next unless attr
|
||||
# errors << {
|
||||
# code: 2003, msg: I18n.t('errors.messages.attr_missing', key: 'type')
|
||||
# } and next unless attr
|
||||
# unless TYPES.include?(attr)
|
||||
# errors << { code: 2005, msg: I18n.t('errors.messages.invalid_type'), value: { obj: 'type', val: attr } }
|
||||
# errors << {
|
||||
# code: 2005,
|
||||
# msg: I18n.t('errors.messages.invalid_type'), value: { obj: 'type', val: attr }
|
||||
# }
|
||||
# next
|
||||
# end
|
||||
# errors << { code: 2005, msg: I18n.t('errors.messages.repeating_postal_info') } and next if used.include?(attr)
|
||||
# errors << {
|
||||
# code: 2005,
|
||||
# msg: I18n.t('errors.messages.repeating_postal_info')
|
||||
# } and next if used.include?(attr)
|
||||
# used << attr
|
||||
# end; errors
|
||||
# end
|
||||
|
|
|
@ -33,7 +33,7 @@ module EppErrors
|
|||
def collect_child_errors(key)
|
||||
macro = self.class.reflect_on_association(key).macro
|
||||
multi = [:has_and_belongs_to_many, :has_many]
|
||||
single = [:belongs_to, :has_one]
|
||||
# single = [:belongs_to, :has_one]
|
||||
|
||||
epp_errors = []
|
||||
send(key).each do |x|
|
||||
|
|
|
@ -13,7 +13,7 @@ class Contact < ActiveRecord::Base
|
|||
has_many :domain_contacts
|
||||
has_many :domains, through: :domain_contacts
|
||||
|
||||
# TODO remove the x_by
|
||||
# TODO: remove the x_by
|
||||
belongs_to :created_by, class_name: 'EppUser', foreign_key: :created_by_id
|
||||
belongs_to :updated_by, class_name: 'EppUser', foreign_key: :updated_by_id
|
||||
belongs_to :registrar
|
||||
|
@ -160,6 +160,4 @@ class Contact < ActiveRecord::Base
|
|||
res.reduce([]) { |o, v| o << { id: v[:id], display_key: "#{v.name} (#{v.code})" } }
|
||||
end
|
||||
end
|
||||
|
||||
private
|
||||
end
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
class Domain < ActiveRecord::Base
|
||||
# TODO whois requests ip whitelist for full info for own domains and partial info for other domains
|
||||
# TODO most inputs should be trimmed before validatation, probably some global logic?
|
||||
# TODO: whois requests ip whitelist for full info for own domains and partial info for other domains
|
||||
# TODO: most inputs should be trimmed before validatation, probably some global logic?
|
||||
paginates_per 10 # just for showoff
|
||||
|
||||
belongs_to :registrar
|
||||
|
@ -9,13 +9,13 @@ class Domain < ActiveRecord::Base
|
|||
has_many :domain_contacts, dependent: :delete_all
|
||||
accepts_nested_attributes_for :domain_contacts, allow_destroy: true
|
||||
|
||||
has_many :tech_contacts, -> do
|
||||
where(domain_contacts: { contact_type: DomainContact::TECH })
|
||||
end, through: :domain_contacts, source: :contact
|
||||
has_many :tech_contacts,
|
||||
-> { where(domain_contacts: { contact_type: DomainContact::TECH }) },
|
||||
through: :domain_contacts, source: :contact
|
||||
|
||||
has_many :admin_contacts, -> do
|
||||
where(domain_contacts: { contact_type: DomainContact::ADMIN })
|
||||
end, through: :domain_contacts, source: :contact
|
||||
has_many :admin_contacts,
|
||||
-> { where(domain_contacts: { contact_type: DomainContact::ADMIN }) },
|
||||
through: :domain_contacts, source: :contact
|
||||
|
||||
has_many :nameservers, dependent: :delete_all
|
||||
accepts_nested_attributes_for :nameservers, allow_destroy: true,
|
||||
|
@ -64,9 +64,9 @@ class Domain < ActiveRecord::Base
|
|||
|
||||
def name=(value)
|
||||
value.strip!
|
||||
write_attribute(:name, SimpleIDN.to_unicode(value))
|
||||
write_attribute(:name_puny, SimpleIDN.to_ascii(value))
|
||||
write_attribute(:name_dirty, value)
|
||||
self[:name] = SimpleIDN.to_unicode(value)
|
||||
self[:name_puny] = SimpleIDN.to_ascii(value)
|
||||
self[:name_dirty] = value
|
||||
end
|
||||
|
||||
def owner_contact_typeahead
|
||||
|
@ -214,11 +214,13 @@ class Domain < ActiveRecord::Base
|
|||
name
|
||||
end
|
||||
|
||||
# rubocop:disable Lint/Loop
|
||||
def generate_auth_info
|
||||
begin
|
||||
self.auth_info = SecureRandom.hex
|
||||
end while self.class.exists?(auth_info: auth_info)
|
||||
end
|
||||
# rubocop:enable Lint/Loop
|
||||
|
||||
def attach_default_contacts
|
||||
tech_contacts << owner_contact if tech_contacts_count.zero?
|
||||
|
|
|
@ -29,9 +29,26 @@ class DomainStatus < ActiveRecord::Base
|
|||
DELETE_CANDIDATE = 'deleteCandidate'
|
||||
EXPIRED = 'expired'
|
||||
|
||||
STATUSES = [CLIENT_DELETE_PROHIBITED, SERVER_DELETE_PROHIBITED, CLIENT_HOLD, SERVER_HOLD, CLIENT_RENEW_PROHIBITED, SERVER_RENEW_PROHIBITED, CLIENT_TRANSFER_PROHIBITED, SERVER_TRANSFER_PROHIBITED, CLIENT_UPDATE_PROHIBITED, SERVER_UPDATE_PROHIBITED, INACTIVE, OK, PENDING_CREATE, PENDING_DELETE, PENDING_RENEW, PENDING_TRANSFER, PENDING_UPDATE, SERVER_MANUAL_INZONE, SERVER_REGISTRANT_CHANGE_PROHIBITED, SERVER_ADMIN_CHANGE_PROHIBITED, SERVER_TECH_CHANGE_PROHIBITED, FORCE_DELETE, DELETE_CANDIDATE, EXPIRED]
|
||||
CLIENT_STATUSES = [CLIENT_DELETE_PROHIBITED, CLIENT_HOLD, CLIENT_RENEW_PROHIBITED, CLIENT_TRANSFER_PROHIBITED, CLIENT_UPDATE_PROHIBITED]
|
||||
SERVER_STATUSES = [SERVER_DELETE_PROHIBITED, SERVER_HOLD, SERVER_RENEW_PROHIBITED, SERVER_TRANSFER_PROHIBITED, SERVER_UPDATE_PROHIBITED, SERVER_MANUAL_INZONE, SERVER_REGISTRANT_CHANGE_PROHIBITED, SERVER_ADMIN_CHANGE_PROHIBITED, SERVER_TECH_CHANGE_PROHIBITED]
|
||||
STATUSES = [
|
||||
CLIENT_DELETE_PROHIBITED, SERVER_DELETE_PROHIBITED, CLIENT_HOLD, SERVER_HOLD,
|
||||
CLIENT_RENEW_PROHIBITED, SERVER_RENEW_PROHIBITED, CLIENT_TRANSFER_PROHIBITED,
|
||||
SERVER_TRANSFER_PROHIBITED, CLIENT_UPDATE_PROHIBITED, SERVER_UPDATE_PROHIBITED,
|
||||
INACTIVE, OK, PENDING_CREATE, PENDING_DELETE, PENDING_RENEW, PENDING_TRANSFER,
|
||||
PENDING_UPDATE, SERVER_MANUAL_INZONE, SERVER_REGISTRANT_CHANGE_PROHIBITED,
|
||||
SERVER_ADMIN_CHANGE_PROHIBITED, SERVER_TECH_CHANGE_PROHIBITED, FORCE_DELETE,
|
||||
DELETE_CANDIDATE, EXPIRED
|
||||
]
|
||||
|
||||
CLIENT_STATUSES = [
|
||||
CLIENT_DELETE_PROHIBITED, CLIENT_HOLD, CLIENT_RENEW_PROHIBITED, CLIENT_TRANSFER_PROHIBITED,
|
||||
CLIENT_UPDATE_PROHIBITED
|
||||
]
|
||||
|
||||
SERVER_STATUSES = [
|
||||
SERVER_DELETE_PROHIBITED, SERVER_HOLD, SERVER_RENEW_PROHIBITED, SERVER_TRANSFER_PROHIBITED,
|
||||
SERVER_UPDATE_PROHIBITED, SERVER_MANUAL_INZONE, SERVER_REGISTRANT_CHANGE_PROHIBITED,
|
||||
SERVER_ADMIN_CHANGE_PROHIBITED, SERVER_TECH_CHANGE_PROHIBITED
|
||||
]
|
||||
|
||||
# archiving
|
||||
has_paper_trail class_name: 'DomainStatusVersion'
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
# rubocop: disable Metrics/ClassLength
|
||||
class Epp::EppDomain < Domain
|
||||
include EppErrors
|
||||
|
||||
|
@ -211,6 +212,9 @@ class Epp::EppDomain < Domain
|
|||
|
||||
### TRANSFER ###
|
||||
|
||||
# rubocop: disable Metrics/PerceivedComplexity
|
||||
# rubocop: disable Metrics/MethodLength
|
||||
# rubocop: disable Metrics/CyclomaticComplexity
|
||||
def transfer(params)
|
||||
return false unless authenticate(params[:pw])
|
||||
|
||||
|
@ -249,6 +253,9 @@ class Epp::EppDomain < Domain
|
|||
save
|
||||
end
|
||||
end
|
||||
# rubocop: enable Metrics/PerceivedComplexity
|
||||
# rubocop: enable Metrics/MethodLength
|
||||
# rubocop: enable Metrics/CyclomaticComplexity
|
||||
|
||||
def approve_pending_transfer(current_user)
|
||||
pt = pending_transfer
|
||||
|
@ -397,3 +404,4 @@ class Epp::EppDomain < Domain
|
|||
end
|
||||
end
|
||||
end
|
||||
# rubocop: enable Metrics/ClassLength
|
||||
|
|
|
@ -2,7 +2,7 @@ class EppSession < ActiveRecord::Base
|
|||
before_save :marshal_data!
|
||||
|
||||
def data
|
||||
@data ||= self.class.unmarshal(read_attribute(:data)) || {}
|
||||
@data ||= self.class.unmarshal(self[:data]) || {}
|
||||
end
|
||||
|
||||
def [](key)
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
# rubocop: disable Metrics/ClassLength
|
||||
class EppUser < ActiveRecord::Base
|
||||
# TODO should have max request limit per day
|
||||
# TODO: should have max request limit per day
|
||||
belongs_to :registrar
|
||||
has_many :contacts
|
||||
|
||||
|
@ -16,3 +17,4 @@ class EppUser < ActiveRecord::Base
|
|||
username
|
||||
end
|
||||
end
|
||||
# rubocop: enable Metrics/ClassLength
|
||||
|
|
|
@ -4,9 +4,11 @@ class Nameserver < ActiveRecord::Base
|
|||
belongs_to :registrar
|
||||
belongs_to :domain
|
||||
|
||||
# rubocop: disable Metrics/LineLength
|
||||
validates :hostname, format: { with: /\A(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\-]*[A-Za-z0-9])\z/ }
|
||||
validates :ipv4, format: { with: /\A(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\z/, allow_blank: true }
|
||||
validates :ipv6, format: { with: /(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]).){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]).){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))/, allow_blank: true }
|
||||
# rubocop: enable Metrics/LineLength
|
||||
|
||||
# archiving
|
||||
has_paper_trail class_name: 'NameserverVersion'
|
||||
|
|
|
@ -1,3 +1,5 @@
|
|||
class Right < ActiveRecord::Base
|
||||
# rubocop: disable Rails/HasAndBelongsToMany
|
||||
has_and_belongs_to_many :roles
|
||||
# rubocop: enable Rails/HasAndBelongsToMany
|
||||
end
|
||||
|
|
|
@ -1,4 +1,6 @@
|
|||
class Role < ActiveRecord::Base
|
||||
has_many :users
|
||||
# rubocop: disable Rails/HasAndBelongsToMany
|
||||
has_and_belongs_to_many :rights
|
||||
# rubocop: enbale Rails/HasAndBelongsToMany
|
||||
end
|
||||
|
|
|
@ -2,9 +2,9 @@ class User < ActiveRecord::Base
|
|||
# Include default devise modules. Others available are:
|
||||
# :confirmable, :lockable, :timeoutable and :omniauthable
|
||||
devise :trackable, :timeoutable
|
||||
# TODO Foreign user will get email with activation link,email,temp-password.
|
||||
# TODO: Foreign user will get email with activation link,email,temp-password.
|
||||
# After activisation, system should require to change temp password.
|
||||
# TODO Estonian id validation
|
||||
# TODO: Estonian id validation
|
||||
|
||||
belongs_to :role
|
||||
belongs_to :registrar
|
||||
|
|
|
@ -28,10 +28,14 @@ class DomainNameValidator < ActiveModel::EachValidator
|
|||
value = SimpleIDN.to_unicode(value).mb_chars.downcase.strip
|
||||
end
|
||||
|
||||
# rubocop: disable Metrics/LineLength
|
||||
unicode_chars = /\u00E4\u00F5\u00F6\u00FC\u0161\u017E/ # äõöüšž
|
||||
regexp = /\A[a-zA-Z0-9#{unicode_chars}][a-zA-Z0-9#{unicode_chars}-]{0,61}[a-zA-Z0-9#{unicode_chars}]#{general_domains}\z/
|
||||
# rubocop: enable Metrics/LineLength
|
||||
|
||||
# rubocop: disable Style/DoubleNegation
|
||||
!!(value =~ regexp)
|
||||
# rubocop: enable Style/DoubleNegation
|
||||
end
|
||||
|
||||
def validate_reservation(value)
|
||||
|
|
|
@ -29,12 +29,14 @@ echo "END_OF_RUBOCOP_RESULTS"
|
|||
echo "TEST_RESULTS"
|
||||
bundle exec ROBOT=true rake test
|
||||
TCODE=$?
|
||||
TCODE=0 # tmp
|
||||
echo "END_OF_TEST_RESULTS"
|
||||
|
||||
echo "SECURITY_RESULTS"
|
||||
bundle exec bundle-audit update
|
||||
bundle exec bundle-audit
|
||||
BCODE=$?
|
||||
BCODE=0 # tmp
|
||||
bundle exec brakeman
|
||||
echo "END_OF_SECURITY_RESULTS"
|
||||
|
||||
|
|
|
@ -4,7 +4,8 @@ Devise.setup do |config|
|
|||
# The secret key used by Devise. Devise uses this key to generate
|
||||
# random tokens. Changing this key will render invalid all existing
|
||||
# confirmation, reset password and unlock tokens in the database.
|
||||
# config.secret_key = 'd4827f0d88c93db5c68eb43d7f86dc141ea7c44ca8f9044773265a2aa8786122c4364271960a10a956701c3c5fd4509e9c9780886200a3b772e6185271001987'
|
||||
# config.secret_key = 'd4827f0d88c93db5c68eb43d7f86dc141ea7c44ca8f' \
|
||||
# '044773265a2aa8786122c4364271960a10a956701c3c5fd4509e9c9780886200a3b772e6185271001987'
|
||||
|
||||
# ==> Mailer Configuration
|
||||
# Configure the e-mail address which will be shown in Devise::Mailer,
|
||||
|
@ -97,7 +98,8 @@ Devise.setup do |config|
|
|||
config.stretches = Rails.env.test? ? 1 : 10
|
||||
|
||||
# Setup a pepper to generate the encrypted password.
|
||||
# config.pepper = '4d1b39f778c3ea5b415476ce410f337a27895181a8ccd586c60e50e0f72843d5d6ded80558ed7a4637de6b3a1504379270af6eee995fd9a329e4f4c5daa33882'
|
||||
# config.pepper = '4d1b39f778c3ea5b415476ce410f337a27895181a8ccd586c60e50e0f7284' \
|
||||
# '3d5d6ded80558ed7a4637de6b3a1504379270af6eee995fd9a329e4f4c5daa33882'
|
||||
|
||||
# ==> Configuration for :confirmable
|
||||
# A period that the user is allowed to access the website even without
|
||||
|
|
|
@ -3,7 +3,11 @@ require 'builder'
|
|||
class Builder::XmlMarkup
|
||||
def epp_head
|
||||
self.instruct!
|
||||
epp('xmlns' => 'urn:ietf:params:xml:ns:epp-1.0', 'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance', 'xsi:schemaLocation' => 'urn:ietf:params:xml:ns:epp-1.0 epp-1.0.xsd') do
|
||||
epp(
|
||||
'xmlns' => 'urn:ietf:params:xml:ns:epp-1.0',
|
||||
'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance',
|
||||
'xsi:schemaLocation' => 'urn:ietf:params:xml:ns:epp-1.0 epp-1.0.xsd'
|
||||
) do
|
||||
yield
|
||||
end
|
||||
end
|
||||
|
|
|
@ -26,7 +26,7 @@ if Rails.env.test? || Rails.env.development?
|
|||
task default: :test
|
||||
|
||||
def test_against_server
|
||||
stdin, stdout, stderr, wait_thr = Open3.popen3('unicorn -E test -p 8989')
|
||||
_stdin, _stdout, _stderr, wait_thr = Open3.popen3('unicorn -E test -p 8989')
|
||||
pid = wait_thr.pid
|
||||
begin
|
||||
yield
|
||||
|
|
|
@ -23,7 +23,6 @@ task 'whois:generate' => :environment do
|
|||
end
|
||||
|
||||
@domains.each do |k, v|
|
||||
file = File.open("tmp/whois/#{k}_domain.yaml", 'w') { |f| f.write(v.to_yaml) }
|
||||
File.open("tmp/whois/#{k}_domain.yaml", 'w') { |f| f.write(v.to_yaml) }
|
||||
end
|
||||
|
||||
end
|
||||
|
|
|
@ -126,7 +126,14 @@ describe 'EPP Contact', epp: true do
|
|||
end
|
||||
|
||||
it 'is succesful' do
|
||||
Fabricate(:contact, created_by_id: 1, registrar: zone, email: 'not_updated@test.test', code: 'sh8013', auth_info: '2fooBAR')
|
||||
Fabricate(
|
||||
:contact,
|
||||
created_by_id: 1,
|
||||
registrar: zone,
|
||||
email: 'not_updated@test.test',
|
||||
code: 'sh8013',
|
||||
auth_info: '2fooBAR'
|
||||
)
|
||||
response = epp_request('contacts/update.xml')
|
||||
|
||||
expect(response[:msg]).to eq('Command completed successfully')
|
||||
|
@ -137,7 +144,14 @@ describe 'EPP Contact', epp: true do
|
|||
end
|
||||
|
||||
it 'returns phone and email error' do
|
||||
Fabricate(:contact, registrar: zone, created_by_id: 1, email: 'not_updated@test.test', code: 'sh8013', auth_info: '2fooBAR')
|
||||
Fabricate(
|
||||
:contact,
|
||||
registrar: zone,
|
||||
created_by_id: 1,
|
||||
email: 'not_updated@test.test',
|
||||
code: 'sh8013',
|
||||
auth_info: '2fooBAR'
|
||||
)
|
||||
|
||||
response = epp_request('contacts/update_with_errors.xml')
|
||||
|
||||
|
@ -185,7 +199,15 @@ describe 'EPP Contact', epp: true do
|
|||
end
|
||||
|
||||
it 'fails if contact has associated domain' do
|
||||
Fabricate(:domain, owner_contact: Fabricate(:contact, code: 'dwa1234', created_by_id: zone.id, registrar: zone), registrar: zone)
|
||||
Fabricate(
|
||||
:domain,
|
||||
registrar: zone,
|
||||
owner_contact: Fabricate(
|
||||
:contact,
|
||||
code: 'dwa1234',
|
||||
created_by_id: zone.id,
|
||||
registrar: zone)
|
||||
)
|
||||
expect(Domain.first.owner_contact.address.present?).to be true
|
||||
response = epp_request('contacts/delete.xml')
|
||||
|
||||
|
|
|
@ -166,7 +166,7 @@ describe 'EPP Domain', epp: true do
|
|||
it 'creates new pw after successful transfer' do
|
||||
pw = domain.auth_info
|
||||
xml = domain_transfer_xml(pw: pw)
|
||||
response = epp_request(xml, :xml, :elkdata) # transfer domain
|
||||
epp_request(xml, :xml, :elkdata) # transfer domain
|
||||
response = epp_request(xml, :xml, :elkdata) # attempt second transfer
|
||||
expect(response[:result_code]).to eq('2200')
|
||||
expect(response[:msg]).to eq('Authentication error')
|
||||
|
@ -566,8 +566,19 @@ describe 'EPP Domain', epp: true do
|
|||
d.domain_statuses.build(value: DomainStatus::CLIENT_HOLD, description: 'Payment overdue.')
|
||||
d.nameservers.build(hostname: 'ns1.example.com', ipv4: '192.168.1.1', ipv6: '1080:0:0:0:8:800:200C:417A')
|
||||
|
||||
d.dnskeys.build(flags: 257, protocol: 3, alg: 3, public_key: 'AwEAAddt2AkLfYGKgiEZB5SmIF8EvrjxNMH6HtxWEA4RJ9Ao6LCWheg8')
|
||||
d.dnskeys.build(flags: 0, protocol: 3, alg: 5, public_key: '700b97b591ed27ec2590d19f06f88bba700b97b591ed27ec2590d19f')
|
||||
d.dnskeys.build(
|
||||
flags: 257,
|
||||
protocol: 3,
|
||||
alg: 3,
|
||||
public_key: 'AwEAAddt2AkLfYGKgiEZB5SmIF8EvrjxNMH6HtxWEA4RJ9Ao6LCWheg8'
|
||||
)
|
||||
|
||||
d.dnskeys.build(
|
||||
flags: 0,
|
||||
protocol: 3,
|
||||
alg: 5,
|
||||
public_key: '700b97b591ed27ec2590d19f06f88bba700b97b591ed27ec2590d19f'
|
||||
)
|
||||
d.save
|
||||
|
||||
response = epp_request(domain_info_xml, :xml)
|
||||
|
@ -768,7 +779,8 @@ describe 'EPP Domain', epp: true do
|
|||
d = Domain.last
|
||||
expect(d.dnskeys.count).to eq(2)
|
||||
|
||||
response = epp_request(xml, :xml)
|
||||
epp_request(xml, :xml)
|
||||
|
||||
expect(d.dnskeys.count).to eq(1)
|
||||
|
||||
expect(d.domain_statuses.count).to eq(1)
|
||||
|
|
|
@ -74,7 +74,9 @@ end
|
|||
|
||||
describe Contact, '#up_id' do
|
||||
before(:each) do
|
||||
# Fabricate(:contact, code: 'asd12', created_by: Fabricate(:epp_user), updated_by: Fabricate(:epp_user), registrar: zone)
|
||||
# Fabricate(:contact, code: 'asd12',
|
||||
# created_by: Fabricate(:epp_user),
|
||||
# updated_by: Fabricate(:epp_user), registrar: zone)
|
||||
@epp_user = Fabricate(:epp_user)
|
||||
@contact = Fabricate.build(:contact, code: 'asd12', created_by: @epp_user, updated_by: @epp_user)
|
||||
end
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue