enfcli 5.0.0.pre.alpha → 5.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29f4309503935f6931b068e80a850488b2f8833474734c05e8455a04f84293e0
-  data.tar.gz: 2488271b45ee7c7e5b96cc95546d2f625fb1c503d9ad6720f62649073d4a1874
+  metadata.gz: 2f52dc569750edcf380a6f64241fd985decde7de862ca0700e00b8a411548a4b
+  data.tar.gz: c3bd0fdbbf27ccc877e82c4ac663118b1710dcf2ccfdeffe2abe91a7930d44fb
 SHA512:
-  metadata.gz: 033366cb4db237f61526ddf357bbdfd57d60b482398d21eee798413b5afc91b51a6baae60526b957f07a80f01dea5b47372d72193d40b0af20a98fb88de1cd51
-  data.tar.gz: e7bd3d1c7da7a861a89f242bd5a2d2f898e5e5b4f848c2412fa9a1b5acb7ac73fb5c679979e80b9b7d1e81ba87de761f157141d49eda2d6c3c5d55b1b315c249
+  metadata.gz: 5ced4fe396b61814d1d4b6bd377cf2d913899c8ddf78041e97897f17de7adb526f1e9f1cab24de0443adedda7975ede9545ea720dc9a198cddfa00c6a4c7e257
+  data.tar.gz: 375a32dd626c0ccf6b17ca876598791883c6f1fd41a26f9fdc66432a5a750607a960a463ed8eae51c772407cfb15fd9c258c14b69f191a9994840f0ceed1dfc4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    enfcli (5.0.0.pre.alpha)
+    enfcli (5.0.3)
       clipboard
       ffi
       readline
@@ -15,13 +15,13 @@ GEM
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     bump (0.8.0)
-    clipboard (1.3.3)
+    clipboard (1.3.4)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     diff-lcs (1.3)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    ffi (1.12.2)
+    ffi (1.13.1)
     fuubar (2.5.0)
       rspec-core (~> 3.0)
       ruby-progressbar (~> 1.4)
@@ -29,16 +29,16 @@ GEM
     http-accept (1.7.0)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
-    io-console (0.5.5)
+    io-console (0.5.6)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2019.1009)
+    mime-types-data (3.2020.0512)
     netrc (0.11.0)
     public_suffix (4.0.3)
     rake (10.5.0)
     readline (0.0.2)
       reline
-    reline (0.1.2)
+    reline (0.1.4)
       io-console (~> 0.5)
     rest-client (2.1.0)
       http-accept (>= 1.7.0, < 2.0)
@@ -68,8 +68,8 @@ GEM
     thor (0.20.3)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.6)
-    unicode-display_width (1.6.1)
+    unf_ext (0.0.7.7)
+    unicode-display_width (1.7.0)
     vcr (5.0.0)
     webmock (3.7.6)
       addressable (>= 2.3.6)
@@ -92,4 +92,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   2.1.4
+   2.2.4

data/lib/enfapi/firewall.rb

@@ -21,17 +21,24 @@ module EnfApi
     include Singleton
 
     def list_firewall_rules(network)
-      EnfApi::API.instance.get "/api/xfw/v1/#{network}/rule"
+      EnfApi::API.instance.get "/api/xfw/v2/#{network}/rule"
     end
 
     def add_firewall_rule(network, rule)
       rule_json = EnfApi::to_json(rule)
-      EnfApi::API.instance.post "/api/xfw/v1/#{network}/rule", rule_json
+
+      if network
+        url = "/api/xfw/v2/#{network}/rule"
+      else
+        url = "/api/xfw/v2/rule"
+      end
+
+      EnfApi::API.instance.post url, rule_json
     end
 
     def delete_firewall_rules(network, id = nil)
       # Same method to call to delete all firewall rules in a network. if id is nil
-      EnfApi::API.instance.delete "/api/xfw/v1/#{network}/rule/#{id}"
+      EnfApi::API.instance.delete "/api/xfw/v2/#{network}/rule/#{id}"
     end
   end
 end

data/lib/enfcli.rb

@@ -22,6 +22,7 @@ require "ipaddr"
 require "clipboard"
 require "json"
 require "securerandom"
+require "io/console"
 
 require "rubygems/commands/update_command"
 require "rubygems/commands/search_command"
@@ -111,21 +112,9 @@ module EnfCli
   end
 
   def self.ask_password(prompt = nil)
-    begin
-      prompt ||= "Enter Password:"
-      print prompt
-      # We hide the entered characters before to ask for the password
-      system "stty -echo"
-      password = $stdin.gets.chomp
-      system "stty echo"
-      puts ""
-      return password
-    rescue NoMethodError, Interrupt
-      # When the process is exited, we display the characters again
-      # And we exit
-      system "stty echo"
-      exit
-    end
+    prompt ||= "Enter Password: "
+    password = IO::console.getpass prompt
+    return password
   end
 
   def self.generate_ec_cert(key, ipv6)

data/lib/enfcli/commands/xfw.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2018 Xaptum,Inc
+# Copyright 2018-2020 Xaptum,Inc
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -44,7 +44,8 @@ module EnfCli
       def list_firewall_rules
         try_with_rescue_in_session do
           # call the api
-          rules = EnfApi::Firewall.instance.list_firewall_rules options[:network]
+          data = EnfApi::Firewall.instance.list_firewall_rules options[:network]
+          rules = data[:data]
 
           # display empty table and return
           if rules.length == 0
@@ -90,7 +91,7 @@ module EnfCli
       end
 
       desc "add-firewall-rule", "Add a firewall rule to a /64 network"
-      method_option :network, :type => :string, :required => true
+      method_option :network, :type => :string
       method_option :priority, :type => :numeric, :required => true
       method_option :protocol, :type => :string, :required => true, :enum => ["TCP", "UDP", "ICMP6", "6", "17", "58"]
       method_option :source_ip, :type => :string
@@ -117,10 +118,12 @@ module EnfCli
           }
 
           # call the api
-          EnfApi::Firewall.instance.add_firewall_rule options[:network], rule
+          data = EnfApi::Firewall.instance.add_firewall_rule options[:network], rule
+          rules = data[:data]
 
           # print success
           say "Created firewall rule!", :green
+          display_firewall_rules rules
         end
       end
 

data/lib/enfcli/version.rb

@@ -14,5 +14,5 @@
 # limitations under the License.
 #
 module EnfCli
-  VERSION = "5.0.0-alpha"
+  VERSION = "5.0.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enfcli
 version: !ruby/object:Gem::Version
-  version: 5.0.0.pre.alpha
+  version: 5.0.3
 platform: ruby
 authors:
 - Venkatakumar Srinivasan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-17 00:00:00.000000000 Z
+date: 2021-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -269,9 +269,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.0.3
 signing_key: