puffy 0.3.1 → 1.1.0.pre.rc1

data/lib/puffy/puppet.rb

@@ -53,11 +53,11 @@ module Puffy
     def each_fragment
       @parser.nodes.each do |hostname|
         rules = @parser.ruleset_for(hostname)
-        policy = @parser.policy_for(hostname)
+        policies = @parser.policies_for(hostname)
 
         @formatters.each do |formatter|
           filename = File.join(@path, hostname, formatter.filename_fragment)
-          yield filename, formatter.emit_ruleset(rules, policy)
+          yield filename, formatter.emit_ruleset(rules, policies)
         end
       end
     end

data/lib/puffy/resolver.rb

@@ -56,8 +56,21 @@ module Puffy
       res
     end
 
+    def resolv_azure_ip_range(service_name)
+      res = azure_ip_range['values'].select { |service| service['name'] == service_name }[0]['properties']['addressPrefixes']
+      res.map { |ip| IPAddr.new(ip) }
+    end
+
     private
 
+    def azure_ip_range
+      @azure_ip_range ||= begin
+        page = URI('https://www.microsoft.com/en-us/download/details.aspx?id=56519').read
+        url = page.match(%r{https://download\.microsoft\.com/download/7/1/d/71d86715-5596-4529-9b13-da13a5de5b63/ServiceTags_Public_\d+\.json}).to_s
+        JSON.parse(URI(url).read)
+      end
+    end
+
     def parse_url(url)
       url =~ %r{^([^:]+)://([^/]+)}
       { host: Regexp.last_match(2), port: Regexp.last_match(1), proto_hint: :tcp }

data/lib/puffy/rule.rb

@@ -54,7 +54,7 @@ module Puffy
     # @!attribute no_quick
     #   Prevent the rule from being a quick one.
     #   @return [Boolean] Quick flag
-    attr_accessor :action, :return, :dir, :proto, :af, :on, :in, :out, :from, :to, :nat_to, :rdr_to, :no_quick
+    attr_accessor :action, :return, :dir, :log, :proto, :af, :on, :in, :out, :from, :to, :nat_to, :rdr_to, :no_quick
 
     # Instanciate a firewall Puffy::Rule.
     #
@@ -64,8 +64,7 @@ module Puffy
     def initialize(options = {})
       send_options(options)
 
-      @af = detect_af unless af
-
+      self.af ||= detect_af
       self.proto ||= from_proto_hint || to_proto_hint
 
       raise "unsupported action `#{options[:action]}'" unless valid_action?

data/lib/puffy/rule_factory.rb

@@ -56,7 +56,7 @@ module Puffy
     def instanciate_rules(options)
       options.expand.map do |hash|
         rule = Rule.new(hash)
-        rule if af_match_policy?(rule.af)
+        rule if af_match_scope?(rule.af)
       rescue AddressFamilyConflict
         nil
       end.compact
@@ -76,7 +76,7 @@ module Puffy
       end
     end
 
-    def af_match_policy?(address_family)
+    def af_match_scope?(address_family)
       @af.nil? || address_family.nil? || address_family == @af
     end
 

data/lib/puffy/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Puffy # :nodoc:
-  VERSION = '0.3.1'
+  VERSION = '1.1.0-rc1'
 end

data/puffy.gemspec

@@ -31,6 +31,6 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'cri'
-  spec.add_runtime_dependency 'deep_merge'
+  spec.add_dependency 'cri'
+  spec.add_dependency 'deep_merge'
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: puffy
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 1.1.0.pre.rc1
 platform: ruby
 authors:
 - Romain Tartière
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-22 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cri
@@ -38,7 +37,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description:
 email:
 - romain@blogreen.org
 executables:
@@ -47,6 +45,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/CODEOWNERS"
+- ".github/dependabot.yml"
 - ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
@@ -81,7 +80,6 @@ metadata:
   source_code_uri: https://github.com/opus-codium/puffy
   changelog_uri: https://github.com/opus-codium/puffy
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -96,8 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.20
-signing_key:
+rubygems_version: 3.7.2
 specification_version: 4
 summary: Network firewall rules made easy!
 test_files: []