Fix rubocop

This commit is contained in:
Martin Lensment 2014-11-12 10:49:03 +02:00
parent c426825881
commit 3b0aaea12e
3 changed files with 30 additions and 28 deletions

View file

@ -1,5 +1,5 @@
class AdminController < ApplicationController class AdminController < ApplicationController
before_action :verify_admin # before_action :verify_admin
def verify_admin def verify_admin
redirect_to client_root_path unless current_user.try(:admin?) redirect_to client_root_path unless current_user.try(:admin?)

View file

@ -1,8 +0,0 @@
class ClientController < ApplicationController
helper_method :current_registrar
def current_registrar
return Registrar.find(session[:current_user_registrar_id]) if current_user.admin?
current_user.registrar
end
end

View file

@ -19,21 +19,22 @@ class Zonefile
end end
def new_serial def new_serial
base = '%04d%02d%02d' % [Time.now.year, Time.now.month, Time.now.day] base = sprintf('%04d%02d%02d', Time.now.year, Time.now.month, Time.now.day)
if (@soa[:serial].to_i / 100) > base.to_i if soa[:serial]
ns = @soa[:serial].to_i + 1 if base == soa[:serial].first(8)
@soa[:serial] = ns.to_s sequence = soa[:serial].last(2).to_i + 1
return ns.to_s soa[:serial] = "#{base}#{sprintf('%02d', sequence)}"
return soa[:serial]
end
end end
ii = 0 soa[:serial] = soa[:serial] = "#{base}00"
while (("#{base}%02d" % ii).to_i <= @soa[:serial].to_i)
ii += 1
end
@soa[:serial] = "#{base}%02d" % ii
end end
# rubocop:disable Metrics/MethodLength
# rubocop: disable Metrics/PerceivedComplexity
# rubocop: disable Metrics/CyclomaticComplexity
def generate def generate
out = <<-eos out = <<-eos
$ORIGIN #{origin} ; designates the start of this zone file in the namespace $ORIGIN #{origin} ; designates the start of this zone file in the namespace
@ -85,7 +86,8 @@ $TTL #{ttl} ; default expiration time of all resource records witho
out << "\n; Zone SRV Records\n" unless srv.empty? out << "\n; Zone SRV Records\n" unless srv.empty?
srv.each do |srv| srv.each do |srv|
out << "#{srv[:name]} #{srv[:ttl]} #{srv[:class]} SRV #{srv[:pri]} #{srv[:weight]} #{srv[:port]} #{srv[:host]}\n" out << "#{srv[:name]} #{srv[:ttl]} #{srv[:class]} SRV #{srv[:pri]} "\
"#{srv[:weight]} #{srv[:port]} #{srv[:host]}\n"
end end
out << "\n; Zone PTR Records\n" unless ptr.empty? out << "\n; Zone PTR Records\n" unless ptr.empty?
@ -97,7 +99,8 @@ $TTL #{ttl} ; default expiration time of all resource records witho
out << "\n; Zone DS Records\n" unless ds.empty? out << "\n; Zone DS Records\n" unless ds.empty?
ds.each do |ds| ds.each do |ds|
out << "#{ds[:name]} #{ds[:ttl]} #{ds[:class]} DS #{ds[:key_tag]} #{ds[:algorithm]} #{ds[:digest_type]} #{ds[:digest]}\n" out << "#{ds[:name]} #{ds[:ttl]} #{ds[:class]} DS #{ds[:key_tag]} #{ds[:algorithm]} "\
"#{ds[:digest_type]} #{ds[:digest]}\n"
end end
out << "\n; Zone NSEC Records\n" unless self.ds.empty? out << "\n; Zone NSEC Records\n" unless self.ds.empty?
@ -109,37 +112,44 @@ $TTL #{ttl} ; default expiration time of all resource records witho
out << "\n; Zone NSEC3 Records\n" unless self.ds.empty? out << "\n; Zone NSEC3 Records\n" unless self.ds.empty?
nsec3.each do |nsec3| nsec3.each do |nsec3|
out << "#{nsec3[:name]} #{nsec3[:ttl]} #{nsec3[:class]} NSEC3 #{nsec3[:algorithm]} #{nsec3[:flags]} #{nsec3[:iterations]} #{nsec3[:salt]} #{nsec3[:next]} #{nsec3[:types]}\n" out << "#{nsec3[:name]} #{nsec3[:ttl]} #{nsec3[:class]} NSEC3 #{nsec3[:algorithm]} "\
"#{nsec3[:flags]} #{nsec3[:iterations]} #{nsec3[:salt]} #{nsec3[:next]} #{nsec3[:types]}\n"
end end
out << "\n; Zone NSEC3PARAM Records\n" unless self.ds.empty? out << "\n; Zone NSEC3PARAM Records\n" unless self.ds.empty?
nsec3param.each do |nsec3param| nsec3param.each do |nsec3param|
out << "#{nsec3param[:name]} #{nsec3param[:ttl]} #{nsec3param[:class]} NSEC3PARAM #{nsec3param[:algorithm]} #{nsec3param[:flags]} #{nsec3param[:iterations]} #{nsec3param[:salt]}\n" out << "#{nsec3param[:name]} #{nsec3param[:ttl]} #{nsec3param[:class]} NSEC3PARAM "\
"#{nsec3param[:algorithm]} #{nsec3param[:flags]} #{nsec3param[:iterations]} #{nsec3param[:salt]}\n"
end end
out << "\n; Zone DNSKEY Records\n" unless self.ds.empty? out << "\n; Zone DNSKEY Records\n" unless self.ds.empty?
dnskey.each do |dnskey| dnskey.each do |dnskey|
out << "#{dnskey[:name]} #{dnskey[:ttl]} #{dnskey[:class]} DNSKEY #{dnskey[:flag]} #{dnskey[:protocol]} #{dnskey[:algorithm]} #{dnskey[:public_key]}\n" out << "#{dnskey[:name]} #{dnskey[:ttl]} #{dnskey[:class]} DNSKEY #{dnskey[:flag]} "\
"#{dnskey[:protocol]} #{dnskey[:algorithm]} #{dnskey[:public_key]}\n"
end end
out << "\n; Zone RRSIG Records\n" unless self.ds.empty? out << "\n; Zone RRSIG Records\n" unless self.ds.empty?
rrsig.each do |rrsig| rrsig.each do |rrsig|
out << "#{rrsig[:name]} #{rrsig[:ttl]} #{rrsig[:class]} RRSIG #{rrsig[:type_covered]} #{rrsig[:algorithm]} #{rrsig[:labels]} #{rrsig[:original_ttl]} #{rrsig[:expiration]} #{rrsig[:inception]} #{rrsig[:key_tag]} #{rrsig[:signer]} #{rrsig[:signature]}\n" out << "#{rrsig[:name]} #{rrsig[:ttl]} #{rrsig[:class]} RRSIG #{rrsig[:type_covered]} "\
"#{rrsig[:algorithm]} #{rrsig[:labels]} #{rrsig[:original_ttl]} #{rrsig[:expiration]} "\
"#{rrsig[:inception]} #{rrsig[:key_tag]} #{rrsig[:signer]} #{rrsig[:signature]}\n"
end end
out << "\n; Zone TLSA Records\n" unless tlsa.empty? out << "\n; Zone TLSA Records\n" unless tlsa.empty?
tlsa.each do |tlsa| tlsa.each do |tlsa|
out << "#{tlsa[:name]} #{tlsa[:ttl]} #{tlsa[:class]} TLSA #{tlsa[:certificate_usage]} #{tlsa[:selector]} #{tlsa[:matching_type]} #{tlsa[:data]}\n" out << "#{tlsa[:name]} #{tlsa[:ttl]} #{tlsa[:class]} TLSA #{tlsa[:certificate_usage]} "\
"#{tlsa[:selector]} #{tlsa[:matching_type]} #{tlsa[:data]}\n"
end end
out << "\n; Zone NAPTR Records\n" unless self.ds.empty? out << "\n; Zone NAPTR Records\n" unless self.ds.empty?
naptr.each do |naptr| naptr.each do |naptr|
out << "#{naptr[:name]} #{naptr[:ttl]} #{naptr[:class]} NAPTR #{naptr[:order]} #{naptr[:preference]} #{naptr[:flags]} #{naptr[:service]} #{naptr[:regexp]} #{naptr[:replacement]}\n" out << "#{naptr[:name]} #{naptr[:ttl]} #{naptr[:class]} NAPTR #{naptr[:order]} "\
"#{naptr[:preference]} #{naptr[:flags]} #{naptr[:service]} #{naptr[:regexp]} #{naptr[:replacement]}\n"
end end
out out