add any further debug loggings
This commit is contained in:
parent
10d8fddd88
commit
018e91bc0c
@ -115,6 +115,13 @@ class d3webauthnadminlogin extends AdminController
|
|||||||
d3GetOxidDIC()->get('d3ox.webauthn.'.LoggerInterface::class)->error($e->getDetailedErrorMessage(), ['UserId' => $userId]);
|
d3GetOxidDIC()->get('d3ox.webauthn.'.LoggerInterface::class)->error($e->getDetailedErrorMessage(), ['UserId' => $userId]);
|
||||||
d3GetOxidDIC()->get('d3ox.webauthn.'.LoggerInterface::class)->debug($e->getTraceAsString());
|
d3GetOxidDIC()->get('d3ox.webauthn.'.LoggerInterface::class)->debug($e->getTraceAsString());
|
||||||
d3GetOxidDIC()->get('d3ox.webauthn.'.Utils::class)->redirect('index.php?cl=login');
|
d3GetOxidDIC()->get('d3ox.webauthn.'.Utils::class)->redirect('index.php?cl=login');
|
||||||
|
} catch (AssertionFailedException $e) {
|
||||||
|
d3GetOxidDIC()->get('d3ox.webauthn.'.Session::class)
|
||||||
|
->setVariable(WebauthnConf::GLOBAL_SWITCH, true);
|
||||||
|
d3GetOxidDIC()->get('d3ox.webauthn.'.UtilsView::class)->addErrorToDisplay($e);
|
||||||
|
d3GetOxidDIC()->get('d3ox.webauthn.'.LoggerInterface::class)->error($e->getMessage(), ['UserId' => $userId]);
|
||||||
|
d3GetOxidDIC()->get('d3ox.webauthn.'.LoggerInterface::class)->debug($e->getTraceAsString());
|
||||||
|
d3GetOxidDIC()->get('d3ox.webauthn.'.Utils::class)->redirect('index.php?cl=login');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -15,6 +15,7 @@ declare(strict_types=1);
|
|||||||
|
|
||||||
namespace D3\Webauthn\Application\Controller;
|
namespace D3\Webauthn\Application\Controller;
|
||||||
|
|
||||||
|
use Assert\AssertionFailedException;
|
||||||
use D3\TestingTools\Production\IsMockable;
|
use D3\TestingTools\Production\IsMockable;
|
||||||
use D3\Webauthn\Application\Model\Webauthn;
|
use D3\Webauthn\Application\Model\Webauthn;
|
||||||
use D3\Webauthn\Application\Model\WebauthnConf;
|
use D3\Webauthn\Application\Model\WebauthnConf;
|
||||||
@ -103,6 +104,13 @@ class d3webauthnlogin extends FrontendController
|
|||||||
d3GetOxidDIC()->get('d3ox.webauthn.'.LoggerInterface::class)->debug($e->getTraceAsString());
|
d3GetOxidDIC()->get('d3ox.webauthn.'.LoggerInterface::class)->debug($e->getTraceAsString());
|
||||||
Registry::getUtilsView()->addErrorToDisplay($e);
|
Registry::getUtilsView()->addErrorToDisplay($e);
|
||||||
d3GetOxidDIC()->get('d3ox.webauthn.'.Utils::class)->redirect('index.php?cl=start');
|
d3GetOxidDIC()->get('d3ox.webauthn.'.Utils::class)->redirect('index.php?cl=start');
|
||||||
|
} catch (AssertionFailedException $e) {
|
||||||
|
d3GetOxidDIC()->get('d3ox.webauthn.'.Session::class)
|
||||||
|
->setVariable(WebauthnConf::GLOBAL_SWITCH, true);
|
||||||
|
d3GetOxidDIC()->get('d3ox.webauthn.'.LoggerInterface::class)->error($e->getMessage(), ['UserId' => $userId]);
|
||||||
|
d3GetOxidDIC()->get('d3ox.webauthn.'.LoggerInterface::class)->debug($e->getTraceAsString());
|
||||||
|
Registry::getUtilsView()->addErrorToDisplay($e);
|
||||||
|
d3GetOxidDIC()->get('d3ox.webauthn.'.Utils::class)->redirect('index.php?cl=start');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -15,7 +15,9 @@ declare(strict_types=1);
|
|||||||
|
|
||||||
namespace D3\Webauthn\Application\Model;
|
namespace D3\Webauthn\Application\Model;
|
||||||
|
|
||||||
|
use Assert\Assert;
|
||||||
use Assert\AssertionFailedException;
|
use Assert\AssertionFailedException;
|
||||||
|
use Assert\InvalidArgumentException;
|
||||||
use D3\TestingTools\Production\IsMockable;
|
use D3\TestingTools\Production\IsMockable;
|
||||||
use D3\Webauthn\Application\Model\Credential\PublicKeyCredential;
|
use D3\Webauthn\Application\Model\Credential\PublicKeyCredential;
|
||||||
use D3\Webauthn\Application\Model\Credential\PublicKeyCredentialList;
|
use D3\Webauthn\Application\Model\Credential\PublicKeyCredentialList;
|
||||||
@ -134,6 +136,7 @@ class Webauthn
|
|||||||
* @return string
|
* @return string
|
||||||
* @throws DoctrineDriverException
|
* @throws DoctrineDriverException
|
||||||
* @throws DoctrineException
|
* @throws DoctrineException
|
||||||
|
* @throws InvalidArgumentException
|
||||||
*/
|
*/
|
||||||
public function getRequestOptions(string $userId): string
|
public function getRequestOptions(string $userId): string
|
||||||
{
|
{
|
||||||
@ -143,11 +146,16 @@ class Webauthn
|
|||||||
d3GetOxidDIC()->set(UserEntity::class.'.args.user', $user);
|
d3GetOxidDIC()->set(UserEntity::class.'.args.user', $user);
|
||||||
/** @var UserEntity $userEntity */
|
/** @var UserEntity $userEntity */
|
||||||
$userEntity = d3GetOxidDIC()->get(UserEntity::class);
|
$userEntity = d3GetOxidDIC()->get(UserEntity::class);
|
||||||
|
$existingCredentials = $this->getExistingCredentials($userEntity);
|
||||||
|
|
||||||
|
d3GetOxidDIC()->get('d3ox.webauthn.'.LoggerInterface::class)->debug(
|
||||||
|
'found user credentials: '.count($existingCredentials).' for ID '.$userId)
|
||||||
|
);
|
||||||
|
|
||||||
// We generate the set of options.
|
// We generate the set of options.
|
||||||
$publicKeyCredentialRequestOptions = $this->getServer()->generatePublicKeyCredentialRequestOptions(
|
$publicKeyCredentialRequestOptions = $this->getServer()->generatePublicKeyCredentialRequestOptions(
|
||||||
PublicKeyCredentialRequestOptions::USER_VERIFICATION_REQUIREMENT_PREFERRED, // Default value
|
PublicKeyCredentialRequestOptions::USER_VERIFICATION_REQUIREMENT_PREFERRED, // Default value
|
||||||
$this->getExistingCredentials($userEntity)
|
$existingCredentials
|
||||||
);
|
);
|
||||||
|
|
||||||
d3GetOxidDIC()->get('d3ox.webauthn.'.Session::class)
|
d3GetOxidDIC()->get('d3ox.webauthn.'.Session::class)
|
||||||
@ -155,9 +163,11 @@ class Webauthn
|
|||||||
|
|
||||||
$json = $this->jsonEncode($publicKeyCredentialRequestOptions);
|
$json = $this->jsonEncode($publicKeyCredentialRequestOptions);
|
||||||
|
|
||||||
if ($json === false) {
|
d3GetOxidDIC()->get('d3ox.webauthn.'.LoggerInterface::class)->debug(
|
||||||
throw oxNew(Exception::class, "can't encode request options");
|
'request options: '.$json
|
||||||
}
|
);
|
||||||
|
|
||||||
|
Assert::that($json)->minLength(1, "can't encode request options");
|
||||||
|
|
||||||
return $json;
|
return $json;
|
||||||
}
|
}
|
||||||
|
@ -38,6 +38,10 @@ class WebauthnErrors
|
|||||||
*/
|
*/
|
||||||
public function translateError(string $msg, string $type = null): string
|
public function translateError(string $msg, string $type = null): string
|
||||||
{
|
{
|
||||||
|
d3GetOxidDIC()->get('d3ox.webauthn.'.LoggerInterface::class)->debug(
|
||||||
|
'error occured: '.$msg
|
||||||
|
);
|
||||||
|
|
||||||
$lang = d3GetOxidDIC()->get('d3ox.webauthn.'.Language::class);
|
$lang = d3GetOxidDIC()->get('d3ox.webauthn.'.Language::class);
|
||||||
$type = $type ? '_'.$type : null;
|
$type = $type ? '_'.$type : null;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user