diff --git a/.ruby-version b/.ruby-version index 00355e29d..79a614418 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.3.7 +2.4.4 diff --git a/Dockerfile b/Dockerfile index bd0cbc07b..b5871bfed 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM internetee/ruby:2.3 +FROM internetee/ruby:2.4 MAINTAINER maciej.szlosarczyk@internet.ee RUN mkdir -p /opt/webapps/app/tmp/pids diff --git a/app/api/repp/domain_v1.rb b/app/api/repp/domain_v1.rb index 5e6c286ca..cf45bfc6f 100644 --- a/app/api/repp/domain_v1.rb +++ b/app/api/repp/domain_v1.rb @@ -29,7 +29,7 @@ module Repp # example: curl -u registrar1:password localhost:3000/repp/v1/domains/1/transfer_info -H "Auth-Code: authinfopw1" get '/:id/transfer_info', requirements: { id: /.*/ } do ident = params[:id] - domain = ident =~ /\A[0-9]+\z/ ? Domain.find_by(id: ident) : Domain.find_by_idn(ident) + domain = ident.match?(/\A[0-9]+\z/) ? Domain.find_by(id: ident) : Domain.find_by_idn(ident) error! I18n.t('errors.messages.epp_domain_not_found'), 404 unless domain error! I18n.t('errors.messages.epp_authorization_error'), 401 unless domain.transfer_code.eql? request.headers['Auth-Code'] diff --git a/app/controllers/epp_controller.rb b/app/controllers/epp_controller.rb index 93da33ead..496526d71 100644 --- a/app/controllers/epp_controller.rb +++ b/app/controllers/epp_controller.rb @@ -145,7 +145,9 @@ class EppController < ApplicationController # VALIDATION def latin_only return true if params['frame'].blank? - return true if params['frame'].match(/\A[\p{Latin}\p{Z}\p{P}\p{S}\p{Cc}\p{Cf}\w_\'\+\-\.\(\)\/]*\Z/i) + if params['frame'].match?(/\A[\p{Latin}\p{Z}\p{P}\p{S}\p{Cc}\p{Cf}\w_\'\+\-\.\(\)\/]*\Z/i) + return true + end epp_errors << { msg: 'Parameter value policy error. Allowed only Latin characters.', diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 8203a630f..6c19d3ac3 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -89,4 +89,8 @@ module ApplicationHelper types.delete('ddoc') ".#{types.join(',.')}" end -end + + def body_css_class + [controller_path.split('/').map!(&:dasherize), action_name.dasherize, 'page'].join('-') + end +end \ No newline at end of file diff --git a/app/models/certificate.rb b/app/models/certificate.rb index 50976a73e..cb28f629b 100644 --- a/app/models/certificate.rb +++ b/app/models/certificate.rb @@ -87,14 +87,14 @@ class Certificate < ActiveRecord::Base -extensions usr_cert -notext -md sha256 \ -in #{csr_file.path} -out #{crt_file.path} -key '#{ENV['ca_key_password']}' -batch") - if err.match(/Data Base Updated/) + if err.match?(/Data Base Updated/) crt_file.rewind self.crt = crt_file.read self.md5 = OpenSSL::Digest::MD5.new(parsed_crt.to_der).to_s save! else logger.error('FAILED TO CREATE CLIENT CERTIFICATE') - if err.match(/TXT_DB error number 2/) + if err.match?(/TXT_DB error number 2/) errors.add(:base, I18n.t('failed_to_create_crt_csr_already_signed')) logger.error('CSR ALREADY SIGNED') else diff --git a/app/models/concerns/versions.rb b/app/models/concerns/versions.rb index 5e2bad90c..53a984179 100644 --- a/app/models/concerns/versions.rb +++ b/app/models/concerns/versions.rb @@ -34,16 +34,12 @@ module Versions end def user_from_id_role_username(str) - user = ApiUser.find_by(id: $1) if str =~ /^(\d+)-(ApiUser:|api-)/ - unless user.present? - user = AdminUser.find_by(id: $1) if str =~ /^(\d+)-AdminUser:/ - unless user.present? - # on import we copied Registrar name, which may eql code - registrar = Registrar.find_by(name: str) - # assume each registrar has only one user - user = registrar.api_users.first if registrar - end - end + registrar = Registrar.find_by(name: str) + user = registrar.api_users.first if registrar + + str_match = str.match(/^(\d+)-(ApiUser:|api-|AdminUser:)/) + user ||= User.find_by(id: str_match[1]) if str_match + user end diff --git a/app/models/nameserver.rb b/app/models/nameserver.rb index d9a5f2a75..d9fdde406 100644 --- a/app/models/nameserver.rb +++ b/app/models/nameserver.rb @@ -100,18 +100,18 @@ class Nameserver < ActiveRecord::Base def check_puny_symbols regexp = /(\A|\.)..--/ - errors.add(:hostname, :invalid) if hostname =~ regexp + errors.add(:hostname, :invalid) if hostname.match?(regexp) end def validate_ipv4_format ipv4.to_a.each do |ip| - errors.add(:ipv4, :invalid) unless ip =~ IPV4_REGEXP + errors.add(:ipv4, :invalid) unless ip.match?(IPV4_REGEXP) end end def validate_ipv6_format ipv6.to_a.each do |ip| - errors.add(:ipv6, :invalid) unless ip =~ IPV6_REGEXP + errors.add(:ipv6, :invalid) unless ip.match?(IPV6_REGEXP) end end end diff --git a/app/validators/contact/ident/reg_no_validator.rb b/app/validators/contact/ident/reg_no_validator.rb index 611d13301..138aab56a 100644 --- a/app/validators/contact/ident/reg_no_validator.rb +++ b/app/validators/contact/ident/reg_no_validator.rb @@ -10,7 +10,8 @@ class Contact::Ident::RegNoValidator < ActiveModel::EachValidator return unless format - record.errors.add(attribute, :invalid_reg_no, country: record.country) unless value =~ format + return if value.match?(format) + record.errors.add(attribute, :invalid_reg_no, country: record.country) end private diff --git a/app/validators/domain_name_validator.rb b/app/validators/domain_name_validator.rb index 22fe0cb34..0d5638b37 100644 --- a/app/validators/domain_name_validator.rb +++ b/app/validators/domain_name_validator.rb @@ -22,7 +22,7 @@ class DomainNameValidator < ActiveModel::EachValidator # it's punycode if value[2] == '-' && value[3] == '-' regexp = /\Axn--[a-zA-Z0-9-]{0,59}\.#{general_domains}\z/ - return false unless value =~ regexp + return false unless value.match?(regexp) value = SimpleIDN.to_unicode(value).mb_chars.downcase.strip end diff --git a/app/views/layouts/admin/base.haml b/app/views/layouts/admin/base.haml index 8ec55c424..792a8cc0b 100644 --- a/app/views/layouts/admin/base.haml +++ b/app/views/layouts/admin/base.haml @@ -10,7 +10,7 @@ = csrf_meta_tags = stylesheet_link_tag 'admin-manifest', media: 'all' = favicon_link_tag 'favicon.ico' - %body{:style => env_style} + %body{:style => env_style, class: body_css_class} .navbar.navbar-inverse.navbar-static-top{role: "navigation"} .container .navbar-header diff --git a/app/views/layouts/devise.haml b/app/views/layouts/devise.haml index 839290cef..e6abcdcc0 100644 --- a/app/views/layouts/devise.haml +++ b/app/views/layouts/devise.haml @@ -9,7 +9,7 @@ = csrf_meta_tags = stylesheet_link_tag 'admin-manifest', media: 'all' = favicon_link_tag 'favicon.ico' - %body{:style => env_style} + %body{:style => env_style, class: body_css_class} .navbar.navbar-inverse.navbar-static-top{role: "navigation"} .container .navbar-header diff --git a/app/views/layouts/registrant/application.html.erb b/app/views/layouts/registrant/application.html.erb index 4bd099937..7873728d5 100644 --- a/app/views/layouts/registrant/application.html.erb +++ b/app/views/layouts/registrant/application.html.erb @@ -14,7 +14,7 @@ <%= stylesheet_link_tag 'registrant-manifest', media: 'all' %> <%= favicon_link_tag 'favicon.ico' %> - +