iptables-web 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 755a195ac5acce94da6643e73aa9225ed797ae14
-  data.tar.gz: f406559206a8f65d9b348a3539485ace05501dbd
+  metadata.gz: 60035381ec896cdd96b0892e60dd1cb43949f853
+  data.tar.gz: e211d23ba54a7b389323c7723df8b5565f9adf0d
 SHA512:
-  metadata.gz: cb8fad2f0c629d26e61e3fc99ba3c45b3b722d6a25df36c533faef78c9e6508755cff6ebc6a8b3df1f1d40a9f152acee9fd3f76a7e9bfed3779fccf9f86aff83
-  data.tar.gz: 532715b9213f900cf3a48851322c2d57a986a4c8b25a212e079ba8b3172bc7bbdf0e00787df64e4ebbd23ce1004fcdbac69bc75ac0ed3366a2bee0037220c303
+  metadata.gz: 9d74bd5fc7379eddccefc52857f182196aa9bafdbf0c75eaf6e319fb5cef673919b93e8f568410c504985025137df3e32ebb5f8e93d76da97b149bc551dc05b0
+  data.tar.gz: f7c0656a71cd42fcf58bac89a39f5592ef7c4afb6f41b986b259be66b97f7c881c06e7e7cfa06ffd71f8ab461dead64bbce6f899dd46e847d477625589ed8e23

data/bin/iptables-web

@@ -76,15 +76,24 @@ command :update do |c|
   c.description = 'Display bar with optional prefix and suffix'
   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.action do |_, options|
     IptablesWeb.configuration.load(options.config) if options.config
     IptablesWeb::Model::Node.handshake do
       rules = IptablesWeb::Model::AccessRule.all
       iptables = IptablesWeb::Iptables.new
+      last_checksum = rules.response.headers[:etag].first
       if options.print
+        say "Loading rules from #{IptablesWeb.configuration['api_base_url']}"
+        say 'Nothing changed.' if IptablesWeb::Configuration.checksum?(last_checksum)
         say iptables.render(rules)
       else
-        iptables.restore(rules)
+        if IptablesWeb::Configuration.checksum?(rules.response.headers[:etag].first) && !options.force
+          say 'Skip iptables update. Nothing changed.'
+        else
+          iptables.restore(rules)
+          IptablesWeb::Configuration.checksum = last_checksum
+        end
       end
     end
   end

data/lib/iptables_web/configuration.rb

@@ -4,9 +4,11 @@ module IptablesWeb
     attr_accessor :loaded
     CONFIG_FILES = %W(#{ENV['HOME']}/.iptables-web/config.yml /etc/iptables-web/config.yml)
     STATIC_RULES_FILES = %W(#{ENV['HOME']}/.iptables-web/static_rules /etc/iptables-web/static_rules)
+    CHECKSUM_FILE = "#{ENV['HOME']}/.iptables-web/checksum"
 
     def initialize
       CONFIG_FILES.each do |config|
+        puts "Load configuration from #{config}"
         if load(config)
           @loaded = true
           break
@@ -35,6 +37,14 @@ module IptablesWeb
       end
     end
 
+    def self.checksum?(checksum)
+      File.exists?(CHECKSUM_FILE) && File.read(CHECKSUM_FILE) == checksum
+    end
+
+    def self.checksum=(checksum)
+      File.write(CHECKSUM_FILE, checksum)
+    end
+
     def self.config_dir
       File.join(ENV['HOME'], '.iptables-web')
     end

data/lib/iptables_web/iptables.rb

@@ -32,7 +32,6 @@ module IptablesWeb
       lines << ':FORWARD ACCEPT [0:0]'
       lines << ':OUTPUT ACCEPT [0:0]'
       lines << static_filter.join("\n").strip if static_filter
-      lines << "\n"
       lines << Array(rules).map(&:to_s).join("\n").strip
       lines << "COMMIT\n"
       static_rules.each do |chain, sub_rules|

data/lib/iptables_web/model/base.rb

@@ -1,11 +1,14 @@
 require 'active_resource'
+require 'active_resource_response'
+
 module IptablesWeb
   module Model
     class Base < ActiveResource::Base
+      add_response_method :response
       def self.configure(config)
         self.site = "#{config['api_base_url']}/api"
         headers['X-Node-Access-Token'] = config['access_token']
       end
     end
   end
-end
+end

data/lib/iptables_web/model/node.rb

@@ -6,19 +6,21 @@ module IptablesWeb
 
       def self.handshake
         node = find('current')
-        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]
-          })
-        end
-        node.ips.uniq! { |ip| ip[:ip] }
-        node.hostname = `hostname -f`
-        if node.save && block_given?
-          yield
+       if node
+          yield if block_given?
+          # 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]
+              })
+          end
+          node.ips.uniq! { |ip| ip[:ip] }
+          node.hostname = `hostname -f`
+          node.save
         end
       end
     end

data/lib/iptables_web/version.rb

@@ -1,3 +1,3 @@
 module IptablesWeb
-  VERSION = '0.2.2'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iptables-web
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - NikolayMurga
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-16 00:00:00.000000000 Z
+date: 2015-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: system-getifaddrs
@@ -64,6 +64,26 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 4.0.0
+- !ruby/object:Gem::Dependency
+  name: activeresource-response
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement