MAGETWO-31354: Magento Version Tag shows in RSS Feed

Author: Maksym Savich

app/code/Magento/AdminNotification/Model/Feed.php

@@ -50,6 +50,16 @@ class Feed extends \Magento\Framework\Model\AbstractModel
      */
     protected $_deploymentConfig;
 
+    /**
+     * @var \Magento\Framework\App\ProductMetadataInterface
+     */
+    protected $productMetadata;
+
+    /**
+     * @var \Magento\Framework\UrlInterface
+     */
+    protected $urlBuilder;
+
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
@@ -68,15 +78,19 @@ public function __construct(
         \Magento\AdminNotification\Model\InboxFactory $inboxFactory,
         \Magento\Framework\HTTP\Adapter\CurlFactory $curlFactory,
         \Magento\Framework\App\DeploymentConfig $deploymentConfig,
+        \Magento\Framework\App\ProductMetadataInterface $productMetadata,
+        \Magento\Framework\UrlInterface $urlBuilder,
         \Magento\Framework\Model\Resource\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\Db $resourceCollection = null,
         array $data = []
     ) {
         parent::__construct($context, $registry, $resource, $resourceCollection, $data);
-        $this->_backendConfig = $backendConfig;
-        $this->_inboxFactory = $inboxFactory;
-        $this->curlFactory = $curlFactory;
+        $this->_backendConfig    = $backendConfig;
+        $this->_inboxFactory     = $inboxFactory;
+        $this->curlFactory       = $curlFactory;
         $this->_deploymentConfig = $deploymentConfig;
+        $this->productMetadata   = $productMetadata;
+        $this->urlBuilder        = $urlBuilder;
     }
 
     /**
@@ -191,7 +205,15 @@ public function setLastUpdate()
     public function getFeedData()
     {
         $curl = $this->curlFactory->create();
-        $curl->setConfig(['timeout' => 2]);
+        $curl->setConfig(
+            [
+                'timeout'   => 2,
+                'useragent' => $this->productMetadata->getName()
+                    . '/' . $this->productMetadata->getVersion()
+                    . ' (' . $this->productMetadata->getEdition() . ')',
+                'referer'   => $this->urlBuilder->getUrl('*/*/*')
+            ]
+        );
         $curl->write(\Zend_Http_Client::GET, $this->getFeedUrl(), '1.0');
         $data = $curl->read();
         if ($data === false) {

app/code/Magento/Version/Controller/Index/Index.php

@@ -15,8 +15,6 @@
  */
 class Index extends Action
 {
-    const PRODUCT_NAME = "Magento";
-
     /**
      * @var ProductMetadataInterface
      */
@@ -40,7 +38,7 @@ public function __construct(Context $context, ProductMetadataInterface $productM
     public function execute()
     {
         $this->getResponse()->setBody(
-            self::PRODUCT_NAME . '/' .
+            $this->productMetadata->getName() . '/' .
             $this->productMetadata->getVersion() . ' (' .
             $this->productMetadata->getEdition() . ')'
         );

dev/tests/unit/testsuite/Magento/Framework/App/ProductMetadataTest.php

@@ -34,4 +34,10 @@ public function testGetEdition()
         $productEdition = $this->productMetadata->getEdition();
         $this->assertNotEmpty($productEdition, 'Empty product edition');
     }
+
+    public function testGetName()
+    {
+        $productName = $this->productMetadata->getName();
+        $this->assertNotEmpty($productName, 'Empty product name');
+    }
 }

lib/internal/Magento/Framework/App/ProductMetadata.php

@@ -12,6 +12,7 @@
 class ProductMetadata implements ProductMetadataInterface
 {
     const EDITION_NAME  = 'Community';
+    const PRODUCT_NAME  = 'Magento';
 
     /**
      * Get Product version
@@ -32,4 +33,14 @@ public function getEdition()
     {
         return self::EDITION_NAME;
     }
+
+    /**
+     * Get Product name
+     *
+     * @return string
+     */
+    public function getName()
+    {
+        return self::PRODUCT_NAME;
+    }
 }

lib/internal/Magento/Framework/App/ProductMetadataInterface.php

@@ -22,4 +22,11 @@ public function getVersion();
      * @return string
      */
     public function getEdition();
+
+    /**
+     * Get Product name
+     *
+     * @return string
+     */
+    public function getName();
 }

lib/internal/Magento/Framework/HTTP/Adapter/Curl.php

@@ -35,11 +35,13 @@ class Curl implements \Zend_Http_Client_Adapter_Interface
      * @var array
      */
     protected $_allowedParams = [
-        'timeout' => CURLOPT_TIMEOUT,
+        'timeout'      => CURLOPT_TIMEOUT,
         'maxredirects' => CURLOPT_MAXREDIRS,
-        'proxy' => CURLOPT_PROXY,
-        'ssl_cert' => CURLOPT_SSLCERT,
-        'userpwd' => CURLOPT_USERPWD,
+        'proxy'        => CURLOPT_PROXY,
+        'ssl_cert'     => CURLOPT_SSLCERT,
+        'userpwd'      => CURLOPT_USERPWD,
+        'useragent'    => CURLOPT_USERAGENT,
+        'referer'      => CURLOPT_REFERER
     ];
 
     /**