Merge pull request #766 from swaschkut/main

version 2.1.12
PaloAltoNetworks · Jul 31, 2023 · 5ac0b13 · 5ac0b13
2 parents faf0f3e + 028fd97
commit 5ac0b13
Show file tree

Hide file tree

Showing 29 changed files with 136 additions and 59 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -1,6 +1,17 @@
 CHANGELOG
 
-2.1.11
+2.1.12
+UTIL:
+* type=bpa-generator | extend response output if not valid JSON
+* type=gcp | extend for mqsql usage and bring in mysql pw in type=key-manager
+
+BUGFIX:
+* type=XYZ | in=api://{MGMT-IP} actions=name-rename - bugfix for API usage
+
+GENERAL:
+
+
+2.1.11 (20230721)
 UTIL:
 * type=rule | introduce new 'filter=(timestamp-rule-creation <>=! -30 days)' | timestamp-rule-modification
 * type=address | introduce 'filter=(value ip4.included-in RFC1918)'

diff --git a/lib/misc-classes/PH.php b/lib/misc-classes/PH.php
@@ -182,7 +182,7 @@ function __construct($argv, $argc)
 
     private static $library_version_major = 2;
     private static $library_version_sub = 1;
-    private static $library_version_bugfix = 11;
+    private static $library_version_bugfix = 12;
 
     //BASIC AUTH PAN-OS 7.1
     public static $softwareupdate_key = "658d787f293e631196dac9fb29490f1cc1bb3827";

diff --git a/lib/misc-classes/PanAPIConnector.php b/lib/misc-classes/PanAPIConnector.php
@@ -422,7 +422,7 @@ static public function findOrCreateConnectorFromHost($host, $apiKey = null, $pro
                 {
                     PH::$useExceptions = $exceptionUse;
 
-                    if( $host != "bpa-apikey" && $host != "license-apikey" && $host != "ldap-password" && $host != "maxmind-licensekey" )
+                    if( $host != "bpa-apikey" && $host != "license-apikey" && $host != "ldap-password" && $host != "maxmind-licensekey" && $host != "gcp-mysql-password" )
                     {
                         $wrongLogin = TRUE;
 
@@ -475,7 +475,7 @@ static public function findOrCreateConnectorFromHost($host, $apiKey = null, $pro
             }
 
 
-            if( strlen($apiKey) < 19 && !( $host == "bpa-apikey" || $host == "license-apikey" || $host == "ldap-password" || $host == "maxmind-licensekey" ) )
+            if( strlen($apiKey) < 19 && !( $host == "bpa-apikey" || $host == "license-apikey" || $host == "ldap-password" || $host == "maxmind-licensekey" || $host == "gcp-mysql-password" ) )
             {
                 $user = $apiKey;
 
@@ -523,7 +523,7 @@ static public function findOrCreateConnectorFromHost($host, $apiKey = null, $pro
                 $connector = new PanAPIConnector($host, $apiKey, 'panos', null, $port);
         }
 
-        if( $host == "bpa-apikey" || $host == "license-apikey" || $host == "ldap-password" || $host == "maxmind-licensekey" || strpos($host, "tsg_id") !== FALSE )
+        if( $host == "bpa-apikey" || $host == "license-apikey" || $host == "ldap-password" || $host == "maxmind-licensekey" || strpos($host, "tsg_id" || $host == "gcp-mysql-password") !== FALSE )
         {
             $checkConnectivity = false;
             self::$savedConnectors[] = $connector;

diff --git a/lib/object-classes/Address.php b/lib/object-classes/Address.php
@@ -345,12 +345,12 @@ public function API_setName($newName)
             return;
         }
 
-        if( !$this->setName($newName) )
-            return FALSE;
-
         $c = findConnectorOrDie($this);
         $xpath = $this->getXPath();
 
+        if( !$this->setName($newName) )
+            return FALSE;
+
         if( $c->isAPI() )
             $c->sendRenameRequest($xpath, $newName);
         elseif( $c->isSaseAPI() )

diff --git a/lib/object-classes/AddressGroup.php b/lib/object-classes/AddressGroup.php
@@ -690,11 +690,11 @@ public function members()
      */
     public function API_setName($newName)
     {
-        $this->setName($newName);
-
         $c = findConnectorOrDie($this);
         $xpath = $this->getXPath();
 
+        $this->setName($newName);
+
         if( $c->isAPI() )
             $c->sendRenameRequest($xpath, $newName);
     }

diff --git a/lib/object-classes/AntiSpywareProfile.php b/lib/object-classes/AntiSpywareProfile.php
@@ -72,11 +72,11 @@ public function setName($newName)
      */
     public function API_setName($newName)
     {
-        $this->setName($newName);
-
         $c = findConnectorOrDie($this);
         $xpath = $this->getXPath();
 
+        $this->setName($newName);
+
         if( $c->isAPI() )
             $c->sendRenameRequest($xpath, $newName);
     }

diff --git a/lib/object-classes/AntiVirusProfile.php b/lib/object-classes/AntiVirusProfile.php
@@ -83,11 +83,11 @@ public function setName($newName)
      */
     public function API_setName($newName)
     {
-        $this->setName($newName);
-
         $c = findConnectorOrDie($this);
         $xpath = $this->getXPath();
 
+        $this->setName($newName);
+
         if( $c->isAPI() )
             $c->sendRenameRequest($xpath, $newName);
     }

diff --git a/lib/object-classes/DNSSecurityProfile.php b/lib/object-classes/DNSSecurityProfile.php
@@ -77,10 +77,11 @@ public function setName($newName)
      */
     public function API_setName($newName)
     {
-        $this->setName($newName);
-
         $c = findConnectorOrDie($this);
         $xpath = $this->getXPath();
+
+        $this->setName($newName);
+
         if( $c->isAPI() )
             $c->sendRenameRequest($xpath, $newName);
     }

diff --git a/lib/object-classes/DataFilteringProfile.php b/lib/object-classes/DataFilteringProfile.php
@@ -70,11 +70,11 @@ public function setName($newName)
      */
     public function API_setName($newName)
     {
-        $this->setName($newName);
-
         $c = findConnectorOrDie($this);
         $xpath = $this->getXPath();
 
+        $this->setName($newName);
+
         if( $c->isAPI() )
             $c->sendRenameRequest($xpath, $newName);
     }

diff --git a/lib/object-classes/DecryptionProfile.php b/lib/object-classes/DecryptionProfile.php
@@ -80,11 +80,11 @@ public function setName($newName)
      */
     public function API_setName($newName)
     {
-        $this->setName($newName);
-
         $c = findConnectorOrDie($this);
         $xpath = $this->getXPath();
 
+        $this->setName($newName);
+
         if( $c->isAPI() )
             $c->sendRenameRequest($xpath, $newName);
     }

diff --git a/lib/object-classes/FileBlockingProfile.php b/lib/object-classes/FileBlockingProfile.php
@@ -70,11 +70,11 @@ public function setName($newName)
      */
     public function API_setName($newName)
     {
-        $this->setName($newName);
-
         $c = findConnectorOrDie($this);
         $xpath = $this->getXPath();
 
+        $this->setName($newName);
+
         if( $c->isAPI() )
             $c->sendRenameRequest($xpath, $newName);
     }

diff --git a/lib/object-classes/Profile.php b/lib/object-classes/Profile.php
@@ -80,11 +80,11 @@ public function setName($newName)
      */
     public function API_setName($newName)
     {
-        $this->setName($newName);
-
         $c = findConnectorOrDie($this);
         $xpath = $this->getXPath();
 
+        $this->setName($newName);
+
         if( $c->isAPI() )
             $c->sendRenameRequest($xpath, $newName);
     }

diff --git a/lib/object-classes/Region.php b/lib/object-classes/Region.php
@@ -142,11 +142,12 @@ public function API_setName($newName)
             mwarning('renaming of TMP object in API is not possible, it was ignored');
             return;
         }
-        $this->setName($newName);
 
         $c = findConnectorOrDie($this);
         $xpath = $this->getXPath();
 
+        $this->setName($newName);
+
         if( $c->isAPI() )
             $c->sendRenameRequest($xpath, $newName);
     }

diff --git a/lib/object-classes/SaasSecurityProfile.php b/lib/object-classes/SaasSecurityProfile.php
@@ -77,11 +77,11 @@ public function setName($newName)
      */
     public function API_setName($newName)
     {
-        $this->setName($newName);
-
         $c = findConnectorOrDie($this);
         $xpath = $this->getXPath();
 
+        $this->setName($newName);
+
         if( $c->isAPI() )
             $c->sendRenameRequest($xpath, $newName);
     }

diff --git a/lib/object-classes/Schedule.php b/lib/object-classes/Schedule.php
@@ -89,11 +89,11 @@ public function setName($newName)
      */
     public function API_setName($newName)
     {
-        $this->setName($newName);
-
         $c = findConnectorOrDie($this);
         $xpath = $this->getXPath();
 
+        $this->setName($newName);
+
         if( $c->isAPI() )
             $c->sendRenameRequest($xpath, $newName);
     }

diff --git a/lib/object-classes/SecurityProfileGroup.php b/lib/object-classes/SecurityProfileGroup.php
@@ -115,11 +115,11 @@ public function setName($newName)
      */
     public function API_setName($newName)
     {
-        $this->setName($newName);
-
         $c = findConnectorOrDie($this);
         $xpath = $this->getXPath();
 
+        $this->setName($newName);
+
         if( $c->isAPI() )
             $c->sendRenameRequest($xpath, $newName);
     }

diff --git a/lib/object-classes/Service.php b/lib/object-classes/Service.php
@@ -570,11 +570,11 @@ public function setName($newName)
      */
     public function API_setName($newName)
     {
-        $this->setName($newName);
-
         $c = findConnectorOrDie($this);
         $xpath = $this->getXPath();
 
+        $this->setName($newName);
+
         if( $c->isAPI())
             $c->sendRenameRequest($xpath, $newName);
     }

diff --git a/lib/object-classes/ServiceGroup.php b/lib/object-classes/ServiceGroup.php
@@ -185,11 +185,11 @@ public function setName($newName)
      */
     public function API_setName($newName)
     {
-        $this->setName($newName);
-
         $c = findConnectorOrDie($this);
         $xpath = $this->getXPath();
 
+        $this->setName($newName);
+
         if( $c->isAPI())
             $c->sendRenameRequest($xpath, $newName);
     }

diff --git a/lib/object-classes/URLProfile.php b/lib/object-classes/URLProfile.php
@@ -105,11 +105,11 @@ public function setName($newName)
      */
     public function API_setName($newName)
     {
-        $this->setName($newName);
-
         $c = findConnectorOrDie($this);
         $xpath = $this->getXPath();
 
+        $this->setName($newName);
+
         if( $c->isAPI())
             $c->sendRenameRequest($xpath, $newName);
     }

diff --git a/lib/object-classes/VirusAndWildfireProfile.php b/lib/object-classes/VirusAndWildfireProfile.php
@@ -70,11 +70,11 @@ public function setName($newName)
      */
     public function API_setName($newName)
     {
-        $this->setName($newName);
-
         $c = findConnectorOrDie($this);
         $xpath = $this->getXPath();
 
+        $this->setName($newName);
+
         if( $c->isAPI())
             $c->sendRenameRequest($xpath, $newName);
     }

diff --git a/lib/object-classes/VulnerabilityProfile.php b/lib/object-classes/VulnerabilityProfile.php
@@ -74,11 +74,11 @@ public function setName($newName)
      */
     public function API_setName($newName)
     {
-        $this->setName($newName);
-
         $c = findConnectorOrDie($this);
         $xpath = $this->getXPath();
 
+        $this->setName($newName);
+
         if( $c->isAPI())
             $c->sendRenameRequest($xpath, $newName);
     }

diff --git a/lib/object-classes/WildfireProfile.php b/lib/object-classes/WildfireProfile.php
@@ -70,11 +70,11 @@ public function setName($newName)
      */
     public function API_setName($newName)
     {
-        $this->setName($newName);
-
         $c = findConnectorOrDie($this);
         $xpath = $this->getXPath();
 
+        $this->setName($newName);
+
         if( $c->isAPI())
             $c->sendRenameRequest($xpath, $newName);
     }

diff --git a/lib/object-classes/customURLProfile.php b/lib/object-classes/customURLProfile.php
@@ -91,11 +91,11 @@ public function setName($newName)
      */
     public function API_setName($newName)
     {
-        $this->setName($newName);
-
         $c = findConnectorOrDie($this);
         $xpath = $this->getXPath();
 
+        $this->setName($newName);
+
         if( $c->isAPI())
             $c->sendRenameRequest($xpath, $newName);
     }

diff --git a/lib/rule-classes/DefaultSecurityRule.php b/lib/rule-classes/DefaultSecurityRule.php
@@ -346,7 +346,7 @@ public function securityProfileType()
     public function securityProfileGroup()
     {
         if( $this->secproftype != 'group' )
-            derr('Cannot be called on a rule that is of security type =' . $this->secproftype);
+            derr('Cannot be called on a rule that is of security profile type = "' . $this->secproftype.'"');
 
         return $this->secprofgroup;
     }

diff --git a/lib/rule-classes/Rule.php b/lib/rule-classes/Rule.php
@@ -701,9 +701,9 @@ public function API_setName($newname)
         $con = findConnectorOrDie($this);
         $xpath = $this->getXPath();
 
-        $con->sendRenameRequest($xpath, $newname);
-
         $this->setName($newname);
+
+        $con->sendRenameRequest($xpath, $newname);
     }
 
     public function API_clearPolicyAppUsageDATA()

diff --git a/utils/common/actions-service.php b/utils/common/actions-service.php
@@ -1052,6 +1052,8 @@
             return;
         }
 
+        $newName = str_replace(",", "_", $newName);
+
         $string = "new name will be '{$newName}'";
         PH::ACTIONlog( $context, $string );
 

diff --git a/utils/lib/BPAGENERATOR.php b/utils/lib/BPAGENERATOR.php
@@ -170,12 +170,13 @@ function send_bpa_api($url, $type = "GET", $config = null, $system_info = null,
             {
                 $reply = json_decode($response, TRUE);
                 if( $reply === null )
+                {
+                    PH::print_stdout( "RESPONSE: ".$response);
                     derr( "invalid JSON file provided", null, FALSE );
+                }
+
                 if( isset( $reply['task_id'] ) )
-                {
-                    #print_r( $reply );
                     $response = $reply['task_id'];
-                }
                 else
                 {
                     print_r( $reply );