turn LDAP's treat remnants as disabled feature config-independent #46992
+432
−42
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
blizzz
requested review from
artonge,
come-nc,
a team and
yemkareems
and removed request for
a team
Signed-off-by: Arthur Schiwon <[email protected]>
- *ldap_mark_remnants_as_disabled were old values and removed now, after - combining their value and storing into current backend_mark_remnants_as_disabled Signed-off-by: Arthur Schiwon <[email protected]>
Signed-off-by: Arthur Schiwon <[email protected]>
Signed-off-by: Arthur Schiwon <[email protected]>
blizzz
force-pushed
the
fix/noid/ldap-remnants-as-disabled-global
branch
from
65f3833
to
6a0351e
Compare
come-nc
requested changes
Aug 5, 2024
|
|
||
| // if it was enabled for at least one configuration, use it as global configuration | ||
| $filteredKeys = array_filter($allKeys, static function (string $key): bool { | ||
| return str_contains($key, 'ldap_mark_remnants_as_disabled'); |
There was a problem hiding this comment.
Suggested change
| return str_contains($key, 'ldap_mark_remnants_as_disabled'); | |
| return str_ends_with($key, 'ldap_mark_remnants_as_disabled'); |
Comment on lines
+427
to
+430
| if (!$this->treatRemnantsAsDisabled()) { | ||
| return $queryDatabaseValue(); | ||
| } | ||
| return !$this->deletedUsersIndex->isUserMarked($uid); |
There was a problem hiding this comment.
Logic is wrong here.
If treatRemnantsAsDisabled is true and the user is not marked we should still query the DB.
Suggested change
| if (!$this->treatRemnantsAsDisabled()) { | |
| return $queryDatabaseValue(); | |
| } | |
| return !$this->deletedUsersIndex->isUserMarked($uid); | |
| if ($this->treatRemnantsAsDisabled() && $this->deletedUsersIndex->isUserMarked($uid)) { | |
| return false; | |
| } else { | |
| return $queryDatabaseValue(); | |
| } |
| @@ -414,6 +419,14 @@ protected function getLcValue(string $varName): string { | |||
| return mb_strtolower($this->getValue($varName), 'UTF-8'); | |||
| } | |||
|
|
|||
| protected function getGlobalAppValueAsBool(string $varName): bool { | |||
There was a problem hiding this comment.
As it returns bool the magic property in phpdoc before the class should be typed to bool I think.
Also the default value in getDefaults is now unused for this property I think.
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
Since former LDAP users cannot be bound to a server configuration anymore (or theoretically belong to more than one) this feature has to be config independent. This PR:
A backport to 28 will need further adjustments as
IAppConfigwas only introduced in 29.Checklist