MAGETWO-38151: Data Rollback

- Validation on rollback filename and few message changes.

Author: safwkhan

lib/internal/Magento/Framework/Setup/BackupRollback.php

@@ -158,6 +158,7 @@ public function codeRollback($rollbackFile, $type = Factory::TYPE_FILESYSTEM)
         $fsRollback->setBackupsDir($backupsDir);
         $fsRollback->setBackupExtension('tgz');
         $time = explode('_', $rollbackFile);
+        $this->checkRollbackFileValidity($time, 'tgz');
         $fsRollback->setTime($time[0]);
         $this->log->log($granularType . ' rollback is starting ...');
         $fsRollback->rollback();
@@ -215,6 +216,7 @@ public function dbRollback($rollbackFile)
         $dbRollback->setBackupsDir($backupsDir);
         $dbRollback->setBackupExtension('gz');
         $time = explode('_', $rollbackFile);
+        $this->checkRollbackFileValidity($time, 'gz');
         if (count($time) === 3) {
             $thirdPart = explode('.', $time[2]);
             $dbRollback->setName($thirdPart[0]);
@@ -281,4 +283,25 @@ private function getMediaBackupIgnorePaths()
         }
         return $ignorePaths;
     }
+
+    /**
+     * Check if the provided backup file for rollback is valid
+     *
+     * @param array $time
+     * @param string $type
+     * @return void
+     * @throws LocalizedException
+     */
+    private function checkRollbackFileValidity($time, $type)
+    {
+        $invalidFileNameMsg = 'Invalid rollback file.';
+        $count = count($time);
+        if (!in_array(count($time), [2, 3])) {
+            throw new LocalizedException(new Phrase($invalidFileNameMsg));
+        }
+        $extension = explode('.', $time[count($time) - 1]);
+        if ($extension[count($extension) - 1] !== $type) {
+            throw new LocalizedException(new Phrase($invalidFileNameMsg));
+        }
+    }
 }

lib/internal/Magento/Framework/Setup/Test/Unit/BackupRollbackTest.php

@@ -152,9 +152,9 @@ public function testDbRollback()
         $this->database->expects($this->once())->method('rollback');
         $this->file->expects($this->once())
             ->method('isExists')
-            ->with($this->path . '/backups/RollbackFile_A.tgz')
+            ->with($this->path . '/backups/RollbackFile_A.gz')
             ->willReturn(true);
-        $this->model->dbRollback('RollbackFile_A.tgz');
+        $this->model->dbRollback('RollbackFile_A.gz');
     }
 
     private function setupCodeBackupRollback()
@@ -187,10 +187,10 @@ private function setupDbBackupRollback()
             ->method('setTime');
         $this->database->expects($this->once())
             ->method('getBackupFilename')
-            ->willReturn('RollbackFile_A.tgz');
+            ->willReturn('RollbackFile_A.gz');
         $this->database->expects($this->once())
             ->method('getBackupPath')
-            ->willReturn('pathToFile/RollbackFile_A.tgz');
+            ->willReturn('pathToFile/RollbackFile_A.gz');
         $this->log->expects($this->once())
             ->method('logSuccess');
     }

setup/src/Magento/Setup/Console/Command/RollbackCommand.php

@@ -119,13 +119,14 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $this->maintenanceMode->set(true);
             $helper = $this->getHelper('question');
             $question = new ConfirmationQuestion(
-                '<info>You are about to remove current code and database tables. Are you sure?[y/N]<info>',
+                '<info>You are about to remove current code and/or database tables. Are you sure?[y/N]<info>',
                 false
             );
             if (!$helper->ask($input, $output, $question) && $input->isInteractive()) {
                 return;
             }
             $this->doRollback($input, $output);
+            $output->writeln('<info>Please set file permission of bin/magento to executable</info>');
 
         } catch (\Exception $e) {
             $output->writeln('<error>' . $e->getMessage() . '</error>');