palo_alto 0.1.9 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75f890f237714b8ab90594551c7a7ae27ad896b0d98f8fa95753c45402534893
-  data.tar.gz: 0be5164b8a2ce37a63c17c6e1a3b17234f90a0fadbf7bd6a2e12c87efded1927
+  metadata.gz: 7442c2cf207b59a2ac451b8f2fe35e7333f5486b8fa8b124887df6dbec5f7501
+  data.tar.gz: b27f957f7e15285d6755d95136f3e8bacdb45ffa03bbcba9ee5274b5f9d651fd
 SHA512:
-  metadata.gz: 40e2437add174f53ccaefa2176b49ce5c4cb600c6cac2f1815bccbb039eac5c63eec25f0836630d1cfbe3a84b83a660ee7ec40ff9112c048879dd12496a6b321
-  data.tar.gz: fd6b3ca8f123ce3c28d4b60dd0ca02bc5d8ea489705ee7851ed79e9deeb08bde7de45bbf1bebf54aaa816bc605658e3eaad9befaedad3a770cebf75070ab39a4
+  metadata.gz: 9dafa319006719982ec6b910c0262c32f19e13019b7f90bb8ed93b3b2d0ece98ac5913b55d40357239860f800f6d3bc66961fdb85a14fd46d0fddadc3acdfd5b
+  data.tar.gz: 26418cfc13c83588cc1349060d55fb9adf716f2d18a1a6ef96b7466a12e00f0d1c21043fcc7de42964515a2d386d32ac3fb316cc171ff2f77a4202bd9c6eb010

data/lib/palo_alto/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PaloAlto
-  VERSION = '0.1.9'
+  VERSION = '0.2.0'
 end

data/lib/palo_alto.rb

@@ -99,7 +99,15 @@ module PaloAlto
 
         thread[:http].start unless thread[:http].started?
 
-        response = thread[:http].post('/api/', URI.encode_www_form(options[:payload]), options[:headers])
+        payload = options[:payload]
+        response = if payload.values.any? { |value| [IO, StringIO].any? { |t| value.is_a?(t) } }
+                     payload.values.select { |value| [IO, StringIO].any? { |t| value.is_a?(t) } }.each(&:rewind)
+                     post_req = Net::HTTP::Post.new('/api/', options[:headers])
+                     post_req.set_form payload.map { |k, v| [k.to_s, v] }, 'multipart/form-data'
+                     thread[:http].request(post_req)
+                   else
+                     thread[:http].post('/api/', URI.encode_www_form(payload), options[:headers])
+                   end
 
         case response.code
         when '200'
@@ -189,13 +197,14 @@ module PaloAlto
         begin
           Helpers::Rest.execute(payload, headers: { 'X-PAN-KEY': auth_key })
         rescue TemporaryException => e
-          dont_continue_at = [
+          dont_retry_at = [
             'Partial revert is not allowed. Full system commit must be completed.',
             'Config for scope ',
             'Config is not currently locked for scope ',
-            'Commit lock is not currently held by'
+            'Commit lock is not currently held by',
+            'You already own a config lock for scope '
           ]
-          if retried || dont_continue_at.any? { |x| e.message.start_with?(x) }
+          if retried || dont_retry_at.any? { |x| e.message.start_with?(x) }
             raise e
           else
             warn "Got error #{e.inspect}; retrying" if XML.debug.include?(:warnings)
@@ -266,14 +275,12 @@ module PaloAlto
     # will execute block if given and unlock afterwards. returns false if lock could not be aquired
     def lock(area:, comment: nil, type: nil, location: nil)
       if block_given?
-        if lock(area: area, comment: comment, type: type, location: location)
-          begin
-            return yield
-          ensure
-            unlock(area: area, type: type, location: location)
-          end
-        else
-          return false
+        return false unless lock(area: area, comment: comment, type: type, location: location)
+
+        begin
+          return yield
+        ensure
+          unlock(area: area, type: type, location: location)
         end
       end
 
@@ -309,8 +316,16 @@ module PaloAlto
     end
 
     def check_for_changes(usernames: [XML.username])
-      result = Op.new.execute({ show: { config: { list: { 'change-summary': { partial: { admin: usernames } } } } } })
-      result.xpath('response/result/summary/device-group/member').map(&:inner_text)
+      cmd = if usernames
+              { show: { config: { list: { 'change-summary': { partial: { admin: usernames } } } } } }
+            else
+              { show: { config: { list: 'change-summary' } } }
+            end
+      result = Op.new.execute(cmd)
+      {
+        device_groups: result.xpath('response/result/summary/device-group/member').map(&:inner_text),
+        templates: result.xpath('response/result/summary/template/member').map(&:inner_text)
+      }
     end
 
     def wait_for_job_completion(job_id, wait: 5, timeout: 300)
@@ -363,8 +378,6 @@ module PaloAlto
       # attempt to obtain the auth_key
       # raise 'Exception attempting to obtain the auth_key' if (self.class.auth_key = get_auth_key).nil?
       self.class.get_auth_key
-
-      self
     end
 
     # Perform a query to the API endpoint for an auth_key based on the credentials provided

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: palo_alto
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.0
 platform: ruby
 authors:
 - Sebastian Roesner
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-11-21 00:00:00.000000000 Z
+date: 2021-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri