palo_alto 0.4.0 → 0.5.1

data/lib/palo_alto/version.rb

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

data/lib/palo_alto.rb

@@ -129,6 +129,7 @@ module PaloAlto
           raise SessionTimedOutException
         when '400', '403'
           begin
+            pp [:error, options[:host], response.code, response.message]
             data = Nokogiri::XML.parse(response.body)
             message = data.xpath('//response/response/msg').text
             code = response.code.to_i
@@ -194,7 +195,7 @@ module PaloAlto
             new_xpath = 'response/result/' + search_xpath[(remove+2)..]
 
             results = cache.xpath(new_xpath)
-						xml = Nokogiri.parse("<?xml version=\"1.0\"?><response><result>#{results.to_s}</result></response>")
+            xml = Nokogiri.parse("<?xml version=\"1.0\"?><response><result>#{results.to_s}</result></response>")
 
             if debug.include?(:statistics)
               warn "Elapsed for parsing cache: #{Time.now - start_time} seconds"
@@ -215,7 +216,7 @@ module PaloAlto
         options[:verify_ssl] = verify_ssl
         options[:payload]    = payload
         options[:debug]      = debug
-        options[:timeout]    = timeout || 180
+        options[:timeout]    = timeout || 600
         options[:headers]    = if payload[:type] == 'keygen'
                                  {}
                                else
@@ -262,6 +263,7 @@ module PaloAlto
       rescue TemporaryException => e
         dont_retry_at = [
           'Partial revert is not allowed. Full system commit must be completed.',
+          'Local commit jobs are queued. Revert operation is not allowed.',
           'Config for scope ',
           'Config is not currently locked for scope ',
           'Commit lock is not currently held by',
@@ -275,7 +277,7 @@ module PaloAlto
         max_retries = if dont_retry_at.any? { |str| e.message.start_with?(str) }
                         0
                       elsif e.message.start_with?('Timed out while getting config lock. Please try again.')
-                        10
+                        30
                       else
                         1
                       end
@@ -321,23 +323,31 @@ module PaloAlto
       cmd = if all
               'commit'
             else
-              { commit: { partial: [
-                { 'admin': admins },
-                if device_groups
-                  device_groups.empty? ? 'no-device-group' : { 'device-group': device_groups }
-                end,
-                if templates
-                  templates.empty? ? 'no-template' : { 'template': templates }
-                end,
-                'no-template-stack',
-                'no-log-collector',
-                'no-log-collector-group',
-                'no-wildfire-appliance',
-                'no-wildfire-appliance-cluster',
-                { 'device-and-network': 'excluded' },
-                { 'shared-object': 'excluded' }
-              ].compact } }
+              commit_partial = {
+                'no-template-stack': true,
+                'no-log-collector': true,
+                'no-log-collector-group': true,
+                'no-wildfire-appliance': true,
+                'no-wildfire-appliance-cluster': true,
+                'device-and-network': 'excluded',
+                'shared-object': 'excluded'
+              }
+
+              if device_groups
+                commit_partial.merge!(device_groups.empty? ? {'no-device-group': true} : { 'device-group': device_groups })
+              end
+
+              if templates
+                commit_partial.merge!(templates.empty? ? {'no-template': true} : { 'template': templates })
+              end
+
+              if admins
+                commit_partial.merge!({'admin': admins})
+              end
+
+              { commit: { partial: commit_partial } }
             end
+
       result = op.execute(cmd)
 
       return result if raw_result
@@ -358,7 +368,7 @@ module PaloAlto
     def primary_active?
       cmd = { show: { 'high-availability': 'state' } }
       state = op.execute(cmd)
-      state.at_xpath('response/result/local-info/state').text == 'primary-active'
+      state.at_xpath('response/result/local-info/state')&.text == 'primary-active'
     end
 
     # area: config, commit
@@ -500,17 +510,17 @@ module PaloAlto
       cmd = if all
               { revert: 'config' }
             else
-              { revert: { config: { partial: [
-                { 'admin': [username] },
-                'no-template',
-                'no-template-stack',
-                'no-log-collector',
-                'no-log-collector-group',
-                'no-wildfire-appliance',
-                'no-wildfire-appliance-cluster',
-                { 'device-and-network': 'excluded' },
-                { 'shared-object': 'excluded' }
-              ] } } }
+              { revert: { config: { partial: {
+                'admin': [username],
+                'no-template': true,
+                'no-template-stack': true,
+                'no-log-collector': true,
+                'no-log-collector-group': true,
+                'no-wildfire-appliance': true,
+                'no-wildfire-appliance-cluster': true,
+                'device-and-network': 'excluded',
+                'shared-object': 'excluded'
+              } } } }
             end
 
       waited = 0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: palo_alto
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Sebastian Roesner
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-10-19 00:00:00.000000000 Z
+date: 2024-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri