gestio2masq 0.1.4 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8dfd30c9c5e99572bd37dc0794a998ba179f0b9d
-  data.tar.gz: fcc607f12edb58b03154303ce321e8ab20547e1a
+  metadata.gz: fd03a774fbdf430652788b68007b6076dcbb3751
+  data.tar.gz: d691394909c932898ed0e8751cb265dbe2f96b45
 SHA512:
-  metadata.gz: 93397dc8926c166729e80814d63eec42139100738431a99c326dec49fab9794a7d7560ce33738219195202bc5fbd64b94bc69ae92a399e626380bbf008223d7d
-  data.tar.gz: 996de291df6f8ee269f843a29c3fd63e471e20e18886d10734a24090cac549c053824e934652f54421b46ac93708cf17c196dd8f9218a31955791b8693ceaa5f
+  metadata.gz: a9e906059ded069a4adc9a12b1d9f57f27b7e43f28e3d65f9ae86c4c3a274042cb3bb4acb96b785c5ef28d5a0873e5d12de007603f172781a2915c58f2a35ea0
+  data.tar.gz: d17967e5d28542be39b2203183e587d8c387a851b6c408024af16153ee302b658e46bcc6d1ef10bf289aab91d866916635750237db9e00c3eb8851054565ef2c

data/{lib/gestio2masq/CHANGELOG → CHANGELOG}

@@ -1,3 +1,7 @@
+0.1.5
+* fix duplicate license, move changelog
+* filter out ipv6 addresses (they caused a crash)
+
 0.1.4
 * Add license
 * readme updates

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015 svdasein
+Copyright (c) 2015 David A. Parker
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -1,8 +1,8 @@
 # Gestio2masq
 [![Gem Version](https://badge.fury.io/rb/gestio2masq.svg)](http://badge.fury.io/rb/gestio2masq)
 
-gestio2masq generates [dnsmasq](http://www.thekelleys.org.uk/dnsmasq/doc.html) configuration files from [GestióIP](http://www.gestioip.net/) mysql databases.
-Or at least, it does this for *me*.  YMMV.
+gestio2masq generates [dnsmasq](http://www.thekelleys.org.uk/dnsmasq/doc.html) configuration files from IPAM data in
+a [GestióIP](http://www.gestioip.net/) mysql database.
 
 
 
@@ -18,7 +18,7 @@ or
 
     $ gem install gestio2masq
     
-Once installed, copy the example config file to /etc/ and edit.  The config file is self documenting :->
+Once installed, copy the example config file to /etc/ and edit (or use command line switches, see below).
 
 ###gestio2masq requires some custom fields in gestioip.
 

data/exe/gestio2masq

@@ -16,13 +16,13 @@ defaults = {
 opts = Trollop::options do
   usage '[options]'
   version %Q{Version #{Gestio2masq::VERSION}}
-  opt :config,   'Config file path',  :short=>'c', :type=>:string
-  opt :destdir,  'Destination dir',   :short=>'t', :type=>:string
-  opt :sqlhost,  'Database host',     :short=>'h', :type=>:string
-  opt :database, 'Database name',     :short=>'d', :type=>:string
-  opt :sqluser,  'Database user',     :short=>'u', :type=>:string
-  opt :sqlpass,  'Database password', :short=>'p', :type=>:string
-  opt :verbose,  'Verbose output',    :short=>'v'
+  opt :config, 'Config file path', :short => 'c', :type => :string
+  opt :destdir, 'Destination dir', :short => 't', :type => :string
+  opt :sqlhost, 'Database host', :short => 'h', :type => :string
+  opt :database, 'Database name', :short => 'd', :type => :string
+  opt :sqluser, 'Database user', :short => 'u', :type => :string
+  opt :sqlpass, 'Database password', :short => 'p', :type => :string
+  opt :verbose, 'Verbose output', :short => 'v'
 end
 
 config_file = opts[:config]||defaults[:config]
@@ -42,27 +42,27 @@ if config.nil? or (config.class != Hash)
   config = Hash.new
 else
   # symbolize hash keys (json format compatibility)
-  config = Hash[config.map{|(k,v)| [k.to_sym,v]}]
+  config = Hash[config.map { |(k, v)| [k.to_sym, v] }]
 end
 
 # Precedence (low to high): defaults, config file, command line
-config = defaults.merge(config).merge(Hash(opts.select {|k,v| !v.nil?}))
+config = defaults.merge(config).merge(Hash(opts.select { |k, v| !v.nil? }))
 
 begin
-	mysql = Mysql2::Client.new(
-		 :host => config[:sqlhost],
-		 :username => config[:sqluser],
-		 :password => config[:sqlpass],
-		 :database => config[:database]
-	)
+  mysql = Mysql2::Client.new(
+      :host => config[:sqlhost],
+      :username => config[:sqluser],
+      :password => config[:sqlpass],
+      :database => config[:database]
+  )
 rescue
-	puts %Q(Error connecting to database #{config[:database]} on host #{config[:sqlhost]} as #{config[:sqluser]}.)
-	exit(status=1)
+  puts %Q(Error connecting to database #{config[:database]} on host #{config[:sqlhost]} as #{config[:sqluser]}.)
+  exit(status=1)
 end
 
-networks_data = mysql.query('select * from net',:symbolize_keys => true)
-ranges_data = mysql.query('select * from ranges',:symbolize_keys => true)
-hosts_data = mysql.query('select * from host order by hostname',:symbolize_keys => true)
+networks_data = mysql.query('select * from net', :symbolize_keys => true)
+ranges_data = mysql.query('select * from ranges', :symbolize_keys => true)
+hosts_data = mysql.query('select * from host order by hostname', :symbolize_keys => true)
 hosts_extra_data = mysql.query('select custom_host_column_entries.*,custom_host_columns.name
                                from custom_host_column_entries,custom_host_columns
                                where custom_host_columns.id = custom_host_column_entries.cc_id',
@@ -70,69 +70,91 @@ hosts_extra_data = mysql.query('select custom_host_column_entries.*,custom_host_
 nets_extra_data = mysql.query('select custom_net_column_entries.*,custom_net_columns.name
                                from custom_net_column_entries,custom_net_columns
                                where custom_net_columns.id = custom_net_column_entries.cc_id',
-                               :symbolize_keys => true)
+                              :symbolize_keys => true)
 
 networks = Hash.new
 networks_data.each { |net|
-	# Merge custom network columns in with "regular" columns
-	nets_extra_data.select { |each| each[:net_id] == net[:red_num] } .each { |entry|
-		net[entry[:name].to_sym] = entry[:entry]
-	}
-	net[:bitmask] = IPAddress.parse("#{net[:red]}/#{net[:BM]}").netmask
-	networks[net[:red_num]] = net
+  # Merge custom network columns in with "regular" columns
+  nets_extra_data.select { |each| each[:net_id] == net[:red_num] }.each { |entry|
+    net[entry[:name].to_sym] = entry[:entry]
+  }
+  begin
+    net[:bitmask] = IPAddress.parse("#{net[:red]}/#{net[:BM]}").netmask
+    networks[net[:red_num]] = net
+  rescue
+    puts "IP address #{net[:red]}/#{net[:BM]} won't parse - rejecting"
+  end
 }
 
 ranges_entries = Array.new
 ranges_data.each { |range|
-	network = networks[range[:red_num].to_i]
-	start_ip = IPAddress::IPv4.parse_u32(range[:start_ip].to_i)
-	end_ip = IPAddress::IPv4.parse_u32(range[:end_ip].to_i)
-	ranges_entries.push("dhcp-range=#{network[:optiontag]},#{start_ip},#{end_ip},#{network[:bitmask]},#{network[:dynleasetime]}")
+  if network = networks[range[:red_num].to_i]
+    begin
+      start_ip = IPAddress::IPv4.parse_u32(range[:start_ip].to_i)
+      end_ip = IPAddress::IPv4.parse_u32(range[:end_ip].to_i)
+      ranges_entries.push("dhcp-range=#{network[:optiontag]},#{start_ip},#{end_ip},#{network[:bitmask]},#{network[:dynleasetime]}")
+    rescue
+      puts "Range #{range[:start_ip]}-#{range[:end_ip]} won't parse - rejecting"
+    end
+  end
 }
 
 hosts_entries = Array.new
 dhcp_hosts_entries = Array.new
 cnames_entries = Array.new
 hosts_data.each { |host|
-	host[:ipaddress] = IPAddress::IPv4.parse_u32(host[:ip].to_i)
-	# Merge custom host columns in with "regular" columns
-	hosts_extra_data.select { |each| each[:host_id] == host[:id] } .each { |entry|
-		host[entry[:name].to_sym] = entry[:entry]
-	}
-	# make hosts point to the network they belong to
-	host[:network] = networks[host[:red_num]]
-	if host[:hostname].size > 0
-		if host[:MAC]
-			# static dhcp assignment
-			if host[:optiontag]
-				dhcp_hosts_entries.push("#{host[:MAC]},set:#{host[:optiontag]},#{host[:hostname].split('.').shift},#{host[:ipaddress]},#{host[:network][:leasetime]}")
-			else
-				dhcp_hosts_entries.push("#{host[:MAC]},#{host[:hostname].split('.').shift},#{host[:ipaddress]},#{host[:network][:leasetime]}")
-			end
-		end
-		# hostname
-		hosts_entries.push("#{host[:ipaddress]}\t#{host[:hostname]}.#{host[:network][:domain]}")
-		if host[:CNAMEs]
-			host[:CNAMEs].split(':').each { |cname|
-				cnames_entries.push("cname=#{cname},#{host[:hostname]}.#{host[:network][:domain]}")
-			}
-		end
-	end
+  begin
+    host[:ipaddress] = IPAddress::IPv4.parse_u32(host[:ip].to_i)
+  rescue
+    puts "Host #{host[:ip]} won't parse - rejecting"
+    next
+  end
+  # Merge custom host columns in with "regular" columns
+  hosts_extra_data.select { |each| each[:host_id] == host[:id] }.each { |entry|
+    host[entry[:name].to_sym] = entry[:entry]
+  }
+  # make hosts point to the network they belong to
+  host[:network] = networks[host[:red_num]]
+  if host[:hostname].size > 0
+    if host[:MAC]
+      # static dhcp assignment
+      if host[:optiontag]
+        dhcp_hosts_entries.push("#{host[:MAC]},set:#{host[:optiontag]},#{host[:hostname].split('.').shift},#{host[:ipaddress]},#{host[:network][:leasetime]}")
+      else
+        dhcp_hosts_entries.push("#{host[:MAC]},#{host[:hostname].split('.').shift},#{host[:ipaddress]},#{host[:network][:leasetime]}")
+      end
+    end
+    # hostname
+    if host[:network] and host[:network][:domain]
+      hosts_entries.push("#{host[:ipaddress]}\t#{host[:hostname]}.#{host[:network][:domain]}")
+    else
+      hosts_entries.push("#{host[:ipaddress]}\t#{host[:hostname]}")
+    end
+    if host[:CNAMEs]
+      host[:CNAMEs].split(':').each { |cname|
+        if host[:network] and host[:network][:domain]
+          cnames_entries.push("cname=#{cname},#{host[:hostname]}.#{host[:network][:domain]}")
+        else
+          cnames_entries.push("cname=#{cname},#{host[:hostname]}")
+        end
+      }
+    end
+  end
 }
 puts "="*80 if config[:verbose]
 puts "RANGES: #{ranges_entries.size}"
-File.new(%Q(#{config[:destdir]}/dnsmasq.d/ranges),'w').puts(ranges_entries.join("\n"))
+File.new(%Q(#{config[:destdir]}/dnsmasq.d/ranges), 'w').puts(ranges_entries.join("\n"))
 puts(ranges_entries.join("\n")) if config[:verbose]
 puts "="*80 if config[:verbose]
 puts "CNAMES: #{cnames_entries.size}"
-File.new(%Q(#{config[:destdir]}/dnsmasq.d/cnames),'w').puts(cnames_entries.join("\n"))
+File.new(%Q(#{config[:destdir]}/dnsmasq.d/cnames), 'w').puts(cnames_entries.join("\n"))
 puts(cnames_entries.join("\n")) if config[:verbose]
 puts "="*80 if config[:verbose]
 puts "DHCP HOSTS: #{dhcp_hosts_entries.size}"
-File.new(%Q(#{config[:destdir]}/dnsmasq-dhcp-hosts.conf),'w').puts(dhcp_hosts_entries.join("\n"))
+File.new(%Q(#{config[:destdir]}/dnsmasq-dhcp-hosts.conf), 'w').puts(dhcp_hosts_entries.join("\n"))
 puts(dhcp_hosts_entries.join("\n")) if config[:verbose]
 puts "="*80 if config[:verbose]
 puts "HOSTS: #{hosts_entries.size}"
-File.new(%Q(#{config[:destdir]}/dnsmasq-hosts.conf),'w').puts(hosts_entries.join("\n"))
+File.new(%Q(#{config[:destdir]}/dnsmasq-hosts.conf), 'w').puts(hosts_entries.join("\n"))
 puts(hosts_entries.join("\n")) if config[:verbose]
 

data/gestio2masq.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.summary       = %q{Executable that generates DNSmasq conifguration files from Gestioip data}
   spec.description   = %q{This gem provides an executable that generates dnsmasq dns and dhcp configuration from a
 gestioip mysql database.}
-  spec.homepage      = "http://github.com/svdasein/gestio2masq"
+  spec.homepage      = "http://gitlab.com/svdasein/gestio2masq"
   spec.license       = "MIT"
 
   # Prevent pushing this gem to RubyGems.org by setting 'allowed_push_host', or

data/lib/gestio2masq/version.rb

@@ -1,3 +1,3 @@
 module Gestio2masq
-  VERSION='0.1.4'
-end
+  VERSION='0.1.6'
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gestio2masq
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.6
 platform: ruby
 authors:
 - svdasein
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-05-15 00:00:00.000000000 Z
+date: 2018-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -92,6 +92,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- CHANGELOG
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -99,11 +100,9 @@ files:
 - exe/gestio2masq
 - gestio2masq.gemspec
 - lib/gestio2masq.rb
-- lib/gestio2masq/CHANGELOG
-- lib/gestio2masq/LICENSE.txt
 - lib/gestio2masq/examples/gestio2masq.conf
 - lib/gestio2masq/version.rb
-homepage: http://github.com/svdasein/gestio2masq
+homepage: http://gitlab.com/svdasein/gestio2masq
 licenses:
 - MIT
 metadata:
@@ -125,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Executable that generates DNSmasq conifguration files from Gestioip data

data/lib/gestio2masq/LICENSE.txt

@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2015 David A. Parker
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.