Skip to content

Conversation

@CarlSchwan
Copy link
Member

@CarlSchwan CarlSchwan commented Dec 5, 2022

Add a fallback for empty keys

  • Still needs to test it with various external storag

Fix #35347
Fix #35443

Add a fallback for empty keys

Signed-off-by: Carl Schwan <[email protected]>
@CarlSchwan CarlSchwan added the 2. developing Work in progress label Dec 5, 2022
@CarlSchwan CarlSchwan added this to the Nextcloud 26 milestone Dec 5, 2022
@CarlSchwan CarlSchwan requested a review from a team December 5, 2022 10:30
@CarlSchwan CarlSchwan self-assigned this Dec 5, 2022
@CarlSchwan CarlSchwan requested review from ArtificialOwl, come-nc and icewind1991 and removed request for a team December 5, 2022 10:30
$auth->setPassword($this->config->getSystemValue('secret', ''));
if (!$auth->loadKey($storage->getBackendOption('private_key'))) {
throw new \RuntimeException('unable to load private key');
$auth->setPassword('');
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe add a comment here why?

$auth->setPassword($this->config->getSystemValue('secret', ''));
if (!$auth->loadKey($storage->getBackendOption('private_key'))) {
throw new \RuntimeException('unable to load private key');
$auth->setPassword('');
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

Copy link
Contributor

@szaimen szaimen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM but didnt test

@szaimen
Copy link
Contributor

szaimen commented Dec 5, 2022

/backport to stable25

Signed-off-by: Carl Schwan <[email protected]>
@PVince81
Copy link
Member

PVince81 commented Dec 5, 2022

obsoleted by #35605 ? @CarlSchwan

@CarlSchwan CarlSchwan added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Dec 6, 2022
@szaimen szaimen requested a review from PVince81 December 6, 2022 08:17
@PVince81
Copy link
Member

PVince81 commented Dec 6, 2022

seems not obsolete

Copy link
Member

@PVince81 PVince81 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@PVince81 PVince81 added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Dec 6, 2022
@szaimen szaimen merged commit 28358ac into master Dec 6, 2022
@szaimen szaimen deleted the fix/empty-secret-migration-files-external branch December 6, 2022 09:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

4. to release Ready to be released and/or waiting for tests to finish

Projects

None yet

5 participants