vagrant-dns 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 683d8d24cadf716452cf7aa6fd6b0e57f79d4e5fb878b24e8c878bc332198256
-  data.tar.gz: 11a2020530cf15c48ac66f877de68bbd4eb50f365b08d622c7f23cf6d72a7fdd
+  metadata.gz: b96bd995237133ab779883dc28ed8ac0ed8b2cb15b71c81c755bef68f93fc6bb
+  data.tar.gz: 9ddc6a521a68af235a6626672e6d7089e330bfcc0445b2126e01f8f45f4ebf32
 SHA512:
-  metadata.gz: 96f4e9cdbde13a3b31aa6e39a578aac3dd7792a9e4943ffaf2a1622202add7c3af49ec4faad1cecf5b6093563928766c41f6036b77dc8fd243aca310f2407626
-  data.tar.gz: 1641b1b9bc427d8705553d0bfe901c3c9f277ff8d34de370f8d9cd4aec92ed46d9714038e8cb58e3f981430d4f4cd5a761642422dc7c5979fdca7f6c0ee06ea6
+  metadata.gz: dee69e1a9fb66bdb817a310a2e2daf049bab4c032f907f7220825feffac480dbdeb4356c412c59dd7bd2369f40b030e8b21576e0c21d7bfd6dd6d3460fc69d74
+  data.tar.gz: d58f43351a8a12aa3f79e6bdb7c047f312b38714767a0c4d0e03c5e2e4a484c9bd11a57aec95d775f37e425ed6cda027af49b8c8cd66f38a84b5fb92bd8439bd

data/.ruby-version

@@ -0,0 +1 @@
+ruby-2.7.7

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 2.4.0 (2023-04-11)
+
+* DHCP support. [GH-51]
+* Non-A-queries (like IPv6 AAAA- or TXT records) matching a configured pattern will be answered with a `NOTIMP` error. [GH-76]
+* Upstream / passthrough DNS servers are now configurable, defaulting to the system config (existing behavior). [GH-76]
+* Passthrough behavior is now configurable (`true`/`false`/`:unknown`). [GH-77]
+
 ## 2.3.0 (2023-01-14)
 
 * 🎉 Linux Support. Many thanks @mattiasb [GH-75]
@@ -23,7 +30,7 @@
 
 ## 2.2.0
 
-### New Feautres:
+### New Features:
 
 * Add global config for time-to-live via `VagrantDNS::Config.ttl`
 
@@ -34,16 +41,16 @@
 
 ### Breaking Changes:
 
-* Removes the global and vm config  `ipv4only`. It was nver been used.
+* Removes the global and vm config  `ipv4only`. It was never used.
 
 ### Changes:
 
-* Resources will now respond with a low TTL (time-to-live) of 5 minutes (300 seconds) instead of the old 24 hours by default. Use `VagrantDNS::Config.ttl = 86400` to reset to the old behaviour.
+* Resources will now respond with a low TTL (time-to-live) of 5 minutes (300 seconds) instead of the old 24 hours by default. Use `VagrantDNS::Config.ttl = 86400` to reset to the old behavior.
 * Internal changes on how the dns pattern config is read and written. (Now using `YAML::Store`)
 * Acceptance tests run against vagrant v2.1.4
 * Acceptance tests run against Ubuntu 18.04
 
-### New Feautres:
+### New Features:
 
 * Adds a check for the VMs configured TLDs to not be included in the [Public Suffix List](https://publicsuffix.org/)
 
@@ -84,7 +91,7 @@
 * Add support for boxes with `public_network` and static IP.
 * Breaking: No longer falls back to `127.0.0.1` when no IP could be found.
 * Log messages will now be tagged with the related box (vm) and `[vagrant-dns]`
-* Develepment targets Vagrant 1.9.3
+* Development targets Vagrant 1.9.3
 
 ## 1.0.0
 

data/DEVELOPMENT.md

@@ -2,7 +2,8 @@
 
 TODO: Expand this section :)
 
-The `Gemfile` uses two environment variables, `TEST_RUBY_VERSION` and `TEST_VAGRANT_VERSION` to control which version of ruby and vagrant are used during local development.
+The `Gemfile` uses the `TEST_VAGRANT_VERSION` environment variable to control which version of vagrant is used during local development.
+To adjust the ruby version used, change the contents of the `.ruby-version` file, even if you don't use a ruby version manager.
 
 ## Running Acceptance Tests
 
@@ -19,5 +20,20 @@ bundle exec rake -D acceptance
 bundle exec rake acceptance:setup:virtualbox
 
 # Run tests
-rake acceptance:virtualbox
+bundle exec rake acceptance:virtualbox
+```
+
+### On other providers
+
+1. If it's not a default provider, add it to to `Gemfile` as a dependency and re-run `bundle install`.
+2. Add a box provider name to box URL mapping to the `TEST_BOXES` hash in `tasks/acceptance.rake`
+3. Run the `acceptance` rake task like above, replacing `virtualbox` with your provider.
+
+
+### VMware IPs
+
+VMware uses IPs from its bridges for DHCP and static private networks. Check IP and net masks using:
+
+```console
+ifconfig -X bridge | grep 'inet ' | grep -v '127.0.0.1' | awk '{ print $2 "\t" $4 }'
 ```

data/Gemfile

@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
-ruby(ENV['TEST_RUBY_VERSION'] || '~> 2.7.3')
+ruby(File.read(File.expand_path('.ruby-version', __dir__))[/\d+\.\d+\.\d+.*/])
 
 ENV['TEST_VAGRANT_VERSION'] ||= 'v2.3.4'
 
@@ -7,6 +7,9 @@ ENV['TEST_VAGRANT_VERSION'] ||= 'v2.3.4'
 # during acceptance tests.
 group :plugins do
   gemspec
+  # source "https://gems.hashicorp.com/" do
+  #   gem "vagrant-vmware-desktop"
+  # end
 end
 
 group :test, :development do

data/README.md

@@ -12,11 +12,11 @@ Alternatively, you can install an older version of vagrant-dns like this: `vagra
 
 ## Usage
 
-In addition to your networking config, configure a toplevel domain and a `hostname` for your machine. Optionally, configure a set of free matching patterns. Global configuration options can be given through the `VagrantDNS::Config` object:
+In addition to your networking config, configure a top-level domain and a `hostname` for your machine. Optionally, configure a set of free matching patterns. Global configuration options can be given through the `VagrantDNS::Config` object:
 
 ```ruby
 Vagrant.configure("2") do |config|
-  #...
+  # ...
 
   config.dns.tld = "test"
 
@@ -148,12 +148,20 @@ We can use [multivm](https://www.vagrantup.com/docs/multi-machine/) configuratio
 *  Execute : `vagrant dns --install`
 *  Test via: `ping worker2.mysite.box` or `worker1.mysite.box`
 
-
 ## VM options
 
 * `vm.dns.tld`: Set the tld for the given virtual machine. No default.
-* `vm.dns.tlds`: Set multiple tlds. Default: `[tld]`
+* `vm.dns.tlds`: Set multiple TLDs. Default: `[tld]`
 * `vm.dns.patterns`: A list of domain patterns to match. Defaults to `[/^.*{host_name}.{tld}$/]`
+* `vm.dns.ip`: Optional, overwrite of the default static IP detection. Valid values are:
+  - `Proc`: A Proc which return value will get used as IP. Eg: `proc { |vm, opts| }` (See DHCP section for full sample)
+  - `Symbol`: Forces the use of the named static network: 
+    + `:private_network`: Use static ip of a configured private network (`config.vm.network "private_network", ip: "192.168.50.4"`)
+    + `:public_network`: Use static ip of a configured public network (`config.vm.network "public_network", ip: "192.168.0.17"`)
+    + `:dynamic`, `:dhcp`: Force reading the guest IP using vagrants build-in `read_ip_address` capability.
+  - Default:
+      If there is no network with a statically defined IP, and no `ip` override is given, use the build-in `read_ip_address` capability.
+      Else, check `:private_network`, if none found check `:public_network`
 
 ## Global Options
 
@@ -162,9 +170,16 @@ We can use [multivm](https://www.vagrantup.com/docs/multi-machine/) configuratio
 * `VagrantDNS::Config.auto_run`: (re)start and reconfigure the server every time a machine is started. On by default.
 * `VagrantDNS::Config.check_public_suffix`: Check if you are going to configure a [Public Suffix](https://publicsuffix.org/) (like a Top Level Domain) in a VMs `tld(s)` config, which could mess up your local dev machines DNS config. Possible configuration values are:
   - `false`: Disables the feature.
-  - `"warn"`: Check and print a warning. (Still creates a resolver config and potentionally messes up your DNS) **At the moment, this is the default** because lots of projetcs used to use `"dev"` as a TLD, but this got registered by google and is now a public suffix.
+  - `"warn"`: Check and print a warning. (Still creates a resolver config and potentially messes up your DNS) **At the moment, this is the default** because lots of projects used to use `"dev"` as a TLD, but this got registered by google and is now a public suffix.
   - `"error"`: Check and prevent the box from starting. (Does not create the resolver config, it will also prevent the box from starting.)
- 
+* `VagrantDNS::Config.passthrough`: Configure how to deal with non-matching DNS queries. Will be set to `false` if no `passthrough_resolver` could be detected, or none is set.
+  - `true`: (default) Every non-matching query is passed through to the upstream DNS server (see `passthrough_resolver`)
+  - `false`: Disable passthrough. Every non-A-query to a matching pattern fails with `NotImp`. Every other query fails with `NXDomain`.
+  - `:unknown`: Only forward queries for which there's no matching pattern. Every non-A-query to a matching pattern fails with `NotImp`. Every other query will be passed through.
+* `VagrantDNS::Config.passthrough_resolver`: By default, DNS queries not matching any patterns will be passed to an upstream DNS server.
+  - `:system`: (Default) pass through to the system configured default DNS server
+  - `[[:udp, "1.1.1.1", 53], [:tcp, "1.1.1.1", 53]]`: an Array of Arrays describing the DNS server(s) to use. (Protocol, IP, Port)
+
 ## Using custom domains from inside the VM (VirtualBox only)
 
 If you need to be able to resolve custom domains managed by this plugin from inside your virtual machine (and you're using VirtualBox), add the following
@@ -189,6 +204,32 @@ setting, however, the NAT engine will act as a DNS proxy
 (see [Virtualbox docs](https://www.virtualbox.org/manual/ch09.html#nat-adv-dns)). That way, queries for your custom domains
 from inside the guest will also be handled by the DNS server run by the plugin.
 
+## DHCP / Dynamic IP
+
+When configuring your VM with a DHCP network, vagrant-dns tries to identify the guest IP using vagrants build-in `read_ip_address` capability.
+
+For more fine-grained control use the `ip` config.
+Here is an example using the VM's default way of communication and using the `hostname` command on it:
+
+```ruby
+Vagrant.configure("2") do |config|
+  # ...
+
+  # - `vm` is the vagrant virtual machine instance and can be used to communicate with it
+  # - `opts` is the vagrant-dns options hash (everything configured via `config.dns.*`)
+  config.dns.ip = -> (vm, opts) do
+    # note: the block handed to `execute` might get called multiple times, hence this closure
+    ip = nil
+    vm.communicate.execute("hostname -I | cut -d ' ' -f 1") do |type, data|
+      ip = data.strip if type == :stdout
+    end
+    ip
+  end
+end
+```
+
+__NOTES__: In order to obtain the IP in this way, the vagrant box needs to be up and running. You will get a log output (`Postponing running user provided IP script until box has started.`) when you try to run `vagrant dns`  on a non-running box.
+
 ## Issues
 
 * macOS and systemd-resolved enabled Linux only (please read: [Platform Support](https://github.com/BerlinVagrant/vagrant-dns/blob/master/PLATFORM_SUPPORT.md) before ranting about this).

data/lib/vagrant-dns/config.rb

@@ -1,9 +1,10 @@
-require 'logger'
+require "logger"
 
 module VagrantDNS
   class Config < Vagrant.plugin(2, :config)
     class << self
-      attr_accessor :listen, :ttl, :logger, :auto_run, :check_public_suffix
+      attr_writer :listen, :ttl, :passthrough, :passthrough_resolver
+      attr_accessor :logger, :auto_run, :check_public_suffix
 
       def listen
         @listen ||= [[:udp, "127.0.0.1", 5300]]
@@ -13,6 +14,15 @@ module VagrantDNS
         @ttl ||= 300
       end
 
+      def passthrough
+        return true if @passthrough.nil?
+        @passthrough
+      end
+
+      def passthrough_resolver
+        @passthrough_resolver ||= :system
+      end
+
       def auto_run
         return true if @auto_run.nil?
         @auto_run
@@ -37,7 +47,7 @@ module VagrantDNS
         failed_tlds = vm.config.dns.tlds.select { |tld| list.find(tld, default: false) }
 
         err = if failed_tlds.any?
-          "tlds include a public suffix: #{failed_tlds.join(', ')}"
+          "tlds include a public suffix: #{failed_tlds.join(", ")}"
         end
 
         if err && check_public_suffix.to_s == "error"
@@ -50,7 +60,7 @@ module VagrantDNS
       end
     end
 
-    attr_accessor :records
+    attr_accessor :records, :ip
     attr_reader :tlds, :patterns
 
     def pattern=(pattern)
@@ -68,11 +78,7 @@ module VagrantDNS
 
     # explicit hash, to get symbols in hash keys
     def to_hash
-      {
-        :patterns => patterns,
-        :records => records,
-        :tlds => tlds
-      }
+      { patterns: patterns, records: records, tlds: tlds, ip: ip }
     end
 
     def validate(machine)
@@ -96,4 +102,3 @@ module VagrantDNS
     end
   end
 end
-

data/lib/vagrant-dns/configurator.rb

@@ -1,4 +1,4 @@
-require 'fileutils'
+require "fileutils"
 
 module VagrantDNS
   class Configurator
@@ -20,124 +20,188 @@ module VagrantDNS
       unregister_patterns!
     end
 
-    private
-      def validate_tlds
-        valid, err = VagrantDNS::Config.validate_tlds(vm)
-        if !valid
-          vm.ui.error(err)
-        elsif err
-          vm.ui.warn(err)
-        end
-        valid
+    private def validate_tlds
+      valid, err = VagrantDNS::Config.validate_tlds(vm)
+      if !valid
+        vm.ui.error(err)
+      elsif err
+        vm.ui.warn(err)
       end
+      valid
+    end
 
-      def regenerate_resolvers!
-        resolver_folder = self.resolver_folder
-        _proto, ip, port = VagrantDNS::Config.listen.first
-        tlds = register_tlds!
+    private def regenerate_resolvers!
+      resolver_folder = self.resolver_folder
+      _proto, ip, port = VagrantDNS::Config.listen.first
+      tlds = register_tlds!
 
-        resolver_files(ip, port, tlds) do |filename, contents|
-          File.write(File.join(resolver_folder, filename), contents)
-        end
+      resolver_files(ip, port, tlds) do |filename, contents|
+        File.write(File.join(resolver_folder, filename), contents)
       end
+    end
 
-      def register_tlds!
-        add_tlds = dns_options(vm)[:tlds]
-        VagrantDNS::TldRegistry.new(tmp_path).transaction do |store|
+    private def register_tlds!
+      add_tlds = dns_options(vm)[:tlds]
+      VagrantDNS::TldRegistry
+        .new(tmp_path)
+        .transaction do |store|
           store["tlds"] ||= []
           store["tlds"] |= add_tlds
           store["tlds"]
         end
+    end
+
+    private def register_patterns!
+      opts = dns_options(vm)
+
+      patterns = opts[:patterns] || default_patterns(opts)
+      if patterns.empty?
+        vm.ui.warn "[vagrant-dns] TLD but no host_name given. No patterns will be configured."
+        return
       end
 
-      def register_patterns!
-        opts = dns_options(vm)
+      ip = vm_ip(opts)
+      unless ip
+        vm.ui.detail "[vagrant-dns] No patterns will be configured."
+        return
+      end
 
-        patterns = opts[:patterns] || default_patterns(opts)
-        if patterns.empty?
-         vm.ui.warn '[vagrant-dns] TLD but no host_name given. No patterns will be configured.'
-         return
-        end
+      registry = Registry.new(tmp_path)
+      registry.transaction do
+        patterns.each { |pattern| registry[pattern] = ip }
+      end
+    end
 
-        network = opts[:networks].find do |nw|
-          nw.first == :private_network && nw.last[:ip]
+    private def unregister_patterns!
+      opts = dns_options(vm)
+
+      patterns = opts[:patterns] || default_patterns(opts)
+      if patterns.empty?
+        vm.ui.warn "[vagrant-dns] TLD but no host_name given. No patterns will be removed."
+        return
+      end
+
+      registry = Registry.open(tmp_path)
+      return unless registry
+
+      registry.transaction do
+        unless registry.any?
+          vm.ui.warn "[vagrant-dns] Configuration missing or empty. No patterns will be removed."
+          registry.abort
         end
 
-        unless network
-          network = opts[:networks].find do |nw|
-            nw.first == :public_network && nw.last[:ip]
+        patterns.each do |pattern|
+          if (ip = registry.delete(pattern))
+            vm.ui.info "[vagrant-dns] Removing pattern: #{pattern} for ip: #{ip}"
+          else
+            vm.ui.info "[vagrant-dns] Pattern: #{pattern} was not in config."
           end
         end
+      end
+    end
 
-        unless network
-          vm.ui.warn '[vagrant-dns] Could not find any static network IP. No patterns will be configured.'
-          return
-        end
+    private def dns_options(vm)
+      return @dns_options if @dns_options
 
-        ip = network.last[:ip]
+      @dns_options = vm.config.dns.to_hash
+      @dns_options[:host_name] = vm.config.vm.hostname
+      @dns_options[:networks] = vm.config.vm.networks
+      @dns_options
+    end
 
-        registry = Registry.new(tmp_path)
-        registry.transaction do
-          patterns.each do |pattern|
-            registry[pattern] = ip
-          end
-        end
+    private def default_patterns(opts)
+      if opts[:host_name]
+        opts[:tlds].map { |tld| /^.*#{opts[:host_name]}.#{tld}$/ }
+      else
+        []
       end
+    end
 
-      def unregister_patterns!
-        opts = dns_options(vm)
+    private def vm_ip(opts)
+      user_ip = opts[:ip]
 
-        patterns = opts[:patterns] || default_patterns(opts)
-        if patterns.empty?
-          vm.ui.warn '[vagrant-dns] TLD but no host_name given. No patterns will be removed.'
-          return
-        end
+      if !user_ip && dynamic_ip_network?(opts) || [:dynamic, :dhcp].include?(user_ip)
+        user_ip = DYNAMIC_VM_IP
+      end
 
-        registry = Registry.open(tmp_path)
-        return unless registry
+      ip =
+        case user_ip
+        when Proc
+          if vm.communicate.ready?
+            user_ip.call(vm, opts.dup.freeze)
+          else
+            vm.ui.info "[vagrant-dns] Postponing running user provided IP script until box has started."
+            return
+          end
+        when Symbol
+          _ip = static_vm_ip(user_ip, opts)
 
-        registry.transaction do
-          unless registry.any?
-            vm.ui.warn '[vagrant-dns] Configuration missing or empty. No patterns will be removed.'
-            registry.abort
+          unless _ip
+            vm.ui.warn "[vagrant-dns] Could not find any static network IP in network type `#{user_ip}'."
+            return
           end
 
-          patterns.each do |pattern|
-            if (ip = registry.delete(pattern))
-              vm.ui.info "[vagrant-dns] Removing pattern: #{pattern} for ip: #{ip}"
-            else
-              vm.ui.info "[vagrant-dns] Pattern: #{pattern} was not in config."
-            end
+          _ip
+        else
+          _ip = static_vm_ip(:private_network, opts)
+          _ip ||= static_vm_ip(:public_network, opts)
+
+          unless _ip
+            vm.ui.warn "[vagrant-dns] Could not find any static network IP."
+            return
           end
+
+          _ip
         end
+
+      # we where unable to find an IP, and there's no user-supplied callback
+      # falling back to dynamic/dhcp style detection
+      if !ip && !user_ip
+        vm.ui.info "[vagrant-dns] Falling back to dynamic IP detection."
+        ip = DYNAMIC_VM_IP.call(vm, opts.dup.freeze)
       end
 
-      def dns_options(vm)
-        @dns_options ||= vm.config.dns.to_hash.merge!(
-          :host_name => vm.config.vm.hostname,
-          :networks => vm.config.vm.networks
-        )
+      if !ip || ip.empty?
+        vm.ui.warn "[vagrant-dns] Failed to identify IP."
+        return
       end
 
-      def default_patterns(opts)
-        if opts[:host_name]
-          opts[:tlds].map { |tld| /^.*#{opts[:host_name]}.#{tld}$/ }
+      ip
+    end
+
+    private def dynamic_ip_network?(opts)
+      opts[:networks].none? { |(_nw_type, nw_config)| nw_config[:ip] }
+    end
+
+    # tries to find an IP in the configured +type+ networks
+    private def static_vm_ip(type, opts)
+      network = opts[:networks].find { |(nw_type, nw_config)| nw_config[:ip] && nw_type == type }
+
+      network.last[:ip] if network
+    end
+
+    DYNAMIC_VM_IP = proc { |vm|
+      vm.guest.capability(:read_ip_address).tap { |ip|
+        if ip
+          vm.ui.info "[vagrant-dns] Identified DHCP IP as '#{ip}'."
         else
-          []
+          vm.ui.warn "[vagrant-dns] Could not identify DHCP IP."
         end
-      end
+      }
+    }
+    private_constant :DYNAMIC_VM_IP
 
-      def resolver_files(ip, port, tlds, &block)
-        installer_class = VagrantDNS::Installers.resolve
-        installer_class.resolver_files(ip, port, tlds, &block)
-      end
+    private def resolver_files(ip, port, tlds, &block)
+      installer_class = VagrantDNS::Installers.resolve
+      installer_class.resolver_files(ip, port, tlds, &block)
+    end
 
-      def resolver_folder
-        File.join(tmp_path, "resolver").tap { |dir| FileUtils.mkdir_p(dir) }
-      end
+    private def resolver_folder
+      File.join(tmp_path, "resolver").tap { |dir| FileUtils.mkdir_p(dir) }
+    end
 
-      def ensure_deamon_env!
-        FileUtils.mkdir_p(File.join(tmp_path, "daemon"))
-      end
+    private def ensure_deamon_env!
+      FileUtils.mkdir_p(File.join(tmp_path, "daemon"))
+    end
   end
 end

data/lib/vagrant-dns/server.rb

@@ -0,0 +1,82 @@
+require 'pp'
+require 'rubydns'
+require 'async/dns/system'
+
+module VagrantDNS
+  class Server
+    attr_reader :registry, :listen, :ttl, :resolver, :passthrough
+
+    def initialize(registry, listen:, ttl:, resolver:, passthrough:)
+      @registry = registry.to_hash
+      @listen = listen
+      @ttl = ttl
+
+      @resolver = if resolver.nil? || resolver == :system
+        RubyDNS::Resolver.new(Async::DNS::System.nameservers)
+      elsif !resolver || resolver.empty?
+        nil
+      else
+        RubyDNS::Resolver.new(resolver)
+      end
+
+      if passthrough && !resolver
+        puts "[Warning] 'passthrough' config has no effect, sice no passthrough resolver is set."
+      end
+
+      @passthrough = !!@resolver && passthrough
+    end
+
+    def run
+      # need those clusures for the +RubyDNS::run_server+ block
+      passthrough = self.passthrough
+      registry = self.registry
+      resolver = self.resolver
+      ttl = self.ttl
+
+      _passthrough = if passthrough
+        proc do |transaction|
+          transaction.passthrough!(resolver) do |response|
+            puts "Passthrough response: #{response.inspect}"
+          end
+        end
+      end
+
+      RubyDNS::run_server(listen) do
+        # match all known patterns first
+        registry.each do |pattern, ip|
+          match(pattern, Resolv::DNS::Resource::IN::A) do |transaction, match_data|
+            transaction.respond!(ip, ttl: ttl)
+          end
+        end
+
+        case passthrough
+        when true
+          # forward everything
+          otherwise(&_passthrough)
+        when false
+          # fail known patterns for non-A queries as NotImp
+          registry.each do |pattern, ip|
+            match(pattern) do |transaction, match_data|
+              transaction.fail!(:NotImp)
+            end
+          end
+
+          # unknown pattern end up as NXDomain
+          otherwise do |transaction|
+            transaction.fail!(:NXDomain)
+          end
+        when :unknown
+          # fail known patterns for non-A queries as NotImp
+          registry.each do |pattern, ip|
+            match(pattern) do |transaction, match_data|
+              transaction.fail!(:NotImp)
+            end
+          end
+
+          # forward only unknown patterns
+          otherwise(&_passthrough)
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-dns/service.rb

@@ -20,44 +20,27 @@ module VagrantDNS
       run!("status")
     end
 
-    SERVER = Proc.new do |tmp_path, skip_require_dependencies|
-      unless skip_require_dependencies
-        require 'rubydns'
-        require 'async/dns/system'
-      end
-
-      registry = Registry.new(tmp_path).to_hash
-      std_resolver = RubyDNS::Resolver.new(Async::DNS::System.nameservers)
-      ttl = VagrantDNS::Config.ttl
-
-      RubyDNS::run_server(VagrantDNS::Config.listen) do
-        registry.each do |pattern, ip|
-          match(pattern, Resolv::DNS::Resource::IN::A) do |transaction, match_data|
-            transaction.respond!(ip, ttl: ttl)
-          end
-        end
-
-        otherwise do |transaction|
-          transaction.passthrough!(std_resolver) do |reply, reply_name|
-            puts reply
-            puts reply_name
-          end
-        end
-      end
-    end
-
     def run!(cmd, opts = {})
       # On darwin, when the running Ruby is not compiled for the running OS
       # @see: https://github.com/BerlinVagrant/vagrant-dns/issues/72
       use_issue_72_workround = RUBY_PLATFORM.match?(/darwin/) && !RUBY_PLATFORM.end_with?(`uname -r`[0, 2])
 
       if cmd == "start" && use_issue_72_workround
-        require 'rubydns'
-        require 'async/dns/system'
+        require_relative "./server"
       end
 
       Daemons.run_proc("vagrant-dns", run_options(cmd, opts)) do
-        SERVER.call(tmp_path, use_issue_72_workround)
+        unless use_issue_72_workround
+          require_relative "./server"
+        end
+
+        VagrantDNS::Server.new(
+          Registry.new(tmp_path),
+          listen: VagrantDNS::Config.listen,
+          ttl: VagrantDNS::Config.ttl,
+          passthrough: VagrantDNS::Config.passthrough,
+          resolver: VagrantDNS::Config.passthrough_resolver
+        ).run
       end
     end
 
@@ -92,9 +75,7 @@ module VagrantDNS
       end
     end
 
-    private
-
-    def run_options(cmd, extra = {})
+    private def run_options(cmd, extra = {})
       daemon_dir = File.join(tmp_path, "daemon")
       {
         ARGV: [cmd],
@@ -103,7 +84,7 @@ module VagrantDNS
         log_output: true,
         log_dir: daemon_dir,
         **extra
-     }
+      }
     end
   end
 end

data/lib/vagrant-dns/version.rb

@@ -1,3 +1,3 @@
 module VagrantDNS
-  VERSION = "2.3.0"
+  VERSION = "2.4.0"
 end

data/tasks/acceptance.rake

@@ -11,7 +11,9 @@ namespace :acceptance do
     # Ubuntu 16.04 https://app.vagrantup.com/ubuntu/boxes/xenial64.json
     # :virtualbox => "https://vagrantcloud.com/ubuntu/boxes/xenial64/versions/20180511.0.0/providers/virtualbox.box"
     # Ubuntu 18.04 https://app.vagrantup.com/ubuntu/boxes/bionic64.json
-    :virtualbox => "https://vagrantcloud.com/ubuntu/boxes/bionic64/versions/20180709.0.0/providers/virtualbox.box"
+    virtualbox: "https://vagrantcloud.com/ubuntu/boxes/bionic64/versions/20180709.0.0/providers/virtualbox.box",
+    # Ubuntu 22.10 https://app.vagrantup.com/bento/boxes/ubuntu-22.10
+    vmware_desktop: "https://app.vagrantup.com/bento/boxes/ubuntu-22.10/versions/202303.13.0/providers/vmware_desktop.box"
   }
 
   TEST_BOXES.each do |provider, box_url|

data/vagrant-dns.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |gem|
   gem.email         = ["florian.gilcher@asquera.de", "robert@dotless.de"]
   gem.description   = %q{vagrant-dns is a vagrant plugin that manages DNS records associated with local machines.}
   gem.summary       = %q{vagrant-dns manages DNS records of vagrant machines}
-  gem.homepage      = ""
+  gem.homepage      = "https://github.com/BerlinVagrant/vagrant-dns"
   gem.license       = "MIT"
 
   gem.files         = `git ls-files`.split($\).reject { |f| f.match(%r{^(test|testdrive)/}) }
@@ -16,6 +16,13 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = VagrantDNS::VERSION
 
+  gem.metadata = {
+    "bug_tracker_uri" => "https://github.com/BerlinVagrant/vagrant-dns/issues",
+    "changelog_uri"   => "https://github.com/BerlinVagrant/vagrant-dns/blob/master/CHANGELOG.md",
+    "source_code_uri" => "https://github.com/BerlinVagrant/vagrant-dns",
+    "wiki_uri"        => "https://github.com/BerlinVagrant/vagrant-dns/wiki"
+  }
+
   gem.required_ruby_version = '>= 2.2.6'
 
   gem.add_dependency "daemons"
@@ -25,7 +32,7 @@ Gem::Specification.new do |gem|
   # Pinning async gem to work around an issue in vagrant, where it does not
   # honor "required_ruby_version" while resolving sub-dependencies.
   # see: https://github.com/hashicorp/vagrant/issues/12640
-  gem.add_dependency 'async', '< 2'
+  gem.add_dependency 'async', '~> 1.30', '>= 1.30.3'
 
   gem.add_development_dependency 'rspec'
 end

data/vagrant-spec.config.rb

@@ -7,9 +7,7 @@ Vagrant::Spec::Acceptance.configure do |c|
   c.component_paths = [acceptance_dir.to_s]
   c.skeleton_paths = [(acceptance_dir + 'skeletons').to_s]
 
-  c.provider ENV['VS_PROVIDER'],
-    box: ENV['VS_BOX_PATH'],
-    skeleton_path: c.skeleton_paths
+  c.provider ENV['VS_PROVIDER'], box: ENV['VS_BOX_PATH'], skeleton_path: c.skeleton_paths
 
   # there seems no other way to set additional environment variables
   # see: https://github.com/mitchellh/vagrant-spec/pull/17

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-dns
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Florian Gilcher
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-14 00:00:00.000000000 Z
+date: 2023-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: daemons
@@ -57,16 +57,22 @@ dependencies:
   name: async
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.30'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2'
+        version: 1.30.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.30'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2'
+        version: 1.30.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -92,6 +98,7 @@ extra_rdoc_files: []
 files:
 - ".editorconfig"
 - ".gitignore"
+- ".ruby-version"
 - CHANGELOG.md
 - DEVELOPMENT.md
 - Gemfile
@@ -110,6 +117,7 @@ files:
 - lib/vagrant-dns/middlewares/config_up.rb
 - lib/vagrant-dns/middlewares/restart.rb
 - lib/vagrant-dns/registry.rb
+- lib/vagrant-dns/server.rb
 - lib/vagrant-dns/service.rb
 - lib/vagrant-dns/store.rb
 - lib/vagrant-dns/tld_registry.rb
@@ -117,10 +125,14 @@ files:
 - tasks/acceptance.rake
 - vagrant-dns.gemspec
 - vagrant-spec.config.rb
-homepage: ''
+homepage: https://github.com/BerlinVagrant/vagrant-dns
 licenses:
 - MIT
-metadata: {}
+metadata:
+  bug_tracker_uri: https://github.com/BerlinVagrant/vagrant-dns/issues
+  changelog_uri: https://github.com/BerlinVagrant/vagrant-dns/blob/master/CHANGELOG.md
+  source_code_uri: https://github.com/BerlinVagrant/vagrant-dns
+  wiki_uri: https://github.com/BerlinVagrant/vagrant-dns/wiki
 post_install_message:
 rdoc_options: []
 require_paths: