Revert #40702 and #40712 for the 10.12.1 release, we want that in 10.13.0

jnweiger · phil-davis · commit 99d4057edaa7 · 2023-04-17T20:41:42.000+05:45
diff --git a/.drone.star b/.drone.star
@@ -294,6 +294,7 @@ config = {
                 "commands": [
                     "php occ maintenance:singleuser --on",
                     "php occ encryption:enable",
+                    "php occ encryption:select-encryption-type masterkey --yes",
                     "php occ encryption:encrypt-all --yes",
                     "php occ encryption:status",
                     "php occ maintenance:singleuser --off",
diff --git a/core/Command/Encryption/EncryptAll.php b/core/Command/Encryption/EncryptAll.php
@@ -115,7 +115,10 @@ protected function execute(InputInterface $input, OutputInterface $output) {
 		$masterKeyEnabled = $this->config->getAppValue('encryption', 'useMasterKey', '');
 		$userKeyEnabled = $this->config->getAppValue('encryption', 'userSpecificKey', '');
 		if (($masterKeyEnabled === '') && ($userKeyEnabled === '')) {
-			throw new \Exception('None of the encryption modules is enabled');
+			/**
+			 * Enable user specific encryption if nothing is enabled.
+			 */
+			$this->config->setAppValue('encryption', 'userSpecificKey', '1');
 		}
 
 		$output->writeln("\n");
diff --git a/tests/Core/Command/Encryption/EncryptAllTest.php b/tests/Core/Command/Encryption/EncryptAllTest.php
@@ -71,7 +71,7 @@ protected function setUp(): void {
 		$this->consoleOutput = $this->createMock('Symfony\Component\Console\Output\OutputInterface');
 	}
 
-	public function testSingleUserAndTrashbin() {
+	public function testEncryptAll() {
 		// trash bin needs to be disabled in order to avoid adding dummy files to the users
 		// trash bin which gets deleted during the encryption process
 		$this->appManager->expects($this->once())->method('disableApp')->with('files_trashbin');
@@ -99,11 +99,12 @@ public function testExecute($answer, $askResult) {
 		$this->config->expects($this->any())
 			->method('getAppValue')
 			->willReturnMap([
-				['encryption', 'useMasterKey', '', '1'], // enabled
+				['encryption', 'useMasterKey', '', ''],
 				['encryption', 'userSpecificKey', '', '']
 			]);
-		$this->config->expects($this->never())
-			->method('setAppValue');
+		$this->config->expects($this->once())
+			->method('setAppValue')
+			->willReturn(null);
 
 		if ($answer === 'Y' || $answer === 'y') {
 			$this->encryptionManager->expects($this->once())
@@ -126,7 +127,7 @@ public function dataTestExecute() {
 
 	/**
 	 */
-	public function testExecuteEncryptionNotEnabled() {
+	public function testExecuteException() {
 		$this->expectException(\Exception::class);
 
 		$command = new EncryptAll($this->encryptionManager, $this->appManager, $this->config, $this->questionHelper);
@@ -135,20 +136,4 @@ public function testExecuteEncryptionNotEnabled() {
 		$this->encryptionModule->expects($this->never())->method('encryptAll');
 		$this->invokePrivate($command, 'execute', [$this->consoleInput, $this->consoleOutput]);
 	}
-
-	/**
-	 */
-	public function testExecuteEncryptionModuleNotEnabled() {
-		$this->expectException(\Exception::class);
-
-		$command = new EncryptAll($this->encryptionManager, $this->appManager, $this->config, $this->questionHelper);
-		$this->encryptionManager->expects($this->once())->method('isEnabled')->willReturn(true);
-		$this->config->expects($this->any())
-			->method('getAppValue')
-			->willReturnMap([
-				['encryption', 'useMasterKey', '', ''],
-				['encryption', 'userSpecificKey', '', '']
-			]);
-		$this->invokePrivate($command, 'execute', [$this->consoleInput, $this->consoleOutput]);
-	}
 }
diff --git a/tests/acceptance/features/bootstrap/EncryptionContext.php b/tests/acceptance/features/bootstrap/EncryptionContext.php
@@ -84,6 +84,46 @@ public function encryptionHasBeenEnabled():void {
 		$this->occContext->theCommandShouldHaveBeenSuccessful();
 	}
 
+	/**
+	 * @param string $encryptionType
+	 *
+	 * @return void
+	 * @throws Exception
+	 */
+	public function setEncryptionTypeUsingTheOccCommand(string $encryptionType):int {
+		return($this->featureContext->runOcc(
+			["encryption:select-encryption-type", $encryptionType, "-y"]
+		)
+		);
+	}
+
+	/**
+	 * @When the administrator sets the encryption type to :encryptionType using the occ command
+	 *
+	 * @param string $encryptionType
+	 *
+	 * @return void
+	 * @throws Exception
+	 */
+	public function theAdministratorSetsEncryptionTypeToUsingTheOccCommand(string $encryptionType):void {
+		$this->featureContext->setOccLastCode(
+			$this->setEncryptionTypeUsingTheOccCommand($encryptionType)
+		);
+	}
+
+	/**
+	 * @Given the administrator has set the encryption type to :encryptionType
+	 *
+	 * @param string $encryptionType
+	 *
+	 * @return void
+	 * @throws Exception
+	 */
+	public function theAdministratorHasSetEncryptionTypeToUsingTheOccCommand(string $encryptionType):void {
+		$this->setEncryptionTypeUsingTheOccCommand($encryptionType);
+		$this->occContext->theCommandShouldHaveBeenSuccessful();
+	}
+
 	/**
 	 * @return void
 	 * @throws Exception
diff --git a/tests/acceptance/features/bootstrap/OccContext.php b/tests/acceptance/features/bootstrap/OccContext.php
@@ -668,6 +668,16 @@ public function theAdministratorHasInvokedOccCommand(string $cmd):void {
 		$this->theCommandShouldHaveBeenSuccessful();
 	}
 
+	/**
+	 * @Given the administrator has selected master key encryption type using the occ command
+	 *
+	 * @return void
+	 * @throws Exception
+	 */
+	public function theAdministratorHasSelectedMasterKeyEncryptionTypeUsingTheOccCommand():void {
+		$this->featureContext->runOcc(['encryption:select-encryption-type', "masterkey --yes"]);
+	}
+
 	/**
 	 * @When the administrator imports security certificate from file :filename in temporary storage on the system under test
 	 *
