iptables-web 0.3.5.pre5 → 0.3.5.pre6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d36a31c66b49086fabd42fd7b569aab936ae2da
-  data.tar.gz: 436a09fbe39d003c2b4ae6fd4e0554feb8397872
+  metadata.gz: 8d6e366fe90d0ec24a41af58b4c6778badd58498
+  data.tar.gz: 2a765207650ecad4f48a5df34557f9b8db0a58e1
 SHA512:
-  metadata.gz: 540c848d4d9e5dec8aa55bd4f2ab24a89a5ef8a7f7f92f6edf04b1c34f062411372218175b5b822e76bf40842e222dc2706cec560d255b8eda24d81363574f97
-  data.tar.gz: c60611fce9ee54ab35a6e0bb8ab95d9151df5022f95718c90512b92700c904e467cb3d1f99b20736f7a8955567b6e4ed4965e805f1630573d8b568c997947a6a
+  metadata.gz: 52f3b2f154e644e14fdd2aaef0b29dc6ef7b1e476ce178e63efebdfc535931f4eefc494f51e107d7b959234a816c34eb9602f0d34fd36c08134a2fe4c0c0575a
+  data.tar.gz: 3c0bd11be8f2d3ee629dfb0ff39a33a72dc4b666eee5e159c0784efbeff3f0b984f22b2137c0817e6449bc9027f1ce07435ad8c7c80da972017d1d2787b62da7

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

@@ -42,8 +42,9 @@ module IptablesWeb
                   end
                 end
               rescue Exception => e
-                logger_log(e.message)
-                logger_log(e.backtrace.join("\n"))
+                logger_log(e.message, ::Logger::ERROR)
+                logger_log(e.backtrace.join("\n"), ::Logger::ERROR)
+                raise e
               end
             end
           end

data/lib/iptables_web/cli/logged_output.rb

@@ -42,10 +42,10 @@ module IptablesWeb
         logger.log(log_level, message.to_s.strip) if logger
       end
 
-      # def logger_log(message, log_level = Logger::INFO)
-      #   logger_log(message, log_level)
-      #   say(message)
-      # end
+      def logger_say(message, log_level = Logger::INFO)
+        logger_log(message, log_level)
+        say(message)
+      end
     end
   end
 end

data/lib/iptables_web/cli.rb

@@ -19,7 +19,7 @@ module IptablesWeb
       end
 
       global_option('--verbose', 'Combination of --log-level debug and --log-stdout') do |_|
-        IptablesWeb.log_level = ::Logger::INFO
+        IptablesWeb.log_level = ::Logger::DEBUG
         IptablesWeb.log_stdout
       end
 

data/lib/iptables_web/iptables.rb

@@ -16,26 +16,26 @@ module IptablesWeb
       bash_file.write "set -e\n"
 
       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 = parse_rules(`#{sudo(IPTABLES_SAVE_COMMAND)}`)
+      bash_file.write sudo("#{sudo(IPTABLES_COMMAND)} -P INPUT ACCEPT")
+      bash_file.write "\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")
+          bash_file.write sudo("#{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 lines.map { |l| sudo(l) }.join("\n")
       bash_file.write "\n"
-      # Close only if rules exist
       if lines.size > 0
-        bash_file.write "#{IPTABLES_COMMAND} -P INPUT DROP\n"
+        bash_file.write sudo("#{IPTABLES_COMMAND} -P INPUT DROP")
+        bash_file.write "\n"
       end
       bash_file.rewind
       backup
-      res = execute("bash #{bash_file.path}")
+      res = `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)
@@ -49,7 +49,7 @@ module IptablesWeb
     end
 
     def save
-      execute(IPTABLES_SAVE_COMMAND).split("\n")
+      `#{sudo(IPTABLES_SAVE_COMMAND)}`.split("\n")
     end
 
     def static_rules
@@ -86,7 +86,7 @@ module IptablesWeb
     def diff
       if @backup
         @after = Tempfile.new('iptables-after')
-        execute("#{IPTABLES_SAVE_COMMAND} > #{@after.path}")
+        `#{sudo(IPTABLES_SAVE_COMMAND)} > #{@after.path}`
         `diff -c #{@backup.path} #{@after.path}`
       end
     end
@@ -94,13 +94,13 @@ module IptablesWeb
     def backup
       @backup ||= Tempfile.new('iptables-before')
       logger_log("Create backup #{@backup.path}\n", ::Logger::DEBUG)
-      execute("#{IPTABLES_SAVE_COMMAND} > #{@backup.path}")
+      `#{sudo(IPTABLES_SAVE_COMMAND)} > #{@backup.path}`
       @backup.rewind
     end
 
     def restore
       if @backup && File.exist?(@backup.path)
-        execute("#{IPTABLES_RESTORE_COMMAND} -c #{@backup.path}")
+        `#{sudo(IPTABLES_RESTORE_COMMAND)} -c #{@backup.path}`
       end
     end
   end

data/lib/iptables_web/mixin/sudo.rb

@@ -1,11 +1,11 @@
 module IptablesWeb
   module Mixin
     module Sudo
-      def execute(command)
+      def sudo(command)
         if is_root? || command.include?('sudo')
-          `#{command}`
+          command
         else
-          `sudo #{command}`
+          "sudo #{command}"
         end
       end
 

data/lib/iptables_web/version.rb

@@ -1,3 +1,3 @@
 module IptablesWeb
-  VERSION = '0.3.5.pre5'
+  VERSION = '0.3.5.pre6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iptables-web
 version: !ruby/object:Gem::Version
-  version: 0.3.5.pre5
+  version: 0.3.5.pre6
 platform: ruby
 authors:
 - NikolayMurga
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-20 00:00:00.000000000 Z
+date: 2016-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: system-getifaddrs
@@ -180,9 +180,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Write a short summary. Required.
 test_files: []
-has_rdoc: