METAR parsing infinite loop bugfix #599 (#600)

METAR parsing infinite loop bugfix #599
nabeelio · Feb 29, 2020 · ea9ee98 · ea9ee98
1 parent b0f122a
commit ea9ee98
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 3 deletions.
diff --git a/app/Services/Metar/AviationWeather.php b/app/Services/Metar/AviationWeather.php
@@ -4,6 +4,8 @@
 
 use App\Contracts\Metar;
 use App\Support\HttpClient;
+use function count;
+use Exception;
 use Illuminate\Support\Facades\Log;
 
 /**
@@ -44,15 +46,31 @@ protected function metar($icao): string
         try {
             $res = $this->httpClient->get($url, []);
             $xml = simplexml_load_string($res);
-            if (\count($xml->data->METAR->raw_text) === 0) {
+
+            $attrs = $xml->data->attributes();
+            if (!isset($attrs['num_results'])) {
+                return '';
+            }
+
+            $num_results = $attrs['num_results'];
+            if (empty($num_results)) {
+                return '';
+            }
+
+            $num_results = (int) $num_results;
+            if ($num_results === 0) {
+                return '';
+            }
+
+            if (count($xml->data->METAR->raw_text) === 0) {
                 return '';
             }
 
             return $xml->data->METAR->raw_text->__toString();
-        } catch (\Exception $e) {
+        } catch (Exception $e) {
             Log::error('Error reading METAR: '.$e->getMessage());
 
-            throw $e;
+            return '';
         }
     }
 }
diff --git a/app/Widgets/Weather.php b/app/Widgets/Weather.php
@@ -19,6 +19,7 @@ class Weather extends Widget
      */
     public function run()
     {
+        /** @var \App\Services\AirportService $airportSvc */
         $airportSvc = app(AirportService::class);
         $metar = $airportSvc->getMetar($this->config['icao']);
 

diff --git a/tests/MetarTest.php b/tests/MetarTest.php
@@ -185,4 +185,15 @@ public function testHttpCallEmpty()
 
         $this->assertNull($airportSvc->getMetar('idk'));
     }
+
+    public function testHttpCallUnknown()
+    {
+        $this->mockXmlResponse('aviationweather/unknown.xml');
+
+        /** @var AirportService $airportSvc */
+        $airportSvc = app(AirportService::class);
+
+        $metar = $airportSvc->getMetar('7AK4');
+        $this->assertNull($metar);
+    }
 }
diff --git a/tests/data/aviationweather/unknown.xml b/tests/data/aviationweather/unknown.xml