Skip to content

Add repair command to search for encryption keys #36526

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
icewind1991 wants to merge 6 commits into from
Closed

Add repair command to search for encryption keys #36526

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9b870ff
extend fix-key-location to handle cases from broken cross-storage moves
icewind1991 Jan 10, 2023
404099b
[wip] add repair to locate missing key
icewind1991 Jan 27, 2023
124142e
clear key cache before trying a key
icewind1991 Feb 3, 2023
6bcae72
allow trying keys from other users
icewind1991 Feb 3, 2023
20993af
tell the user where we copied the key to
icewind1991 Feb 3, 2023
b9ec6ad
psalm fixes
icewind1991 Apr 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
psalm fixes 
Signed-off-by: Robin Appelman <[email protected]>
  • Loading branch information
@icewind1991
icewind1991 committed Apr 4, 2023
commit b9ec6adfb2e057bcac25339e21f694569b3ec48b
2 changes: 1 addition & 1 deletion apps/encryption/lib/Command/FixKeyLocation.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ public function findUserKeyForSystemFileByName(IUser $user, File $node): ?string
*
* @param string $basePath
* @param string $name
* @return \Generator<string>
* @return \Iterator<mixed, string>
*/
public function findKeysByFileName(string $basePath, string $name) {
$allKeys = $this->repair->findAllKeysInDirectory($basePath);
Expand Down
6 changes: 4 additions & 2 deletions apps/encryption/lib/Repair.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,9 @@ public function getUserKeyRoot(IUser $user): string {
}

public function tryReadFile(File $node): bool {
$this->keyStorage->clearKeyCache();
if ($this->keyStorage instanceof Storage) {
$this->keyStorage->clearKeyCache();
}
try {
$fh = $node->fopen('r');
// read a single chunk
Expand Down Expand Up @@ -265,7 +267,7 @@ public function getKeyPath(IUser $user, Node $node): string {
if ($this->needsSystemKey($node->getPath())) {
return $this->getSystemKeyPath($node);
} else {
return $this->getUserKeyRoot($user, $node);
return $this->getUserKeyRoot($user);
}
}

Expand Down