Merge pull request #633 from nextcloud/backport/630/stable29

[stable29] fix: handle getNetInterfaces error
nextcloud · Jun 25, 2024 · e4a2fae · e4a2fae
2 parents e271395 + ea244b2
commit e4a2fae
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 2 deletions.
diff --git a/lib/OperatingSystems/FreeBSD.php b/lib/OperatingSystems/FreeBSD.php
@@ -138,7 +138,13 @@ public function getNetworkInfo(): array {
 	public function getNetworkInterfaces(): array {
 		$data = [];
 
-		foreach ($this->getNetInterfaces() as $interfaceName => $interface) {
+		try {
+			$interfaces = $this->getNetInterfaces();
+		} catch (RuntimeException) {
+			return $data;
+		}
+
+		foreach ($interfaces as $interfaceName => $interface) {
 			$netInterface = new NetInterface($interfaceName, $interface['up']);
 			$data[] = $netInterface;
 

diff --git a/lib/OperatingSystems/Linux.php b/lib/OperatingSystems/Linux.php
@@ -160,7 +160,13 @@ public function getNetworkInfo(): array {
 	public function getNetworkInterfaces(): array {
 		$data = [];
 
-		foreach ($this->getNetInterfaces() as $interfaceName => $interface) {
+		try {
+			$interfaces = $this->getNetInterfaces();
+		} catch (RuntimeException) {
+			return $data;
+		}
+
+		foreach ($interfaces as $interfaceName => $interface) {
 			$netInterface = new NetInterface($interfaceName, $interface['up']);
 			$data[] = $netInterface;
 

diff --git a/tests/lib/FreeBSDTest.php b/tests/lib/FreeBSDTest.php
@@ -151,6 +151,16 @@ public function testGetNetworkInterfaces(): void {
 		$this->assertEquals($expected, $actual);
 	}
 
+	public function testGetNetworkInterfacesError(): void {
+		$this->os->method('getNetInterfaces')
+			->willThrowException(new RuntimeException('Unable to get network interfaces'));
+
+		$expected = [];
+		$actual = $this->os->getNetworkInterfaces();
+
+		$this->assertEquals($expected, $actual);
+	}
+
 	public function testSupported(): void {
 		$this->assertFalse($this->os->supported());
 	}

diff --git a/tests/lib/LinuxTest.php b/tests/lib/LinuxTest.php
@@ -262,4 +262,14 @@ public function testGetNetworkInterfaces(): void {
 
 		$this->assertEquals($expected, $actual);
 	}
+
+	public function testGetNetworkInterfacesError(): void {
+		$this->os->method('getNetInterfaces')
+			->willThrowException(new RuntimeException('Unable to get network interfaces'));
+
+		$expected = [];
+		$actual = $this->os->getNetworkInterfaces();
+
+		$this->assertEquals($expected, $actual);
+	}
 }