devdnsd 2.4.0 → 3.0.0

data/locales/it.yml

@@ -1,6 +1,6 @@
 # encoding: utf-8
 #
-# This file is part of the devdnsd gem. Copyright (C) 2013 and above Shogun <shogun_panda@me.com>.
+# This file is part of the devdnsd gem. Copyright (C) 2013 and above Shogun <shogun_panda@cowtech.it>.
 # Licensed under the MIT license, which can be found at http://www.opensource.org/licenses/mit-license.php.
 #
 
@@ -9,7 +9,7 @@
     rule_invalid_call: "Devi specificare almeno una regola e un host (anche tramite un blocco). Opzionalmente puoi aggiungere un tipo di record (default: A) e le opzioni."
     rule_invalid_options: "Puoi usare solo hash per le opzioni."
     rule_invalid_resource: "Classe di risorsa %1 non valida."
-    no_jruby_rubinius: "DevDNSd non è disponibile per JRuby o Rubinius."
+    no_jruby: "DevDNSd non è disponibile per JRuby."
     no_fork: "Il forking non è disponibile per questa piattaforma. Eseguo foreground ..."
     dns_update: "Cancello la cache dei DNS e dei resolver ..."
     starting: "Avvio DevDNSd ..."
@@ -38,11 +38,38 @@
     application_help_log_file: "Il file di log da utilizzare. Non usato se eseguito in foreground. Il valore predefinito è \"/var/log/devdnsd.log\"."
     application_help_log_level: "Il livello di log da utilizzare. I valori validi sono da 0 a 5 dove 0 significa \"tutti i messaggi\". Il valore predefinito è 1."
     application_help_foreground: "Non eseguire in background."
+    application_help_interface: "L'interfaccia da gestire. L'interfaccia predefinita è \"lo0\"."
+    application_help_addresses: "La lista di indirizzi da aggiungere. Sovrascrive la lista sequenziale."
+    application_help_start_address: "L'indirizzo iniziale per gli indirizzi sequenziali. L'indirizzo predefinito è \"10.0.0.1\"."
+    application_help_aliases: "Il numero di indirizzi da aggiungere. Il numero predefinito è 5."
+    application_help_add_command: "Il comando da eseguire per aggiungere un indirizzo. Il comando predefinito è \"sudo ifconfig {{interface}} alias {{address}}\"."
+    application_help_remove_command: "Il comando da eseguire per rimuovere un indirizzo. Il comando predefinito è \"sudo ifconfig {{interface}} -alias {{address}}\"."
+    application_help_dry_run: "Mostra solo quali modifiche sarebbero applicato"
+    application_help_quiet: "Non mostra alcun messaggio"
     application_meta_file: "FILE"
     application_meta_domain: "DOMINIO"
     application_meta_level: "LIVELLO"
     application_meta_port: "PORTA"
+    application_meta_interface: "INTERFACCIA"
+    application_meta_address: "INDIRIZZO"
+    application_meta_addresses: "INDIRIZZI"
+    application_meta_aliases: "ALIAS"
+    application_meta_command: "COMANDO"
     command_start: "Avvia server."
     command_install: "Installa il server."
     command_uninstall: "Disinstalla il server."
     command_stop: "Ferma il server."
+    command_aliases: "Aggiunge or rimuove indirizzi dalle interfacce di rete."
+    command_add: "Aggiungi indirizzi"
+    command_remove: "Rimuovi indirizzi."
+    removing: "Rimuovo"
+    adding: "Aggiungo"
+    remove: "rimuovere"
+    add: "aggiungere"
+    to: "all'"
+    from: "dall'"
+    general_error: "Impossibile {mark=bright}%1{/mark} l'indirizzo {mark=bright}%2{/mark} %3interfaccia {mark=bright}%4{/mark}."
+    add_empty: "Nessun indirizzo valido da aggiungere all'interfaccia trovato."
+    remove_empty: "Nessun indirizzo valido da rimuovere dall'interfaccia trovato."
+    run: "%1 {mark=bright}%2{/mark} l'indirizzo {mark=bright}%3{/mark} %4interfaccia {mark=bright}%5{/mark}..."
+    dry_run: "%1 Sto per {mark=bright}%2{/mark} l'indirizzo {mark=bright}%3{/mark} %4interfaccia {mark=bright}%5{/mark}..."

data/spec/coverage_helper.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 #
-# This file is part of the devdnsd gem. Copyright (C) 2013 and above Shogun <shogun_panda@me.com>.
+# This file is part of the devdnsd gem. Copyright (C) 2013 and above Shogun <shogun_panda@cowtech.it>.
 # Licensed under the MIT license, which can be found at http://www.opensource.org/licenses/mit-license.php.
 #
 
@@ -8,7 +8,7 @@ require "pathname"
 require "simplecov"
 require "coveralls"
 
-Coveralls.wear!
+Coveralls.wear! if ENV["CI"] || ENV["JENKINS_URL"]
 
 SimpleCov.start do
   root = Pathname.new(File.dirname(__FILE__)) + ".."
@@ -17,4 +17,4 @@ SimpleCov.start do
     path = Pathname.new(src_file.filename).relative_path_from(root).to_s
     path =~ /^lib\/devdnsd\/patches/ || path !~ /^(bin|lib)/
   end
-end
+end

data/spec/devdnsd/application_spec.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 #
-# This file is part of the devdnsd gem. Copyright (C) 2013 and above Shogun <shogun_panda@me.com>.
+# This file is part of the devdnsd gem. Copyright (C) 2013 and above Shogun <shogun_panda@cowtech.it>.
 # Licensed under the MIT license, which can be found at http://www.opensource.org/licenses/mit-license.php.
 #
 
@@ -13,16 +13,14 @@ describe DevDNSd::Application do
   end
 
   def create_application(overrides = {})
-    mamertes_app = Mamertes::App(run: false) do
+    DevDNSd::Application.new(Bovem::Application.create(run: false) {
       option :configuration, [], {default: overrides["configuration"] || "/dev/null"}
       option :tld, [], {default: overrides["tld"] || "dev"}
       option :port, [], {type: Integer, default: overrides["port"] || 7771}
       option :pid_file, [:P, "pid-file"], {type: String, default: "/var/run/devdnsd.pid"}
       option :log_file, [:l, "log-file"], {default: overrides["log_file"] || "/dev/null"}
       option :log_level, [:L, "log-level"], {type: Integer, default: overrides["log_level"] || 1}
-    end
-
-    DevDNSd::Application.new(mamertes_app, :en)
+    }, :en)
   end
 
   let(:log_file) { "/tmp/devdnsd-test-log-#{Time.now.strftime("%Y%m%d-%H%M%S")}" }
@@ -61,19 +59,18 @@ describe DevDNSd::Application do
 
   describe ".quit" do
     it "should quit the application" do
-      expect(::EventMachine).to receive(:stop)
+      allow(EM).to receive(:add_timer).and_yield
+      expect(EM).to receive(:stop)
       DevDNSd::Application.quit
     end
-  end
 
-  describe ".check_ruby_implementation" do
-    it "won't run on Rubinius" do
-      stub_const("Rubinius", true)
-      expect(Kernel).to receive(:exit).with(0)
-      expect(Kernel).to receive(:puts)
-      DevDNSd::Application.check_ruby_implementation
+    it "should not blow up in case of errors" do
+      allow(EM).to receive(:add_timer).and_raise(RuntimeError)
+      expect { DevDNSd::Application.quit }.not_to raise_error
     end
+  end
 
+  describe ".check_ruby_implementation" do
     it "won't run on JRuby" do
       stub_const("JRuby", true)
       expect(Kernel).to receive(:exit).with(0)
@@ -87,8 +84,8 @@ describe DevDNSd::Application do
       allow(DevDNSd::Application).to receive(:instance).and_call_original
     end
 
-    let(:mamertes) {
-      Mamertes::App(run: false) do
+    let(:bovem) {
+      Bovem::Application.create(run: false) do
         option :configuration, [], {default: "/dev/null"}
         option :tld, [], {default: "dev"}
         option :port, [], {type: Integer, default: 7771}
@@ -99,19 +96,19 @@ describe DevDNSd::Application do
     }
 
     it "should create a new instance" do
-      expect(DevDNSd::Application.instance(mamertes)).to be_a(DevDNSd::Application)
+      expect(DevDNSd::Application.instance(bovem)).to be_a(DevDNSd::Application)
     end
 
     it "should always return the same instance" do
-      other = DevDNSd::Application.instance(mamertes)
+      other = DevDNSd::Application.instance(bovem)
       expect(DevDNSd::Application).not_to receive(:new)
-      expect(DevDNSd::Application.instance(mamertes)).to eq(other)
+      expect(DevDNSd::Application.instance(bovem)).to eq(other)
       expect(DevDNSd::Application.instance).to eq(other)
     end
 
     it "should recreate an instance" do
-      other = DevDNSd::Application.instance(mamertes)
-      expect(DevDNSd::Application.instance(mamertes, :en, true)).not_to be(other)
+      other = DevDNSd::Application.instance(bovem)
+      expect(DevDNSd::Application.instance(bovem, :en, true)).not_to be(other)
     end
   end
 
@@ -158,26 +155,19 @@ describe DevDNSd::Application do
     let(:application){ create_application({"log_file" => log_file, "configuration" => sample_config}) }
 
     def test_resolve(host = "match_1.dev", type = "ANY", nameserver = "127.0.0.1", port = 7771, logger = nil)
-      allow(application).to receive(:on_start) do Thread.main[:resolver].run if Thread.main[:resolver].try(:alive?) end
-
-      Thread.current[:resolver] = Thread.start {
-        Thread.stop
-        Thread.main[:result] = devdnsd_resolv(host, type, nameserver, port, logger)
-      }
-
-      Thread.current[:server] = Thread.start {
-        sleep(0.1)
-        if block_given? then
-          yield
-        else
-          application.perform_server
-        end
-      }
+      result = nil
+
+      EM.run do
+        EM.add_timer(0.01) { application.perform_server }
+        EM.add_timer(0.1) {
+          Fiber.new {
+            result = devdnsd_resolv(host, type, nameserver, port, logger)
+            EM.stop
+          }.resume
+        }
+      end
 
-      Thread.current[:resolver].join
-      Thread.kill(Thread.current[:server])
-      Thread.main[:running] = false
-      Thread.main[:result]
+      result
     end
 
     it "should run the server" do
@@ -189,12 +179,10 @@ describe DevDNSd::Application do
       expect_any_instance_of(RubyDNS::Server).to receive(:on).with(:start)
       expect_any_instance_of(RubyDNS::Server).to receive(:on).with(:stop)
 
-      Thread.new {
-        sleep(0.1)
-        application.class.quit
-      }
-
-      application.perform_server
+      EM.run do
+        EM.add_timer(0.01) { application.perform_server }
+        EM.add_timer(0.2) { DevDNSd::Application.quit }
+      end
     end
 
     it "should iterate the rules" do
@@ -223,12 +211,12 @@ describe DevDNSd::Application do
         expect(test_resolve("match_1.dev")).to eq(["10.0.1.1", :A])
         expect(test_resolve("match_2.dev")).to eq(["10.0.2.1", :MX])
         expect(test_resolve("match_3.dev")).to eq(["10.0.3.1", :A])
-        expect(test_resolve("match_4.dev")).to eq(["10.0.4.1", :CNAME])
+        expect(test_resolve("match_4.dev")).to eq(["cowtech.it", :CNAME])
       end
 
       it "basing on a regexp pattern" do
-        expect(test_resolve("match_5_11.dev")).to eq(["10.0.5.11", :A])
-        expect(test_resolve("match_5_22.dev")).to eq(["10.0.5.22", :A])
+        expect(test_resolve("match_5_11.dev")).to eq(["ns.cowtech.it", :NS])
+        expect(test_resolve("match_5_22.dev")).to eq(["ns.cowtech.it", :NS])
         expect(test_resolve("match_6_33.dev")).to eq(["10.0.6.33", :PTR])
         expect(test_resolve("match_6_44.dev")).to eq(["10.0.6.44", :PTR])
         expect(test_resolve("match_7_55.dev")).to eq(["10.0.7.55", :A])
@@ -243,8 +231,8 @@ describe DevDNSd::Application do
       end
 
       it "and reject invalid matches (with or without rules)" do
-        expect(test_resolve("match_9.dev")).to be_nil
-        expect(test_resolve("invalid.dev")).to be_nil
+        expect(test_resolve("match_9.dev")).to eq([])
+        expect(test_resolve("invalid.dev")).to eq([])
       end
     end
   end
@@ -357,16 +345,165 @@ describe DevDNSd::Application do
     end
   end
 
+  describe "#manage_aliases" do
+    it "should override configuration" do
+      allow(application).to receive(:manage_address)
+      application.manage_aliases(:add, "MESSAGE", {aliases: 10})
+      expect(application.config.aliases).to eq(10)
+    end
+
+    it "should log an error if no interfaces are found" do
+      allow(application).to receive(:compute_addresses).and_return([])
+      expect(application.logger).to receive(:error).with("MESSAGE")
+      expect(application.manage_aliases(:add, "MESSAGE", {aliases: 10})).to be_false
+    end
+
+    it "should call #manage_address for each address" do
+      expect(application).to receive(:manage_address).with("OPERATION", IPAddr.new("10.0.0.1"), "DRY_RUN").and_return(true)
+      expect(application).to receive(:manage_address).with("OPERATION", IPAddr.new("10.0.0.2"), "DRY_RUN").and_return(true)
+      expect(application).to receive(:manage_address).with("OPERATION", IPAddr.new("10.0.0.3"), "DRY_RUN").and_return(true)
+      expect(application.manage_aliases("OPERATION", "MESSAGE", {aliases: 3, dry_run: "DRY_RUN"})).to be_true
+    end
+  end
+
+  describe "#manage_address" do
+    it "should show a right message to the user" do
+      expect(application.logger).to receive(:info).with(/.+.*3.*\/.*5.*.+ *Adding.* address .*10.0.0.3.* to interface .*lo0.*/)
+      application.manage_address(:add, "10.0.0.3")
+
+      expect(application.logger).to receive(:info).with(/.+.*3.*\/.*5.*.+ *Removing.* address .*10.0.0.3.* from interface .*lo0.*/)
+      application.manage_address(:remove, "10.0.0.3")
+    end
+
+    it "should call the right system command" do
+      expect(application).to receive(:execute_command).with("sudo ifconfig lo0 alias 10.0.0.3 > /dev/null 2>&1")
+      application.manage_address(:add, "10.0.0.3")
+
+      expect(application).to receive(:execute_command).with("sudo ifconfig lo0 -alias 10.0.0.3 > /dev/null 2>&1")
+      application.manage_address(:remove, "10.0.0.3")
+    end
+
+    it "should return true if the command succeded" do
+      application.config.add_command = "echo {{interface}}"
+      expect(application.manage_address(:add, "10.0.0.3")).to be_true
+    end
+
+    it "should return false if the command failed" do
+      expect(application.manage_address(:add, "10.0.0.256")).to be_false
+    end
+
+    it "should respect dry-run mode" do
+      expect(application).not_to receive(:execute_command)
+      expect(application.logger).to receive(:info).with(/.+.*3.*\/.*5.*.+ I will .*add.* address .*10.0.0.3.* to interface .*lo0.*/)
+      expect(application.logger).to receive(:info).with(/.+.*3.*\/.*5.*.+ I will .*remove.* address .*10.0.0.3.* from interface .*lo0.*/)
+
+      application.manage_address(:add, "10.0.0.3", true)
+      application.manage_address(:remove, "10.0.0.3", true)
+    end
+  end
+
+  describe "#compute_addresses" do
+    describe "should use only the explicit list if given" do
+      before(:each) do
+        application.config.addresses = ["10.0.0.1", "::1", "INVALID 1", "10.0.0.2", "INVALID 2", "2001:0db8:0::0:1428:57ab"]
+      end
+
+      it "considering all address" do
+        expect(application.compute_addresses).to eq(["10.0.0.1", "::1", "10.0.0.2", "2001:0db8:0::0:1428:57ab"])
+      end
+
+      it "considering only IPv4" do
+        expect(application.compute_addresses(:ipv4)).to eq(["10.0.0.1", "10.0.0.2"])
+        application.config.addresses = ["::1", "INVALID 1"]
+        expect(application.compute_addresses(:ipv4)).to eq([])
+      end
+
+      it "considering only IPv6" do
+        expect(application.compute_addresses(:ipv6)).to eq(["::1", "2001:0db8:0::0:1428:57ab"])
+        application.config.addresses = ["10.0.0.1", "INVALID 1"]
+        expect(application.compute_addresses(:ipv6)).to eq([])
+      end
+    end
+
+    describe "should compute a sequential list of address" do
+      it "considering all address" do
+        application.config.start_address = "10.0.1.1"
+        expect(application.compute_addresses).to eq(["10.0.1.1", "10.0.1.2", "10.0.1.3", "10.0.1.4", "10.0.1.5"])
+
+        application.config.start_address = "10.0.0.1"
+        application.config.aliases = 3
+        expect(application.compute_addresses).to eq(["10.0.0.1", "10.0.0.2", "10.0.0.3"])
+
+        application.config.start_address = "10.0.1.1"
+        application.config.aliases = -1
+        expect(application.compute_addresses).to eq(["10.0.1.1"])
+      end
+
+      it "considering only IPv4" do
+        application.config.start_address = "::1"
+        expect(application.compute_addresses(:ipv4)).to eq([])
+      end
+
+      it "considering only IPv6" do
+        application.config.start_address = "10.0.0.1"
+        expect(application.compute_addresses(:ipv6)).to eq([])
+      end
+    end
+  end
+
+  describe "#is_ipv4?" do
+    it "correctly detects valid IPv4 address" do
+      expect(application.is_ipv4?("10.0.0.1")).to be_true
+      expect(application.is_ipv4?("255.0.0.1")).to be_true
+      expect(application.is_ipv4?("192.168.0.1")).to be_true
+    end
+
+    it "rejects other values" do
+      expect(application.is_ipv4?("10.0.0.256")).to be_false
+      expect(application.is_ipv4?("10.0.0.-1")).to be_false
+      expect(application.is_ipv4?("::1")).to be_false
+      expect(application.is_ipv4?("INVALID")).to be_false
+      expect(application.is_ipv4?(nil)).to be_false
+    end
+  end
+
+  describe "#is_ipv6?" do
+    it "correctly detects valid IPv4 address" do
+      expect(application.is_ipv6?("2001:0db8:0000:0000:0000:1428:57ab")).to be_true
+      expect(application.is_ipv6?("2001:0db8:0:000:00:1428:57ab")).to be_true
+      expect(application.is_ipv6?("2001:0db8:0::1428:57ab")).to be_true
+      expect(application.is_ipv6?("2001::")).to be_true
+      expect(application.is_ipv6?("::1")).to be_true
+      expect(application.is_ipv6?("::2:1")).to be_true
+      expect(application.is_ipv6?("2011::10.0.0.1")).to be_true
+      expect(application.is_ipv6?("2011::0:10.0.0.1")).to be_true
+    end
+
+    it "rejects other values" do
+      expect(application.is_ipv6?("::H")).to be_false
+      expect(application.is_ipv6?("192.168.0.256")).to be_false
+      expect(application.is_ipv6?("INVALID")).to be_false
+      expect(application.is_ipv6?(nil)).to be_false
+    end
+  end
+
   describe "#action_start" do
     it "should call perform_server in foreground" do
       application = create_application({"log_file" => log_file})
-      application.config.foreground = true
+      application.instance_variable_set(:@command, Bovem::Command.new {
+        option :foreground, [:n, "foreground"], {default: true}
+      })
+
       expect(application).to receive(:perform_server)
       application.action_start
     end
 
     it "should start the daemon" do
       application = create_application({"log_file" => log_file})
+      application.instance_variable_set(:@command, Bovem::Command.new {
+        option :foreground, [:n, "foreground"], {default: false}
+      })
+
       expect(::RExec::Daemon::Controller).to receive(:start)
       application.action_start
     end
@@ -579,4 +716,18 @@ describe DevDNSd::Application do
       expect(application.action_uninstall).to be_false
     end
   end
+
+  describe "#action_add" do
+    it "should #manage_aliases" do
+      expect(application).to receive(:manage_aliases).with(:add, "No valid addresses to add to the interface found.", {a: 1})
+      application.action_add({a: 1})
+    end
+  end
+
+  describe "#action_remove" do
+    it "should #manage_aliases" do
+      expect(application).to receive(:manage_aliases).with(:remove, "No valid addresses to remove from the interface found.", {a: 1})
+      application.action_remove({a: 1})
+    end
+  end
 end

data/spec/devdnsd/configuration_spec.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 #
-# This file is part of the devdnsd gem. Copyright (C) 2013 and above Shogun <shogun_panda@me.com>.
+# This file is part of the devdnsd gem. Copyright (C) 2013 and above Shogun <shogun_panda@cowtech.it>.
 # Licensed under the MIT license, which can be found at http://www.opensource.org/licenses/mit-license.php.
 #
 

data/spec/devdnsd/rule_spec.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 #
-# This file is part of the devdnsd gem. Copyright (C) 2013 and above Shogun <shogun_panda@me.com>.
+# This file is part of the devdnsd gem. Copyright (C) 2013 and above Shogun <shogun_panda@cowtech.it>.
 # Licensed under the MIT license, which can be found at http://www.opensource.org/licenses/mit-license.php.
 #