iptables-web 0.3.4 → 0.3.5.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8aa2e7a4f2081bada1a78a10c439b96d1066b541
-  data.tar.gz: c3dfc7a32f40944ec85d7867b39fd75d1efcf83c
+  metadata.gz: c88d608bca3ca5b66af10b416635051baf9c0cb6
+  data.tar.gz: f56fe75a5012aec57a0a83a381e27f3cd5671337
 SHA512:
-  metadata.gz: 5af17b475ed4b4a694fe4b6f1907ee1e82b6f6297fa4c84eadca6483f6c03394bcc22940e87bda112b36df56bdbd6b666c8211b97ab323fff392a75576c2d878
-  data.tar.gz: 7f733c157ec31d56ab9690e5dc44c7870050749ccf8db616afeb6100a4c54f887e88c535423d93e8efcb683b33ba2c1c53d4c420282d57e4c1ae1e310b517eea
+  metadata.gz: 85e0aa40dcbbb129c2f1366eef8f10ea849fd71e0e15c3f3cea5ca36147327156ca45c2b398c871af8c2440185b469fe26d860d23f8defa227e63733b59847d6
+  data.tar.gz: 887dfd58ba7554dd67e5225e1c11b9c7a41fe80bf4619ae6ad17a38b2804515d4a0706d42e9f29f182202c914c76d8cacc0e10b40dbcf3f55421e5cbb7ec534b

data/lib/iptables_web/cli.rb

@@ -22,6 +22,10 @@ module IptablesWeb
         IptablesWeb.log_path = log_path
       end
 
+      global_option('--log_level LEVEL', 'Log level') do |log_level|
+        IptablesWeb.log_level = 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/cli/command/update.rb

@@ -10,25 +10,34 @@ module IptablesWeb
             c.option '--config STRING', String, 'Path to config file'
             c.option '--print', 'Show rules without restoring'
             c.option '--force', 'Set rules omit checksum check'
+            c.option '--dry-run', 'Skip handshake'
             c.action do |_, options|
               begin
                 IptablesWeb.configuration.load(options.config) if options.config
                 logged_say "Use iptables server #{IptablesWeb.api_base_url}"
                 IptablesWeb.pid_file do
-                  IptablesWeb::Model::Node.handshake do
+                  IptablesWeb::Model::Node.handshake(options.dry_run || options.print) do
                     rules = IptablesWeb::Model::AccessRule.all
                     iptables = IptablesWeb::Iptables.new
-                    last_checksum = rules.response.headers[:etag].first
+                    request_etag = rules.response.headers[:etag].first
                     if options.print
-                      logged_say 'Nothing changed.' if IptablesWeb.checksum?(last_checksum)
+                      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
-                      if IptablesWeb.checksum?(rules.response.headers[:etag].first) && !options.force
+                      logged_say 'Run client in DRY-RUN mode' if options.dry_run
+                      logged_say("Etag value: #{request_etag.inspect}", ::Logger::DEBUG)
+                      if IptablesWeb.checksum?(request_etag) && !options.force
                         logged_say 'Skip iptables update. Nothing changed.'
                       else
                         logged_say '*** Iptables updated! ***'
-                        iptables.restore(rules)
-                        IptablesWeb.checksum = last_checksum
+                        logger_log(iptables.render(rules), ::Logger::DEBUG)
+                        unless options.dry_run
+                          iptables.restore(rules)
+                          IptablesWeb.checksum = request_etag
+                        end
                       end
                     end
                   end

data/lib/iptables_web/cli/logged_output.rb

@@ -1,11 +1,25 @@
 module IptablesWeb
   class Cli
     class LoggedOutput < ::HighLine
+
+      LOG_LEVEL_MAP = {
+        'debug' => ::Logger::DEBUG,
+        'info' => ::Logger::INFO,
+        'warn' => ::Logger::WARN,
+        'error' => ::Logger::ERROR,
+        'fatal' => ::Logger::FATAL,
+        'unknown' => ::Logger::UNKNOWN,
+      }
+
       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
           logger.formatter = ::Logger::Formatter.new
           logger
         end
@@ -15,8 +29,12 @@ module IptablesWeb
         @logger = nil
       end
 
-      def logged_say(message, log_level = Logger::INFO)
+      def logger_log(message, log_level = Logger::INFO)
         logger.log(log_level, message) if logger
+      end
+
+      def logged_say(message, log_level = Logger::INFO)
+        logger_log(message, log_level)
         say(message)
       end
     end

data/lib/iptables_web/configuration.rb

@@ -97,21 +97,34 @@ module IptablesWeb
       $terminal.reset if $terminal.present? && $terminal.is_a?(Cli::LoggedOutput)
     end
 
-    #
+    def log_level=(level)
+      @log_level = level
+      $terminal.reset if $terminal.present? && $terminal.is_a?(Cli::LoggedOutput)
+    end
+
+    def log_level
+      @log_level || ::Logger::INFO
+    end
+
     def checksum_path
       path(@checksum_path || 'checksum')
     end
 
+    def checksum
+      File.read(checksum_path) if File.exists?(checksum_path)
+    end
+
     def checksum_path=(pid_path)
       @checksum_path = pid_path
     end
 
-    def checksum?(checksum)
-      File.exists?(checksum_path) && File.read(checksum_path) == make_checksum(checksum)
+
+    def checksum?(etag)
+      checksum == make_checksum(etag)
     end
 
-    def checksum=(checksum)
-      File.write(checksum_path, make_checksum(checksum))
+    def checksum=(etag)
+      File.write(checksum_path, make_checksum(etag))
     end
 
     def make_checksum(check_sum)

data/lib/iptables_web/model/node.rb

@@ -4,7 +4,7 @@ module IptablesWeb
       self.element_name = 'node'
       self.include_root_in_json = true
 
-      def self.handshake(&block)
+      def self.handshake(dry_run = false, &block)
         node = find('current')
         if node
           begin
@@ -16,15 +16,17 @@ module IptablesWeb
             node.report << 'Backtrace: ' + e.backtrace.join("\n")
             raise e
           ensure
+            return if dry_run
+            puts ''
             # save node after updating
             node.ips = []
             ::System.get_ifaddrs.each do |interface, config|
               next if interface.to_s.include?('lo')
               node.ips.push({
-                  interface: interface,
-                  ip: config[:inet_addr],
-                  netmask: config[:netmask]
-                })
+                interface: interface,
+                ip: config[:inet_addr],
+                netmask: config[:netmask]
+              })
             end
             node.ips.uniq! { |ip| ip[:ip] }
             node.hostname = `hostname -f`

data/lib/iptables_web/version.rb

@@ -1,3 +1,3 @@
 module IptablesWeb
-  VERSION = '0.3.4'
+  VERSION = '0.3.5.pre'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iptables-web
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5.pre
 platform: ruby
 authors:
 - NikolayMurga
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-11 00:00:00.000000000 Z
+date: 2016-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: system-getifaddrs
@@ -173,9 +173,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.7