Skip to content

[stable30] fix(files_sharing): Fix error messages from password policy #49822

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
provokateurin merged 4 commits into from
Dec 12, 2024
Merged

[stable30] fix(files_sharing): Fix error messages from password policy #49822

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2fa67bf
fix(files_sharing): Fix error messages from password policy
come-nc Nov 19, 2024
dab9539
fix(files_sharing): Do not wrap password policy exception into a gene…
come-nc Nov 19, 2024
ca1e382
fix(shares): Wrap exceptions from password validation to set code to 400
come-nc Dec 10, 2024
2546bc5
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
Prev Previous commit
Next Next commit
fix(shares): Wrap exceptions from password validation to set code to 400 
This fixes a regression that bad password returned 403 instead of 400
 because of previous changes.

Signed-off-by: Côme Chilliet <[email protected]>
  • Loading branch information
@come-nc
come-nc committed Dec 12, 2024
commit ca1e3828aa1ceb6fb2366ccecd619b28dfce8f31
8 changes: 7 additions & 1 deletion lib/private/Share20/Manager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,12 @@ protected function verifyPassword($password) {
}

// Let others verify the password
$this->dispatcher->dispatchTyped(new ValidatePasswordPolicyEvent($password));
try {
$this->dispatcher->dispatchTyped(new ValidatePasswordPolicyEvent($password));
} catch (HintException $e) {
/* Wrap in a 400 bad request error */
throw new HintException($e->getMessage(), $e->getHint(), 400, $e);
}
}

/**
Expand Down Expand Up @@ -768,6 +773,7 @@ public function createShare(IShare $share) {
* @param IShare $share
* @return IShare The share object
* @throws \InvalidArgumentException
* @throws HintException
*/
public function updateShare(IShare $share) {
$expirationDateUpdated = false;
Expand Down