From 756aa56710920bd3bf0aa5f128855b219145106a Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 3 Dec 2021 12:03:23 -0500
Subject: [PATCH] Detect group hierarchy loops and break them.

---
 web/includes/Group.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/web/includes/Group.php b/web/includes/Group.php
index 026d1f7f4..34db0e869 100644
--- a/web/includes/Group.php
+++ b/web/includes/Group.php
@@ -167,9 +167,15 @@ class Group extends ZM_Object {
 	public function Parents() {
 		$Parents = array();
 		$Parent = $this->Parent();
-		while( $Parent ) {
+    $seen_parents = array();
+		while ($Parent) {
+      $seen_parents[$Parent->Id()] = $Parent;
 			array_unshift($Parents, $Parent);
 			$Parent = $Parent->Parent();
+      if ($Parent and isset($seen_parents[$Parent->Id()])) {
+        Warning("Detected hierarchy loop in group {$Parent->Name()}");
+        break;
+      }
 		}
 		return $Parents;
 	}
@@ -189,6 +195,9 @@ class Group extends ZM_Object {
 	public function canView($u=null) {
 		global $user;
 		if (!$u) $u = $user;
+    if (!count($this->Monitors()) and !count($this->Children())) {
+      return true;
+    }
 		# Can view if we can view any of the monitors in it.
 		foreach ($this->Monitors() as $monitor) {
 			if ($monitor->canView($u)) return true;