Address comments from PR

Author: estringana

appsec/src/extension/ddappsec.c

@@ -498,10 +498,6 @@ static PHP_FUNCTION(datadog_appsec_push_addresses)
         return;
     }
 
-    if (addresses == NULL) {
-        return;
-    }
-
     zend_array *parameters_arr =
         zend_new_array(zend_hash_num_elements(addresses));
     zval parameters_zv;

src/DDTrace/Integrations/Filesystem/FilesystemIntegration.php

@@ -65,7 +65,8 @@ private static function preHook($variant)
                 $addresses["server.io.fs.file"] = $hook->args[0];
            }
 
-           if (in_array($variant, ['file_get_contents', 'fopen']) && (empty($protocol) || $protocol === 'http')) {
+           if (in_array($variant, ['file_get_contents', 'fopen']) &&
+                (empty($protocol) || in_array($protocol, ['http', 'https', 'ftp', 'ftps']))) {
                 $addresses["server.io.net.url"] = $hook->args[0];
 
            }

tests/Integrations/Filesystem/FilesystemTest.php

@@ -56,21 +56,47 @@ public function testFileProtocol()
         $this->assertEvent('file://'. $file, $traces);
     }
 
-    public function testHttpProtocol()
+    public function raspProtocols()
     {
-        $file = 'http://example.com';
-        $traces = $this->tracesFromWebRequest(function () use ($file) {
-            $response = $this->call(GetSpec::create('Root', '/?function=fopen&path='.$file));
+        return [
+            ['http'],
+            ['https'],
+            ['ftp'],
+            ['ftps']
+        ];
+    }
+
+    /**
+    * @dataProvider raspProtocols
+    */
+    public function testRaspProtocols($protocol)
+    {
+        $url = $protocol.'://example.com';
+        $traces = $this->tracesFromWebRequest(function () use ($url) {
+            $response = $this->call(GetSpec::create('Root', '/?function=fopen&path='.$url));
             TestCase::assertSame('OK', $response);
         });
 
        $events = AppsecStatus::getInstance()->getEvents();
        $this->assertEquals(1, count($events));
-       $this->assertEquals($file, $events[0][0]["server.io.net.url"]);
+       $this->assertEquals(1, count($events[0][0]));
+       $this->assertEquals($url, $events[0][0]["server.io.net.url"]);
        $this->assertEquals('push_addresses', $events[0]['eventName']);
        $this->assertTrue($events[0]['rasp']);
     }
 
+    public function testInvalidProtocol()
+    {
+        $url = 'bad://example.com';
+        $traces = $this->tracesFromWebRequest(function () use ($url) {
+            $response = $this->call(GetSpec::create('Root', '/?function=fopen&path='.$url));
+            TestCase::assertSame('OK', $response);
+        });
+
+       $events = AppsecStatus::getInstance()->getEvents();
+       $this->assertEquals(0, count($events));
+    }
+
     public function testFilePutContents()
     {
         $traces = $this->tracesFromWebRequest(function () {

tests/Integrations/Filesystem/index.php

@@ -7,13 +7,13 @@
 
 switch ($function) {
     case 'file_put_contents':
-            file_put_contents($path, 'some content');
+            @file_put_contents($path, 'some content');
             break;
     case 'fopen':
-            fopen($path, 'r');
+            @fopen($path, 'r');
             break;
     default:
-        $function($path);
+        @$function($path);
         break;
 }