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

Merge pull request #2039 from internetee/2306-csync-trim-whitespaces

Browse source 
2306-csync-trim-whitespaces
This commit is contained in:
Timo Võhmar 2021-06-21 14:51:42 +03:00 • committed by GitHub
commit 2a9692cb03
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 45 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

17
app/models/csync_record.rb
View file

@ -90,13 +90,19 @@ class CsyncRecord < ApplicationRecord
def validate_unique_pub_key
return false unless domain
return true if disable_requested?
return true unless domain.dnskeys.where(public_key: dnskey.public_key).any?
return true unless dnskey_already_present?
errors.add(:public_key, 'already tied to this domain')
end
# since dnskeys stored in DB may include whitespace chars, we could not find them by
# 'where' clause using dnskey.public_key being stripped of whitespaces by csync generator
def dnskey_already_present?
domain.dnskeys.pluck(:public_key).map { |key| key.gsub(/\s+/, '') }.include? dnskey.public_key
end
def self.by_domain_name(domain_name)
domain = Domain.find_by(name: domain_name)
domain = Domain.find_by(name: domain_name) || Domain.find_by(name_puny: domain_name)
log.info "CsyncRecord: '#{domain_name}' not in zone. Not initializing record." unless domain
CsyncRecord.find_or_initialize_by(domain: domain) if domain
end
@ -112,8 +118,11 @@ class CsyncRecord < ApplicationRecord
end
def log
@log ||= Rails.env.test? ? logger : Logger.new(STDOUT)
@log
self.class.log
end
def self.log
Rails.env.test? ? logger : Logger.new(STDOUT)
end
def validate_csync_action