fix: handle getNetInterfaces error

Signed-off-by: Daniel Kesselberg <[email protected]>
nextcloud · Jun 24, 2024 · ce95c08 · ce95c08
1 parent c827392
commit ce95c08
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
@@ -119,7 +119,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
@@ -144,7 +144,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
@@ -134,6 +134,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
@@ -245,4 +245,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);
+	}
 }