iptables-web 0.3.5.pre3 → 0.3.5.pre4

data/README.md

@@ -4,22 +4,11 @@ TODO: Write a gem description
 
 ## Installation
 
-Add this line to your application's Gemfile:
-
-    gem 'iptables-web'
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install iptables-web
-
-## Usage
-
-TODO: Write usage instructions here
+Recommended installation on the server (system wide):
 
+    sudo /usr/local/ruby/1.9.3/bin/gem install iptables-web
+    sudo ln -sf /usr/local/ruby/1.9.3/bin/iptables-web /usr/local/bin/iptables-web
+    
 ## Contributing
 
 1. Fork it ( https://github.com/[my-github-username]/iptables-web/fork )

data/lib/iptables_web/cli/command/install.rb

@@ -3,28 +3,33 @@ module IptablesWeb
     module Command
       module Install
         def install_command
+          command :crontab do |c|
+
+          end
+
           command :install do |c|
             c.syntax = 'iptables-web install'
             c.description = 'Displays foo'
             c.option '--force', 'Force config '
             c.action do |args, options|
+              # TODO: Should be refactored
               config = IptablesWeb::Configuration.new
               api_url = ask('Api base url: ') { |q| q.default = config['api_base_url'] }
               token = ask('Access token: ') { |q| q.default = config['access_token'] }
               update_period = ask('Update every [min]', Integer) { |q| q.default = 1; q.in = 0..59 }
-              config_dir = IptablesWeb::Configuration.config_dir
+              config_path = IptablesWeb.config_path
+              config_dir = File.dirname(IptablesWeb.config_path)
               unless File.exist?(config_dir)
                 say "Create config directory: #{config_dir}"
-                Dir.mkdir(config_dir)
+                Dir.mkdir(File.dirname(config_dir))
               end
-              config_file = File.join(config_dir, 'config.yml')
-              say "Write config to #{config_file}"
-              File.write config_file, <<CONFIG
+              say "Write config to #{config_path}"
+              File.write config_path, <<CONFIG
 api_base_url: #{api_url}
 access_token: #{token}
 CONFIG
               if system("LANG=C bash -l -c \"type rvm | cat | head -1 | grep -q '^rvm is a function$'\"")
-                wrapper = "#{ENV['HOME']}/.rvm/wrappers/#{`rvm current`.strip}/iptables-web"
+                wrapper = 'rvm system do iptables-web'
               else
                 wrapper = 'iptables-web'
               end
@@ -33,7 +38,7 @@ CONFIG
               say "Write file #{cron_file}"
               File.write cron_file, <<CONFIG
 #/bin/env ruby
-#{wrapper} update
+#{wrapper}
 CONFIG
               File.chmod(0700, cron_file)
               say "Add cronjob #{cron_file}"
@@ -42,28 +47,6 @@ CONFIG
               jobs.reject! { |job| job.include?('.iptables-web') }
               jobs << "*/#{update_period} * * * * #{File.join(ENV['HOME'], '.iptables-web', 'cron.sh')}"
               crontab.save(jobs)
-
-              static_rules = File.join(config_dir, 'static_rules')
-
-              say "Create file for static rules #{static_rules}"
-              say "* * * * * * * * * * * * * * * * * * * * * * * *\n"
-              say "* You can write predefined rules to this file.\n"
-              say "* This file will be concat with rules \n"
-              say "* See 'iptables-save' format.\n"
-              say "* * * * * * * * * * * * * * * * * * * * * * * * \n"
-
-              if File.exist?(static_rules) && !options.force
-                say 'File already exist!'
-              else
-                File.write static_rules, <<STATIC_RULES
-*filter
--A INPUT -i lo -j ACCEPT
--A FORWARD -i lo -j ACCEPT
--A INPUT -m state --state ESTABLISHED,RELATED -j ACCEPT
--A FORWARD -m state --state ESTABLISHED,RELATED -j ACCEPT
-COMMIT
-STATIC_RULES
-              end
             end
           end
         end

data/lib/iptables_web/cli/command/update.rb

@@ -8,34 +8,33 @@ module IptablesWeb
             c.syntax = 'iptables-web update'
             c.description = 'Display bar with optional prefix and suffix'
             c.option '--config STRING', String, 'Path to config file'
-            c.option '--print', 'Show rules without restoring'
+            c.option '--print', 'Just print rules'
             c.option '--force', 'Set rules omit checksum check'
-            c.option '--dry-run', 'Skip handshake'
+            c.option '--dry-run', 'Skip handshake and update'
             c.action do |_, options|
               begin
                 IptablesWeb.configuration.load(options.config) if options.config
-                logged_say "Use iptables server #{IptablesWeb.api_base_url}"
+                logger_log "Use iptables server #{IptablesWeb.api_base_url}"
                 IptablesWeb.pid_file do
                   IptablesWeb::Model::Node.handshake(options.dry_run || options.print) do
                     rules = IptablesWeb::Model::AccessRule.all
                     iptables = IptablesWeb::Iptables.new
                     request_etag = rules.response.headers[:etag].first
                     if options.print
-                      logged_say 'Run client in print mode'
-                      logged_say 'Nothing changed.' if IptablesWeb.checksum?(request_etag)
-                      logged_say "Previous checksum #{IptablesWeb.checksum}"
-                      logged_say "Current checksum #{IptablesWeb.make_checksum(request_etag)}"
                       say iptables.render(rules)
                     else
-                      logged_say 'Run client in DRY-RUN mode' if options.dry_run
-                      logged_say("Etag value: #{request_etag.inspect}", ::Logger::DEBUG)
+                      logger_log 'Run client in DRY-RUN mode' if options.dry_run
+                      logger_log("Etag value: #{request_etag.inspect}", ::Logger::DEBUG)
                       if IptablesWeb.checksum?(request_etag) && !options.force
-                        logged_say 'Skip iptables update. Nothing changed.'
+                        logger_log '**** Nothing changed ****'
                       else
-                        logged_say '*** Iptables updated! ***'
-                        logger_log(iptables.render(rules), ::Logger::DEBUG)
-                        unless options.dry_run
-                          iptables.restore(rules)
+                        logger_log '*** Iptables updated! ***'
+                        if options.dry_run
+                          logger_log('New rules:', ::Logger::INFO)
+                          logger_log(iptables.render(rules), ::Logger::INFO)
+                        else
+                          iptables.update(rules)
+                          logger_log(iptables.diff, ::Logger::DEBUG)
                           IptablesWeb.checksum = request_etag
                         end
                       end
@@ -43,8 +42,8 @@ module IptablesWeb
                   end
                 end
               rescue Exception => e
-                logged_say(e.message)
-                logged_say(e.backtrace.join("\n"))
+                logger_log(e.message)
+                logger_log(e.backtrace.join("\n"))
               end
             end
           end

data/lib/iptables_web/cli/import.rb

@@ -4,5 +4,5 @@ require 'forwardable'
 $terminal = IptablesWeb::Cli::LoggedOutput.new
 module Kernel
   extend Forwardable
-  def_delegators :$terminal, :agree, :ask, :choose, :say, :logged_say, :logger_log
+  def_delegators :$terminal, :agree, :ask, :choose, :say, :logger_log, :logger_log
 end

data/lib/iptables_web/cli/logged_output.rb

@@ -14,29 +14,38 @@ module IptablesWeb
       def logger
         @logger ||= begin
           logfile = IptablesWeb::log_path
-          log_level = IptablesWeb::log_level
-          log_level = LOG_LEVEL_MAP[log_level] if LOG_LEVEL_MAP[log_level]
-          log_level = log_level.to_i
-          say("Open log file #{logfile}")
-          logger =::Logger.new(logfile)
-          logger.level = log_level.to_i
+          @log_io = MultiIO.new(File.open(logfile, 'a'))
+          logger =::Logger.new(@log_io)
           logger.formatter = ::Logger::Formatter.new
           logger
         end
       end
 
+      def log_stdout
+        @log_io.add(STDOUT)
+      end
+
+      def log_level=(log_level)
+        log_level = LOG_LEVEL_MAP[log_level] if LOG_LEVEL_MAP[log_level]
+        logger.level = log_level.to_i
+      end
+
+      def log_level
+        logger.level
+      end
+
       def reset
         @logger = nil
       end
 
       def logger_log(message, log_level = Logger::INFO)
-        logger.log(log_level, message) if logger
+        logger.log(log_level, message.to_s.strip) if logger
       end
 
-      def logged_say(message, log_level = Logger::INFO)
-        logger_log(message, log_level)
-        say(message)
-      end
+      # def logger_log(message, log_level = Logger::INFO)
+      #   logger_log(message, log_level)
+      #   say(message)
+      # end
     end
   end
 end

data/lib/iptables_web/cli/multi_io.rb

@@ -0,0 +1,22 @@
+module IptablesWeb
+  class Cli
+    class MultiIO
+      def initialize(*targets)
+        @targets = targets
+      end
+
+      def add(target)
+        @targets << target
+      end
+
+      def write(*args)
+        @targets.each { |t| t.write(*args) }
+      end
+
+      def close
+        @targets.each(&:close)
+      end
+    end
+  end
+end
+

data/lib/iptables_web/cli/pid_file.rb

@@ -8,8 +8,8 @@ module IptablesWeb
 
       def create
         raise AnotherLaunched.new("Another process with #{pid} already launched!") if another_exist?
-        logged_say("Create pidfile #{self} for pid #{Process.pid}")
-        logged_say("Grab pidfile #{self} for pid #{Process.pid} due process #{pid} is down.") if other?
+        logger_log("Create pidfile #{self} for pid #{Process.pid}")
+        logger_log("Grab pidfile #{self} for pid #{Process.pid} due process #{pid} is down.") if other?
         File.open(@pidfile, 'w') do |file|
           file.write(Process.pid)
         end
@@ -18,7 +18,7 @@ module IptablesWeb
 
       def delete
         raise AnotherLaunched.new("Delete error. Another process with #{pid} already launched!") if another_exist?
-        logged_say("Delete pidfile #{self} for pid #{pid}")
+        logger_log("Delete pidfile #{self} for pid #{pid}")
         File.unlink(@pidfile) if exist?
       end
 

data/lib/iptables_web/cli.rb

@@ -18,14 +18,23 @@ module IptablesWeb
         IptablesWeb.reload
       end
 
-      global_option('--log_file FILE', 'Log file path') do |log_path|
+      global_option('--verbose', 'Combination of --log-level debug and --log-stdout') do |_|
+        IptablesWeb.log_level = ::Logger::INFO
+        IptablesWeb.log_stdout
+      end
+
+      global_option('--log-file FILE', 'Log file path') do |log_path|
         IptablesWeb.log_path = log_path
       end
 
-      global_option('--log_level LEVEL', 'Log level') do |log_level|
+      global_option('--log-level LEVEL', 'Log level') do |log_level|
         IptablesWeb.log_level = log_level
       end
 
+      global_option('--log-stdout', 'Write log to stdout too') do |log_level|
+        IptablesWeb.log_stdout = log_level
+      end
+
       global_option('--host URL', 'Server base url') do |server_base_url|
         IptablesWeb.api_base_url = server_base_url
       end

data/lib/iptables_web/configuration.rb

@@ -1,30 +1,33 @@
 require 'yaml'
+require 'fileutils'
 module IptablesWeb
   module Configuration
+    include IptablesWeb::Mixin::ConfigParser
+
     def reload
       if File.exists?(config_path)
-        logged_say("Load config file #{config_path}")
+        logger_log("Load config file #{config_path}")
         YAML.load_file(config_path).each do |method, value|
           send("#{method}=".to_sym, value)
         end
       else
-        logged_say("Config file #{config_path} does not exist")
+        logger_log("Config file #{config_path} does not exist")
       end
     end
 
     def static_rules
-      return {} unless static_rules?
-      rules = File.read(static_rules_path)
-      chains = rules.scan(/\*([a-z]+)(.*?)COMMIT/m)
-      if chains && chains.size > 0
-        chains.each_with_object({}) do |r, obj|
-          chain = r[0]
-          obj[chain] ||= []
-          obj[chain] = obj[chain] | r[1].split("\n")
-        end
-      else
-        { 'filter' => rules.split("\n") }
+      unless static_rules?
+        return {
+          'filter' => [
+            '-A INPUT -i lo -j ACCEPT',
+            '-A FORWARD -i lo -j ACCEPT',
+            '-A INPUT -m state --state ESTABLISHED,RELATED -j ACCEPT',
+            '-A FORWARD -m state --state ESTABLISHED,RELATED -j ACCEPT'
+          ]
+        }
       end
+      rules = File.read(static_rules_path)
+      parse_rules(rules)
     end
 
     def static_rules?
@@ -39,35 +42,28 @@ module IptablesWeb
       @home = home
     end
 
-    def dir
-      @dir ||= begin
-        if root?
-          '/var/run/iptables_web'
-        else
-          File.expand_path(File.join(home, '.iptables-web'))
-        end
+    def work_dir
+      @work_dir ||= begin
+        work_dir = '/tmp/iptables-web'
+        FileUtils.mkdir_p(work_dir) unless File.exist?(work_dir)
+        work_dir
       end
     end
 
-    def dir=(d)
-      @dir = d
+    def work_dir=(d)
+      @work_dir = d
     end
 
-    def path(path)
-      File.expand_path(path, dir)
+    def work_path(path)
+      File.expand_path(path, work_dir)
     end
 
     def root?
       Process::UID.eid == 0
     end
 
-    #
     def config_path
-      if root?
-        '/etc/iptables_web/config.yml'
-      else
-        path(@config_path || 'config.yml')
-      end
+      @config_path || '/etc/iptables-web/config.yml'
     end
 
     def config_path=(config_path)
@@ -76,7 +72,7 @@ module IptablesWeb
 
     #
     def pid_path
-      path(@pid_path || 'run.pid')
+      work_path(@pid_path || 'run.pid')
     end
 
     def pid_path=(pid_path)
@@ -85,29 +81,28 @@ module IptablesWeb
 
     #
     def log_path
-      if root?
-        '/var/log/iptables-web.log'
-      else
-        path(@log_path || 'run.log')
-      end
+      @log_path || '/var/log/iptables-web/run.log'
     end
 
     def log_path=(pid_path)
       @log_path = pid_path
-      $terminal.reset if $terminal.present? && $terminal.is_a?(Cli::LoggedOutput)
+      $terminal.reset if $terminal.present?
     end
 
     def log_level=(level)
-      @log_level = level
-      $terminal.reset if $terminal.present? && $terminal.is_a?(Cli::LoggedOutput)
+      $terminal.log_level = level if $terminal.present?
+    end
+
+    def log_stdout
+      $terminal.log_stdout if $terminal.present?
     end
 
     def log_level
-      @log_level || ::Logger::INFO
+      $terminal.present? ? $terminal.log_level : ::Logger::INFO
     end
 
     def checksum_path
-      path(@checksum_path || 'checksum')
+      work_path(@checksum_path || 'checksum')
     end
 
     def checksum
@@ -133,20 +128,14 @@ module IptablesWeb
       Digest::MD5.hexdigest(check_sum)
     end
 
-    #
     def static_rules_path
-      if root?
-        '/etc/iptables_web/static_rules'
-      else
-        path(@static_rules_path || 'static_rules')
-      end
+      @static_rules_path || File.expand_path('static_rules', File.dirname(config_path))
     end
 
     def static_rules_path=(static_rules_path)
       @static_rules_path = static_rules_path
     end
 
-    #
     def api_base_url
       # raise 'api_base_url is required' unless @api_base_url
       @api_base_url
@@ -174,9 +163,8 @@ module IptablesWeb
         block.call(pid_file)
         pid_file.delete
       rescue Cli::PidFile::AnotherLaunched => e
-
         pid_file.delete
-        logged_say(e.message)
+        logger_log(e.message)
         return
       rescue Exception => e
         pid_file.delete

data/lib/iptables_web/iptables.rb

@@ -1,63 +1,107 @@
 require 'tempfile'
 module IptablesWeb
   class Iptables
+    LABEL = '[iptables-web]'
+
+    IPTABLES_COMMAND = 'iptables'
+    IPTABLES_SAVE_COMMAND = 'iptables-save'
+    IPTABLES_RESTORE_COMMAND = 'iptables-restore'
+
     include IptablesWeb::Mixin::Sudo
+    include IptablesWeb::Mixin::ConfigParser
 
-    def restore(access_rules)
-      lines = combine(access_rules)
-      if lines.size == 0
-        logged_say('Skip restore because no rules found')
-        return
-      end
+    def update(access_rules)
+      bash_file = Tempfile.new('rules')
+      bash_file.write "#!/bin/bash\n"
+      bash_file.write "set -e\n"
 
-      temp_file = Tempfile.new('rules')
-      logged_say("Save rules to file #{temp_file.path}")
-      temp_file.write lines.join("\n")
-      temp_file.rewind
-      execute("/sbin/iptables-restore -c #{temp_file.path}")
+      lines = combine_new_rules(access_rules)
+      current_rules = parse_rules(execute('iptables-save'))
+      # set default policy to ACCEPT
+      bash_file.write "#{IPTABLES_COMMAND} -P INPUT ACCEPT\n"
+      current_rules.each do |table, rules|
+        rules.each do |rule|
+          next unless rule.include?(LABEL)
+          bash_file.write("#{IPTABLES_COMMAND} -t #{table} #{rule.gsub('-A', '-D')}")
+          bash_file.write("\n")
+        end
+      end
+      bash_file.write "# Create rules\n"
+      bash_file.write lines.join("\n")
+      bash_file.write "\n"
+      # Close only if rules exist
+      if lines.size > 0
+        bash_file.write "#{IPTABLES_COMMAND} -P INPUT DROP\n"
+      end
+      bash_file.rewind
+      backup
+      res = execute("bash #{bash_file.path}")
+      unless $? == 0
+        logger_log('Failed to import settings. Restore previous configuration. See log for more details.', ::Logger::ERROR)
+        logger_log(res, ::Logger::ERROR)
+        restore
+      end
     ensure
-      if temp_file
-        temp_file.close
-        temp_file.unlink
+      if bash_file
+        bash_file.close
+        bash_file.unlink
       end
     end
 
     def save
-      execute('iptables-save').split("\n")
+      execute(IPTABLES_SAVE_COMMAND).split("\n")
     end
 
     def static_rules
       IptablesWeb.static_rules
     end
 
-    def combine(rules)
-      static_rules = self.static_rules
-      static_filter = static_rules.delete('filter')
-
-      filter_rules =[]
-      filter_rules = filter_rules | Array(static_filter)
-      filter_rules = filter_rules | Array(rules).map(&:to_s)
-      filter_rules.reject! { |r| r.strip.empty? }
-      lines = []
-      if filter_rules.size > 0
-        lines << '*filter'
-        lines << ':INPUT DROP [0:0]'
-        lines << ':FORWARD ACCEPT [0:0]'
-        lines << ':OUTPUT ACCEPT [0:0]'
-        lines = lines | filter_rules
-        lines << "COMMIT\n"
+    def combine_new_rules(rules)
+      all_rules = self.static_rules
+      static_filter = all_rules.delete('filter')
+      all_rules['filter'] = Array(static_filter) | Array(rules).map(&:make).flatten
+      all_rules.each_with_object([]) do |(table, sub_rules), arr|
+        sub_rules.reject! { |s| s.strip.empty? }
+        sub_rules.each do |rule|
+          arr << "#{IPTABLES_COMMAND} -t #{table} #{add_label(rule)}"
+        end
       end
+    end
 
-      static_rules.each do |chain, sub_rules|
-        lines << "*#{chain}"
-        lines << sub_rules.join("\n").strip
-        lines << "COMMIT\n"
+    def add_label(rule)
+      m = rule.match("^(.*?--comment)(\s+)\"(.*?)\"(.*?)$")
+      if m
+        return rule if m[3].include?(LABEL)
+        comment = "#{LABEL} #{m[3]}"
+        "#{m[1]} \"#{comment.strip}\"#{m[4]}"
+      else
+        "#{rule} -m comment --comment \"#{LABEL}\""
       end
-      lines
     end
 
     def render(rules)
-      combine(rules).join("\n")
+      combine_new_rules(rules).join("\n")
+    end
+
+    def diff
+      if @backup
+        @after = Tempfile.new('iptables-after')
+        execute("iptables-save > #{@after.path}")
+        execute("diff -c #{@backup.path} #{@after.path}")
+      end
+    end
+
+    def backup
+      @backup ||= Tempfile.new('iptables-before')
+      logger_log("Create backup #{@backup.path}\n", ::Logger::DEBUG)
+      execute("iptables-save > #{@backup.path}")
+      @backup.rewind
+    end
+
+    def restore
+      if @backup && File.exist?(@backup.path)
+        execute("/sbin/iptables-restore -c #{@backup.path}")
+      end
     end
   end
 end

data/lib/iptables_web/mixin/config_parser.rb

@@ -0,0 +1,22 @@
+module IptablesWeb
+  module Mixin
+    module ConfigParser
+      def parse_rules(rules)
+        chains = rules.scan(/\*(filter|nat|mangle)(.*?)COMMIT/m)
+        if chains && chains.size > 0
+          chains.each_with_object({}) do |r, obj|
+            chain = r[0]
+            obj[chain] ||= []
+            obj[chain] = obj[chain] + reject_comments(r[1].split("\n"))
+          end
+        else
+          { 'filter' => reject_comments(rules.split("\n")) }
+        end
+      end
+
+      def reject_comments(rules)
+        rules.reject { |l| l[0]=='#' }
+      end
+    end
+  end
+end

data/lib/iptables_web/model/access_rule.rb

@@ -3,19 +3,18 @@ module IptablesWeb
   module Model
     class AccessRule < Base
       self.element_name = 'access_rule'
-
       SUPPORTED_PROTOCOLS = %w(tcp udp)
 
-      def to_s
-        protocols = protocol.to_s.downcase  == 'all' ? SUPPORTED_PROTOCOLS : [protocol]
+      def make
+        protocols = protocol.to_s.downcase == 'all' ? SUPPORTED_PROTOCOLS : [protocol]
         protocols.map do |protocol|
           self.resolved_ips.map do |ip|
             command = %w(-A INPUT)
             self.attributes.each do |name, value|
               case name.to_sym
                 when :port
-                  next if  value.to_s.empty? || !value
-                  if value.include?(',')
+                  next if value.to_s.empty? || !value
+                  if value.match(/(:|,)/)
                     command << '-m'
                     command << 'multiport'
                     command << '--dports'
@@ -24,20 +23,18 @@ module IptablesWeb
                     command << '--dport'
                     command << value
                   end
-                # when :ip
-                #   command << '-s'
-                #   command << value
                 when :protocol
                   next unless protocol
                   command << '-p'
                   command << protocol
                 when :description
-                  if value
+                  if value && !value.empty?
                     command << '-m'
                     command << 'comment'
                     command << '--comment'
-                    command <<  "\"#{::Shellwords.escape(value)}\""
+                    command << "\"#{description.strip.gsub('"', '\"')}\""
                   end
+
                 else
                   #skip
               end
@@ -48,12 +45,7 @@ module IptablesWeb
             command << 'ACCEPT'
             command.join(' ')
           end
-        end.join("\n")
-        # -A INPUT -s 88.150.233.48/29 -p tcp -m tcp --dport 9200 -j ACCEPT
-      end
-
-      def mapping(parameter)
-
+        end
       end
     end
   end

data/lib/iptables_web/model/node.rb

@@ -17,7 +17,6 @@ module IptablesWeb
             raise e
           ensure
             return if dry_run
-            puts ''
             # save node after updating
             node.ips = []
             ::System.get_ifaddrs.each do |interface, config|
@@ -28,10 +27,10 @@ module IptablesWeb
                 netmask: config[:netmask]
               })
             end
-            logged_say '*** Found interfaces!!! ***'
+            logger_log('*** Found interfaces!!! ***', ::Logger::DEBUG)
             logger_log(node.ips.inspect, ::Logger::DEBUG)
             node.ips.uniq! { |ip| ip[:ip] }
-            logged_say '*** Unique interfaces!!! ***'
+            logger_log('*** Unique interfaces!!! ***', ::Logger::DEBUG)
             logger_log(node.ips.inspect, ::Logger::DEBUG)
             node.hostname = `hostname -f`
             node.save

data/lib/iptables_web/version.rb

@@ -1,3 +1,3 @@
 module IptablesWeb
-  VERSION = '0.3.5.pre3'
+  VERSION = '0.3.5.pre4'
 end

data/lib/iptables_web.rb

@@ -1,8 +1,9 @@
 
 require 'iptables_web/version'
+require 'iptables_web/mixin/sudo'
+require 'iptables_web/mixin/config_parser'
 require 'iptables_web/configuration'
 require 'system/getifaddrs'
-require 'iptables_web/mixin/sudo'
 require 'iptables_web/model/base'
 require 'iptables_web/model/access_rule'
 require 'iptables_web/model/node'
@@ -12,12 +13,14 @@ require 'iptables_web/iptables'
 require 'commander'
 require 'iptables_web/cli/command/install'
 require 'iptables_web/cli/command/update'
+require 'iptables_web/cli/multi_io'
 require 'iptables_web/cli/logged_output'
 require 'iptables_web/cli/import'
 require 'iptables_web/cli'
 
 
 module IptablesWeb
+
   extend Configuration
 end
 

metadata

@@ -1,135 +1,150 @@
 --- !ruby/object:Gem::Specification
 name: iptables-web
 version: !ruby/object:Gem::Version
-  version: 0.3.5.pre3
+  version: 0.3.5.pre4
+  prerelease: 6
 platform: ruby
 authors:
 - NikolayMurga
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-12 00:00:00.000000000 Z
+date: 2016-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: system-getifaddrs
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: activeresource
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.0'
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.0'
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: commander
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.3'
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 4.3.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.3'
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 4.3.5
 - !ruby/object:Gem::Dependency
   name: activeresource-response
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.1.1
 - !ruby/object:Gem::Dependency
   name: lockfile
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2'
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2'
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.1.3
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
 description: Write a longer description. Optional.
@@ -140,46 +155,49 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- LICENSE.txt
-- README.md
-- bin/iptables-web
-- lib/iptables_web.rb
-- lib/iptables_web/cli.rb
 - lib/iptables_web/cli/command/install.rb
 - lib/iptables_web/cli/command/update.rb
 - lib/iptables_web/cli/import.rb
 - lib/iptables_web/cli/logged_output.rb
+- lib/iptables_web/cli/multi_io.rb
 - lib/iptables_web/cli/pid_file.rb
+- lib/iptables_web/cli.rb
 - lib/iptables_web/configuration.rb
 - lib/iptables_web/crontab.rb
 - lib/iptables_web/iptables.rb
+- lib/iptables_web/mixin/config_parser.rb
 - lib/iptables_web/mixin/sudo.rb
 - lib/iptables_web/model/access_rule.rb
 - lib/iptables_web/model/base.rb
 - lib/iptables_web/model/node.rb
 - lib/iptables_web/version.rb
+- lib/iptables_web.rb
+- bin/iptables-web
+- LICENSE.txt
+- README.md
 homepage: https://github.com/MurgaNikolay/iptables-web-client
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">"
+  - - ! '>'
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Write a short summary. Required.
 test_files: []

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: d82c50d21d327346d81fe8256ddd1b5c76cb90de
-  data.tar.gz: 64a251f60a292bfbaa6f2106a27f0900bd04b603
-SHA512:
-  metadata.gz: fefdc6e3a7f46fb33db8662b7878f162613f196c7a6c68523b562adb90f93ab0ca50917abace21b3b11b62a5253f2f257bf1d4e4d7c70964f73b80a19346f939
-  data.tar.gz: 0ce33638f0d7404ba4f450eb407c90c93a1fb53282af092d649188d5d635b658d1af012751af0c837248175e3613af98d3e8ae92f7a889c6de8c2f3f6a7a03d5