enfcli 4.0.0 → 5.0.0.pre.alpha

data/lib/enfcli/commands/xdns.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2019 Xaptum,Inc
+# Copyright 2019-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.
@@ -13,17 +13,16 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-require 'enfthor'
-require 'enfapi'
+require "enfthor"
+require "enfapi/dns"
 
 module EnfCli
   module Cmd
-
     class Xdns < EnfThor
-      DnsRecordType_AAAA = 'AAAA'
-      DnsRecordType_TXT = 'TXT'
-      DnsRecordType_SRV = 'SRV'
-      DnsRecordType_CNAME = 'CNAME'
+      DnsRecordType_AAAA = "AAAA"
+      DnsRecordType_TXT = "TXT"
+      DnsRecordType_SRV = "SRV"
+      DnsRecordType_CNAME = "CNAME"
       DnsRecordTypes = [DnsRecordType_AAAA, DnsRecordType_CNAME, DnsRecordType_SRV, DnsRecordType_TXT]
 
       no_commands {
@@ -35,13 +34,10 @@ module EnfCli
           case type
           when DnsRecordType_AAAA
             value = value[:ipv6]
-
           when DnsRecordType_CNAME
             value = value[:dname]
-
           when DnsRecordType_SRV
             value = "#{value[:priority]} #{value[:weight]} #{value[:port]} #{value[:target]}"
-
           when DnsRecordType_TXT
             value = value[:txt]
           end
@@ -50,33 +46,33 @@ module EnfCli
         end
 
         def display_zones_table(zones)
-          headings = ['Id', 'Zone', 'Description', 'Enf Domain']
-          rows = zones.map{ |hash|
-            [ hash[:id], hash[:zone_domain_name], hash[:description], hash[:enf_domain] ]
+          headings = ["Id", "Zone", "Description", "Privileged", "Enf Domain"]
+          rows = zones.map { |hash|
+            [hash[:id], hash[:zone_domain_name], hash[:description], hash[:privileged], hash[:enf_domain]]
           }
           render_table(headings, rows)
         end
 
         def display_networks_table(networks)
-          headings = ['Id', 'Network' ]
-          rows = networks.map{ |hash|
-            [ hash[:rowid], hash[:enf_network] ]
+          headings = ["Id", "Network"]
+          rows = networks.map { |hash|
+            [hash[:rowid], hash[:enf_network]]
           }
           render_table(headings, rows)
         end
 
         def display_records_table(records)
-          headings = ['Id', 'Name', 'Type', 'Value', 'TTL']
-          rows = records.map{ |hash|
-            [ hash[:id], hash[:name], hash[:type], get_record_value(hash[:type], hash[:value]), hash[:ttl] ]
+          headings = ["Id", "Name", "Type", "Value", "TTL"]
+          rows = records.map { |hash|
+            [hash[:id], hash[:name], hash[:type], get_record_value(hash[:type], hash[:value]), hash[:ttl]]
           }
           render_table(headings, rows)
         end
 
         def display_servers_table(servers)
-          headings = ['Id', 'IPv6', 'Network', 'Description' ]
-          rows = servers.map{ |hash|
-            [ hash[:id], hash[:ipv6], hash[:enf_network], hash[:description] ]
+          headings = ["Id", "IPv6", "Network", "Description"]
+          rows = servers.map { |hash|
+            [hash[:id], hash[:ipv6], hash[:enf_network], hash[:description]]
           }
           render_table(headings, rows)
         end
@@ -86,30 +82,38 @@ module EnfCli
       method_option :'zone-domain-name', :type => :string, :required => true
       method_option :description, :type => :array, :banner => "DESCRIPTION"
       method_option :'enf-domain', :type => :string, :banner => "/48 Enf Domain"
+      method_option :'enf-network', :type => :string, :banner => "/64 Enf Network"
+
       def create_zone
         try_with_rescue_in_session do
           ## session
           session = EnfCli::CTX.instance.session
 
           ## Gather parameters
-          zone_domain_name = options['zone-domain-name']
+          zone_domain_name = options["zone-domain-name"]
           description = array_option_to_string(options.description) if options.description
-          case session[:type]
-          when 'XAPTUM_ADMIN'
-            enf_domain = options['enf-domain']
+          if EnfCli::CTX.instance.xaptum_admin?
+            enf_domain = options["enf-domain"]
             raise "No value provided for required options '--enf-domain'" unless enf_domain
-
           else
-            enf_domain = session[:domain_network]
+            enf_domain = session[:domain]
+          end
+
+          enf_network = options["enf-network"]
+          unless EnfCli::CTX.instance.edit_domain_role?
+            raise "No value provided for required option '--enf-network'" unless enf_network
           end
 
           ## create request hash
           new_zone = {
             :zone_domain_name => zone_domain_name,
             :description => description,
-            :enf_domain => enf_domain
+            :enf_domain => enf_domain,
           }
 
+          ## add enf_network to request if present
+          new_zone[:enf_network] = enf_network if enf_network
+
           ## call api
           data = EnfApi::Dns.instance.create_dns_zone new_zone
           zones = data[:data]
@@ -123,18 +127,17 @@ module EnfCli
 
       desc "list-zones", "List DNS Zones"
       method_option :'enf-domain', :type => :string, :banner => "/48 Enf Domain"
+
       def list_zones
         try_with_rescue_in_session do
           ## session
           session = EnfCli::CTX.instance.session
 
-          case session[:type]
-          when 'XAPTUM_ADMIN'
-            enf_domain = options['enf-domain']
+          if EnfCli::CTX.instance.xaptum_admin?
+            enf_domain = options["enf-domain"]
             raise "No value provided for required options '--enf-domain'" unless enf_domain
-
           else
-            enf_domain = session[:domain_network]
+            enf_domain = session[:domain]
           end
 
           ## call api
@@ -148,6 +151,7 @@ module EnfCli
 
       desc "delete-zone", "Delete a DNS zone"
       method_option :'zone-id', :type => :string, :required => true
+
       def delete_zone
         try_with_rescue_in_session do
           zone_id = options[:'zone-id']
@@ -162,6 +166,7 @@ module EnfCli
       desc "update-zone", "Update a DNS zone description"
       method_option :'zone-id', :type => :string, :required => true
       method_option :description, :type => :array, :banner => "DESCRIPTION", :required => true
+
       def update_zone
         try_with_rescue_in_session do
           ## get parameters
@@ -169,7 +174,7 @@ module EnfCli
 
           ## update request
           update_zone_req = {
-            :description => description
+            :description => description,
           }
 
           ## call api
@@ -184,15 +189,16 @@ module EnfCli
       desc "add-networks-to-zone", "Add /64 networks to DNS zone"
       method_option :'zone-id', :type => :string, :required => true
       method_option :networks, :type => :array, :banner => "NETWORKS", :required => true
+
       def add_networks_to_zone
         try_with_rescue_in_session do
           ## gather parameters
           zone_id = options[:'zone-id']
-          networks = array_option_to_string(options[:networks]).split(",").map{ |x| x.strip }
+          networks = array_option_to_string(options[:networks]).split(",").map { |x| x.strip }
 
           ## add networks request
           add_networks_req = {
-            :networks => networks
+            :networks => networks,
           }
 
           ## call api
@@ -207,6 +213,7 @@ module EnfCli
 
       desc "list-networks-in-zone", "List /64 networks in DNS zone"
       method_option :'zone-id', :type => :string, :required => true
+
       def list_networks_in_zone
         try_with_rescue_in_session do
           ## gather parameters
@@ -224,6 +231,7 @@ module EnfCli
       desc "delete-networks-from-zone", "Delete /64 networks from DNS zone"
       method_option :'zone-id', :type => :string, :required => true
       method_option :networks, :type => :array, :banner => "NETWORKS", :required => true
+
       def delete_networks_from_zone
         try_with_rescue_in_session do
           ## gather parameters
@@ -241,15 +249,16 @@ module EnfCli
       desc "replace-networks-in-zone", "Replace /64 networks in DNS zone"
       method_option :'zone-id', :type => :string, :required => true
       method_option :networks, :type => :array, :banner => "NETWORKS", :required => true
+
       def replace_networks_in_zone
         try_with_rescue_in_session do
           ## gather parameters
           zone_id = options[:'zone-id']
-          networks = array_option_to_string(options[:networks]).split(",").map{ |x| x.strip }
+          networks = array_option_to_string(options[:networks]).split(",").map { |x| x.strip }
 
           ## replace networks request
           replace_networks_req = {
-            :networks => networks
+            :networks => networks,
           }
 
           ## call api
@@ -262,6 +271,7 @@ module EnfCli
 
       desc "list-zones-in-network", "List DNS Zones in /64 Network"
       method_option :'network', :type => :string, :banner => "/64 Enf Network", :required => true
+
       def list_zones_in_network
         try_with_rescue_in_session do
           ## gather parameters
@@ -278,11 +288,12 @@ module EnfCli
 
       desc "create-record", "Create a DNS record"
       method_option :'zone-id', :type => :string, :required => true
-      method_option :name, :type => :string, :banner => '<name>',
-                    :desc => '<name> is DNS record name. Enter . to create a record with the zone domain name'
-      method_option :'type',  :type => :string, :required => true, :enum => DnsRecordTypes
+      method_option :name, :type => :string, :banner => "<name>",
+                           :desc => "<name> is DNS record name. Enter . to create a record with the zone domain name"
+      method_option :'type', :type => :string, :required => true, :enum => DnsRecordTypes
       method_option :ttl, :type => :numeric, :required => true
-      method_option :value, :type => :array, :required => true, :banner => 'VALUE'
+      method_option :value, :type => :array, :required => true, :banner => "VALUE"
+
       def create_record
         try_with_rescue_in_session do
           ## gather parameters
@@ -297,28 +308,23 @@ module EnfCli
           when DnsRecordType_AAAA
             ipv6 = EnfCli::IPV6.new(value).to_s
             value = { :ipv6 => ipv6 }
-
           when DnsRecordType_CNAME
             value = { :dname => value }
-
           when DnsRecordType_SRV
             raise "Invalid value for #{DnsRecordType_SRV} record" unless options.value.length == 4
             value = { :priority => Integer(options.value[0]),
                       :weight => Integer(options.value[1]),
                       :port => Integer(options.value[2]),
-                      :target => options.value[3],
-                    }
-
+                      :target => options.value[3] }
           when DnsRecordType_TXT
             value = { :txt => value }
           end
 
-
           ## create request hash
           new_record = {
             :type => type,
             :ttl => ttl,
-            :value => value
+            :value => value,
           }
 
           ## optionally add name to request hash
@@ -336,6 +342,7 @@ module EnfCli
 
       desc "list-records", "List DNS records in a DNS zone"
       method_option :'zone-id', :type => :string, :required => true
+
       def list_records
         try_with_rescue_in_session do
           ## gather parameters
@@ -353,7 +360,8 @@ module EnfCli
       desc "query", "Query DNS for a record"
       method_option :'network', :type => :string, :required => true, :banner => "/64 Enf Network"
       method_option :name, :type => :string, :required => true
-      method_option :'type',  :type => :string, :required => true, :enum => DnsRecordTypes
+      method_option :'type', :type => :string, :required => true, :enum => DnsRecordTypes
+
       def query
         try_with_rescue_in_session do
           ## gather parameters
@@ -372,6 +380,7 @@ module EnfCli
 
       desc "delete-record", "Delete a DNS record"
       method_option :'id', :type => :string, :required => true
+
       def delete_record
         try_with_rescue_in_session do
           ## gather parameters
@@ -389,6 +398,7 @@ module EnfCli
       method_option :'network', :type => :string, :banner => "/64 Enf Network", :required => true
       method_option :'ipv6', :type => :string
       method_option :description, :type => :array, :banner => "DESCRIPTION"
+
       def provision_server
         try_with_rescue_in_session do
           ## gather parameters
@@ -398,7 +408,7 @@ module EnfCli
 
           new_server = {
             :ipv6 => ipv6,
-            :description => description
+            :description => description,
           }
 
           ## call API
@@ -412,6 +422,7 @@ module EnfCli
 
       desc "list-servers", "List DNS server in /64 network"
       method_option :'network', :type => :string, :banner => "/64 Enf Network", :required => true
+
       def list_servers
         try_with_rescue_in_session do
           ## gather parameters
@@ -429,6 +440,7 @@ module EnfCli
       desc "delete-server", "Delete DNS server in /64 network"
       method_option :'network', :type => :string, :banner => "/64 Enf Network", :required => true
       method_option :'ipv6', :type => :string, :banner => "Server Ipv6", :required => true
+
       def delete_server
         try_with_rescue_in_session do
           ## gather parameters
@@ -442,8 +454,6 @@ module EnfCli
           say "Delete DNS server with ipv6 #{ipv6} in #{network}!", :green
         end
       end
-
     end # Xdns
-
   end # Cmd module
 end # EnfCli module

data/lib/enfcli/commands/xfw.rb

@@ -13,27 +13,26 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-require 'enfthor'
-require 'enfapi'
-require 'base64'
-require 'digest'
-require 'openssl'
-require 'ipaddr'
+require "enfthor"
+require "enfapi/firewall"
+require "base64"
+require "digest"
+require "openssl"
+require "ipaddr"
 
 module EnfCli
   module Cmd
-    
     class Xfw < EnfThor
       no_commands {
-        def display_firewall_rules rules
-          headings = ['Id', 'Priority', 'Protocol', 'Direction', 'Source', 'Source Port', 'Destination', 'Destination Port', 'Action']
-          rows = rules.map{ |hash|
-            [ hash[:id], hash[:priority], hash[:protocol], hash[:direction],
-              hash[:source_ip] == '' ? '*' : hash[:source_ip],
-              hash[:source_port] == 0 ? '*' : hash[:source_port],
-              hash[:dest_ip] == '' ? '*' : hash[:dest_ip],
-              hash[:dest_port] == 0 ? '*' : hash[:dest_port],
-              hash[:action] ]
+        def display_firewall_rules(rules)
+          headings = ["Id", "Priority", "Protocol", "Direction", "Source", "Source Port", "Destination", "Destination Port", "Action"]
+          rows = rules.map { |hash|
+            [hash[:id], hash[:priority], hash[:protocol], hash[:direction],
+             hash[:source_ip] == "" ? "*" : hash[:source_ip],
+             hash[:source_port] == 0 ? "*" : hash[:source_port],
+             hash[:dest_ip] == "" ? "*" : hash[:dest_ip],
+             hash[:dest_port] == 0 ? "*" : hash[:dest_port],
+             hash[:action]]
           }
           render_table(headings, rows)
         end
@@ -41,40 +40,41 @@ module EnfCli
 
       desc "list-firewall-rules", "List all firewall rules in a /64 network"
       method_option :network, :type => :string, :required => true
+
       def list_firewall_rules
         try_with_rescue_in_session do
           # call the api
           rules = EnfApi::Firewall.instance.list_firewall_rules options[:network]
 
           # display empty table and return
-          if rules.length == 0 then
+          if rules.length == 0
             display_firewall_rules rules
             return
           end
 
           # sort the rules by direction, priority
-          sorted_rules = rules.sort{ |x,y|
+          sorted_rules = rules.sort { |x, y|
             r = x[:direction] <=> y[:direction]
-            if r == 0 then
+            if r == 0
               x[:priority] <=> y[:priority]
             else
               r
             end
           }
-         
+
           # chunk them into egress/ingress arrays
           egress_rules = Array.new
           ingress_rules = Array.new
-          sorted_rules.each{ |rule|
-            if rule[:direction] == 'INGRESS' then
+          sorted_rules.each { |rule|
+            if rule[:direction] == "INGRESS"
               ingress_rules << rule
             else
               egress_rules << rule
             end
           }
-          
+
           # display data
-          if egress_rules.length > 0 then
+          if egress_rules.length > 0
             say "Egress firewall rules(Endpoint -> ENF)", :yellow
             display_firewall_rules egress_rules
 
@@ -82,7 +82,7 @@ module EnfCli
             say ""
           end
 
-          if ingress_rules.length > 0 then
+          if ingress_rules.length > 0
             say "Ingress firewall rules(ENF -> Endpoint)", :yellow
             display_firewall_rules ingress_rules
           end
@@ -92,28 +92,28 @@ module EnfCli
       desc "add-firewall-rule", "Add a firewall rule to a /64 network"
       method_option :network, :type => :string, :required => true
       method_option :priority, :type => :numeric, :required => true
-      method_option :protocol, :type => :string, :required => true, :enum => ['TCP', 'UDP', 'ICMP6', '6', '17', '58']
+      method_option :protocol, :type => :string, :required => true, :enum => ["TCP", "UDP", "ICMP6", "6", "17", "58"]
       method_option :source_ip, :type => :string
       method_option :source_port, :type => :numeric
       method_option :dest_ip, :type => :string
       method_option :dest_port, :type => :numeric
-      method_option :direction, :type => :string, :required => true, :enum => ['EGRESS', 'INGRESS']
-      method_option :action, :type => :string, :required => true, :enum => ['ACCEPT', 'DROP']
-      
+      method_option :direction, :type => :string, :required => true, :enum => ["EGRESS", "INGRESS"]
+      method_option :action, :type => :string, :required => true, :enum => ["ACCEPT", "DROP"]
+
       def add_firewall_rule
-        protocol_map = { 'TCP' => 'TCP', 'UDP' => 'UDP', 'ICMP6' => 'ICMP6', '6' => 'TCP', '17' => 'UDP', '58' => 'ICMP6' }
+        protocol_map = { "TCP" => "TCP", "UDP" => "UDP", "ICMP6" => "ICMP6", "6" => "TCP", "17" => "UDP", "58" => "ICMP6" }
         try_with_rescue_in_session do
           # get options
           rule = {
-            :ip_family => 'IP6',
+            :ip_family => "IP6",
             :priority => options[:priority],
-            :protocol => protocol_map[ options[:protocol] ],
-            :source_ip => options[:source_ip] ? options[:source_ip] : '*',
+            :protocol => protocol_map[options[:protocol]],
+            :source_ip => options[:source_ip] ? options[:source_ip] : "*",
             :source_port => options[:source_port] ? options[:source_port] : 0,
-            :dest_ip => options[:dest_ip] ? options[:dest_ip] : '*',
+            :dest_ip => options[:dest_ip] ? options[:dest_ip] : "*",
             :dest_port => options[:dest_port] ? options[:dest_port] : 0,
             :direction => options[:direction],
-            :action => options[:action]
+            :action => options[:action],
           }
 
           # call the api
@@ -127,6 +127,7 @@ module EnfCli
       desc "delete-firewall-rule", "Delete a firewall rule"
       method_option :network, :type => :string, :required => true
       method_option :id, :type => :string, :required => true
+
       def delete_firewall_rule
         try_with_rescue_in_session do
           # call the api
@@ -144,8 +145,7 @@ module EnfCli
       #  raise EnfCli::ERROR, "User Session not establised!" if !session
       #  EnfApi::Firewall.instance.delete_firewall_rules options[:network]
       # end
-      
-    end
 
+    end
   end
 end