Skip to content

fix(files_sharing): Do not wrap password policy exception into a generic one #49366

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

Merged
come-nc merged 3 commits into from
Dec 12, 2024
Merged

fix(files_sharing): Do not wrap password policy exception into a generic one #49366

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
28d7206
fix(files_sharing): Do not wrap password policy exception into a gene…
come-nc Nov 19, 2024
17007f6
fix(shares): Wrap exceptions from password validation to set code to 400
come-nc Dec 10, 2024
365ff40
fix(tests): Adapt ManagerTest to change in Exception class used
come-nc Dec 10, 2024
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
Next Next commit
fix(files_sharing): Do not wrap password policy exception into a gene… 
…ric one

Let the controller access the HintException and show the error to the user.

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
  • Loading branch information
@come-nc
come-nc committed Dec 12, 2024
commit 28d7206e5cab68eb4b4a012574ee26275e2c74d8
8 changes: 2 additions & 6 deletions lib/private/Share20/Manager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ private function splitFullId($id) {
* Verify if a password meets all requirements
*
* @param string $password
* @throws \Exception
* @throws HintException
*/
protected function verifyPassword($password) {
if ($password === null) {
Expand All @@ -112,11 +112,7 @@ protected function verifyPassword($password) {
}

// Let others verify the password
try {
$this->dispatcher->dispatchTyped(new ValidatePasswordPolicyEvent($password));
} catch (HintException $e) {
throw new \Exception($e->getHint());
}
$this->dispatcher->dispatchTyped(new ValidatePasswordPolicyEvent($password));
Copy link
Contributor

@susnux susnux Nov 19, 2024

Choose a reason for hiding this comment

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

Still disappointed that this is done using exceptions rather than setting property on the even like isValid...

}

/**
Expand Down