Merge pull request #92 from swaschkut/developer

framework appStore | general improvements to bring in appStore on each level/hierarchy and not only at shared level
PaloAltoNetworks · Jul 19, 2021 · 42c68e9 · 42c68e9
2 parents 5591d09 + 807b0ac
commit 42c68e9
Show file tree

Hide file tree

Showing 32 changed files with 519 additions and 220 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -1,6 +1,16 @@
 CHANGELOG
 
-2.0.7
+2.0.8
+UTILS:
+
+BUGFIX:
+
+GENERAL:
+* SecurityProfile classes rename from XYZStore to XYZ
+* class App - introduce methods isApplicationCustom() / isApplicationFilter() / isApplicationGroup()
+
+
+2.0.7 (20210717)
 UTILS:
 * pa_securityprofilegroup-edit | new actions=securityProfile-Set and securityProfile-Remove - new filters: * secprof: as-profile.is, as-profile.is.set, av-profile.is, av-profile.is.set, data-profile.is, data-profile.is.set, file-profile.is, file-profile.is.set, url-profile.is, url-profile.is.set, vuln-profile.is, vuln-profile.is.set, wf-profile.is, wf-profile.is.set
 * introduce new script pa_application-edit; with different filters

diff --git a/lib/container-classes/AppRuleContainer.php b/lib/container-classes/AppRuleContainer.php
@@ -191,7 +191,11 @@ public function load_from_domxml($xml)
                 derr('this container has members with empty name!', $node);
             }
 
-            $f = $this->parentCentralStore->findOrCreate($lower, $this);
+
+            /** @var AppStore $appStore */
+            $appStore = $this->owner->owner->owner->appStore;
+            $f = $appStore->findorCreate( $lower, $this);
+
             $this->o[] = $f;
             $i++;
         }

diff --git a/lib/container-classes/UrlCategoryRuleContainer.php b/lib/container-classes/UrlCategoryRuleContainer.php
@@ -21,7 +21,7 @@
 
 /**
  * Class UrlCategoryRuleContainer
- * @property customURLProfileStore[]|URLProfileStore[] $o
+ * @property customURLProfile[]|URLProfile[] $o
  * @property Rule|SecurityRule $owner
  *
  */
@@ -43,7 +43,7 @@ public function __construct($owner)
 
 
     /**
-     * @param customURLProfileStore|URLProfileStore $Obj
+     * @param customURLProfile|URLProfile $Obj
      * @param bool $rewriteXml
      * @return bool
      */
@@ -61,7 +61,7 @@ public function add($Obj, $rewriteXml = TRUE)
     }
 
     /**
-     * @param customURLProfileStore|URLProfileStore $Obj
+     * @param customURLProfile|URLProfile $Obj
      * @param bool $rewritexml
      * @return bool
      */
@@ -84,7 +84,7 @@ public function isApplicationDefault()
 
 
     /**
-     * @param customURLProfileStore|URLProfileStore $Obj
+     * @param customURLProfile|URLProfile $Obj
      * @param bool $rewriteXml
      * @param bool $forceAny
      *
@@ -110,7 +110,7 @@ public function remove($Obj, $rewriteXml = TRUE, $forceAny = FALSE)
     }
 
     /**
-     * @param customURLProfileStore|URLProfileStore $Obj
+     * @param customURLProfile|URLProfile $Obj
      * @param bool $rewriteXml
      * @param bool $forceAny
      * @return bool
@@ -142,7 +142,7 @@ public function setAny()
 
 
     /**
-     * @param customURLProfileStore|URLProfileStore|string $object can be customURLProfileStore|URLProfileStore object or object name (string)
+     * @param customURLProfile|URLProfile|string $object can be customURLProfileStore|URLProfileStore object or object name (string)
      * @return bool
      */
     public function has($object, $caseSensitive = TRUE)
@@ -153,7 +153,7 @@ public function has($object, $caseSensitive = TRUE)
 
     /**
      * return an array with all objects
-     * @return customURLProfileStore[]|URLProfileStore[]
+     * @return customURLProfile[]|URLProfile[]
      */
     public function members()
     {
@@ -162,7 +162,7 @@ public function members()
 
     /**
      * return an array with all objects
-     * @return customURLProfileStore[]|URLProfileStore[]
+     * @return customURLProfile[]|URLProfile[]
      */
     public function all()
     {
@@ -364,7 +364,7 @@ public function isAny()
 
 
     /**
-     * @param customURLProfileStore|URLProfileStore
+     * @param customURLProfile|URLProfile
      * @param bool $anyIsAcceptable
      * @return bool
      */
@@ -468,7 +468,7 @@ public function includesStoreExpanded(UrlCategoryRuleContainer $other, $anyIsAcc
     }
 
     /**
-     * @return customURLProfileStore[]|URLProfileStore[]
+     * @return customURLProfile[]|URLProfile[]
      */
     public function &membersExpanded($keepGroupsInList = FALSE)
     {

diff --git a/lib/device-and-system-classes/Container.php b/lib/device-and-system-classes/Container.php
@@ -173,8 +173,13 @@ public function __construct($owner)
         $this->tagStore = new TagStore($this);
         $this->tagStore->name = 'tags';
 
+        //Todo: swaschkut 20210718 each Container should also have its own zoneStore???
         $this->zoneStore = $owner->zoneStore;
-        $this->appStore = $owner->appStore;
+        #$this->zoneStore = new ZoneStore($this);
+        #$this->zoneStore->setName('zoneStore');
+
+        $this->appStore = new AppStore($this);
+        $this->appStore->name = 'customApplication';
 
         $this->serviceStore = new ServiceStore($this);
         $this->serviceStore->name = 'services';
@@ -183,28 +188,28 @@ public function __construct($owner)
         $this->addressStore->name = 'address';
 
 
-        $this->customURLProfileStore = new SecurityProfileStore($this, "customURLProfileStore");
+        $this->customURLProfileStore = new SecurityProfileStore($this, "customURLProfile");
         $this->customURLProfileStore->name = 'CustomURL';
 
-        $this->URLProfileStore = new SecurityProfileStore($this, "URLProfileStore");
+        $this->URLProfileStore = new SecurityProfileStore($this, "URLProfile");
         $this->URLProfileStore->name = 'URL';
 
-        #$this->AntiVirusProfileStore = new SecurityProfileStore($this, "AntiVirusProfileStore");
+        #$this->AntiVirusProfileStore = new SecurityProfileStore($this, "AntiVirusProfile");
         #$this->AntiVirusProfileStore->name = 'AntiVirus';
 
-        $this->VirusAndWildfireProfileStore = new SecurityProfileStore($this, "VirusAndWildfireProfileStore");
+        $this->VirusAndWildfireProfileStore = new SecurityProfileStore($this, "VirusAndWildfireProfile");
         $this->VirusAndWildfireProfileStore->name = 'VirusAndWildfire';
 
-        $this->DNSSecurityProfileStore = new SecurityProfileStore($this, "DNSSecurityProfileStore");
+        $this->DNSSecurityProfileStore = new SecurityProfileStore($this, "DNSSecurityProfile");
         $this->DNSSecurityProfileStore->name = 'DNSSecurity';
 
-        $this->VulnerabilityProfileStore = new SecurityProfileStore($this, "VulnerabilityProfileStore");
+        $this->VulnerabilityProfileStore = new SecurityProfileStore($this, "VulnerabilityProfile");
         $this->VulnerabilityProfileStore->name = 'Vulnerability';
 
-        $this->AntiSpywareProfileStore = new SecurityProfileStore($this, "AntiSpywareProfileStore");
+        $this->AntiSpywareProfileStore = new SecurityProfileStore($this, "AntiSpywareProfile");
         $this->AntiSpywareProfileStore->name = 'AntiSpyware';
 
-        $this->FileBlockingProfileStore = new SecurityProfileStore($this, "FileBlockingProfileStore");
+        $this->FileBlockingProfileStore = new SecurityProfileStore($this, "FileBlockingProfile");
         $this->FileBlockingProfileStore->name = 'FileBlocking';
 
         #$this->WildfireProfileStore = new SecurityProfileStore($this, "SecurityProfileWildFire");
@@ -215,13 +220,13 @@ public function __construct($owner)
         $this->securityProfileGroupStore->name = 'SecurityProfileGroups';
 
 
-        $this->DecryptionProfileStore = new SecurityProfileStore($this, "DecryptionProfileStore");
+        $this->DecryptionProfileStore = new SecurityProfileStore($this, "DecryptionProfile");
         $this->DecryptionProfileStore->name = 'Decryption';
 
-        $this->HipObjectsProfileStore = new SecurityProfileStore($this, "HipObjectsProfileStore");
+        $this->HipObjectsProfileStore = new SecurityProfileStore($this, "HipObjectsProfile");
         $this->HipObjectsProfileStore->name = 'HipObjects';
 
-        $this->HipProfilesProfileStore = new SecurityProfileStore($this, "HipProfilesProfileStore");
+        $this->HipProfilesProfileStore = new SecurityProfileStore($this, "HipProfilesProfile");
         $this->HipProfilesProfileStore->name = 'HipProfiles';
 
         $this->scheduleStore = new ScheduleStore($this);

diff --git a/lib/device-and-system-classes/DeviceCloud.php b/lib/device-and-system-classes/DeviceCloud.php
@@ -169,7 +169,9 @@ public function __construct(FawkesConf $owner, Container $applicableDG = null)
         #$this->importedInterfaces = new InterfaceContainer($this, $owner->network);
         #$this->importedVirtualRouter = new VirtualRouterContainer($this, $owner->network);
 
-        $this->appStore = $owner->appStore;
+        #$this->appStore = $owner->appStore;
+        $this->appStore = new AppStore($this);
+        $this->appStore->name = 'customApplication';
 
         $this->zoneStore = new ZoneStore($this);
         $this->zoneStore->setName('zoneStore');
@@ -182,28 +184,28 @@ public function __construct(FawkesConf $owner, Container $applicableDG = null)
         $this->addressStore->name = 'addresses';
 
 
-        $this->customURLProfileStore = new SecurityProfileStore($this, "customURLProfileStore");
+        $this->customURLProfileStore = new SecurityProfileStore($this, "customURLProfile");
         $this->customURLProfileStore->name = 'CustomURL';
 
-        $this->URLProfileStore = new SecurityProfileStore($this, "URLProfileStore");
+        $this->URLProfileStore = new SecurityProfileStore($this, "URLProfile");
         $this->URLProfileStore->name = 'URL';
 
-        #$this->AntiVirusProfileStore = new SecurityProfileStore($this, "AntiVirusProfileStore");
+        #$this->AntiVirusProfileStore = new SecurityProfileStore($this, "AntiVirusProfile");
         #$this->AntiVirusProfileStore->name = 'AntiVirus';
 
-        $this->VirusAndWildfireProfileStore = new SecurityProfileStore($this, "VirusAndWildfireProfileStore");
+        $this->VirusAndWildfireProfileStore = new SecurityProfileStore($this, "VirusAndWildfireProfile");
         $this->VirusAndWildfireProfileStore->name = 'VirusAndWildfire';
 
-        $this->DNSSecurityProfileStore = new SecurityProfileStore($this, "DNSSecurityProfileStore");
+        $this->DNSSecurityProfileStore = new SecurityProfileStore($this, "DNSSecurityProfile");
         $this->DNSSecurityProfileStore->name = 'DNSSecurity';
 
-        $this->VulnerabilityProfileStore = new SecurityProfileStore($this, "VulnerabilityProfileStore");
+        $this->VulnerabilityProfileStore = new SecurityProfileStore($this, "VulnerabilityProfile");
         $this->VulnerabilityProfileStore->name = 'Vulnerability';
 
-        $this->AntiSpywareProfileStore = new SecurityProfileStore($this, "AntiSpywareProfileStore");
+        $this->AntiSpywareProfileStore = new SecurityProfileStore($this, "AntiSpywareProfile");
         $this->AntiSpywareProfileStore->name = 'AntiSpyware';
 
-        $this->FileBlockingProfileStore = new SecurityProfileStore($this, "FileBlockingProfileStore");
+        $this->FileBlockingProfileStore = new SecurityProfileStore($this, "FileBlockingProfile");
         $this->FileBlockingProfileStore->name = 'FileBlocking';
 
         #$this->WildfireProfileStore = new SecurityProfileStore($this, "SecurityProfileWildFire");
@@ -214,13 +216,13 @@ public function __construct(FawkesConf $owner, Container $applicableDG = null)
         $this->securityProfileGroupStore->name = 'SecurityProfileGroups';
 
 
-        $this->DecryptionProfileStore = new SecurityProfileStore($this, "DecryptionProfileStore");
+        $this->DecryptionProfileStore = new SecurityProfileStore($this, "DecryptionProfile");
         $this->DecryptionProfileStore->name = 'Decryption';
 
-        $this->HipObjectsProfileStore = new SecurityProfileStore($this, "HipObjectsProfileStore");
+        $this->HipObjectsProfileStore = new SecurityProfileStore($this, "HipObjectsProfile");
         $this->HipObjectsProfileStore->name = 'HipObjects';
 
-        $this->HipProfilesProfileStore = new SecurityProfileStore($this, "HipProfilesProfileStore");
+        $this->HipProfilesProfileStore = new SecurityProfileStore($this, "HipProfilesProfile");
         $this->HipProfilesProfileStore->name = 'HipProfiles';
 
 
@@ -303,6 +305,9 @@ public function load_from_domxml($xml)
                 $this->addressStore->parentCentralStore = $parentContainer->addressStore;
                 $this->serviceStore->parentCentralStore = $parentContainer->serviceStore;
                 $this->tagStore->parentCentralStore = $parentContainer->tagStore;
+                $this->scheduleStore->parentCentralStore = $parentContainer->scheduleStore;
+                $this->appStore->parentCentralStore = $parentContainer->appStore;
+                $this->securityProfileGroupStore->parentCentralStore = $parentContainer->securityProfileGroupStore;
                 //Todo: swaschkut 20210505 - check if other Stores must be added
                 //- appStore;scheduleStore/securityProfileGroupStore/all kind of SecurityProfile
             }

diff --git a/lib/device-and-system-classes/DeviceGroup.php b/lib/device-and-system-classes/DeviceGroup.php
@@ -155,7 +155,11 @@ public function __construct($owner)
         $this->tagStore->name = 'tags';
 
         $this->zoneStore = $owner->zoneStore;
-        $this->appStore = $owner->appStore;
+
+        //this is not working correctly - each DG has its own appstore
+        #$this->appStore = $owner->appStore;
+        $this->appStore = new AppStore($this);
+        $this->appStore->name = 'customApplication';
 
         $this->serviceStore = new ServiceStore($this);
         $this->serviceStore->name = 'services';
@@ -164,43 +168,43 @@ public function __construct($owner)
         $this->addressStore->name = 'address';
 
 
-        $this->customURLProfileStore = new SecurityProfileStore($this, "customURLProfileStore");
+        $this->customURLProfileStore = new SecurityProfileStore($this, "customURLProfile");
         $this->customURLProfileStore->name = 'CustomURL';
 
-        $this->URLProfileStore = new SecurityProfileStore($this, "URLProfileStore");
+        $this->URLProfileStore = new SecurityProfileStore($this, "URLProfile");
         $this->URLProfileStore->name = 'URL';
 
-        $this->AntiVirusProfileStore = new SecurityProfileStore($this, "AntiVirusProfileStore");
+        $this->AntiVirusProfileStore = new SecurityProfileStore($this, "AntiVirusProfile");
         $this->AntiVirusProfileStore->name = 'AntiVirus';
 
 
-        $this->VulnerabilityProfileStore = new SecurityProfileStore($this, "VulnerabilityProfileStore");
+        $this->VulnerabilityProfileStore = new SecurityProfileStore($this, "VulnerabilityProfile");
         $this->VulnerabilityProfileStore->name = 'Vulnerability';
 
-        $this->AntiSpywareProfileStore = new SecurityProfileStore($this, "AntiSpywareProfileStore");
+        $this->AntiSpywareProfileStore = new SecurityProfileStore($this, "AntiSpywareProfile");
         $this->AntiSpywareProfileStore->name = 'AntiSpyware';
 
-        $this->FileBlockingProfileStore = new SecurityProfileStore($this, "FileBlockingProfileStore");
+        $this->FileBlockingProfileStore = new SecurityProfileStore($this, "FileBlockingProfile");
         $this->FileBlockingProfileStore->name = 'FileBlocking';
 
-        $this->DataFilteringProfileStore = new SecurityProfileStore($this, "DataFilteringProfileStore");
+        $this->DataFilteringProfileStore = new SecurityProfileStore($this, "DataFilteringProfile");
         $this->DataFilteringProfileStore->name = 'DataFiltering';
 
-        $this->WildfireProfileStore = new SecurityProfileStore($this, "WildfireProfileStore");
+        $this->WildfireProfileStore = new SecurityProfileStore($this, "WildfireProfile");
         $this->WildfireProfileStore->name = 'WildFire';
 
 
         $this->securityProfileGroupStore = new SecurityProfileGroupStore($this);
         $this->securityProfileGroupStore->name = 'SecurityProfileGroups';
 
 
-        $this->DecryptionProfileStore = new SecurityProfileStore($this, "DecryptionProfileStore");
+        $this->DecryptionProfileStore = new SecurityProfileStore($this, "DecryptionProfile");
         $this->DecryptionProfileStore->name = 'Decryption';
 
-        $this->HipObjectsProfileStore = new SecurityProfileStore($this, "HipObjectsProfileStore");
+        $this->HipObjectsProfileStore = new SecurityProfileStore($this, "HipObjectsProfile");
         $this->HipObjectsProfileStore->name = 'HipObjects';
 
-        $this->HipProfilesProfileStore = new SecurityProfileStore($this, "HipProfilesProfileStore");
+        $this->HipProfilesProfileStore = new SecurityProfileStore($this, "HipProfilesProfile");
         $this->HipProfilesProfileStore->name = 'HipProfiles';
 
         $this->scheduleStore = new ScheduleStore($this);
@@ -710,6 +714,7 @@ public function load_from_domxml($xml)
         $this->serviceStore->nestedPointOfView();
         $this->tagStore->nestedPointOfView();
         $this->scheduleStore->nestedPointOfView();
+        $this->appStore->nestedPointOfView();
 
     }
 

diff --git a/lib/device-and-system-classes/FawkesConf.php b/lib/device-and-system-classes/FawkesConf.php
@@ -119,7 +119,7 @@ public function __construct()
         $this->zoneStore->setName('zoneStore');
 
 
-        $this->appStore = AppStore::getPredefinedStore();
+        $this->appStore = AppStore::getPredefinedStore( $this );
 
         $this->urlStore = SecurityProfileStore::getPredefinedStore();
 
@@ -331,6 +331,8 @@ public function load_from_domxml($xml)
                     $ldv->serviceStore->parentCentralStore = $parentContainer->serviceStore;
                     $ldv->tagStore->parentCentralStore = $parentContainer->tagStore;
                     $ldv->scheduleStore->parentCentralStore = $parentContainer->scheduleStore;
+                    $ldv->appStore->parentCentralStore = $parentContainer->appStore;
+                    $ldv->securityProfileGroupStore->parentCentralStore = $parentContainer->securityProfileGroupStore;
                     //Todo: swaschkut 20210505 - check if other Stores must be added
                     //- appStore;scheduleStore/securityProfileGroupStore/all kind of SecurityProfile
                 }
@@ -840,6 +842,8 @@ public function createContainer($name, $parentContainerName)
             $newDG->serviceStore->parentCentralStore = $parentContainer->serviceStore;
             $newDG->tagStore->parentCentralStore = $parentContainer->tagStore;
             $newDG->scheduleStore->parentCentralStore = $parentContainer->scheduleStore;
+            $newDG->appStore->parentCentralStore = $parentContainer->appStore;
+            $newDG->securityProfileGroupStore->parentCentralStore = $parentContainer->securityProfileGroupStore;
             //Todo: swaschkut 20210505 - check if other Stores must be added
             //- appStore;scheduleStore/securityProfileGroupStore/all kind of SecurityProfile
         }
@@ -913,6 +917,8 @@ public function createDeviceCloud($name, $parentContainer_txt )
             $newDG->serviceStore->parentCentralStore = $parentContainer->serviceStore;
             $newDG->tagStore->parentCentralStore = $parentContainer->tagStore;
             $newDG->scheduleStore->parentCentralStore = $parentContainer->scheduleStore;
+            $newDG->appStore->parentCentralStore = $parentContainer->appStore;
+            $newDG->securityProfileGroupStore->parentCentralStore = $parentContainer->securityProfileGroupStore;
             //Todo: swaschkut 20210505 - check if other Stores must be added
             //- appStore;scheduleStore/securityProfileGroupStore/all kind of SecurityProfile
         }