chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Whispeak: Track every authentiy attempt - refs BT#15821

Browse Source
pull/3377/head
Angel Fernando Quiroz Campos 7 years ago
parent 5dad320cd1
commit a3131383c8
5 changed files with 43 additions and 173 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 1
      plugin/whispeakauth/Entity/LogEvent.php
  2. 143
      plugin/whispeakauth/WhispeakAuthPlugin.php
  3. 36
      plugin/whispeakauth/ajax/authentify_password.php
  4. 22
      plugin/whispeakauth/ajax/record_audio.php
  5. 14
      plugin/whispeakauth/authentify.php

1
plugin/whispeakauth/Entity/LogEvent.php
Unescape View File

@ -24,7 +24,6 @@ use Doctrine\ORM\Mapping as ORM;
*/
class LogEvent
{
const STATUS_REQUIRED = -1;
const STATUS_FAILED = 0;
const STATUS_SUCCESS = 1;

143
plugin/whispeakauth/WhispeakAuthPlugin.php
Unescape View File

@ -692,43 +692,7 @@ class WhispeakAuthPlugin extends Plugin implements HookPluginInterface
}
/**
* @param int $userId
* @param int $lpItemId
* @param int $lpId
*
* @throws \Doctrine\ORM\NonUniqueResultException
*
* @return LogEventLp|null
*/
public function getLastRequiredAttemptInLearningPath($userId, $lpItemId, $lpId)
{
$query = Database::getManager()
->createQuery(
'SELECT log FROM ChamiloPluginBundle:WhispeakAuth\LogEventLp log
WHERE
log.user = :user AND
log.lp = :lp AND
log.lpItem = :lp_item AND
log.actionStatus = :action_status
ORDER BY log.datetime DESC'
)
->setMaxResults(1)
->setParameters(
[
'user' => $userId,
'lp' => $lpId,
'lp_item' => $lpItemId,
'action_status' => LogEvent::STATUS_REQUIRED,
]
);
/** @var LogEventLp|null $logEvent */
$logEvent = $query->getOneOrNullResult();
return $logEvent;
}
/**
* @param int $status
* @param int $userId
* @param int $lpItemId
* @param int $lpId
@ -739,7 +703,7 @@ class WhispeakAuthPlugin extends Plugin implements HookPluginInterface
*
* @return LogEventLp|null
*/
public function addAttemptInLearningPath($userId, $lpItemId, $lpId)
public function addAttemptInLearningPath($status, $userId, $lpItemId, $lpId)
{
$em = Database::getManager();
@ -759,7 +723,7 @@ class WhispeakAuthPlugin extends Plugin implements HookPluginInterface
->setDatetime(
api_get_utc_datetime(null, false, true)
)
->setActionStatus($logEvent::STATUS_REQUIRED);
->setActionStatus($status);
$em->persist($logEvent);
$em->flush();
@ -769,73 +733,6 @@ class WhispeakAuthPlugin extends Plugin implements HookPluginInterface
/**
* @param int $status
* @param int $userId
* @param int $lpItemId
* @param int $lpId
*
* @throws \Doctrine\ORM\NonUniqueResultException
* @throws \Doctrine\ORM\OptimisticLockException
*
* @return LogEventLp|null
*/
public function updateAttemptInLearningPath($status, $userId, $lpItemId, $lpId)
{
$em = Database::getManager();
$logEvent = $this->getLastRequiredAttemptInLearningPath($userId, $lpItemId, $lpId);
if (empty($logEvent)) {
return null;
}
if ($logEvent->getActionStatus() !== $status) {
$logEvent->setActionStatus($status);
$em->persist($logEvent);
$em->flush();
}
return $logEvent;
}
/**
* @param int $userId
* @param int $questionId
* @param int $quizId
*
* @throws \Doctrine\ORM\NonUniqueResultException
*
* @return LogEventQuiz|null
*/
public function getLastRequiredAttemptInQuiz($userId, $questionId, $quizId)
{
$query = Database::getManager()
->createQuery(
'SELECT log FROM ChamiloPluginBundle:WhispeakAuth\LogEventQuiz log
WHERE
log.user = :user AND
log.quiz = :quiz AND
log.question = :question AND
log.actionStatus = :action_status
ORDER BY log.datetime DESC'
)
->setMaxResults(1)
->setParameters(
[
'user' => $userId,
'quiz' => $quizId,
'question' => $questionId,
'action_status' => LogEvent::STATUS_REQUIRED,
]
);
/** @var LogEventQuiz|null $logEvent */
$logEvent = $query->getOneOrNullResult();
return $logEvent;
}
/**
* @param int $userId
* @param int $questionId
* @param int $quizId
@ -846,7 +743,7 @@ class WhispeakAuthPlugin extends Plugin implements HookPluginInterface
*
* @return LogEventQuiz|null
*/
public function addAttemptInQuiz($userId, $questionId, $quizId)
public function addAttemptInQuiz($status, $userId, $questionId, $quizId)
{
$em = Database::getManager();
@ -866,7 +763,7 @@ class WhispeakAuthPlugin extends Plugin implements HookPluginInterface
->setDatetime(
api_get_utc_datetime(null, false, true)
)
->setActionStatus($logEvent::STATUS_REQUIRED);
->setActionStatus($status);
$em->persist($logEvent);
$em->flush();
@ -874,36 +771,6 @@ class WhispeakAuthPlugin extends Plugin implements HookPluginInterface
return $logEvent;
}
/**
* @param int $status
* @param int $userId
* @param int $questionId
* @param int $quizId
*
* @throws \Doctrine\ORM\NonUniqueResultException
* @throws \Doctrine\ORM\OptimisticLockException
*
* @return LogEventQuiz|null
*/
public function updateAttemptInQuiz($status, $userId, $questionId, $quizId)
{
$logEvent = $this->getLastRequiredAttemptInQuiz($userId, $questionId, $quizId);
if (empty($logEvent)) {
return null;
}
if ($logEvent->getActionStatus() !== $status) {
$logEvent->setActionStatus($status);
$em = Database::getManager();
$em->persist($logEvent);
$em->flush();
}
return $logEvent;
}
/**
* @param int $lpId
* @param int $userId

36
plugin/whispeakauth/ajax/authentify_password.php
Unescape View File

@ -51,6 +51,22 @@ $isExpired = empty($user->getExpirationDate()) || $user->getExpirationDate() > a
$userPass = true;
if (!$isValidPassword || !$isActive || !$isExpired) {
if (!empty($lpItemInfo)) {
$plugin->addAttemptInLearningPath(
LogEvent::STATUS_FAILED,
$user->getId(),
$lpItemInfo['lp_item'],
$lpItemInfo['lp']
);
} elseif (!empty($quizQuestionInfo)) {
$plugin->addAttemptInQuiz(
LogEvent::STATUS_FAILED,
$user->getId(),
$quizQuestionInfo['question'],
$quizQuestionInfo['quiz']
);
}
$userPass = false;
$message = $plugin->get_lang('AuthentifyFailed');
@ -76,34 +92,18 @@ if (!$isValidPassword || !$isActive || !$isExpired) {
if (!$maxAttempts ||
($maxAttempts && $failedLogins >= $maxAttempts)
) {
if (!empty($lpItemInfo)) {
$plugin->updateAttemptInLearningPath(
LogEvent::STATUS_FAILED,
$user->getId(),
$lpItemInfo['lp_item'],
$lpItemInfo['lp']
);
} elseif (!empty($quizQuestionInfo)) {
$plugin->updateAttemptInQuiz(
LogEvent::STATUS_FAILED,
$user->getId(),
$quizQuestionInfo['question'],
$quizQuestionInfo['quiz']
);
}
$userPass = true;
}
} elseif ($isValidPassword) {
if (!empty($lpItemInfo)) {
$plugin->updateAttemptInLearningPath(
$plugin->addAttemptInLearningPath(
LogEvent::STATUS_SUCCESS,
$user->getId(),
$lpItemInfo['lp_item'],
$lpItemInfo['lp']
);
} elseif (!empty($quizQuestionInfo)) {
$plugin->updateAttemptInQuiz(
$plugin->addAttemptInQuiz(
LogEvent::STATUS_SUCCESS,
$user->getId(),
$quizQuestionInfo['question'],

22
plugin/whispeakauth/ajax/record_audio.php
Unescape View File

@ -174,6 +174,24 @@ if ($isAuthentify) {
$message = $plugin->get_lang('AuthentifySuccess');
if (!$success) {
if (!empty($lpItemInfo)) {
$plugin->addAttemptInLearningPath(
LogEvent::STATUS_FAILED,
$user->getId(),
$lpItemInfo['lp_item'],
$lpItemInfo['lp']
);
}
if (!empty($quizQuestionInfo)) {
$plugin->addAttemptInQuiz(
LogEvent::STATUS_FAILED,
$user->getId(),
$quizQuestionInfo['question'],
$quizQuestionInfo['quiz']
);
}
$message = $plugin->get_lang('AuthentifyFailed');
ChamiloSession::write(WhispeakAuthPlugin::SESSION_FAILED_LOGINS, ++$failedLogins);
@ -249,7 +267,7 @@ if ($isAuthentify) {
ChamiloSession::erase(WhispeakAuthPlugin::SESSION_LP_ITEM);
ChamiloSession::erase(WhispeakAuthPlugin::SESSION_2FA_USER);
$plugin->updateAttemptInLearningPath(
$plugin->addAttemptInLearningPath(
LogEvent::STATUS_SUCCESS,
$user->getId(),
$lpItemInfo['lp_item'],
@ -267,7 +285,7 @@ if ($isAuthentify) {
ChamiloSession::write(WhispeakAuthPlugin::SESSION_QUIZ_QUESTION, $quizQuestionInfo);
$plugin->updateAttemptInQuiz(
$plugin->addAttemptInQuiz(
LogEvent::STATUS_SUCCESS,
$user->getId(),
$quizQuestionInfo['question'],

14
plugin/whispeakauth/authentify.php
Unescape View File

@ -44,20 +44,6 @@ if (ChamiloSession::read(WhispeakAuthPlugin::SESSION_AUTH_PASSWORD, false)) {
exit;
}
if (!empty($lpItemInfo)) {
$plugin->addAttemptInLearningPath(
$userId,
$lpItemInfo['lp_item'],
$lpItemInfo['lp']
);
} elseif (!empty($lpQuestionInfo)) {
$plugin->addAttemptInQuiz(
$userId,
$lpQuestionInfo['question'],
$lpQuestionInfo['quiz']
);
}
if ($userId) {
$wsid = WhispeakAuthPlugin::getAuthUidValue($userId);

Write Preview
Loading…
Cancel
Save