From e3bcfbfe6627137e585c831aa66e9bc28c732d51 Mon Sep 17 00:00:00 2001
From: Dale Sikkema <dsikkema@ebay.com>
Date: Thu, 18 Jun 2015 10:43:42 -0500
Subject: [PATCH] MAGETWO-38065: /magento_verion exposes too detailed version
information - return blank page if bad version found
---
.htaccess | 2 +-
app/code/Magento/Version/Controller/Index/Index.php | 9 +++++++--
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/.htaccess b/.htaccess
index 01f8f8dd24d..b48c8689c8c 100644
--- a/.htaccess
+++ b/.htaccess
@@ -187,4 +187,4 @@
## If running in cluster environment, uncomment this
## http://developer.yahoo.com/performance/rules.html#etags
- #FileETag none
\ No newline at end of file
+ #FileETag none
diff --git a/app/code/Magento/Version/Controller/Index/Index.php b/app/code/Magento/Version/Controller/Index/Index.php
index 610d98e5889..3d71b3e7446 100644
--- a/app/code/Magento/Version/Controller/Index/Index.php
+++ b/app/code/Magento/Version/Controller/Index/Index.php
@@ -9,6 +9,7 @@ namespace Magento\Version\Controller\Index;
use Magento\Framework\App\Action\Action;
use Magento\Framework\App\Action\Context;
use Magento\Framework\App\ProductMetadataInterface;
+use Magento\Framework\Exception\StateException;
/**
* Magento Version controller
@@ -34,12 +35,16 @@ class Index extends Action
* Sets the response body to ProductName/Major.MinorVersion (Edition). E.g.: Magento/0.42 (Community). Omits patch
* version from response
*
+ * @throws StateException
* @return void
*/
public function execute()
{
- $fullVersion = explode('.', $this->productMetadata->getVersion());
- $majorMinorVersion = $fullVersion[0] . '.' . $fullVersion[1];
+ $versionParts = explode('.', $this->productMetadata->getVersion());
+ if(!isset($versionParts[0]) || !isset($versionParts[1])) {
+ return ; // Major and minor version are not set - return empty response
+ }
+ $majorMinorVersion = $versionParts[0] . '.' . $versionParts[1];
$this->getResponse()->setBody(
$this->productMetadata->getName() . '/' .
$majorMinorVersion . ' (' .
--
GitLab