feat: decrypt versions on IVersionedStorage

.drone.star

@@ -80,7 +80,6 @@ config = {
             ],
             "servers": [
                 "daily-master-qa",
-                "latest",
             ],
             "extraSetup": [
                 {
@@ -105,7 +104,6 @@ config = {
             ],
             "servers": [
                 "daily-master-qa",
-                "latest",
             ],
             "extraSetup": [
                 {
@@ -129,7 +127,6 @@ config = {
             ],
             "servers": [
                 "daily-master-qa",
-                "latest",
             ],
             "emailNeeded": True,
             "extraSetup": [
@@ -155,7 +152,6 @@ config = {
             ],
             "servers": [
                 "daily-master-qa",
-                "latest",
             ],
             "extraSetup": [
                 {
@@ -179,7 +175,6 @@ config = {
             ],
             "servers": [
                 "daily-master-qa",
-                "latest",
             ],
             "emailNeeded": True,
             "extraSetup": [
@@ -1920,7 +1915,7 @@ def installCore(ctx, version, db, useBundledApp):
         "name": "install-core",
         "image": OC_CI_CORE,
         "settings": {
-            "version": version,
+            "git_reference": "feat/storage-based-encryption-key-location-2",
             "core_path": dir["server"],
             "db_type": dbType,
             "db_name": database,

lib/AppInfo/Application.php

@@ -178,7 +178,6 @@ function (IAppContainer $c) {
 					$server->getEncryptionKeyStorage(),
 					$c->query('Crypt'),
 					$server->getConfig(),
-					$server->getUserSession(),
 					new Session($server->getSession()),
 					$server->getLogger(),
 					$c->query('Util')

lib/Crypto/Encryption.php

@@ -171,7 +171,7 @@ public function getDisplayName() {
 	 *                       written to the header, in case of a write operation
 	 *                       or if no additional data is needed return a empty array
 	 */
-	public function begin($path, $user, $mode, array $header, array $accessList, $sourceFileOfRename = null) {
+	public function begin($path, $user, $mode, array $header, array $accessList, $sourceFileOfRename = null, $fileEncryptionVersion = null) {
 		$this->path = $this->getPathToRealFile($path);
 		$this->accessList = $accessList;
 		$this->user = $user;
@@ -198,10 +198,13 @@ public function begin($path, $user, $mode, array $header, array $accessList, $so
 		// always use the version from the original file, also part files
 		// need to have a correct version number if they get moved over to the
 		// final location
-		if ($sourceFileOfRename !== null) {
-			$this->version = $this->keyManager->getVersion($sourceFileOfRename, new View());
-		} else {
-			$this->version = (int)$this->keyManager->getVersion($this->stripPartFileExtension($path), new View());
+		$this->version = $fileEncryptionVersion;
+		if (!$this->version) {
+			if ($sourceFileOfRename !== null) {
+				$this->version = $this->keyManager->getVersion($sourceFileOfRename, new View());
+			} else {
+				$this->version = (int)$this->keyManager->getVersion($this->stripPartFileExtension($path), new View());
+			}
 		}
 
 		if (

lib/Factory/EncDecAllFactory.php

@@ -161,7 +161,6 @@ public function getEncryptAllObj() {
 			$this->encStorage,
 			$this->getCryptoEngine(),
 			$this->config,
-			$this->userSession,
 			$this->encSession,
 			$this->logger,
 			$this->encUtil

lib/KeyManager.php

@@ -61,10 +61,6 @@ class KeyManager {
 	 * @var string
 	 */
 	private $masterKeyId;
-	/**
-	 * @var string UserID
-	 */
-	private $keyId;
 	/**
 	 * @var string
 	 */
@@ -100,7 +96,6 @@ class KeyManager {
 	 * @param IStorage $keyStorage
 	 * @param Crypt $crypt
 	 * @param IConfig $config
-	 * @param IUserSession $userSession
 	 * @param Session $session
 	 * @param ILogger $log
 	 * @param Util $util
@@ -109,7 +104,6 @@ public function __construct(
 		IStorage $keyStorage,
 		Crypt $crypt,
 		IConfig $config,
-		IUserSession $userSession,
 		Session $session,
 		ILogger $log,
 		Util $util
@@ -136,7 +130,6 @@ public function __construct(
 
 		$this->setPublicShareKeyIDAndMasterKeyId();
 
-		$this->keyId = $userSession !== null && $userSession->isLoggedIn() ? $userSession->getUser()->getUID() : false;
 		$this->log = $log;
 	}
 
@@ -539,11 +532,13 @@ public function userHasKeys($userId) {
 
 		if ($privateKey && $publicKey) {
 			return true;
-		} elseif (!$privateKey && !$publicKey) {
+		}
+
+		if (!$privateKey && !$publicKey) {
 			return false;
-		} else {
-			throw $exception;
 		}
+
+		throw $exception;
 	}
 
 	/**

tests/unit/Command/FixEncryptedVersionTest.php

@@ -72,7 +72,6 @@ public static function setUpBeforeClass(): void {
 			\OC::$server->getEncryptionKeyStorage(),
 			$crypt,
 			\OC::$server->getConfig(),
-			\OC::$server->getUserSession(),
 			$encryptionSession,
 			\OC::$server->getLogger(),
 			$encryptionUtil

tests/unit/KeyManagerTest.php

@@ -48,9 +48,6 @@ class KeyManagerTest extends TestCase {
 	/** @var \OCA\Encryption\Crypto\Crypt|\PHPUnit\Framework\MockObject\MockObject */
 	private $cryptMock;
 
-	/** @var \OCP\IUserSession|\PHPUnit\Framework\MockObject\MockObject */
-	private $userMock;
-
 	/** @var \OCA\Encryption\Session|\PHPUnit\Framework\MockObject\MockObject */
 	private $sessionMock;
 
@@ -75,7 +72,6 @@ public function setUp(): void {
 		$this->configMock->expects($this->any())
 			->method('getAppValue')
 			->will($this->returnCallback([$this, 'returnAppValue']));
-		$this->userMock = $this->createMock('OCP\IUserSession');
 		$this->sessionMock = $this->getMockBuilder('OCA\Encryption\Session')
 			->disableOriginalConstructor()
 			->getMock();
@@ -88,7 +84,6 @@ public function setUp(): void {
 			$this->keyStorageMock,
 			$this->cryptMock,
 			$this->configMock,
-			$this->userMock,
 			$this->sessionMock,
 			$this->logMock,
 			$this->utilMock
@@ -261,7 +256,6 @@ public function testInit($useMasterKey) {
 					$this->keyStorageMock,
 					$this->cryptMock,
 					$this->configMock,
-					$this->userMock,
 					$this->sessionMock,
 					$this->logMock,
 					$this->utilMock
@@ -518,7 +512,6 @@ public function testGetMasterKeyId() {
 					$this->keyStorageMock,
 					$this->cryptMock,
 					$localConfigMock,
-					$this->userMock,
 					$this->sessionMock,
 					$this->logMock,
 					$this->utilMock
@@ -538,7 +531,6 @@ public function testGetPublicMasterKey() {
 					$this->keyStorageMock,
 					$this->cryptMock,
 					$localConfigMock,
-					$this->userMock,
 					$this->sessionMock,
 					$this->logMock,
 					$this->utilMock
@@ -593,7 +585,6 @@ public function testValidateMasterKey($masterKey) {
 					$this->keyStorageMock,
 					$this->cryptMock,
 					$localConfigMock,
-					$this->userMock,
 					$this->sessionMock,
 					$this->logMock,
 					$this->utilMock