WMDE
/
LDAPAccountManager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

support MIT Kerberos

This commit is contained in:
Roland Gruber 2012-11-11 11:35:45 +00:00
parent 01c9df38f6
commit 159c21f4e7
4 changed files with 56 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lam/HISTORY
View File

@ -2,6 +2,8 @@ December 2012
- account profiles and PDF structures are now bound to server profile - account profiles and PDF structures are now bound to server profile
- IMAP: support "/" as path separator (RFE 3575692) - IMAP: support "/" as path separator (RFE 3575692)
- show server profile name on config pages (RFE 3579768) - show server profile name on config pages (RFE 3579768)
- LAM Pro:
-> MIT Kerberos support
25.09.2012 3.9 25.09.2012 3.9

22
lam/lib/modules/sambaSamAccount.inc
View File

@ -997,6 +997,14 @@ class sambaSamAccount extends baseModule implements passwordService {
$this->getAccountContainer()->getAccountModule('heimdalKerberos')->setExpirationDate( $this->getAccountContainer()->getAccountModule('heimdalKerberos')->setExpirationDate(
$_POST['expire_yea'], $_POST['expire_mon'], $_POST['expire_day']); $_POST['expire_yea'], $_POST['expire_mon'], $_POST['expire_day']);
} }
if (isset($_POST['syncMIT']) && ($_POST['syncMIT'] == 'on')) {
$this->getAccountContainer()->getAccountModule('mitKerberos')->setExpirationDate(
$_POST['expire_yea'], $_POST['expire_mon'], $_POST['expire_day']);
}
if (isset($_POST['syncMITStructural']) && ($_POST['syncMITStructural'] == 'on')) {
$this->getAccountContainer()->getAccountModule('mitKerberosStructural')->setExpirationDate(
$_POST['expire_yea'], $_POST['expire_mon'], $_POST['expire_day']);
}
} }
elseif (strpos($buttonName, '_del') !== false) { elseif (strpos($buttonName, '_del') !== false) {
// remove attribute value // remove attribute value
@ -1010,6 +1018,14 @@ class sambaSamAccount extends baseModule implements passwordService {
$this->getAccountContainer()->getAccountModule('heimdalKerberos')->setExpirationDate( $this->getAccountContainer()->getAccountModule('heimdalKerberos')->setExpirationDate(
null, null, null); null, null, null);
} }
if (isset($_POST['syncMIT']) && ($_POST['syncMIT'] == 'on')) {
$this->getAccountContainer()->getAccountModule('mitKerberos')->setExpirationDate(
null, null, null);
}
if (isset($_POST['syncMITStructural']) && ($_POST['syncMITStructural'] == 'on')) {
$this->getAccountContainer()->getAccountModule('mitKerberosStructural')->setExpirationDate(
null, null, null);
}
} }
return $return; return $return;
} }
@ -1412,6 +1428,12 @@ class sambaSamAccount extends baseModule implements passwordService {
if ($this->getAccountContainer()->getAccountModule('heimdalKerberos') != null) { if ($this->getAccountContainer()->getAccountModule('heimdalKerberos') != null) {
$return->addElement(new htmlTableExtendedInputCheckbox('syncHeimdal', false, _('Set also for Kerberos')), true); $return->addElement(new htmlTableExtendedInputCheckbox('syncHeimdal', false, _('Set also for Kerberos')), true);
} }
if ($this->getAccountContainer()->getAccountModule('mitKerberos') != null) {
$return->addElement(new htmlTableExtendedInputCheckbox('syncMIT', false, _('Set also for Kerberos')), true);
}
if ($this->getAccountContainer()->getAccountModule('mitKerberosStructural') != null) {
$return->addElement(new htmlTableExtendedInputCheckbox('syncMITStructural', false, _('Set also for Kerberos')), true);
}
$return->addElement(new htmlSpacer(null, '10px'), true); $return->addElement(new htmlSpacer(null, '10px'), true);
$buttons = new htmlTable(); $buttons = new htmlTable();
$buttons->addElement(new htmlAccountPageButton(get_class($this), 'attributes', 'change' . $attr, _('Change'))); $buttons->addElement(new htmlAccountPageButton(get_class($this), 'attributes', 'change' . $attr, _('Change')));

22
lam/lib/modules/shadowAccount.inc
View File

@ -391,6 +391,14 @@ class shadowAccount extends baseModule implements passwordService {
$this->getAccountContainer()->getAccountModule('heimdalKerberos')->setExpirationDate( $this->getAccountContainer()->getAccountModule('heimdalKerberos')->setExpirationDate(
$_POST['shadowExpire_yea'], $_POST['shadowExpire_mon'], $_POST['shadowExpire_day']); $_POST['shadowExpire_yea'], $_POST['shadowExpire_mon'], $_POST['shadowExpire_day']);
} }
if (isset($_POST['syncMIT']) && ($_POST['syncMIT'] == 'on')) {
$this->getAccountContainer()->getAccountModule('mitKerberos')->setExpirationDate(
$_POST['shadowExpire_yea'], $_POST['shadowExpire_mon'], $_POST['shadowExpire_day']);
}
if (isset($_POST['syncMITStructural']) && ($_POST['syncMITStructural'] == 'on')) {
$this->getAccountContainer()->getAccountModule('mitKerberosStructural')->setExpirationDate(
$_POST['shadowExpire_yea'], $_POST['shadowExpire_mon'], $_POST['shadowExpire_day']);
}
} }
// remove expiration date // remove expiration date
elseif (isset($_POST['form_subpage_shadowAccount_attributes_del'])) { elseif (isset($_POST['form_subpage_shadowAccount_attributes_del'])) {
@ -404,6 +412,14 @@ class shadowAccount extends baseModule implements passwordService {
$this->getAccountContainer()->getAccountModule('heimdalKerberos')->setExpirationDate( $this->getAccountContainer()->getAccountModule('heimdalKerberos')->setExpirationDate(
null, null, null); null, null, null);
} }
if (isset($_POST['syncMIT']) && ($_POST['syncMIT'] == 'on')) {
$this->getAccountContainer()->getAccountModule('mitKerberos')->setExpirationDate(
null, null, null);
}
if (isset($_POST['syncMITStructural']) && ($_POST['syncMITStructural'] == 'on')) {
$this->getAccountContainer()->getAccountModule('mitKerberosStructural')->setExpirationDate(
null, null, null);
}
} }
return $errors; return $errors;
} }
@ -436,6 +452,12 @@ class shadowAccount extends baseModule implements passwordService {
if ($this->getAccountContainer()->getAccountModule('heimdalKerberos') != null) { if ($this->getAccountContainer()->getAccountModule('heimdalKerberos') != null) {
$return->addElement(new htmlTableExtendedInputCheckbox('syncHeimdal', false, _('Set also for Kerberos')), true); $return->addElement(new htmlTableExtendedInputCheckbox('syncHeimdal', false, _('Set also for Kerberos')), true);
} }
if ($this->getAccountContainer()->getAccountModule('mitKerberos') != null) {
$return->addElement(new htmlTableExtendedInputCheckbox('syncMIT', false, _('Set also for Kerberos')), true);
}
if ($this->getAccountContainer()->getAccountModule('mitKerberosStructural') != null) {
$return->addElement(new htmlTableExtendedInputCheckbox('syncMITStructural', false, _('Set also for Kerberos')), true);
}
$return->addElement(new htmlSpacer(null, '10px'), true); $return->addElement(new htmlSpacer(null, '10px'), true);
$buttonTable = new htmlTable(); $buttonTable = new htmlTable();
$buttonTable->addElement(new htmlAccountPageButton('shadowAccount', 'attributes', 'change', _('Change'))); $buttonTable->addElement(new htmlAccountPageButton('shadowAccount', 'attributes', 'change', _('Change')));

10
lam/lib/types/user.inc
View File

@ -129,6 +129,13 @@ class user extends baseType {
if ($container->getAccountModule('posixAccount') != null) { if ($container->getAccountModule('posixAccount') != null) {
$unixAttributes = $container->getAccountModule('posixAccount')->getAttributes(); $unixAttributes = $container->getAccountModule('posixAccount')->getAttributes();
} }
$mitKerberosAttributes = null;
if ($container->getAccountModule('mitKerberosStructural') != null) {
$mitKerberosAttributes = $container->getAccountModule('mitKerberosStructural')->getAttributes();
}
elseif ($container->getAccountModule('mitKerberos') != null) {
$mitKerberosAttributes = $container->getAccountModule('mitKerberos')->getAttributes();
}
// check if first and last name can be shown // check if first and last name can be shown
if (($personalAttributes != null) && isset($personalAttributes['sn'][0]) && isset($personalAttributes['givenName'][0])) { if (($personalAttributes != null) && isset($personalAttributes['sn'][0]) && isset($personalAttributes['givenName'][0])) {
return htmlspecialchars($personalAttributes['givenName'][0] . ' ' . $personalAttributes['sn'][0]); return htmlspecialchars($personalAttributes['givenName'][0] . ' ' . $personalAttributes['sn'][0]);
@ -154,6 +161,9 @@ class user extends baseType {
if (($accountAttributes != null) && isset($accountAttributes['uid'][0])) { if (($accountAttributes != null) && isset($accountAttributes['uid'][0])) {
return htmlspecialchars($accountAttributes['uid'][0]); return htmlspecialchars($accountAttributes['uid'][0]);
} }
if (($mitKerberosAttributes != null) && isset($mitKerberosAttributes['krbPrincipalName'][0])) {
return htmlspecialchars($mitKerberosAttributes['krbPrincipalName'][0]);
}
if ($container->isNewAccount) { if ($container->isNewAccount) {
return _("New user"); return _("New user");
} }