iptables-web 0.2.1 → 0.2.2.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db90c528af9faa51da2d80600059f9f81ddeae84
-  data.tar.gz: 3a80c1d215d272a8c6bf131b255276df3044bc1d
+  metadata.gz: 795d6acb81a448ae23ed901a6d75d84a3a6fddff
+  data.tar.gz: 9981243b1b2aca571c4bc4aef5b4c765d32f4c4e
 SHA512:
-  metadata.gz: 711fb7f78f124f917fe1002358329c05ad1401698d5cfcad6987b9c8b0d823acdad5af7a53c07c0ab7b14f61e247c6ad0d962feb6a09ca4c62663423be377635
-  data.tar.gz: 5a121b7f21e1f3b0fc59a123272e64195a4b085ea128085c57e967bb6674bbe48fc1e8e9691ff4f8f0171fd815df8290311a59536b48466b3b7a4dae1d87fede
+  metadata.gz: 2c60142651eec3170f3236a7fa788b0dea6c5e736097a409d492c7b345b014932204149c14005647beaeb7c6e25789c571aeaab2bc25495a823e79a7c3317b41
+  data.tar.gz: 55aa35c092dd33f4a8ffd53813f59bd025067f491705327df869846b8e002a6870e9e46bcd0cff7dc3a2333548dc2dd2d7c7c0dcb35edcf0ab4f9d302e818598

data/bin/iptables-web

@@ -60,10 +60,12 @@ CONFIG
       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
@@ -75,8 +77,9 @@ command :update do |c|
   c.option '--config STRING', String, 'Path to config file'
   c.option '--print', 'Show rules without restoring'
   c.action do |_, options|
-    IptablesWeb::Configuration.load(options.config) if options.config
-    IptablesWeb::Model::Node.handshake do
+    IptablesWeb.configuration.load(options.config) if options.config
+    puts  IptablesWeb.configuration
+    # IptablesWeb::Model::Node.handshake do
       rules = IptablesWeb::Model::AccessRule.all
       iptables = IptablesWeb::Iptables.new
       if options.print
@@ -84,6 +87,6 @@ command :update do |c|
       else
         iptables.restore(rules)
       end
-    end
+    # end
   end
 end

data/lib/iptables_web/configuration.rb

@@ -20,9 +20,14 @@ module IptablesWeb
     end
 
     def self.static_rules
-      STATIC_RULES_FILES.map do |file|
+      rules = STATIC_RULES_FILES.map do |file|
         File.exist?(file) ? File.read(file) : nil
       end.compact.join("\n").strip
+      rules.scan(/\*([a-z]+)(.*?)COMMIT/m).each_with_object({}) do |r, obj|
+        chain = r[0]
+        obj[chain] ||= []
+        obj[chain]  = obj[chain] | r[1].split("\n")
+      end
     end
 
     def self.config_dir

data/lib/iptables_web/iptables.rb

@@ -23,17 +23,22 @@ module IptablesWeb
       IptablesWeb::Configuration.static_rules
     end
 
-    def render(rules, name = 'filter')
+    def render(rules)
+      static_rules = self.static_rules
       lines = []
-      lines << "*#{name}"
+      lines << '*filter'
       lines << ':INPUT DROP [0:0]'
       lines << ':FORWARD ACCEPT [0:0]'
       lines << ':OUTPUT ACCEPT [0:0]'
-      lines << static_rules
+      lines << static_rules.delete('filter')
       lines << Array(rules).map(&:to_s).join("\n")
       lines << 'COMMIT'
-      lines << '#end'
-      lines.join("\n")
+      static_rules.each do |chain, sub_rules|
+        lines << "*#{chain}"
+        lines << sub_rules.join("\n")
+        lines << 'COMMIT'
+      end
+      lines.join("\n").gsub(/^\s*/, '')
     end
   end
 end

data/lib/iptables_web/model/node.rb

@@ -24,20 +24,3 @@ module IptablesWeb
     end
   end
 end
-
-# *filter
-# :INPUT ACCEPT [217626552:31573175391]
-# :FORWARD ACCEPT [0:0]
-# :OUTPUT ACCEPT [1334268962:861811554534]
-# -A INPUT -s 88.150.233.48/29 -p tcp -m tcp --dport 9200 -j ACCEPT
-# -A INPUT -s 88.150.213.250/32 -p tcp -m tcp --dport 9200 -j ACCEPT
-# -A INPUT -s 127.0.0.1/32 -p tcp -m tcp --dport 9200 -j ACCEPT
-# -A INPUT -s 37.220.8.122/32 -p tcp -m tcp --dport 9200 -j ACCEPT
-# -A INPUT -p tcp -m tcp --dport 9200 -j DROP
-# -A INPUT -s 88.150.233.48/29 -p tcp -m tcp --dport 9300 -j ACCEPT
-# -A INPUT -s 88.150.213.250/32 -p tcp -m tcp --dport 9300 -j ACCEPT
-# -A INPUT -p tcp -m tcp --dport 9300 -j DROP
-# -A INPUT -s 193.105.70.192/29 -p tcp -m tcp --dport 22 -j ACCEPT
-# -A INPUT -s 92.60.190.109/32 -p tcp -m tcp --dport 22 -j ACCEPT
-# -A INPUT -p tcp -m tcp --dport 22 -j DROP
-# COMMIT

data/lib/iptables_web/version.rb

@@ -1,3 +1,3 @@
 module IptablesWeb
-  VERSION = '0.2.1'
+  VERSION = '0.2.2.pre'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iptables-web
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2.pre
 platform: ruby
 authors:
 - NikolayMurga
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-23 00:00:00.000000000 Z
+date: 2015-07-10 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.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Write a short summary. Required.