yetangitu/lam
1
0
Fork 0
mirror of https://github.com/LDAPAccountManager/lam.git synced 2025-10-03 17:59:21 +02:00
Code Issues Releases Wiki Activity

refactoring

Browse source
This commit is contained in:
Roland Gruber 2025-07-22 17:03:06 +02:00
parent 72129dc127
commit c368a748dd
8 changed files with 40 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lam/lib/account.inc
View file

@ -492,7 +492,7 @@ function getNumberOfCharacterClasses($password): int {
/** /**
* Returns an array with all Samba 3 domain entries under the given suffix * Returns an array with all Samba 3 domain entries under the given suffix
* *
* @param handle LDAP handle (if null then $_SESSION['ldap']->server() is used) * @param Connection|null $server LDAP handle (if null then $_SESSION['ldap']->server() is used)
* @param String $suffix LDAP suffix to search (if null then $_SESSION['config']->get_Suffix('smbDomain') is used) * @param String $suffix LDAP suffix to search (if null then $_SESSION['config']->get_Suffix('smbDomain') is used)
* @return array list of samba3domain objects * @return array list of samba3domain objects
*/ */

6
lam/lib/baseModule.inc
View file

@ -81,7 +81,7 @@ abstract class baseModule {
protected $moduleSettings; protected $moduleSettings;
/** /**
* self service profile with settings of all modules * self-service profile with settings of all modules
* @var selfServiceProfile profile * @var selfServiceProfile profile
*/ */
protected $selfServiceSettings; protected $selfServiceSettings;
@ -89,10 +89,10 @@ abstract class baseModule {
/** name of parent accountContainer ($_SESSION[$base]) */ /** name of parent accountContainer ($_SESSION[$base]) */
private $base; private $base;
/** contains all ldap attributes which should be written */ /** @var array<string, string[]|string>|null contains all ldap attributes which should be written */
protected $attributes; protected $attributes;
/** contains all ldap attributes which are loaded from ldap */ /** @var array<string, string[]|string>|null contains all ldap attributes which are loaded from LDAP */
protected $orig; protected $orig;
/** contains all error messages of a module */ /** contains all error messages of a module */

2
lam/lib/baseType.inc
View file

@ -235,7 +235,7 @@ class baseType {
*/ */
private function buildAccountStatusDialogDiv(AccountStatus $accountStatus, array $lockableOptions): htmlElement { private function buildAccountStatusDialogDiv(AccountStatus $accountStatus, array $lockableOptions): htmlElement {
$hasLockOptions = !empty($lockableOptions); $hasLockOptions = !empty($lockableOptions);
$hasUnlockOptions = $accountStatus->isLocked() || $accountStatus->isPartiallyLocked(); $hasUnlockOptions = $accountStatus->isLocked() || $accountStatus->isPartiallyLocked() || $accountStatus->isPartiallyExpired();
$container = new htmlResponsiveRow(); $container = new htmlResponsiveRow();
$container->add(new htmlTitle(_('Change account status'))); $container->add(new htmlTitle(_('Change account status')));

46
lam/lib/modules/sambaSamAccount.inc
View file

@ -2,13 +2,14 @@
use LAM\REMOTE\Remote; use LAM\REMOTE\Remote;
use LAM\TYPES\ConfiguredType; use LAM\TYPES\ConfiguredType;
use LDAP\Connection;
use function LAM\ACCOUNTLIST\isPasswordChangeByDefault; use function LAM\ACCOUNTLIST\isPasswordChangeByDefault;
/* /*
This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/) This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
Copyright (C) 2003 - 2006 Tilo Lutz Copyright (C) 2003 - 2006 Tilo Lutz
2005 - 2024 Roland Gruber 2005 - 2025 Roland Gruber
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@ -718,6 +719,8 @@ class sambaSamAccount extends baseModule implements passwordService, AccountStat
// Save attributes // Save attributes
$this->attributes['sambaDomainName'][0] = $_POST['sambaDomainName']; $this->attributes['sambaDomainName'][0] = $_POST['sambaDomainName'];
// Get Domain SID from name // Get Domain SID from name
$SID = '';
$RIDbase = 1000;
for ($i = 0; $i < count($sambaDomains); $i++) { for ($i = 0; $i < count($sambaDomains); $i++) {
if ($this->attributes['sambaDomainName'][0] == $sambaDomains[$i]->name) { if ($this->attributes['sambaDomainName'][0] == $sambaDomains[$i]->name) {
$SID = $sambaDomains[$i]->SID; $SID = $sambaDomains[$i]->SID;
@ -1074,19 +1077,20 @@ class sambaSamAccount extends baseModule implements passwordService, AccountStat
if (isset($this->attributes['sambaSID'][0]) && $this->attributes['sambaSID'][0] != '') { if (isset($this->attributes['sambaSID'][0]) && $this->attributes['sambaSID'][0] != '') {
$domainSID = substr($this->attributes['sambaSID'][0], 0, strrpos($this->attributes['sambaSID'][0], "-")); $domainSID = substr($this->attributes['sambaSID'][0], 0, strrpos($this->attributes['sambaSID'][0], "-"));
} }
$sel_domain = []; $sel_domain = null;
$SID = '';
for ($i = 0; $i < count($sambaDomains); $i++) { for ($i = 0; $i < count($sambaDomains); $i++) {
$sambaDomainNames[] = $sambaDomains[$i]->name; $sambaDomainNames[] = $sambaDomains[$i]->name;
if (isset($domainSID)) { if (isset($domainSID)) {
if ($domainSID == $sambaDomains[$i]->SID) { if ($domainSID == $sambaDomains[$i]->SID) {
$SID = $domainSID; $SID = $domainSID;
$sel_domain = [$sambaDomains[$i]->name]; $sel_domain = $sambaDomains[$i]->name;
} }
} }
elseif (isset($this->attributes['sambaDomainName'][0]) && ($this->attributes['sambaDomainName'][0] != '')) { elseif (isset($this->attributes['sambaDomainName'][0]) && ($this->attributes['sambaDomainName'][0] != '')) {
if ($this->attributes['sambaDomainName'][0] == $sambaDomains[$i]->name) { if ($this->attributes['sambaDomainName'][0] == $sambaDomains[$i]->name) {
$SID = $sambaDomains[$i]->SID; $SID = $sambaDomains[$i]->SID;
$sel_domain = [$sambaDomains[$i]->name]; $sel_domain = $sambaDomains[$i]->name;
} }
} }
} }
@ -1241,7 +1245,7 @@ class sambaSamAccount extends baseModule implements passwordService, AccountStat
$return->add(new htmlResponsiveSelect('sambaSID', $options, $selected, _('Special user'), 'specialUser')); $return->add(new htmlResponsiveSelect('sambaSID', $options, $selected, _('Special user'), 'specialUser'));
} }
// domain // domain
$return->add(new htmlResponsiveSelect('sambaDomainName', $sambaDomainNames, $sel_domain, _('Domain'), 'domain')); $return->add(new htmlResponsiveSelect('sambaDomainName', $sambaDomainNames, [$sel_domain], _('Domain'), 'domain'));
// logon hours and terminal server options // logon hours and terminal server options
if ($this->get_scope() == 'user') { if ($this->get_scope() == 'user') {
if (!$this->isBooleanConfigOptionSet('sambaSamAccount_hideLogonHours')) { if (!$this->isBooleanConfigOptionSet('sambaSamAccount_hideLogonHours')) {
@ -2590,9 +2594,9 @@ class sambaSamAccount extends baseModule implements passwordService, AccountStat
* Returns the domain object of the user's domain. * Returns the domain object of the user's domain.
* *
* @param array $attributes LDAP attributes * @param array $attributes LDAP attributes
* @param handle $server LDAP connection (leave empty for admin interface) * @param Connection|null $server LDAP connection (leave empty for admin interface)
* @param String $suffix LDAP search suffix (leave empty for admin interface) * @param String $suffix LDAP search suffix (leave empty for admin interface)
* @return samba3domain domain * @return samba3domain|null domain
*/ */
public function getUserDomain($attributes, $server = null, $suffix = null) { public function getUserDomain($attributes, $server = null, $suffix = null) {
$attributes = array_change_key_case($attributes); $attributes = array_change_key_case($attributes);
@ -2621,8 +2625,8 @@ class sambaSamAccount extends baseModule implements passwordService, AccountStat
/** /**
* Returns the group name of the group with the given group ID. * Returns the group name of the group with the given group ID.
* *
* @param String $groupID group ID * @param string $groupID group ID
* @return String group name * @return string|null group name
*/ */
private function getGroupName($groupID) { private function getGroupName($groupID) {
$results = searchLDAPByAttribute('gidNumber', $groupID, 'posixGroup', ['cn'], ['group']); $results = searchLDAPByAttribute('gidNumber', $groupID, 'posixGroup', ['cn'], ['group']);
@ -2636,12 +2640,9 @@ class sambaSamAccount extends baseModule implements passwordService, AccountStat
* Returns the time when the user needs to change his password. * Returns the time when the user needs to change his password.
* *
* @param array $domains list of domain objects * @param array $domains list of domain objects
* @param String $selectedDomain selected domain name * @param string|null $selectedDomain selected domain name
*/ */
private function getPasswordMustChangeTime($domains, $selectedDomain) { private function getPasswordMustChangeTime($domains, $selectedDomain) {
if (is_array($selectedDomain) && ($selectedDomain !== [])) {
$selectedDomain = $selectedDomain[0];
}
$return = '-'; $return = '-';
// check if password expires at all // check if password expires at all
if ($this->noexpire) { if ($this->noexpire) {
@ -2670,12 +2671,9 @@ class sambaSamAccount extends baseModule implements passwordService, AccountStat
* Returns the time when the user can change his password. * Returns the time when the user can change his password.
* *
* @param array $domains list of domain objects * @param array $domains list of domain objects
* @param String $selectedDomain selected domain name * @param string $selectedDomain selected domain name
*/ */
private function getPasswordCanChangeTime($domains, $selectedDomain) { private function getPasswordCanChangeTime($domains, $selectedDomain) {
if (is_array($selectedDomain) && ($selectedDomain !== [])) {
$selectedDomain = $selectedDomain[0];
}
$return = '-'; $return = '-';
// check if there is a time set for the last password change // check if there is a time set for the last password change
if (!isset($this->attributes['sambaPwdLastSet'][0])) { if (!isset($this->attributes['sambaPwdLastSet'][0])) {
@ -2734,7 +2732,7 @@ class sambaSamAccount extends baseModule implements passwordService, AccountStat
/** /**
* Returns a list of existing Samba 3 domains. * Returns a list of existing Samba 3 domains.
* *
* @param handle $server LDAP connection (leave empty for admin interface) * @param Connection|null $server LDAP connection (leave empty for admin interface)
* @param String $suffix LDAP search suffix (leave empty for admin interface) * @param String $suffix LDAP search suffix (leave empty for admin interface)
* @return array list of samba3domain objects * @return array list of samba3domain objects
*/ */
@ -2807,7 +2805,7 @@ class sambaSamAccount extends baseModule implements passwordService, AccountStat
/** /**
* Deactivates this account. * Deactivates this account.
* *
* @param array $attributes LDAP attributes * @param array<string, string[]|string> $attributes LDAP attributes
*/ */
public function deactivate(array &$attributes) { public function deactivate(array &$attributes) {
if (!isset($attributes['sambaacctflags'][0])) { if (!isset($attributes['sambaacctflags'][0])) {
@ -2817,13 +2815,13 @@ class sambaSamAccount extends baseModule implements passwordService, AccountStat
if (!str_contains($flags, 'D')) { if (!str_contains($flags, 'D')) {
$flags[strpos($flags, ' ')] = 'D'; $flags[strpos($flags, ' ')] = 'D';
} }
$attributes['sambaacctflags'][0] = $flags; $attributes['sambaacctflags'][0] = (string) $flags;
} }
/** /**
* Activates this account. * Activates this account.
* *
* @param array $attributes LDAP attributes * @param array<string, string[]|string> $attributes LDAP attributes
*/ */
public function activate(array &$attributes) { public function activate(array &$attributes) {
if (!isset($attributes['sambaacctflags'][0])) { if (!isset($attributes['sambaacctflags'][0])) {
@ -2835,7 +2833,7 @@ class sambaSamAccount extends baseModule implements passwordService, AccountStat
/** /**
* Unlocks this account. * Unlocks this account.
* *
* @param array $attributes LDAP attributes * @param array<string, string[]|string> $attributes LDAP attributes
*/ */
public function unlock(array &$attributes) { public function unlock(array &$attributes) {
$attributes['sambaacctflags'][0] = str_replace('L', ' ', $attributes['sambaacctflags'][0]); $attributes['sambaacctflags'][0] = str_replace('L', ' ', $attributes['sambaacctflags'][0]);
@ -2844,8 +2842,8 @@ class sambaSamAccount extends baseModule implements passwordService, AccountStat
/** /**
* Creates the value to store in sambaPasswordHistory attribute. * Creates the value to store in sambaPasswordHistory attribute.
* *
* @param String $password password * @param string $password password
* @return String value for sambaPasswordHistory * @return string|null value for sambaPasswordHistory
*/ */
public static function createHistoryEntry($password) { public static function createHistoryEntry($password) {
if (empty($password)) { if (empty($password)) {

4
lam/lib/modules/shadowAccount.inc
View file

@ -993,7 +993,7 @@ class shadowAccount extends baseModule implements passwordService, AccountStatus
} }
if (in_array(self::STATUS_PASSWORD_EXPIRED, $lockIds)) { if (in_array(self::STATUS_PASSWORD_EXPIRED, $lockIds)) {
$inactive = empty($attributes['shadowinactive'][0]) ? 0 : $attributes['shadowinactive'][0]; $inactive = empty($attributes['shadowinactive'][0]) ? 0 : $attributes['shadowinactive'][0];
$attributes['shadowlastchange'][0] = intval(time() / 3600 / 24) - $attributes['shadowmax'][0] - $inactive - 1; $attributes['shadowlastchange'][0] = (string) (intval(time() / 3600 / 24) - $attributes['shadowmax'][0] - $inactive - 1);
} }
} }
@ -1008,7 +1008,7 @@ class shadowAccount extends baseModule implements passwordService, AccountStatus
unset($attributes['shadowexpire']); unset($attributes['shadowexpire']);
} }
if (in_array(self::STATUS_PASSWORD_EXPIRED, $lockIds)) { if (in_array(self::STATUS_PASSWORD_EXPIRED, $lockIds)) {
$attributes['shadowlastchange'][0] = intval(time() / 3600 / 24); $attributes['shadowlastchange'][0] = (string) (time() / 3600 / 24);
} }
} }

5
lam/lib/modules/windowsGroup.inc
View file

@ -914,7 +914,6 @@ class windowsGroup extends baseModule {
$this->addPDFKeyValue($return, 'groupScope', _('Group scope'), $groupScope); $this->addPDFKeyValue($return, 'groupScope', _('Group scope'), $groupScope);
$this->addPDFKeyValue($return, 'groupType', _('Group type'), $groupType); $this->addPDFKeyValue($return, 'groupType', _('Group type'), $groupType);
// managed by // managed by
$managedBy = '';
if (isset($this->attributes['managedBy'][0])) { if (isset($this->attributes['managedBy'][0])) {
$managedBy = getAbstractDN($this->attributes['managedBy'][0]); $managedBy = getAbstractDN($this->attributes['managedBy'][0]);
$this->addPDFKeyValue($return, 'managedBy', _('Managed by'), $managedBy); $this->addPDFKeyValue($return, 'managedBy', _('Managed by'), $managedBy);
@ -922,7 +921,7 @@ class windowsGroup extends baseModule {
// members // members
if (!empty($this->attributes['member'])) { if (!empty($this->attributes['member'])) {
$memberList = []; $memberList = [];
if (isset($this->attributes['member']) && is_array($this->attributes['member'])) { if (isset($this->attributes['member'][0])) {
$memberList = $this->attributes['member']; $memberList = $this->attributes['member'];
} }
usort($memberList, 'compareDN'); usort($memberList, 'compareDN');
@ -937,7 +936,7 @@ class windowsGroup extends baseModule {
// member of // member of
if (!empty($this->attributes['memberOf'])) { if (!empty($this->attributes['memberOf'])) {
$memberOfList = []; $memberOfList = [];
if (isset($this->attributes['memberOf']) && is_array($this->attributes['memberOf'])) { if (isset($this->attributes['memberOf'][0])) {
$memberOfList = $this->attributes['memberOf']; $memberOfList = $this->attributes['memberOf'];
} }
usort($memberOfList, 'compareDN'); usort($memberOfList, 'compareDN');

14
lam/lib/modules/windowsUser.inc
View file

@ -77,6 +77,7 @@ class windowsUser extends baseModule implements passwordService, AccountStatusPr
private const DISPLAY_GROUPS_DN = 'DN'; private const DISPLAY_GROUPS_DN = 'DN';
/** display groups as cn */ /** display groups as cn */
private const DISPLAY_GROUPS_CN = 'CN'; private const DISPLAY_GROUPS_CN = 'CN';
public const ACCOUNT_DOES_NOT_EXPIRE = '9223372036854775807';
/** current group list */ /** current group list */
private $groupList = []; private $groupList = [];
@ -2119,7 +2120,8 @@ class windowsUser extends baseModule implements passwordService, AccountStatusPr
$return = new htmlResponsiveRow(); $return = new htmlResponsiveRow();
$attr = 'accountexpires'; $attr = 'accountexpires';
$datetime = new DateTime('now', getTimeZone()); $datetime = new DateTime('now', getTimeZone());
if (!empty($this->attributes[$attr][0]) && ($this->attributes[$attr][0] != '0')) { $datetime->add(new DateInterval('P1Y'));
if (!empty($this->attributes[$attr][0]) && ($this->attributes[$attr][0] !== self::ACCOUNT_DOES_NOT_EXPIRE)) {
$datetime = windowsUser::getFileTime($this->attributes[$attr][0]); $datetime = windowsUser::getFileTime($this->attributes[$attr][0]);
} }
$dateInput = new htmlResponsiveInputField(_('Account expiration date'), $attr, $datetime->format('Y-m-d'), 'accountexpires'); $dateInput = new htmlResponsiveInputField(_('Account expiration date'), $attr, $datetime->format('Y-m-d'), 'accountexpires');
@ -4017,10 +4019,10 @@ class windowsUser extends baseModule implements passwordService, AccountStatusPr
foreach ($attrs as $key => $value) { foreach ($attrs as $key => $value) {
if (strtolower($key) === 'useraccountcontrol') { if (strtolower($key) === 'useraccountcontrol') {
if ($deactivated) { if ($deactivated) {
$attrs[$key][0] = intval($value[0]) | self::AC_ACCOUNT_DISABLED; $attrs[$key][0] = (string) (intval($value[0]) | self::AC_ACCOUNT_DISABLED);
} }
elseif ((intval($value[0]) & self::AC_ACCOUNT_DISABLED) !== 0) { elseif ((intval($value[0]) & self::AC_ACCOUNT_DISABLED) !== 0) {
$attrs[$key][0] = intval($value[0]) - self::AC_ACCOUNT_DISABLED; $attrs[$key][0] = (string) (intval($value[0]) - self::AC_ACCOUNT_DISABLED);
} }
} }
} }
@ -4228,7 +4230,7 @@ class windowsUser extends baseModule implements passwordService, AccountStatusPr
$attributes = &$this->attributes; $attributes = &$this->attributes;
} }
if (empty($attributes['accountexpires'][0]) || ($attributes['accountexpires'][0] == '0') if (empty($attributes['accountexpires'][0]) || ($attributes['accountexpires'][0] == '0')
|| ($attributes['accountexpires'][0] == '9223372036854775807')) { || ($attributes['accountexpires'][0] == self::ACCOUNT_DOES_NOT_EXPIRE)) {
return ' - '; return ' - ';
} }
return $this->formatFileTime($attributes['accountexpires'][0]); return $this->formatFileTime($attributes['accountexpires'][0]);
@ -4245,7 +4247,7 @@ class windowsUser extends baseModule implements passwordService, AccountStatusPr
$attributes = &$this->attributes; $attributes = &$this->attributes;
} }
if (empty($attributes['msds-userpasswordexpirytimecomputed'][0]) || ($attributes['msds-userpasswordexpirytimecomputed'][0] == '0') if (empty($attributes['msds-userpasswordexpirytimecomputed'][0]) || ($attributes['msds-userpasswordexpirytimecomputed'][0] == '0')
|| ($attributes['msds-userpasswordexpirytimecomputed'][0] == '9223372036854775807')) { || ($attributes['msds-userpasswordexpirytimecomputed'][0] == self::ACCOUNT_DOES_NOT_EXPIRE)) {
return ' - '; return ' - ';
} }
return $this->formatFileTime($attributes['msds-userpasswordexpirytimecomputed'][0]); return $this->formatFileTime($attributes['msds-userpasswordexpirytimecomputed'][0]);
@ -4926,7 +4928,7 @@ if (interface_exists('\LAM\JOB\Job', false)) {
} }
// skip if password does not expire // skip if password does not expire
if (empty($user['msds-userpasswordexpirytimecomputed'][0]) if (empty($user['msds-userpasswordexpirytimecomputed'][0])
|| ($user['msds-userpasswordexpirytimecomputed'][0] == '9223372036854775807') || ($user['msds-userpasswordexpirytimecomputed'][0] == windowsUser::ACCOUNT_DOES_NOT_EXPIRE)
|| ($user['msds-userpasswordexpirytimecomputed'][0] == '0')) { || ($user['msds-userpasswordexpirytimecomputed'][0] == '0')) {
$this->jobResultLog->logDebug($dn . ': password does not expire.'); $this->jobResultLog->logDebug($dn . ': password does not expire.');
return; return;

1
phpstan.neon
View file

@ -22,3 +22,4 @@ parameters:
- '#Variable \$helpArray might not be defined.#' - '#Variable \$helpArray might not be defined.#'
- '#Function [a-zA-Z0-9\(\)\\_-]+ has invalid return type [a-zA-Z0-9\\_-]+.#' - '#Function [a-zA-Z0-9\(\)\\_-]+ has invalid return type [a-zA-Z0-9\\_-]+.#'
- '#Binary operation .* between .* and .* results in an error.#' - '#Binary operation .* between .* and .* results in an error.#'
- '#Offset .SID. on array.*in isset\(\) always exists.*#'