smart_proxy_dhcp_dnsmasq 0.6 → 0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 64fb30133ada0a818bdf665a6488a4373f317144
-  data.tar.gz: 60dd83f0e023802e77b59d54ba75bdd1ec40e75c
+SHA256:
+  metadata.gz: b9f60a51d51d8a80edf7ebd7f841ef4f5e44397c4b86bfb5c13c8872fab3d74b
+  data.tar.gz: e528fe5bc8aef7b939ab6feea332ec2c0aedba81d5a101e2be1d063c242fb2b4
 SHA512:
-  metadata.gz: 11665804f753f83922fbbabd1551b08c415b5910439f4a00319115794bbf4dd97cb472e1f75be48f5c091ab9cc3e1464c840956ecdb7bdec7da26698a4065e90
-  data.tar.gz: eb8ae2512a23f5924d15dd0a7b89c50b555fdbfe809f45daab0e8e3f6368a5aa8523fa85d59978c947ba3688c95cb5fe17546ed1e054001370fcc6ac5965e42e
+  metadata.gz: 45ba84592849d76efe6725ec24723509ac3347d7a4ff15c1de47969aeb3cd5a9e019d51521b2bdddca27ff7bb25c861fd49ff6c17261a08cc1be60066099cd0c
+  data.tar.gz: 9d7e177853adff920b1c98892c4a240c174afdb7ff07e848ec49065434f2f59ca9e7df890cc4a2fdcfdb7e0b426dfa09417a960986f12a8b8b66e40400a94c62

data/bundler.d/dhcp_dnsmasq.rb

@@ -0,0 +1 @@
+gem 'smart_proxy_dhcp_dnsmasq'

data/lib/smart_proxy_dhcp_dnsmasq/dhcp_dnsmasq_main.rb

@@ -13,6 +13,7 @@ module Proxy::DHCP::Dnsmasq
       @optsfile_content = []
 
       Dir.mkdir @config_dir unless Dir.exist? @config_dir
+      cleanup_optsfile if true # TODO: Only cleanup occasionally
 
       subnet_service.load!
 
@@ -72,7 +73,7 @@ module Proxy::DHCP::Dnsmasq
     def optsfile_content
       path = File.join(@config_dir, 'dhcpopts.conf').freeze
 
-      @optsfile_content = open(path).readlines \
+      @optsfile_content = File.open(path).readlines.map(&:chomp).reject(&:empty?) \
         if File.exist?(path) && @optsfile_content.empty?
       @optsfile_content
     end
@@ -85,6 +86,20 @@ module Proxy::DHCP::Dnsmasq
       File.write(path, optsfile_content.join("\n") + "\n")
     end
 
+    def cleanup_optsfile
+      used_tags = []
+      Dir.glob(File.join(@config_dir, 'dhcphosts', '*.conf')) do |file|
+        File.read(file).scan(/set:(.*?),/m) { |tag| used_tags << tag }
+      end
+      used_tags = used_tags.sort.uniq
+
+      @optsfile_content = optsfile_content.select do |line|
+        tag = line[/tag:(.*?),/, 1]
+        used_tags.include?(tag)
+      end
+      File.write(File.join(@config_dir, 'dhcpopts.conf'), optsfile_content.join("\n") + "\n")
+    end
+
     def sanitize_string(string)
       string.downcase.gsub(/[^0-9a-z]/, '_')
     end

data/lib/smart_proxy_dhcp_dnsmasq/dhcp_dnsmasq_subnet_service.rb

@@ -43,7 +43,7 @@ module Proxy::DHCP::Dnsmasq
     end
 
     def parse_config_for_subnet
-      configuration = {}
+      configuration = { options: {} }
       files = []
       @config_paths.each do |path|
         files << path if File.exist? path
@@ -88,8 +88,6 @@ module Proxy::DHCP::Dnsmasq
           when 'dhcp-option'
             data = value.split(',')
 
-            configuration[:options] = {} unless configuration.key? :options
-
             data.shift until data.empty? || /\A\d+\z/ === data.first
             next if data.empty?
 
@@ -217,27 +215,24 @@ module Proxy::DHCP::Dnsmasq
         if dupe = find_host_by_mac(record.subnet_address, record.mac)
           logger.debug "Found duplicate #{dupe} when adding record #{record}, skipping"
           next
-          # delete_host(dupe)
         end
 
-        logger.debug "Adding host #{record}"
+        # logger.debug "Adding host #{record}"
         add_host(record.subnet_address, record)
       end
 
-      leases = [] # load_leases # FIXME: Will cause collisions if added
+      leases = load_leases
       leases.each do |lease|
         if dupe = find_lease_by_mac(lease.subnet_address, lease.mac)
-          logger.debug "Removing duplicate #{dupe} when adding lease #{lease}, skipping"
+          logger.debug "Found duplicate #{dupe} by MAC when adding lease #{lease}, skipping"
           next
-          # delete_lease(dupe)
         end
         if dupe = find_lease_by_ip(lease.subnet_address, lease.ip)
-          logger.debug "Removing duplicate #{dupe} when adding lease #{lease}, skipping"
+          logger.debug "Found duplicate #{dupe} by IP when adding lease #{lease}, skipping"
           next
-          # delete_lease(dupe)
         end
 
-        logger.debug "Adding lease #{lease}"
+        # logger.debug "Adding lease #{lease}"
         add_lease(lease.subnet_address, lease)
       end
     end

data/lib/smart_proxy_dhcp_dnsmasq/dhcp_dnsmasq_version.rb

@@ -1,7 +1,7 @@
 module Proxy
   module DHCP
     module Dnsmasq
-      VERSION = '0.6'.freeze
+      VERSION = '0.7'.freeze
     end
   end
 end

data/test/dhcp_dnsmasq_production_wiring_test.rb

@@ -6,6 +6,7 @@ class DHCPDnsmasqProductionWiringTest < Test::Unit::TestCase
   def setup
     @container = ::Proxy::DependencyInjection::Container.new
     @config = ::Proxy::DHCP::Dnsmasq::PluginConfiguration.new
+    Proxy::DHCP::Dnsmasq::Record.any_instance.stubs(:cleanup_optsfile)
   end
 
   def test_dns_provider_initialization_default

data/test/dhcp_dnsmasq_record_handling_test.rb

@@ -6,6 +6,7 @@ class DHCPDnsmasqRecordHandlingTest < Test::Unit::TestCase
     @subnet_service = mock
     @subnet_service.expects(:load!).returns(true)
     Dir.stubs(:exist?).returns(true)
+    Proxy::DHCP::Dnsmasq::Record.any_instance.stubs(:cleanup_optsfile)
 
     @server = ::Proxy::DHCP::Dnsmasq::Record.new('/etc/dnsmasq.d/', '/bin/true', @subnet_service)
     @server.instance_eval('@optsfile_content = []')

data/test/dhcp_dnsmasq_subnet_service_test.rb

@@ -21,11 +21,11 @@ class DHCPDnsmasqSubnetServiceTest < Test::Unit::TestCase
 
     initializer.expects(:add_subnet).with(subnet)
     initializer.expects(:add_host)
-#    initializer.expects(:add_lease)
+    initializer.expects(:add_lease)
 
     initializer.expects(:parse_config_for_subnet).returns(subnet)
     initializer.expects(:parse_config_for_dhcp_reservations).returns([host])
-#    initializer.expects(:load_leases).returns([lease])
+    initializer.expects(:load_leases).returns([lease])
 #    initializer.expects(:add_watch)
 
     initializer.load!

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_dhcp_dnsmasq
 version: !ruby/object:Gem::Version
-  version: '0.6'
+  version: '0.7'
 platform: ruby
 authors:
 - Alexander Olofsson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-27 00:00:00.000000000 Z
+date: 2019-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -61,7 +61,7 @@ extra_rdoc_files: []
 files:
 - LICENSE
 - README.md
-- bundler.d/dns_dnsmasq.rb
+- bundler.d/dhcp_dnsmasq.rb
 - config/dhcp_dnsmasq.yml
 - lib/smart_proxy_dhcp_dnsmasq.rb
 - lib/smart_proxy_dhcp_dnsmasq/dhcp_dnsmasq_configuration.rb
@@ -74,7 +74,7 @@ files:
 - test/dhcp_dnsmasq_record_handling_test.rb
 - test/dhcp_dnsmasq_subnet_service_test.rb
 - test/test_helper.rb
-homepage: https://github.com/ace13/smart_proxy_dhcp_dnsmasq
+homepage: https://github.com/theforeman/smart_proxy_dhcp_dnsmasq
 licenses:
 - GPL-3.0
 metadata: {}
@@ -93,14 +93,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: dnsmasq DHCP provider plugin for Foreman's smart proxy
 test_files:
 - test/test_helper.rb
+- test/dhcp_dnsmasq_subnet_service_test.rb
 - test/dhcp_dnsmasq_default_settings_test.rb
 - test/dhcp_dnsmasq_production_wiring_test.rb
 - test/dhcp_dnsmasq_record_handling_test.rb
-- test/dhcp_dnsmasq_subnet_service_test.rb

data/bundler.d/dns_dnsmasq.rb

@@ -1 +0,0 @@
-gem 'smart_proxy_dns_dnsmasq'