Skip to content

[stable25] fix: null password handling in entry control logic #461

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
st3iny merged 1 commit into from
Apr 24, 2023
Merged

[stable25] fix: null password handling in entry control logic #461

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion lib/Compliance/Expiration.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ public function update(IUser $user, string $password): void {
);
}

public function entryControl(IUser $user, string $password): void {
public function entryControl(IUser $user, ?string $password): void {
if ($this->policyConfig->getExpiryInDays() !== 0
&& $this->isLocalUser($user)
&& $this->isPasswordExpired($user)
Expand Down
2 changes: 1 addition & 1 deletion lib/Compliance/IEntryControl.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@ interface IEntryControl {
/**
* @throws HintException
*/
public function entryControl(IUser $user, string $password): void;
public function entryControl(IUser $user, ?string $password): void;
}
4 changes: 3 additions & 1 deletion lib/ComplianceService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,11 @@ public function audit(IUser $user, string $password) {
* @throws LoginException
*/
//public function entryControl(IUser $user, string $password, bool $isTokenLogin) {
public function entryControl(string $loginName, string $password) {
public function entryControl(string $loginName, ?string $password) {
$uid = $loginName;
\OCP\Util::emitHook('\OCA\Files_Sharing\API\Server2Server', 'preLoginNameUsedAsUserName', ['uid' => &$uid]);

/** @var IEntryControl $instance */
foreach ($this->getInstance(IEntryControl::class) as $instance) {
try {
$user = \OC::$server->getUserManager()->get($uid);
Expand Down