Skip to content

Commit

Permalink
refactoring: made changes in code formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
Oleg Hasjanov committed Mar 29, 2021
1 parent a9cbd84 commit 7439664
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 10 deletions.
6 changes: 5 additions & 1 deletion app/models/csync_record.rb
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,15 @@ def dnskey
key
end

def destroy_all_but_last_one
domain.dnskeys.order(id: :desc).offset(1).destroy_all
end

def process_new_dnskey
return unless dnssec_validates?

if dnskey.save
domain.dnskeys.order(id: :desc).offset(1).destroy_all
destroy_all_but_last_one
finalize_and_notify
else
log.info "Failed to save DNSKEY. Errors: #{dnskey.errors.full_messages.join('. ')}"
Expand Down
27 changes: 18 additions & 9 deletions app/models/domain.rb
Original file line number Diff line number Diff line change
Expand Up @@ -169,25 +169,34 @@ def status_is_consistant

validate :statuses_uniqueness

def resolver_generator(nameserver, do_validation, do_caching, dnssec)
resolver = Dnsruby::Resolver.new(nameserver: nameserver)
resolver.do_validation = do_validation
resolver.do_caching = do_caching
resolver.dnssec = dnssec
resolver
end

def dnssec_security_level(stubber: nil)
Dnsruby::Dnssec.reset
resolver = Dnsruby::Resolver.new(nameserver: Dnskey::RESOLVERS)
resolver.do_validation = true
resolver.do_caching = false
resolver.dnssec = true
resolver = resolver_generator(Dnskey::RESOLVERS, true, false, true)
Dnsruby::Recursor.clear_caches(resolver)
if Rails.env.staging?
Dnsruby::Dnssec.clear_trust_anchors
Dnsruby::Dnssec.clear_trusted_keys
Dnsruby::Dnssec.add_trust_anchor(Dnsruby::RR.create(ENV['trusted_dnskey']))
else
Dnsruby::Dnssec.add_trust_anchor(stubber.ds_rr) if stubber
clear_dnssec_trusted_anchors_and_keys
elsif stubber
Dnsruby::Dnssec.add_trust_anchor(stubber.ds_rr)
end
recursor = Dnsruby::Recursor.new(resolver)
recursor.dnssec = true
recursor.query(name, 'A', 'IN').security_level
end

def clear_dnssec_trusted_anchors_and_keys
Dnsruby::Dnssec.clear_trust_anchors
Dnsruby::Dnssec.clear_trusted_keys
Dnsruby::Dnssec.add_trust_anchor(Dnsruby::RR.create(ENV['trusted_dnskey']))
end

def statuses_uniqueness
return if statuses.uniq == statuses
errors.add(:statuses, :taken)
Expand Down

0 comments on commit 7439664

Please sign in to comment.