From c9e3933239e73d57c122ea6be61f7e162d5ba3a2 Mon Sep 17 00:00:00 2001
From: Pavel Vyskocil <vyskocilpavel@muni.cz>
Date: Thu, 2 Nov 2017 14:22:12 +0100
Subject: [PATCH] Fix the table names and a name of variables for tables.
---
config-templates/module_statisticsproxy.php | 4 ++--
config-templates/tables.sql | 6 ++---
lib/Auth/Process/DatabaseCommand.php | 26 ++++++++++-----------
lib/Auth/Process/DatabaseConnector.php | 20 ++++++++--------
4 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/config-templates/module_statisticsproxy.php b/config-templates/module_statisticsproxy.php
index 9e17aa7..9bd77ed 100644
--- a/config-templates/module_statisticsproxy.php
+++ b/config-templates/module_statisticsproxy.php
@@ -16,7 +16,7 @@ $config = array(
'databaseName' => 'STATS',
- 'proxyTableName' => 'statistics_proxy',
+ 'identityProvidersTableName' => 'identityProviders',
- 'servicesProxyName' => 'statistics_services',
+ 'serviceProvidersTableName' => 'serviceProviders',
);
\ No newline at end of file
diff --git a/config-templates/tables.sql b/config-templates/tables.sql
index 9e1a65c..f480001 100644
--- a/config-templates/tables.sql
+++ b/config-templates/tables.sql
@@ -1,5 +1,5 @@
-#Statistics for proxy
-CREATE TABLE statistics_proxy (
+#Statistics for IdPs
+CREATE TABLE identityProviders (
year INT NOT NULL,
month INT NOT NULL,
day INT NOT NULL,
@@ -13,7 +13,7 @@ CREATE TABLE statistics_proxy (
);
#Statistics for services
-CREATE TABLE statistics_services(
+CREATE TABLE serviceProviders(
year INT NOT NULL,
month INT NOT NULL,
day INT NOT NULL,
diff --git a/lib/Auth/Process/DatabaseCommand.php b/lib/Auth/Process/DatabaseCommand.php
index 681908e..e6f5042 100644
--- a/lib/Auth/Process/DatabaseCommand.php
+++ b/lib/Auth/Process/DatabaseCommand.php
@@ -12,18 +12,18 @@ class DatabaseCommand
$databaseConnector = new DatabaseConnector();
$conn = $databaseConnector->getConnection();
assert($conn != NULL);
- $proxyTableName = $databaseConnector->getProxyTableName();
- $servicesTableName = $databaseConnector->getServicesTableName();
+ $identityProvidersTableName = $databaseConnector->getIdentityProvidersTableName();
+ $serviceProvidersTableName = $databaseConnector->getServiceProvidersTableName();
$sourceIdp = $request['saml:sp:IdP'];
$service = $request['Destination']['name']['en'];
- $sql = "INSERT INTO ".$proxyTableName."(year, month, day, sourceIdp, count) VALUES ('".$date->format('Y')."','".$date->format('m') ."','".$date->format('d')."','".$sourceIdp."','1') ON DUPLICATE KEY UPDATE count = count + 1";
+ $sql = "INSERT INTO ".$identityProvidersTableName."(year, month, day, sourceIdp, count) VALUES ('".$date->format('Y')."','".$date->format('m') ."','".$date->format('d')."','".$sourceIdp."','1') ON DUPLICATE KEY UPDATE count = count + 1";
SimpleSAML_Logger::info($sql);
if ($conn->query($sql) === FALSE) {
SimpleSAML_Logger::error("The login log wasn't inserted into the database.");
}
- $sql = "INSERT INTO ".$servicesTableName."(year, month, day, service, count) VALUES ('".$date->format('Y')."','".$date->format('m') ."','".$date->format('d')."','".$service."','1') ON DUPLICATE KEY UPDATE count = count + 1";
+ $sql = "INSERT INTO ".$serviceProvidersTableName."(year, month, day, service, count) VALUES ('".$date->format('Y')."','".$date->format('m') ."','".$date->format('d')."','".$service."','1') ON DUPLICATE KEY UPDATE count = count + 1";
SimpleSAML_Logger::info($sql);
if ($conn->query($sql) === FALSE) {
SimpleSAML_Logger::error("The login log wasn't inserted into the database.");
@@ -37,7 +37,7 @@ class DatabaseCommand
$databaseConnector = new DatabaseConnector();
$conn = $databaseConnector->getConnection();
assert($conn != NULL);
- $table_name = $databaseConnector->getProxyTableName();
+ $table_name = $databaseConnector->getIdentityProvidersTableName();
$sql = "SELECT year, month, day, SUM(count) AS count FROM ".$table_name." GROUP BY year,month,day";
$result = $conn->query($sql);
while($row = $result->fetch_assoc()) {
@@ -52,7 +52,7 @@ class DatabaseCommand
$databaseConnector = new DatabaseConnector();
$conn = $databaseConnector->getConnection();
assert($conn != NULL);
- $table_name = $databaseConnector->getProxyTableName();
+ $table_name = $databaseConnector->getIdentityProvidersTableName();
$sql = "SELECT year, month, sourceIdp, SUM(count) AS count FROM ".$table_name. " GROUP BY year, month, sourceIdp HAVING sourceIdp != ''";
$result = $conn->query($sql);
while($row = $result->fetch_assoc()) {
@@ -66,7 +66,7 @@ class DatabaseCommand
$databaseConnector = new DatabaseConnector();
$conn = $databaseConnector->getConnection();
assert($conn != NULL);
- $table_name = $databaseConnector->getServicesTableName();
+ $table_name = $databaseConnector->getServiceProvidersTableName();
$sql = "SELECT year, month, service, SUM(count) AS count FROM ".$table_name." GROUP BY year, month, service HAVING service != ''";
$result = $conn->query($sql);
while($row = $result->fetch_assoc()) {
@@ -79,7 +79,7 @@ class DatabaseCommand
$databaseConnector = new DatabaseConnector();
$conn = $databaseConnector->getConnection();
assert($conn != NULL);
- $table_name = $databaseConnector->getProxyTableName();
+ $table_name = $databaseConnector->getIdentityProvidersTableName();
$sql = "SELECT SUM(count) AS count FROM " . $table_name;
$result = $conn->query($sql);
while ($row = $result->fetch_assoc()) {
@@ -100,7 +100,7 @@ class DatabaseCommand
$databaseConnector = new DatabaseConnector();
$conn = $databaseConnector->getConnection();
assert($conn != NULL);
- $table_name = $databaseConnector->getProxyTableName();
+ $table_name = $databaseConnector->getIdentityProvidersTableName();
$sql = "SELECT SUM(count) AS count FROM " . $table_name." WHERE year = ".$dateTime->format('Y')." AND month=".$dateTime->format('m')." AND day = ".$dateTime->format('d');
$result = $conn->query($sql);
while ($row = $result->fetch_assoc()) {
@@ -120,7 +120,7 @@ class DatabaseCommand
$databaseConnector = new DatabaseConnector();
$conn = $databaseConnector->getConnection();
assert($conn != NULL);
- $table_name = $databaseConnector->getServicesTableName();
+ $table_name = $databaseConnector->getServiceProvidersTableName();
$sql = "SELECT service, SUM(count) AS count FROM ".$table_name." GROUP BY service HAVING service != ''";
$result = $conn->query($sql);
while($row = $result->fetch_assoc()) {
@@ -134,7 +134,7 @@ class DatabaseCommand
$databaseConnector = new DatabaseConnector();
$conn = $databaseConnector->getConnection();
assert($conn != NULL);
- $table_name = $databaseConnector->getProxyTableName();
+ $table_name = $databaseConnector->getIdentityProvidersTableName();
$sql = "SELECT sourceIdp, SUM(count) AS count FROM ".$table_name." GROUP BY sourceIdp HAVING sourceIdp != ''";
$result = $conn->query($sql);
while($row = $result->fetch_assoc()) {
@@ -148,7 +148,7 @@ class DatabaseCommand
$databaseConnector = new DatabaseConnector();
$conn = $databaseConnector->getConnection();
assert($conn != NULL);
- $table_name = $databaseConnector->getProxyTableName();
+ $table_name = $databaseConnector->getIdentityProvidersTableName();
$sql = "SELECT COUNT(*) AS count FROM (SELECT DISTINCT sourceIdp FROM ".$table_name." ) AS idps WHERE sourceIdp != ''";
$result = $conn->query($sql);
while($row = $result->fetch_assoc()) {
@@ -167,7 +167,7 @@ class DatabaseCommand
$databaseConnector = new DatabaseConnector();
$conn = $databaseConnector->getConnection();
assert($conn != NULL);
- $table_name = $databaseConnector->getServicesTableName();
+ $table_name = $databaseConnector->getServiceProvidersTableName();
$sql = "SELECT COUNT(*) AS count FROM (SELECT DISTINCT service FROM ".$table_name." ) AS services WHERE service != ''";
$result = $conn->query($sql);
while($row = $result->fetch_assoc()) {
diff --git a/lib/Auth/Process/DatabaseConnector.php b/lib/Auth/Process/DatabaseConnector.php
index 67e2d36..62ce4f0 100644
--- a/lib/Auth/Process/DatabaseConnector.php
+++ b/lib/Auth/Process/DatabaseConnector.php
@@ -9,16 +9,16 @@ class databaseConnector
private $username;
private $password;
private $databaseName;
- private $proxyTableName;
- private $servicesTableName;
+ private $identityProvidersTableName;
+ private $serviceProvidersTableName;
const CONFIG_FILE_NAME = 'module_statisticsproxy.php';
const SERVER = 'serverName';
const USER = 'userName';
const PASSWORD = 'password';
const DATABASE = 'databaseName';
- const PROXY_TABLE_NAME = 'proxyTableName';
- const SERVICES_TABLE_NAME = 'servicesProxyName' ;
+ const IDP_TABLE_NAME = 'identityProvidersTableName';
+ const SP_TABLE_NAME = 'serviceProvidersTableName' ;
@@ -29,8 +29,8 @@ class databaseConnector
$this->username = $conf->getString(self::USER);
$this->password = $conf->getString(self::PASSWORD);
$this->databaseName = $conf->getString(self::DATABASE);
- $this->proxyTableName = $conf->getString(self::PROXY_TABLE_NAME);
- $this->servicesTableName = $conf->getString(self::SERVICES_TABLE_NAME);
+ $this->identityProvidersTableName = $conf->getString(self::IDP_TABLE_NAME);
+ $this->serviceProvidersTableName = $conf->getString(self::SP_TABLE_NAME);
}
public function getConnection()
@@ -40,15 +40,15 @@ class databaseConnector
return $conn;
}
- public function getProxyTableName()
+ public function getIdentityProvidersTableName()
{
- return $this->proxyTableName;
+ return $this->identityProvidersTableName;
}
- public function getServicesTableName()
+ public function getServiceProvidersTableName()
{
- return $this->servicesTableName;
+ return $this->serviceProvidersTableName;
}
--
GitLab