radd 1.5.2 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ce6277f2c17ee82c7e873be185b142c0bf8cd4fcfe5faf7b6287360e9a5de77
-  data.tar.gz: 9bcb6d8caa6fd25c73dd284ad556ec3be6071b38bca02adbe4b2a0ee24edf0b2
+  metadata.gz: 89f434326187f7616eb3f1c4c90b97ae0f509276885afa93f66ebdb45be2032c
+  data.tar.gz: 501b58d548f23284c3df02301ee278beb5011e3450fe731e701570f2f7b06f9c
 SHA512:
-  metadata.gz: 529ba3c5d7129dc4ba5e783c75e82617ee095578558e7dc23c54ea1aa7439e9c02a5410bf7e40257dcaeff2162e59cc0ee055c9626d11a51ce09b6557124f744
-  data.tar.gz: d102da674aea8d27f70cca080c197ac5646e3786327d37e2ed25ab0e216eed128b5b2d2ba9bd5b5987cffce2eae50801eeb58037be1ed8ef9dc8468a1da460d6
+  metadata.gz: b80b94d5fb7e63a0ffa02e9f9d67a443f548e06adf9b22244543fc4579467fbd231579a335f106cc6e7e7091ef85a4a73cd2e505f7ffe917c719762a350f81d9
+  data.tar.gz: 1cac04ba43cfa863044ba3b5e3c37f8d718369cb753a65dc88ac1e64adf8f9eedbeb8ab02136d56e59758c1a9480dbdd00ea43668733e484f524a803419886c5

data/lib/radd/config.rb

@@ -10,7 +10,7 @@ module Radd
       raise ConfigurationError, "could not open config file #{file_path}" unless file_path.file?
       config = YAML.load(file_path.read)
       raise ConfigurationError, 'origin missing' unless config['origin']
-      @origin = config['origin']
+      @origin = Resolv::DNS::Name.create(config['origin'])
       raise ConfigurationError, 'invalid IP' unless Radd.valid_ip?(config['ip'])
       @ip = config['ip']
       uri = URI.parse("http://#{config['http']}")

data/lib/radd/nameserver.rb

@@ -6,18 +6,32 @@ module Radd
     end
 
     def process(name, resource_class, transaction)
-      name = name.downcase
+      name = Resolv::DNS::Name.create(name.downcase)
       # NOTE: do not use case..when, as resource classes are not identical
       if Resolv::DNS::Resource::IN::A == resource_class
-        ip = [Radd.mname, Radd.origin].include?(name) ? Radd.ip : Radd.query(name)
-        return transaction.respond!(ip, ttl: Radd.ttl) if ip
+        if Radd.mname == name || Radd.origin == name
+          return respond_a(transaction, Radd.ip)
+        elsif name.subdomain_of?(Radd.origin)
+          return respond_a(transaction, Radd.query(name))
+        end
       elsif resource_class <= Resolv::DNS::Resource::SOA && Radd.origin == name
         # mname, rname, serial, refresh, retry_, expire, minimum
         return transaction.respond!(Radd.mname, Radd.rname, Radd.serial, 10800, 1800, 604800, 1800)
       elsif resource_class <= Resolv::DNS::Resource::NS && Radd.origin == name
         return transaction.respond!(Radd.mname)
       end
-      transaction.fail!(:NXDomain)
+      transaction.fail!(:Refused)
     end
+
+    private
+
+    def respond_a(transaction, ip)
+      if ip
+        transaction.respond!(ip, ttl: Radd.ttl)
+      else
+        transaction.fail!(:NXDomain)
+      end
+    end
+
   end
 end

data/lib/radd/version.rb

@@ -1,3 +1,3 @@
 module Radd
-  VERSION = '1.5.2'
+  VERSION = '1.6.0'
 end

data/lib/radd.rb

@@ -63,7 +63,7 @@ module Radd
     end
 
     def fqdn2name(fqdn)
-      if match = fqdn.downcase.match(/\A([a-z0-9-]{1,63})\.#{Regexp.escape(origin)}\z/)
+      if match = fqdn.to_s.downcase.match(/\A([a-z0-9-]{1,63})\.#{Regexp.escape(origin.to_s)}\z/)
         match.captures[0]
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: radd
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.6.0
 platform: ruby
 authors:
 - Matthias Grosser
@@ -206,17 +206,12 @@ files:
 - lib/radd/cli.rb
 - lib/radd/config.rb
 - lib/radd/db.rb
-- lib/radd/dns.rb
-- lib/radd/dns_service.rb
 - lib/radd/errors.rb
-- lib/radd/http.rb
-- lib/radd/http_service.rb
 - lib/radd/ip.rb
 - lib/radd/middleware.rb
 - lib/radd/nameserver.rb
 - lib/radd/record.rb
 - lib/radd/schema.rb
-- lib/radd/tasks.rb
 - lib/radd/update.rb
 - lib/radd/version.rb
 - lib/radd/webserver.rb

data/lib/radd/dns.rb

@@ -1,18 +0,0 @@
-class Radd::DNS < Async::DNS::Server
-  def initialize
-    super(Async::DNS::Endpoint.for(Radd.host, port: Radd.dns_port))
-  end
-  
-  def process(name, resource_class, transaction)
-    name = name.downcase
-    if Resolv::DNS::Resource::IN::A == resource_class
-      if Radd.domain == name
-        ip = Radd.ip
-      else
-        ip = Radd.query(name)
-      end
-    end
-    return transaction.respond!(ip, ttl: 300) if ip
-    transaction.fail!(:NXDomain)
-  end
-end

data/lib/radd/dns_service.rb

@@ -1,12 +0,0 @@
-class Radd::DNSService < Async::Service::GenericService
-  def setup(container)
-    super
-    
-    container.run(count: 1, restart: false) do |instance|
-      instance.ready!
-      puts "DNS service starting..."
-      
-      Radd::DNS.new.run
-    end
-  end
-end

data/lib/radd/http.rb

@@ -1,7 +0,0 @@
-class Radd::HTTP < Async::HTTP::Server
-  def initialize
-    endpoint = Async::HTTP::Endpoint.parse("http://#{Radd.host}:#{Radd.http_port}")
-    middleware = Protocol::Rack::Adapter.new(Radd::App)
-    super(middleware, endpoint)
-  end
-end

data/lib/radd/http_service.rb

@@ -1,12 +0,0 @@
-class Radd::HTTPService < Async::Service::GenericService
-  def setup(container)
-    super
-    
-    container.run(count: 1, restart: false) do |instance|
-      instance.ready!
-      puts "HTTP service starting..."
-      
-      Radd::HTTP.new.run
-    end
-  end
-end

data/lib/radd/tasks.rb

@@ -1,39 +0,0 @@
-namespace :radd do
-  task :config do
-    Radd::Cli.load_config
-  end
-
-  namespace :db do
-    desc 'Create database'
-    task create: :config do
-      load './db/schema.rb'
-    end
-  end
-  
-  desc 'Add record'
-  task add: :config do
-    print "Enter name: "
-    name = STDIN.gets.chomp
-    print "Password: "
-    password = STDIN.gets.chomp
-    print "Re-type password: "
-    password_confirmation = STDIN.gets.chomp
-    raise "Password mismatch!" unless password == password_confirmation
-    record = Radd::Record.new(password: password)
-    record.name = name
-    record.save
-    puts "Added record '#{name}'\n"
-  end
-  
-  desc 'List all records'
-  task list: :config do
-    puts
-    records = Radd::Record.all
-    tab = [records.map(&:name).map(&:size).max, 24].compact.max
-    records.each do |record|
-      puts "#{record.name.ljust(tab)}  #{record.ip.to_s.ljust(15)}  #{record.updated_at || 'never updated'}\n"
-    end
-    puts
-  end
-  
-end