Merge pull request #8897 from piwik/bulk_track_ignore_reqparam

Do not fail bulk tracking request if individual request has an incorrect request parameter.

plugins/BulkTracking/Tracker/Handler.php

@@ -12,6 +12,7 @@ namespace Piwik\Plugins\BulkTracking\Tracker;
 use Piwik\Archiver\Request;
 use Piwik\AuthResult;
 use Piwik\Container\StaticContainer;
+use Piwik\Exception\InvalidRequestParameterException;
 use Piwik\Exception\UnexpectedWebsiteFoundException;
 use Piwik\Piwik;
 use Piwik\Tracker;
@@ -56,6 +57,8 @@ class Handler extends Tracker\Handler
                 $tracker->trackRequest($request);
             } catch (UnexpectedWebsiteFoundException $ex) {
                 $invalidRequests[] = $index;
+            } catch (InvalidRequestParameterException $ex) {
+                $invalidRequests[] = $index;
             }
         }
 

plugins/BulkTracking/tests/System/TrackerTest.php

@@ -53,12 +53,18 @@ class TrackerTest extends SystemTestCase
         $this->tracker->setIdSite(1);
         $this->tracker->doTrackPageView('Test');
 
+        // test skipping invalid request parameter errors
+        $this->tracker->setDebugStringAppend('cid=abc');
+        $this->tracker->doTrackPageView('Test');
+
+        $this->tracker->DEBUG_APPEND_URL = '';
+
         // another invalid one to further test the invalid request indices in the result
         $this->tracker->setIdSite(7);
         $this->tracker->doTrackPageView('Test');
 
         $response = $this->tracker->doBulkTrack();
 
-        $this->assertEquals('{"status":"success","tracked":3,"invalid":2,"invalid_indices":[2,4]}', $response);
+        $this->assertEquals('{"status":"success","tracked":3,"invalid":3,"invalid_indices":[2,4,5]}', $response);
     }
 }
\ No newline at end of file

tests/resources/access-logs/fake_logs_replay.log

+#incorrect cid param, should not break the log importer
+180.153.201.215 - - [02/Aug/2015:21:15:38 +0000] "GET /piwik.php?action_name=hduy uyeuy nuo 36 ??\xAC&idsite=1&rec=1&r=199956&h=0&m=18&s=24&url=http://www.xxx.lt/x?gclid=CL6m2O6oi8cCFY_JtAod_tYIPQ&price=216,456&urlref=http://www.xxxx.lt/ss-aparatai?gclid=CL6m2O6oi8cCFY_JtAod_tYIPQ&_id=54f474c0c50144df&_idts=1438550142&_idvc=1&_idn=0&_refts=1438550142&_viewts=1438550142&_ref=http://www.googleadservices.com/pagead/aclk?sa=L&ai=Cii7VcIi-VeDRGIaRjAaPqK-QBZr23PYFwq3-29QBtcrnsxUIABABIL_gsAMoA2C5A6ABrqKPywPIAQGpAtRzbKu7bLI-qgQiT9Dly94npwbCg5D7SkUsuqSK-SLDbgVFTQ55B4AxabBQloAFkE6IBgGAB7rd8DSQBwOoB6LCG6gHpr4b2AcB&ohost=www.google.com&cid=5GjGWDPimmkdeh1FrgcuUImc3pojqtIChK-EDtUjr4JZmw&sig=AOD64_3GESvwtzmjkBhlZRJcFCvb4QN70g&clui=0&rct=j&q=&ved=0CBoQ0QxqFQoTCIz3keuoi8cCFcKyFAodIQ0Ktw&adurl=http://www.oigai.lt/agepdf=1&qt=0&realp=0&wma=1&dir=0&fla=1&java=1&gears=0&ag=0&cookie=1&res=1366x768&gt_ms=7972 HTTP/1.1" 200 54 "http://www.xx.lt/eagea-aparatai?gclid=CL6m2O6oi8cCFY_JtAod_tYIPQ&price=216,456" "Mozilla/5.0 (Linux; U; Android 4.4.2; zh-cn; GT-I9500 Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko)Version/4.0 MQQBrowser/5.0 QQ-Manager Mobile Safari/537.36"
 - - - [15/Aug/2012:09:18:38 +0200] "GET /piwik.php?idsite=1&rec=1&apiv=1&rand=1636495582&_id=e4002ba0f2c2dd70&fla=1&java=1&dir=0&qt=0&realp=0&pdf=0&wma=0&gears=0&ag=0&h=12&m=34&s=6&res=1024x768&cookie=1&_cvar=%7B%225%22%3A%5B%22VisitorType%22%2C%22NewLoggedOut%22%5D%7D&cvar=%7B%223%22%3A%5B%22_pks%22%2C%22SKU2%22%5D%2C%224%22%3A%5B%22_pkn%22%2C%22PRODUCT+name%22%5D%2C%225%22%3A%5B%22_pkc%22%2C%22Electronics+%26+Cameras%22%5D%7D&url=http%3A%2F%2Fexample.org%2Findex.htm&urlref=&action_name=incredible+title%21&urlref=http%3A%2F%2Fpiwik.org%2Fcontribute% HTTP/1.1" 200 43 "http://example-referrer-replay.org/" "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; Business Everywhere 7.1.2; GTB6; .NET CLR 1.0.3705; .NET CLR 1.1.4322; Media Center PC 4.0) "
 - - - [15/Aug/2012:06:30:13 +0200] "GET /piwik.php?action_name=Piwik%20Forums&idsite=1&rec=1&r=136285&h=8&m=0&s=47&url=http%3A%2F%2Fforum.piwik.org%2Fregister.php%3F0%2Capprove%3D9a94a02145599&urlref=http%3A%2F%2Fsn110w.snt110.mail.live.com%2Fmail%2FInboxLight.aspx%3Fn%3D184083971&_id=0290799d35c0f2ba&_idts=1306645141&_idvc=1&_idn=0&_refts=0&_viewts=1306645141&pdf=1&qt=0&realp=0&wma=1&dir=1&fla=1&java=1&gears=1&ag=0&res=1280x800&cookie=1&_cvar=%7B%223%22%3A%5B%22Forum%20status%22%2C%22Anonymous%22%5D%7D HTTP/1.1" 200 43 "http://forum.piwik.org/register.php?0,approve=9a94a02145599" "Mozilla/5.0 (Windows NT 5.1) AppleWebKit/534.24 (KHTML, like Gecko) Chrome/11.0.696.71 Safari/534.24"
 - - - [15/Aug/2012:06:18:38 +0200] "GET /piwik.php?idsite=2&rec=1&apiv=1&rand=837354687&_id=e4002ba0f2c2dd70&fla=1&java=1&dir=0&qt=0&realp=0&pdf=0&wma=0&gears=0&ag=0&h=12&m=34&s=6&res=1024x768&cookie=1&_cvar=%7B%225%22%3A%5B%22VisitorType%22%2C%22NewLoggedOut%22%5D%7D&cvar=%7B%223%22%3A%5B%22_pks%22%2C%22SKU+VERY+nice+indeed%22%5D%2C%224%22%3A%5B%22_pkn%22%2C%22PRODUCT+name%22%5D%7D&url=http%3A%2F%2Fexample.org%2Findex.htm&urlref=&action_name=Another+Product+page+with+no+category&urlref=http%3A%2F%2Fpiwik.org%2Fcontribute% HTTP/1.1" 200 43 "http://forum.piwik.org/read.php?2,76977" "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_7; en-us) AppleWebKit/533.21.1 (KHTML, like Gecko) Version/5.0.5 Safari/533.21.1"