palletjack-tools 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1698a81a8f10fd0ae9b078c077a157d62185388d
-  data.tar.gz: 8e00cb7db1fe2051f3ebe34e015f7285dff5cc07
+  metadata.gz: 443662d2e6f9f483d2de9d2305340e50656ae500
+  data.tar.gz: ffa79a21b570f12fdbb1f5ff4ff4c494f44cde4e
 SHA512:
-  metadata.gz: 41a4e3b367d5f38d5b9514df1e6f8e01571046d46cd5d70ab38f1a4913c44fd9930986af3a4e72b1b9a9978b542a58e26cbe96947c2b39dd15b13505685fd17b
-  data.tar.gz: 1993440970282599886f25403198dc39c86e8f3128451f6a8d63dbef26f2b71b0e5be1b49051f3372ca09490b0dfbaccf72b49669cfbebafea1eda42d628197f
+  metadata.gz: 97879673f71ef8f1f2ec8f643988a7145e0ec508675aa72d62c77b2756ad0cc1204355d88492d90c451034fe6209db1a6b6be890aab18e22788e2bbe707c0173
+  data.tar.gz: ad68602d2ff0ba2cc16ed4c319db333e01abbb7003df90d313d20022618c8930ca536a51b0a55dcef670b1559124616b8299180687eaa78542ba11b7379ecc7d

data/exe/palletjack2unbound

@@ -15,8 +15,76 @@
 
 require 'palletjack/tool'
 require 'ip'
+require 'resolv'
 
 class PalletJack2Unbound < PalletJack::Tool
+
+  # Representation of a stub zone configuration for Unbound
+
+  class StubZone
+
+    # :call-seq:
+    # new(TOOL, ZONE, AUTH-NS, ...)
+    # new(TOOL, ZONE, AUTH-NS, ..., transparent: true)
+    #
+    # If the +transparent+ option is true, it represents
+    # a <tt>local-zone ... transparent</tt>, declaration to
+    # override the builtin RFC1918 blocking in unbound.
+
+    def initialize(zone, *stub_addrs, transparent: false)
+      raise ArgumentError.new if stub_addrs.empty?
+
+      @tool = PalletJack2Unbound.instance
+      @zone = zone
+      @stub_addrs = stub_addrs
+      @transparent = transparent
+    end
+
+    # Write a stub-zone declaration to a file in conf.d/
+
+    def output
+      @tool.config_file :conf_dir, "#{@zone}.conf" do |stubfile|
+        stubfile << @tool.git_header('palletjack2unbound')
+        stubfile << "
+stub-zone:
+  name: #{@zone}\n"
+
+        @stub_addrs.each do |addr|
+          stubfile << "  stub-addr: #{addr}\n"
+        end
+
+        if @transparent then
+          stubfile << "\nserver:\n  local-zone: \"#{@zone}\" transparent\n"
+        end
+      end
+    end
+  end
+
+  # Representation of a service wide configuration for Unbound
+
+  class UnboundConfig
+    def initialize(service_name)
+      @tool = PalletJack2Unbound.instance
+      @service_name = service_name
+      @service_config = @tool.jack.fetch(kind:'service', name: @service_name)
+    end
+
+    # Generate unbound service configuration
+
+    def output
+      @tool.config_file :local_dir, "#{@service_name}.conf" do |configfile|
+        configfile << @tool.git_header('palletjack2unbound')
+        @service_config["service.unbound.server"].each do |config|
+          config.each do |key, value|
+            configfile << "#{key}: #{value}\n"
+          end
+        end
+      end
+    end
+  end
+
+  # Setup command line options parser
+
   def parse_options(opts)
     opts.banner =
 "Usage: #{$PROGRAM_NAME} -w <warehouse> -s <service> -o <output directory>
@@ -42,30 +110,6 @@ E.g.
     required_option :service
   end
 
-  # Write a stub-zone declaration to a file in conf.d/
-  # If the +transparent+ option is true, also write
-  # a local-zone ... transparent, declaration e.g. to
-  # override the builtin RFC1918 blocking in unbound.
-
-  def stub_zone(zone, stub_addrs, transparent: false)
-    return if stub_addrs.empty?
-
-    config_file :conf_dir, "#{zone}.conf" do |stubfile|
-      stubfile << git_header('palletjack2unbound')
-      stubfile << "
-stub-zone:
-  name: #{zone}\n"
-
-      stub_addrs.each do |addr|
-        stubfile << "  stub-addr: #{addr}\n"
-      end
-
-      if transparent then
-        stubfile << "\nserver:\n  local-zone: \"#{zone}\" transparent\n"
-      end
-    end
-  end
-
   # Check if +ip+ belongs to some RFC1918 network
 
   def rfc1918?(ip)
@@ -75,55 +119,72 @@ stub-zone:
     rfc1918_nets.any? {|net| ip.is_in?(net)}
   end
 
-  # Generate unbound service configuration
+  # Processing stage for stub zones
+
+  def process_stub_zones
+    @stub_zones = []
+
+    jack.each(kind:'domain') do |domain|
+      zone = domain['net.dns.domain']
+      stub_addrs = []
 
-  def unbound_config(service_name)
-    service_config = jack.fetch(kind:'service', name: service_name)
+      domain['net.dns.ns'].each do |ns|
+        nsname = Resolv::DNS::Name.create(ns)
+        nsname =
+          Resolv::DNS::Name.create("#{ns}.#{zone}.") unless nsname.absolute?
 
-    config_file :local_dir, "#{service_name}.conf" do |configfile|
-      configfile << git_header('palletjack2unbound')
-      service_config["service.unbound.server"].each do |config|
-        config.each do |key, value|
-          configfile << "#{key}: #{value}\n"
+        jack.each(kind:'ipv4_interface',
+                  all?:{'net.dns.fqdn' => nsname.to_s}) do |ipv4|
+          stub_addrs << ipv4['net.ipv4.address']
         end
       end
-    end
-  end
-end
 
-PalletJack2Unbound.run do
-  config_dir :conf_dir
-  config_dir :local_dir
+      @stub_zones << StubZone.new(zone, *stub_addrs)
 
-  jack.each(kind:'domain') do |domain|
-    zone = domain['net.dns.domain']
-    stub_addrs = []
+      next unless domain['net.ipv4.cidr']
 
-    domain['net.dns.ns'].each do |ns|
-      jack.each(kind:'ipv4_interface', all?:{'net.dns.fqdn' => ns}) do |ipv4|
-        stub_addrs << ipv4['net.ipv4.address']
-      end
+      # Assume all delegations happen on octet boundaries for now.
+      # TODO: RFC 2317 classless in-addr.arpa delegation
+
+      ip_net = IP.new(domain['net.ipv4.cidr'])
+      reverse_zone = ip_net.to_arpa
+      prefix_octets, _ = domain['net.ipv4.prefixlen'].to_i.divmod(8)
+      reverse_zone =
+        ip_net.to_arpa.split('.')[-(2 + prefix_octets) .. 5].join('.')
+
+      # Make the same assumption that palletjack2knot does;
+      # reverse delegations are made to the same nameserver
+      # as forward delegations.
+
+      @stub_zones << StubZone.new(reverse_zone, *stub_addrs,
+                                  transparent: rfc1918?(ip_net))
     end
+  end
+
+  # Processing stage for global service configuration
 
-    stub_zone(zone, stub_addrs)
+  def process_service_config
+    @unbound_config = UnboundConfig.new(options[:service])
+  end
 
-    next unless domain['net.ipv4.cidr']
+  # Main processing stage
 
-    # Assume all delegations happen on octet boundaries for now.
-    # TODO: RFC 2317 classless in-addr.arpa delegation
+  def process
+    process_stub_zones
+    process_service_config
+  end
 
-    ip_net = IP.new(domain['net.ipv4.cidr'])
-    reverse_zone = ip_net.to_arpa
-    prefix_octets, _ = domain['net.ipv4.prefixlen'].to_i.divmod(8)
-    reverse_zone =
-      ip_net.to_arpa.split('.')[-(2 + prefix_octets) .. 5].join('.')
+  # Config file output stage
 
-    # Make the same assumption that palletjack2knot does;
-    # reverse delegations are made to the same nameserver
-    # as forward delegations.
+  def output
+    config_dir :conf_dir
+    config_dir :local_dir
 
-    stub_zone(reverse_zone, stub_addrs, transparent: rfc1918?(ip_net))
+    @stub_zones.each {|stub_zone| stub_zone.output }
+    @unbound_config.output
   end
+end
 
-  unbound_config(options[:service])
+if PalletJack2Unbound.standalone?(__FILE__)
+  PalletJack2Unbound.run
 end

metadata

@@ -1,37 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: palletjack-tools
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Karl-Johan Karlsson
 autorequire: 
 bindir: exe
-cert_chain:
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIDljCCAn6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBIMRYwFAYDVQQDDA1jYWxs
-  ZS5lbmdsdW5kMRkwFwYKCZImiZPyLGQBGRYJc2FhYmdyb3VwMRMwEQYKCZImiZPy
-  LGQBGRYDY29tMB4XDTE2MTEwMjA5MjYyN1oXDTE3MTEwMjA5MjYyN1owSDEWMBQG
-  A1UEAwwNY2FsbGUuZW5nbHVuZDEZMBcGCgmSJomT8ixkARkWCXNhYWJncm91cDET
-  MBEGCgmSJomT8ixkARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-  ggEBAM7OxaztzD0LyOwK1mPcg3BhioX1EDVbD/qAFOAzBSGGlAhtmHMqAkyvJMvs
-  iiG7xvBidWUapxiEiBwamXiOTSrp2eW+XSXW9omdWHXjBZcwHqwb1VmAlYRDkSHf
-  dzcM/z4xlV+DJw/pFyMRWzqNdVBtWTbVXAFGjJSqQ6q21ACYJldV9U71AIpXo+oF
-  VEMf6PZS2uhB1G+FgAtnX/xmy7OM1Cy3qc/CaJbWSddpegxWJMUn2HNQxFwIe40g
-  WoEoiFA7qQg9DnR/5i3lW6QyfIaA5k9cv2su1VyjqKLbkFTTTjYw0P1BJmvfXjtc
-  rMl+3HCWYj6UunZwfZi2wDGsBkkCAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
-  DwQEAwIEsDAdBgNVHQ4EFgQUwHCMEKgrIMaiTkTVLKZn6yOD1SIwJgYDVR0RBB8w
-  HYEbY2FsbGUuZW5nbHVuZEBzYWFiZ3JvdXAuY29tMCYGA1UdEgQfMB2BG2NhbGxl
-  LmVuZ2x1bmRAc2FhYmdyb3VwLmNvbTANBgkqhkiG9w0BAQUFAAOCAQEAP9OnE0jP
-  2vRHI/vnOkgCvLFNoOqK/YB4yDVVW69Pza+xIXcmUBvl7DQ+bBdF5AK0B1A7U0rp
-  Pbdj0bpQtWxmUmMIbnE1w6iuVCXAabsyUfHY4mlztToWXMVOXc1SPlJ/S2XXaRd5
-  fiNj/nBTb0YTQA0E4pZ0Aud80qZ2WLdc6FfzHUEMW91BL3bhLeDL40noHK5Lvk52
-  phzVHIrDjCowUMTnGiPZCXEo4KZW76KwYYV6oQ6LzcrYBw5mJ4XpdgQKZgnTnRBP
-  f8wtQllq82VF0AXUYeLtTh1f+DW3WW5BO1e2OCu5eOV7dbyaVPaNK/+rHjCN8kM/
-  DGZSwUoNADmVkQ==
-  -----END CERTIFICATE-----
-date: 2016-11-02 00:00:00.000000000 Z
+cert_chain: []
+date: 2016-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: palletjack
@@ -39,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.1.3
 - !ruby/object:Gem::Dependency
   name: dns-zone
   requirement: !ruby/object:Gem::Requirement
@@ -193,7 +170,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Tools for the Pallet Jack Lightweight Configuration Management Database

metadata.gz.sig

@@ -1,3 +0,0 @@
-�.��۩'1����:�򙘹TF��TX̉�]]��ZY��bWـ�R}Jo{���$S1cǹ�%�M��W���� ��_����S���wE�ѣl�8!$ҩ��?]s�0=���c�Ud�ς�!;
-��L���;|�Y�9jq�
-�V��h��5����s��Yw�ZEʰ�o~n�V~�N��v����!�T?XO5忊j��$R�O���AT�3��W<�lѯ*J=֥��vcg78F��A�3�,Q��ڌn�