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

typos

This commit is contained in:
Roland Gruber 2020-06-03 17:51:21 +02:00
parent 6ade23ce65
commit 5a09f8159f
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lam/HISTORY
View File

@ -14,7 +14,7 @@ September 2020
17.03.2020 7.1 17.03.2020 7.1
- PHP 7 required - PHP 7 required
- Webauthn/FIDO2 support for 2-factor-authentication (requires PHP 7.2) - WebAuthn/FIDO2 support for 2-factor-authentication (requires PHP 7.2)
- IMAP: changed library to support latest TLS versions - IMAP: changed library to support latest TLS versions
- Personal: support display name (hidden by default in server profile) - Personal: support display name (hidden by default in server profile)
- Windows users: support allowed workstations, more profile options - Windows users: support allowed workstations, more profile options

8
lam/lib/2factor.inc
View File

@ -526,16 +526,16 @@ class WebauthnProvider extends BaseProvider {
*/ */
public function addCustomInput(&$row, $userDn) { public function addCustomInput(&$row, $userDn) {
if (version_compare(phpversion(), '7.2.0') < 0) { if (version_compare(phpversion(), '7.2.0') < 0) {
$row->add(new htmlStatusMessage('ERROR', 'Webauthn requires PHP 7.2.'), 12); $row->add(new htmlStatusMessage('ERROR', 'WebAuthn requires PHP 7.2.'), 12);
return; return;
} }
if (!extension_loaded('PDO')) { if (!extension_loaded('PDO')) {
$row->add(new htmlStatusMessage('ERROR', 'Webauthn requires the PDO extension for PHP.'), 12); $row->add(new htmlStatusMessage('ERROR', 'WebAuthn requires the PDO extension for PHP.'), 12);
return; return;
} }
$pdoDrivers = \PDO::getAvailableDrivers(); $pdoDrivers = \PDO::getAvailableDrivers();
if (!in_array('sqlite', $pdoDrivers)) { if (!in_array('sqlite', $pdoDrivers)) {
$row->add(new htmlStatusMessage('ERROR', 'Webauthn requires the sqlite PDO driver for PHP.'), 12); $row->add(new htmlStatusMessage('ERROR', 'WebAuthn requires the sqlite PDO driver for PHP.'), 12);
return; return;
} }
include_once __DIR__ . '/webauthn.inc'; include_once __DIR__ . '/webauthn.inc';
@ -567,7 +567,7 @@ class WebauthnProvider extends BaseProvider {
} }
$errorMessageDiv = new htmlDiv('generic-webauthn-error', new htmlOutputText('')); $errorMessageDiv = new htmlDiv('generic-webauthn-error', new htmlOutputText(''));
$errorMessageDiv->addDataAttribute('button', _('Ok')); $errorMessageDiv->addDataAttribute('button', _('Ok'));
$errorMessageDiv->addDataAttribute('title', _('Webauthn failed')); $errorMessageDiv->addDataAttribute('title', _('WebAuthn failed'));
$row->add($errorMessageDiv, 12); $row->add($errorMessageDiv, 12);
$row->add(new htmlJavaScript('window.lam.webauthn.start(\'' . $pathPrefix . '\', ' . $selfServiceParam . ');'), 0); $row->add(new htmlJavaScript('window.lam.webauthn.start(\'' . $pathPrefix . '\', ' . $selfServiceParam . ');'), 0);
} }

2
lam/lib/tools/webauthn.inc
View File

@ -43,7 +43,7 @@ class toolWebauthn implements \LAMTool {
* @return string name * @return string name
*/ */
function getName() { function getName() {
return _('Webauthn devices'); return _('WebAuthn devices');
} }
/** /**

2
lam/templates/config/mainmanage.php
View File

@ -512,7 +512,7 @@ printHeaderContents(_("Edit general settings"), '../..');
include_once __DIR__ . '/../../lib/webauthn.inc'; include_once __DIR__ . '/../../lib/webauthn.inc';
$database = new \LAM\LOGIN\WEBAUTHN\PublicKeyCredentialSourceRepositorySQLite(); $database = new \LAM\LOGIN\WEBAUTHN\PublicKeyCredentialSourceRepositorySQLite();
if ($database->hasRegisteredCredentials()) { if ($database->hasRegisteredCredentials()) {
$row->add(new htmlSubTitle(_('Webauthn devices')), 12); $row->add(new htmlSubTitle(_('WebAuthn devices')), 12);
$webauthnSearchField = new htmlResponsiveInputField(_('User DN'), 'webauthn_searchTerm', null, '252'); $webauthnSearchField = new htmlResponsiveInputField(_('User DN'), 'webauthn_searchTerm', null, '252');
$row->add($webauthnSearchField, 12); $row->add($webauthnSearchField, 12);
$row->addVerticalSpacer('0.5rem'); $row->addVerticalSpacer('0.5rem');

8
lam/templates/lib/500_lam.js
View File

@ -1453,7 +1453,7 @@ window.lam.webauthn.run = function(prefix, isSelfService) {
} }
}) })
.fail(function() { .fail(function() {
console.log('Webauthn failed'); console.log('WebAuthn failed');
}); });
} }
@ -1602,7 +1602,7 @@ window.lam.webauthn.searchDevices = function(event) {
window.lam.webauthn.addDeviceActionListeners(); window.lam.webauthn.addDeviceActionListeners();
}) })
.fail(function() { .fail(function() {
console.log('Webauthn search failed'); console.log('WebAuthn search failed');
}); });
return false; return false;
} }
@ -1721,7 +1721,7 @@ window.lam.webauthn.sendRemoveDeviceRequest = function(element, action, successC
} }
}) })
.fail(function() { .fail(function() {
console.log('Webauthn device deletion failed'); console.log('WebAuthn device deletion failed');
}); });
} }
@ -1763,7 +1763,7 @@ window.lam.webauthn.registerOwnDevice = function(event, isSelfService) {
resultDiv.html(jsonData.content); resultDiv.html(jsonData.content);
}) })
.fail(function() { .fail(function() {
console.log('Webauthn device registration failed'); console.log('WebAuthn device registration failed');
}); });
}; };
} }

2
lam/templates/misc/ajax.php
View File

@ -343,7 +343,7 @@ class Ajax {
$dn = $_POST['dn']; $dn = $_POST['dn'];
$sessionDn = $_SESSION['ldap']->getUserName(); $sessionDn = $_SESSION['ldap']->getUserName();
if ($sessionDn !== $dn) { if ($sessionDn !== $dn) {
logNewMessage(LOG_ERR, 'Webauthn delete canceled, DN does not match.'); logNewMessage(LOG_ERR, 'WebAuthn delete canceled, DN does not match.');
die(); die();
} }
if ($action === 'delete') { if ($action === 'delete') {