iptables-web 0.2.2.pre → 0.2.2.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 795d6acb81a448ae23ed901a6d75d84a3a6fddff
-  data.tar.gz: 9981243b1b2aca571c4bc4aef5b4c765d32f4c4e
+  metadata.gz: ee89cd5a890a8e586e177f8027ed8af3bfbd0193
+  data.tar.gz: 8ea6fc5dccb2f42da7e830f0614a4a5a9d19c530
 SHA512:
-  metadata.gz: 2c60142651eec3170f3236a7fa788b0dea6c5e736097a409d492c7b345b014932204149c14005647beaeb7c6e25789c571aeaab2bc25495a823e79a7c3317b41
-  data.tar.gz: 55aa35c092dd33f4a8ffd53813f59bd025067f491705327df869846b8e002a6870e9e46bcd0cff7dc3a2333548dc2dd2d7c7c0dcb35edcf0ab4f9d302e818598
+  metadata.gz: 651f82ae7d49552941459d554209611426c96043633037a86e13575d0dbf6f21eacaec9b40eb7ddd0064021d37275042a9ee75974fdcb3eed60151acb82b4e3d
+  data.tar.gz: 5123f6eba6ec4c1a17fcba242b81b0e50f4e06261e493f25049c2de968e98aa3d330ef473ef87ed8a8e703a523659fbe473bd7c0be1aac2337a59fec352ab05a

data/bin/iptables-web

@@ -78,8 +78,7 @@ command :update do |c|
   c.option '--print', 'Show rules without restoring'
   c.action do |_, options|
     IptablesWeb.configuration.load(options.config) if options.config
-    puts  IptablesWeb.configuration
-    # IptablesWeb::Model::Node.handshake do
+    IptablesWeb::Model::Node.handshake do
       rules = IptablesWeb::Model::AccessRule.all
       iptables = IptablesWeb::Iptables.new
       if options.print
@@ -87,6 +86,6 @@ command :update do |c|
       else
         iptables.restore(rules)
       end
-    # end
+    end
   end
 end

data/lib/iptables_web/configuration.rb

@@ -23,10 +23,15 @@ module IptablesWeb
       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")
+      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") }
       end
     end
 

data/lib/iptables_web/iptables.rb

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

data/lib/iptables_web/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iptables-web
 version: !ruby/object:Gem::Version
-  version: 0.2.2.pre
+  version: 0.2.2.pre2
 platform: ruby
 authors:
 - NikolayMurga
@@ -29,6 +29,9 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.0'
+    - - '>='
       - !ruby/object:Gem::Version
         version: 4.0.0
   type: :runtime
@@ -36,6 +39,9 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.0'
+    - - '>='
       - !ruby/object:Gem::Version
         version: 4.0.0
 - !ruby/object:Gem::Dependency
@@ -43,6 +49,9 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.0'
+    - - '>='
       - !ruby/object:Gem::Version
         version: 4.0.0
   type: :runtime
@@ -50,6 +59,9 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.0'
+    - - '>='
       - !ruby/object:Gem::Version
         version: 4.0.0
 - !ruby/object:Gem::Dependency
@@ -100,7 +112,7 @@ files:
 - lib/iptables_web/model/base.rb
 - lib/iptables_web/model/node.rb
 - lib/iptables_web/version.rb
-homepage: ''
+homepage: https://github.com/MurgaNikolay/iptables-web-client
 licenses:
 - MIT
 metadata: {}