MAGETWO-64556: Configuration management - Hide sensitive values from config:show command

Author: Yevhen Miroshnychenko

app/code/Magento/Config/Console/Command/ConfigShow/ValueProcessor.php

@@ -86,14 +86,17 @@ public function process($scope, $scopeCode, $value, $path)
         $backendModel = $field && $field->hasBackendModel()
             ? $field->getBackendModel()
             : $this->configValueFactory->create();
+
+        if ($backendModel instanceof Encrypted) {
+            return  $value ? self::SAFE_PLACEHOLDER : null;
+        }
+
         $backendModel->setPath($path);
         $backendModel->setScope($scope);
         $backendModel->setScopeId($scopeCode);
         $backendModel->setValue($value);
         $backendModel->afterLoad();
 
-        return ($backendModel instanceof Encrypted) && !empty($backendModel->getValue())
-            ? self::SAFE_PLACEHOLDER
-            : $backendModel->getValue();
+        return $backendModel->getValue();
     }
 }

app/code/Magento/Config/Test/Unit/Console/Command/ConfigShow/ValueProcessorTest.php

@@ -66,6 +66,11 @@ protected function setUp()
      * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $expectsGetBackendModel
      * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $expectsCreate
      * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $expectsGetValue
+     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $expectsSetPath
+     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $expectsSetScope
+     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $expectsSetScopeId
+     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $expectsSetValue
+     * @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $expectsAfterLoad
      * @param string $expectsValue
      * @param string $className
      * @dataProvider processDataProvider
@@ -75,9 +80,15 @@ public function testProcess(
         $expectsGetBackendModel,
         $expectsCreate,
         $expectsGetValue,
+        $expectsSetPath,
+        $expectsSetScope,
+        $expectsSetScopeId,
+        $expectsSetValue,
+        $expectsAfterLoad,
         $expectsValue,
         $className
-    ) {
+    )
+    {
         $scope = 'someScope';
         $scopeCode = 'someScopeCode';
         $value = 'someValue';
@@ -107,23 +118,23 @@ public function testProcess(
             ->disableOriginalConstructor()
             ->setMethods(['setPath', 'setScope', 'setScopeId', 'setValue', 'getValue', 'afterLoad'])
             ->getMock();
-        $backendModelMock->expects($this->once())
+        $backendModelMock->expects($expectsSetPath)
             ->method('setPath')
             ->with($path)
             ->willReturnSelf();
-        $backendModelMock->expects($this->once())
+        $backendModelMock->expects($expectsSetScope)
             ->method('setScope')
             ->with($scope)
             ->willReturnSelf();
-        $backendModelMock->expects($this->once())
+        $backendModelMock->expects($expectsSetScopeId)
             ->method('setScopeId')
             ->with($scopeCode)
             ->willReturnSelf();
-        $backendModelMock->expects($this->once())
+        $backendModelMock->expects($expectsSetValue)
             ->method('setValue')
             ->with($value)
             ->willReturnSelf();
-        $backendModelMock->expects($this->once())
+        $backendModelMock->expects($expectsAfterLoad)
             ->method('afterLoad')
             ->willReturnSelf();
         $backendModelMock->expects($expectsGetValue)
@@ -163,22 +174,38 @@ public function processDataProvider()
                 'expectsGetBackendModel' => $this->once(),
                 'expectsCreate' => $this->never(),
                 'expectsGetValue' => $this->once(),
+                'expectsSetPath' => $this->once(),
+                'expectsSetScope' => $this->once(),
+                'expectsSetScopeId' => $this->once(),
+                'expectsSetValue' => $this->once(),
+                'expectsAfterLoad' => $this->once(),
                 'expectsValue' => 'someValue',
-                'className' => Value::class
+                'className' => Value::class,
+
             ],
             [
                 'hasBackendModel' => false,
                 'expectsGetBackendModel' => $this->never(),
                 'expectsCreate' => $this->once(),
                 'expectsGetValue' => $this->once(),
+                'expectsSetPath' => $this->once(),
+                'expectsSetScope' => $this->once(),
+                'expectsSetScopeId' => $this->once(),
+                'expectsSetValue' => $this->once(),
+                'expectsAfterLoad' => $this->once(),
                 'expectsValue' => 'someValue',
                 'className' => Value::class
             ],
             [
                 'hasBackendModel' => true,
                 'expectsGetBackendModel' => $this->once(),
                 'expectsCreate' => $this->never(),
-                'expectsGetValue' => $this->once(),
+                'expectsGetValue' => $this->never(),
+                'expectsSetPath' => $this->never(),
+                'expectsSetScope' => $this->never(),
+                'expectsSetScopeId' => $this->never(),
+                'expectsSetValue' => $this->never(),
+                'expectsAfterLoad' => $this->never(),
                 'expectsValue' => ValueProcessor::SAFE_PLACEHOLDER,
                 'className' => Encrypted::class,
             ],