iptables-web 0.1.0 → 0.2.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a139530b147346fe830287212857940a70cfad5
-  data.tar.gz: c0fc21ed2e8c05aada06d3d06d869df259cabd22
+  metadata.gz: d1617382a4273d74b32143e069ed9ceec430a890
+  data.tar.gz: 183bebac53e65517e71674382e4300d1d3e29d60
 SHA512:
-  metadata.gz: 672789d5c2099099ad2589abe1eb3bcc3fbb0cf30f4bb7b829284c4a6211385c99bade46ffa8ac792f6e98d60d4813079caed35789b18d164cf48cc698b66fd0
-  data.tar.gz: 88add871cab6f009691bc3f1036c0c9e954845b912cb068baa4b69d992532884a989003faf0130d9dfc47989df116c608bd3d5338b9ef2ac5b16ee0b6b8f9171
+  metadata.gz: 4130032a62a91def785039cad41784b5de812183f4b9937315e267592bb48cde769351f3f52b1bbb97504f6e3a0bb0a5892b079fec0b3b44e5985928bd70111c
+  data.tar.gz: 6b316ef4967f98cc6b5b87b1a874375a677b3aa041fee4bd2f0f1a0ad7a3b9d5d61092b079bacbb9052830a63cc6d7c2066c7835caf47c662ea5e5092ad312ac

data/bin/iptables-web

@@ -71,11 +71,17 @@ command :update do |c|
   c.syntax = 'iptables-web update'
   c.description = 'Display bar with optional prefix and suffix'
   c.option '--config STRING', String, 'Path to config file'
-  c.action do |args, options|
+  c.option '--print', 'Show rules without restoring'
+  c.action do |_, options|
     IptablesWeb::Configuration.load(options.config) if options.config
     IptablesWeb::Model::Node.handshake do
-      iptables = IptablesWeb::Iptables.new
-      iptables.restore(IptablesWeb::Model::AccessRule.all)
+      rules = IptablesWeb::Model::AccessRule.all
+      if options.print
+        say rules.map(&:to_s).join("\n")
+      else
+        iptables = IptablesWeb::Iptables.new
+        iptables.restore(rules)
+      end
     end
   end
 end

data/lib/iptables_web/iptables.rb

@@ -5,7 +5,6 @@ module IptablesWeb
 
     def restore(access_rules)
       temp_file = Tempfile.new('rules')
-      puts render(access_rules)
       temp_file.write render(access_rules)
       temp_file.rewind
       execute("iptables-restore -c < #{temp_file.path}")

data/lib/iptables_web/model/access_rule.rb

@@ -1,53 +1,50 @@
+require 'shellwords'
 module IptablesWeb
   module Model
     class AccessRule < Base
       self.element_name = 'access_rule'
 
-      MAPPING = {
-        chain: 'INPUT',
-        target_chain: 'ACCEPT',
-        protocol: '-p {value}',
-        port: '--dport {value}',
-        ip: '-s {value}',
-        description: '-m comment --comment "{value}"'
-      }
+      SUPPORTED_PROTOCOLS = %w(tcp udp)
 
       def to_s
-        command = %w(-A INPUT)
-        self.attributes.each do |name, value|
-
-          case name.to_sym
-            when :port
-              next unless value
-              if value.include?(',')
-                command << '-m'
-                command << 'multiport'
-                command << '--dports'
+        protocols = protocol.to_s.downcase  == 'all' ? SUPPORTED_PROTOCOLS : [protocol]
+        protocols.map do |protocol|
+          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?(',')
+                  command << '-m'
+                  command << 'multiport'
+                  command << '--dports'
+                  command << value
+                else
+                  command << '--dport'
+                  command << value
+                end
+              when :ip
+                command << '-s'
                 command << value
+              when :protocol
+                next unless protocol
+                command << '-p'
+                command << protocol
+              when :description
+                if value
+                  command << '-m'
+                  command << 'comment'
+                  command << '--comment'
+                  command <<  ::Shellwords.escape(value)
+                end
               else
-                command << '--dport'
-                command << value
-              end
-            when :ip
-              command << '-s'
-              command << value
-            when :protocol
-              command << '-p'
-              command << value
-            when :description
-              if value
-                command << '-m'
-                command << 'comment'
-                command << '--comment'
-                command <<  Shellwords.escape(value)
-              end
-            else
-              #skip
+                #skip
+            end
           end
-        end
-        command << '-j'
-        command << 'ACCEPT'
-        command.join(' ')
+          command << '-j'
+          command << 'ACCEPT'
+          command.join(' ')
+        end.join("\n")
         # -A INPUT -s 88.150.233.48/29 -p tcp -m tcp --dport 9200 -j ACCEPT
       end
 

data/lib/iptables_web/model/node.rb

@@ -7,7 +7,7 @@ module IptablesWeb
       def self.handshake
         node = find('current')
         node.ips = []
-        System.get_ifaddrs.each do |interface, config|
+        ::System.get_ifaddrs.each do |interface, config|
           next if interface.to_s.include?('lo')
           node.ips.push({
             interface: interface,

data/lib/iptables_web/version.rb

@@ -1,3 +1,3 @@
 module IptablesWeb
-  VERSION = "0.1.0"
+  VERSION = '0.2.0.beta1'
 end

data/lib/iptables_web.rb

@@ -1,5 +1,6 @@
 require 'iptables_web/version'
 require 'iptables_web/configuration'
+require 'system/getifaddrs'
 require 'iptables_web/mixin/sudo'
 require 'iptables_web/model/base'
 require 'iptables_web/model/access_rule'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iptables-web
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0.beta1
 platform: ruby
 authors:
 - NikolayMurga
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-06 00:00:00.000000000 Z
+date: 2014-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: system-getifaddrs
@@ -115,12 +115,12 @@ 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.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Write a short summary. Required.