algosec-sdk 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d57a7f42feec59ab1260d8b662d201048b341515
-  data.tar.gz: f116ced6c0739e3823ced4f4e10b82219131025b
+  metadata.gz: 56034524fe3048203cf77cd466bc6a5c3a4c8a2c
+  data.tar.gz: aa9cdba1f2bdd438a30671d2e2369b39481f60c4
 SHA512:
-  metadata.gz: 982599fbbf3ac54e546469470dac5d86d6456dddfd1669032b10df17e290759f51c46afe5a7e01b964aaae5de343bb966cc35db939ceb625d31503f212ae4a55
-  data.tar.gz: b8a0bd17374d44d8d642bc3b9a3bd7b13fd2d9f2d8e24d21e6cd39ccb0a2bfa11bd3ea61457c0ba1ae142b1e7c6a80e99feafda1f1e235fca7203ab40668044d
+  metadata.gz: 9c3424704a4cd59a987fdbec1bad9e8166bef1e55bc0610afeafbb6a63e58b5df73b464ca1ea6e6242173926fd5f3cac66c166118d67ccddddae201c9b858966
+  data.tar.gz: 518c7ce35db30dbc3f752dc0e63371eb61f7cd3e60b80642595e4cfed9ffc169488c92f5508468ff736f6dfe68a45524f6858899bb0771596e033a67a9c9d505

data/.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.2.0
+current_version = 1.2.1
 commit = True
 tag = True
 

data/lib/algosec-sdk/helpers/business_flow_helper.rb

@@ -366,20 +366,14 @@ module ALGOSEC_SDK
       # TODO: Add unitests that objects are being create only once (if the same object is twice in the incoming list)
       network_object_names = Set.new(network_object_names)
       ipv4_or_subnet_objects = network_object_names.map do |object_name|
-        begin
-          IPAddress.parse object_name
-          search_result = search_network_object(object_name, NetworkObjectSearchType::EXACT)
-          # If no object was found in search, we'll count this object for creation
-          search_result.empty? ? object_name : nil
-        rescue ArgumentError
-          # The parsed object name was not IP Address or IP Subnet, ignore it
-          nil
+        if get_network_object_type(object_name)
+          search_network_object(object_name, NetworkObjectSearchType::EXACT).empty? ? object_name : nil
         end
       end.compact
 
       # Create all the objects. If the error from the server tells us that the object already exists, ignore the error
       ipv4_or_subnet_objects.map do |ipv4_or_subnet|
-        create_network_object(NetworkObjectType::HOST, ipv4_or_subnet, ipv4_or_subnet)
+        create_network_object(get_network_object_type(ipv4_or_subnet), ipv4_or_subnet, ipv4_or_subnet)
       end.compact
     end
 
@@ -403,5 +397,19 @@ module ALGOSEC_SDK
         end
       end.compact
     end
+
+    private
+
+    def get_network_object_type(object_name)
+      # handle IP ranges
+      if object_name.split('-').size == 2
+        object_name.split('-').all? { |ip| !get_network_object_type(ip).nil? } ? NetworkObjectType::RANGE : nil
+      else
+        ip_parse = IPAddress.parse object_name
+        ip_parse.size == 1 ? NetworkObjectType::HOST : NetworkObjectType::RANGE
+      end
+    rescue ArgumentError
+      nil
+    end
   end
 end

data/lib/algosec-sdk/version.rb

@@ -2,5 +2,5 @@
 
 # Gem version defined here
 module ALGOSEC_SDK
-  VERSION = '1.2.0'.freeze
+  VERSION = '1.2.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: algosec-sdk
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Almog Cohen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-05 00:00:00.000000000 Z
+date: 2018-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient