iptablez 1.0.2.pre → 1.0.3.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed56014a1c4446b0ea5a103660d8f2fa17a08977
-  data.tar.gz: cb5b5a3e33bfd07fb389aebec48e195b9bc7216d
+  metadata.gz: 1440f17ad339ac23dc229322f5ae21219029e598
+  data.tar.gz: 43742fd31b17bb868f5aa3d0672a22a153efc38c
 SHA512:
-  metadata.gz: 16b9f41a4007f46bc144029443d70308c87f7f654ae56b4e0a78cdd00fb301b39b7676db8f578fb9050ee10c593c9475de8e762bccc7f5b9a053d7b86ac009ae
-  data.tar.gz: ca58720d07668ab89892cb1f753813f57b86a05f1de8e7fce47ebb255b47addba9a947ea058e9d76f05246a2e143c485d6e645b30fbad6215d4f9607d57e538d
+  metadata.gz: 55c5f8de9bcea965e6d42554464291349aafaa7b3f5cf8713bc71fc46151c71cb745d9db19c62c685d6cf06bdcefe8c1f9ad1c6fe8e42fe97d050b0085627ef7
+  data.tar.gz: 8eb8c9e4ed6b8fd39ced1f8f812d64ea8db645f6c24e4c03e2e983615862055748da1b62f47aa94cb1b3923c44df9ac922bc14b4237e5d2627130ff61b08034c

data/bin/iptablez-shell

@@ -1,4 +1,3 @@
-$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 #!/usr/bin/env ruby
 
 require 'iptablez'
@@ -7,15 +6,20 @@ require 'pry'
 
 include Iptablez
 
+def chains
+  Chains
+end
+
 prompt_name = "#{"<コ".red + ":".green + "彡".red} #{"~".blue} "
 
 Pry.config.prompt = [
   proc { |target_self, nest_level, pry|
-    "#{prompt_name}#{":#{nest_level}" unless nest_level.zero?}> "
+    "#{prompt_name}#{":#{nest_level}" unless nest_level.zero?} "
   },
   proc { |target_self, nest_level, pry|
     "#{prompt_name}(#{Pry.view_clip(target_self)})#{":#{nest_level}" unless nest_level.zero?}* "
   }
 ]
 Pry.config.prompt_name = prompt_name
+
 Pry.start

data/lib/iptablez.rb

@@ -12,6 +12,9 @@ require "iptablez/commands/flush_chain"
 require "iptablez/commands/interface"
 require "iptablez/commands/policy"
 require "iptablez/commands/new_chain"
+require "iptablez/commands/stats/bytes"
+require "iptablez/commands/stats/packets"
+require "iptablez/commands/stats"
 require "iptablez/commands/append_chain"
 require "iptablez/commands/rename_chain"
 require "iptablez/commands/delete_chain"

data/lib/iptablez/chains/chains.rb

@@ -169,6 +169,42 @@ module Iptablez
         raise "Cannot use both a single name and multiple names together."
       end
     end 
+   
+    def self.stats
+      Commands::Stats
+    end
+    
+    def self.packets
+      Commands::Stats::Packets
+    end
+
+    def self.bytes
+      Commands::Stats::Bytes
+    end
+
+    def self.list
+      Commands::List
+    end
+  
+    def self.new_chain
+      Commands::NewChain
+    end
+
+    def self.delete_chain
+      Commands::DeleteChain
+    end
+
+    def self.flush_chain
+      Commands::FlushChain
+    end
+
+    def self.rename_chain
+      Commands::RenameChain
+    end
+
+    def self.append_chain
+      Commands::AppendChain
+    end
 
     def self.create(name: false, names: [], error: false, continue: !error)
       if name
@@ -205,7 +241,7 @@ module Iptablez
         end
       end
     end
-
+    
     def self.rename(from: false, to: false, pairs: {}, error: false, continue: !error)
       if from && to
         Commands::RenameChain.chain(from: from, to: to, continue: continue) do |result|
@@ -220,7 +256,14 @@ module Iptablez
         end
       end
     end
-
+    
+    def self.append(name: false, names: [], error: false, continue: !error, **args)
+      if name
+        Commands::AppendChain.chain(name: name, continue: continue, **args)
+      elsif !names.empty?
+        Commands::AppendChain.chains(names: names, continue: continue, **args)
+      end
+    end
 
   end
 

data/lib/iptablez/commands/append_chain.rb

@@ -57,6 +57,16 @@ module Iptablez
         end
       end
 
+      def self.chains(names:, error: false, continue: !error, **args)
+        results = {} 
+        names.each do |name|
+          results[name] = chain(name: name, continue: continue, **args) do |name, result|
+            yield [name, result] if block_given?
+          end
+        end
+        results 
+      end
+
     end
   end
 end

data/lib/iptablez/commands/helpers/argument_helpers.rb

@@ -88,9 +88,13 @@ module Iptablez
         results[:protocol] = normalize_protocol(args[:protocol])[:protocol]                     if args[:protocol]
         results[:interface]= normalize_interface(args[:interface])[:interface]                  if args[:interface]
         results[:src]      = normalize_source(args[:src])[:source]                              if args[:src]
+        results[:src]      = normalize_source(args[:source])[:source]                           if args[:source]
         results[:sport]    = normalize_source(args[:sport], port: true)[:source_port]           if args[:sport]
+        results[:sport]    = normalize_source(args[:source_port], port: true)[:source_port]     if args[:source_port]
         results[:dst]      = normalize_destination(args[:dst])[:destination]                    if args[:dst]
+        results[:dst]      = normalize_destination(args[:destination])[:destination]            if args[:destination]
         results[:dport]    = normalize_destination(args[:dport], port: true)[:destination_port] if args[:dport]
+        results[:dport]    = normalize_destination(args[:destination_port], port: true)[:destination_port] if args[:destination_port] # lol
         results
       end
 

data/lib/iptablez/commands/list.rb

@@ -205,6 +205,17 @@ module Iptablez
           determine_error(chain: name, error: e)
         end 
       end
+
+      def self.chains(names:, policy: false, error: false, continue: !error)
+        results = {} 
+        names.each do |name|
+          results[name] = chain(name: name, policy: policy, continue: continue) do |name, result|
+            yield [name, result] if block_given?
+          end
+        end
+        results 
+      end
+
     end
   end
 end

data/lib/iptablez/commands/stats.rb

@@ -0,0 +1,17 @@
+module Iptablez
+
+  module Commands
+
+    module Stats 
+
+      def self.packets
+        Packets
+      end       
+
+      def self.bytes
+        Bytes
+      end
+
+    end
+  end
+end

data/lib/iptablez/commands/stats/bytes.rb

@@ -0,0 +1,81 @@
+module Iptablez
+  module Commands
+    module Stats 
+      module Bytes 
+        include MoveOn
+        UNKOWN_OPTION        = 'unknown option'.freeze
+        NO_CHAIN_MATCH_ERROR = 'iptables: No chain/target/match by that name.'.freeze
+        PERMISSION_DENIED    = 'Permission denied (you must be root)'.freeze
+        INVALID_RULE_NUMBER  = 'Invalid rule number'.freeze
+
+        KNOWN_ERRORS = [NO_CHAIN_MATCH_ERROR, PERMISSION_DENIED, INVALID_RULE_NUMBER, UNKOWN_OPTION].freeze
+
+        # @api private
+        # Determine a given error. Optionally a chain can be used to provide better context.
+        private_class_method def self.determine_error(error:, chain: false, number: false)
+          if error == NO_CHAIN_MATCH_ERROR
+            raise ChainExistenceError, "#{chain} doesn't exist!"
+          elsif error == INVALID_RULE_NUMBER
+            raise InvalidRuleIndexError, "#{chain} invalid number #{number}!"
+          else
+            raise error
+          end
+        end
+
+        def self.chain(name:, error: false, continue: !error, **args)
+          o, e, s = Open3.capture3(Iptablez.bin_path, '-L', name, '-v', '-n')      
+          e.strip! # remove new line
+          if s.success?
+            result = if Iptablez::Chains.defaults.include?(name)
+                       default_chain(o)
+                     else
+                       user_defined_chain(o)              
+                     end
+            yield [name, result] if block_given?
+            return result
+          elsif MoveOn.continue?(continue: continue, message: e, known_errors: KNOWN_ERRORS)
+            yield [name, false] if block_given?
+            return false
+          else
+            determine_error(chain: name, error: e)
+          end
+        end
+
+        def self.chains(names:, error: false, continue: !error, **args)
+          results = {}
+          names.each do |name|
+            results[name] = chain(name: name, continue: continue) do |name, result|
+              yield [name, result] if block_given?
+            end
+          end
+          results
+        end
+
+        def self.user_defined_chain(o)
+          result = 0
+          o = o.split("\n")
+          2.times { o.delete_at(0) }
+          o.each { |line| result += line.split[1].to_i }
+          yield result if block_given?
+          result 
+        end
+
+        def self.default_chain(o)
+          o = o.split("\n")
+          result = o[0].match(/\d+(K)/).to_s.to_i
+          yield result if block_given?
+          result
+        end
+
+        def self.all(names: Iptablez::Chains.all, error: false, continue: !error)
+          chains(names: names, continue: continue) do |name, result|
+            yield [name, result] if block_given?
+          end
+        end
+
+
+
+      end
+    end
+  end
+end

data/lib/iptablez/commands/stats/packets.rb

@@ -0,0 +1,80 @@
+module Iptablez
+  module Commands
+    module Stats 
+      module Packets       
+        include MoveOn
+
+        UNKOWN_OPTION        = 'unknown option'.freeze
+        NO_CHAIN_MATCH_ERROR = 'iptables: No chain/target/match by that name.'.freeze
+        PERMISSION_DENIED    = 'Permission denied (you must be root)'.freeze
+        INVALID_RULE_NUMBER  = 'Invalid rule number'.freeze
+
+        KNOWN_ERRORS = [NO_CHAIN_MATCH_ERROR, PERMISSION_DENIED, INVALID_RULE_NUMBER, UNKOWN_OPTION].freeze
+
+        # @api private
+        # Determine a given error. Optionally a chain can be used to provide better context.
+        private_class_method def self.determine_error(error:, chain: false, number: false)
+          if error == NO_CHAIN_MATCH_ERROR
+            raise ChainExistenceError, "#{chain} doesn't exist!"
+          elsif error == INVALID_RULE_NUMBER
+            raise InvalidRuleIndexError, "#{chain} invalid number #{number}!"
+          else
+            raise error
+          end
+        end
+
+        def self.chain(name:, error: false, continue: !error, **args)
+          o, e, s = Open3.capture3(Iptablez.bin_path, '-L', name, '-v', '-n')      
+          e.strip! # remove new line
+          if s.success?
+            result = if Iptablez::Chains.defaults.include?(name)
+                       default_chain(o)
+                     else
+                       user_defined_chain(o)              
+                     end
+            yield [name, result] if block_given?
+            return result
+          elsif MoveOn.continue?(continue: continue, message: e, known_errors: KNOWN_ERRORS)
+            yield [name, false] if block_given?
+            return false
+          else
+            determine_error(chain: name, error: e)
+          end
+        end
+
+        def self.user_defined_chain(o)
+          result = 0
+          o = o.split("\n")
+          2.times { o.delete_at(0) }
+          o.each { |line| result += line.split[0].to_i }
+          yield result if block_given?
+          result 
+        end
+
+        def self.default_chain(o)
+          o = o.split("\n")
+          result = o[0].match(/\d+/).to_s.to_i
+          yield result if block_given?
+          result
+        end
+        
+        def self.chains(names:, error: false, continue: !error, **args)
+          results = {}
+          names.each do |name|
+            results[name] = chain(name: name, continue: continue) do |name, result|
+              yield [name, result] if block_given?
+            end
+          end
+          results
+        end
+
+        def self.all(names: Iptablez::Chains.all, error: false, continue: !error)
+          chains(names: names, continue: continue) do |name, result|
+            yield [name, result] if block_given?
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/iptablez/helpers/README.md

@@ -0,0 +1,113 @@
+# Helpers 
+
+Iptablez helpers are here to make life easier by helping out.
+
+## Method Overview
+```ruby
+require 'iptablez'
+
+Iptablez.bin_path
+Iptablez.version
+Iptablez.list
+Iptablez.chains
+# more to come I'm sure...
+```
+
+## Bin Path
+
+Return the full path to `iptables`.
+
+```ruby
+Iptablez.bin_path
+# => "/sbin/iptables"
+```
+
+## Version
+
+Get `iptables` version.
+
+```ruby
+Iptablez::Chains.version
+# => "1.6.0"
+```
+
+## Delete 
+
+Delete a list of a given single `name` or an array of `names`. If the chain is not empty, the operation will fail. Consider flushing the chain(s) if you want to delete them.
+
+```ruby
+Iptablez::Chains.delete(name: "frogs") # frogs is not a real chain
+# => false
+
+Iptablez::Chains.delete(name: "frogs") do |name, result|
+  if result # this will be false
+    puts "#{name} was deleted!"
+  else
+    puts "#{name} couldn't be deleted!"
+  end
+end
+
+Iptablez::Chains.delete(names: ["dogs", "cats"])
+# => {"dogs"=>true, "cats"=>true}
+
+Iptablez::Chains.delete(names: ["dogs", "cats"]) do |name, result|
+  puts name if result # won't happen, already deleted! :)
+end
+# => {"dogs"=>false, "cats"=>false}
+```
+
+## Exists?
+
+Check if a list of a given single `name` or an array of `names` actually exists.
+
+```ruby
+Iptablez::Chains.exists?(name: "frogs") # frogs is not a real chain
+# => false
+
+Iptablez::Chains.exists?(name: "frogs") do |name, result|
+  if result # this will be false
+    puts "#{name} exists!"
+  else
+    puts "#{name} doesn't exist!"
+  end
+end
+
+Iptablez::Chains.exists?(names: ["dogs", "cats"])
+# => {"dogs"=>true, "cats"=>true}
+
+Iptablez::Chains.exists?(names: ["dogs", "cats"]) do |name, result|
+  puts name if result # won't happen, already deleted! :)
+end
+# => {"dogs"=>false, "cats"=>false}
+```
+
+## Policies
+
+Get a a list of a given single `name` or an array of `names` default policy response/target.
+
+```ruby
+Iptablez::Chains.policies(name: "frogs") # frogs is not a real chain
+# => false
+
+Iptablez::Chains.exists?(name: "frogs") do |name, result|
+  if result # this will be false
+    puts "#{name} exists!"
+  else
+    puts "#{name} doesn't exist!"
+  end
+end
+
+Iptablez::Chains.exists?(names: ["dogs", "cats"])
+# => {"dogs"=>true, "cats"=>true}
+
+Iptablez::Chains.exists?(names: ["dogs", "cats"]) do |name, result|
+  puts name if result # won't happen, already deleted! :)
+end
+# => {"dogs"=>false, "cats"=>false}
+```
+
+
+
+
+
+

data/lib/iptablez/helpers/version.rb

@@ -1,3 +1,3 @@
 module Iptablez
-  VERSION = "1.0.2.pre"
+  VERSION = "1.0.3.pre"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iptablez
 version: !ruby/object:Gem::Version
-  version: 1.0.2.pre
+  version: 1.0.3.pre
 platform: ruby
 authors:
 - Kent 'picat' Gruber
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-25 00:00:00.000000000 Z
+date: 2017-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -114,8 +114,12 @@ files:
 - lib/iptablez/commands/new_chain.rb
 - lib/iptablez/commands/policy.rb
 - lib/iptablez/commands/rename_chain.rb
+- lib/iptablez/commands/stats.rb
+- lib/iptablez/commands/stats/bytes.rb
+- lib/iptablez/commands/stats/packets.rb
 - lib/iptablez/commands/version.rb
 - lib/iptablez/commands/zero.rb
+- lib/iptablez/helpers/README.md
 - lib/iptablez/helpers/helpers.rb
 - lib/iptablez/helpers/version.rb
 homepage: https://github.com/picatz/iptablez