Skip to content
Snippets Groups Projects

fix: auth_event_filter code fixes

Merged Marek Hlávka requested to merge marekhlavka/PRX-393/fix_auth_event_fiter into main
3 files
+ 96
71
Compare changes
  • Side-by-side
  • Inline
Files
3
@@ -12,6 +12,7 @@ use SimpleSAML\Logger;
@@ -12,6 +12,7 @@ use SimpleSAML\Logger;
use SimpleSAML\Error\Exception;
use SimpleSAML\Error\Exception;
use SimpleSAML\Module\perun\EntitlementUtils;
use SimpleSAML\Module\perun\EntitlementUtils;
use SimpleSAML\Module\perun\databaseCommand\DatabaseCommand;
use SimpleSAML\Module\perun\databaseCommand\DatabaseCommand;
 
use SimpleSAML\Module\perun\databaseCommand\AuthEventDatabaseCommand;
use GeoIp2\Database\Reader;
use GeoIp2\Database\Reader;
class AuthEventLogging extends ProcessingFilter
class AuthEventLogging extends ProcessingFilter
@@ -107,11 +108,13 @@ class AuthEventLogging extends ProcessingFilter
@@ -107,11 +108,13 @@ class AuthEventLogging extends ProcessingFilter
public function process(&$request)
public function process(&$request)
{
{
// Create cnnection via DatabaseConfig
// Create cnnection via DatabaseConfig
$dbCmd = new DatabaseCommand();
$dbCmd = new AuthEventDatabaseCommand();
// Retrieve all needed variables
// Retrieve all needed variables
$dateTime = new DateTime();
$dateTimeObject = new DateTime();
 
$dateTime = $dateTimeObject->format('Y-m-d H:i:s');
$userId = $this->getUserId($request);
$userId = $this->getUserId($request);
 
$clientIpAddr = $_SERVER['REMOTE_ADDR'];
$clientIpAddr = $_SERVER['REMOTE_ADDR'];
$userAgentRaw = $_SERVER['HTTP_USER_AGENT'];
$userAgentRaw = $_SERVER['HTTP_USER_AGENT'];
@@ -129,18 +132,17 @@ class AuthEventLogging extends ProcessingFilter
@@ -129,18 +132,17 @@ class AuthEventLogging extends ProcessingFilter
list($idpIdentifier, $idpName, $spIdentifier, $spName) = $this->getEntities($request);
list($idpIdentifier, $idpName, $spIdentifier, $spName) = $this->getEntities($request);
// Inserting into side tables
// Inserting into side tables
$idpTableId = $dbCmd->getIdFromIdentifier($dbCmd, self::TABLE_LOGGING_IDP, $idpIdentifier, $idpName);
$idpTableId = $dbCmd->getIdFromIdentifier(self::TABLE_LOGGING_IDP, $idpIdentifier, $idpName);
$spTableId = $dbCmd->getIdFromIdentifier($dbCmd, self::TABLE_LOGGING_SP, $spIdentifier, $spName);
$spTableId = $dbCmd->getIdFromIdentifier(self::TABLE_LOGGING_SP, $spIdentifier, $spName);
$sessionTableId = $dbCmd->getIdFromForeignTable($dbCmd, self::TABLE_SESSION_ID, $sessionId);
$sessionTableId = $dbCmd->getIdFromForeignTable(self::TABLE_SESSION_ID, $sessionId);
$requestedACRsTableId = $dbCmd->getIdFromForeignTable(
$requestedACRsTableId = $dbCmd->getIdFromForeignTable(
$dbCmd,
self::TABLE_REQUESTED_ACRS,
self::TABLE_REQUESTED_ACRS,
json_encode($requestedACRs)
json_encode($requestedACRs)
);
);
$upstreamACRsTableId = $dbCmd->getIdFromForeignTable($dbCmd, self::TABLE_UPSTREAM_ACRS, $upstreamACRs);
$upstreamACRsTableId = $dbCmd->getIdFromForeignTable(self::TABLE_UPSTREAM_ACRS, $upstreamACRs);
$userAgentRawTableId = $dbCmd->getIdFromForeignTable($dbCmd, self::TABLE_USER_AGENT_RAW, $userAgentRaw);
$userAgentRawTableId = $dbCmd->getIdFromForeignTable(self::TABLE_USER_AGENT_RAW, $userAgentRaw);
$userAgentTableId = $dbCmd->getIdFromForeignTable($dbCmd, self::TABLE_USER_AGENT, $userAgent);
$userAgentTableId = $dbCmd->getIdFromForeignTable(self::TABLE_USER_AGENT, $userAgent);
$dbCmd->insertIntoAuthTable(self::TABLE_AUTH_EVENT, [
$dbCmd->insertIntoAuthTable(self::TABLE_AUTH_EVENT, [
'day' => $dateTime,
'day' => $dateTime,
Loading