feat: Added configurable ipdIdColumnName and spIdColumnName in statistics

Author: BaranekD

perun-oidc-server-webapp/src/main/webapp/WEB-INF/user-context.xml

@@ -178,6 +178,8 @@
 				<prop key="filter.stats.statisticsTableName">statistics_per_user</prop>
 				<prop key="filter.stats.identityProvidersMapTableName">statistics_idp</prop>
 				<prop key="filter.stats.serviceProvidersMapTableName">statistics_sp</prop>
+				<prop key="filter.stats.idpIdColumnName">idpId</prop>
+				<prop key="filter.stats.spIdColumnName">spId</prop>
 			</props>
 		</property>
 	</bean>

perun-oidc-server/src/main/java/cz/muni/ics/oidc/server/filters/impl/ProxyStatisticsFilter.java

@@ -38,6 +38,8 @@
  *         to idp name (depends on DataSource bean mitreIdStats)
  *     <li><b>filter.[name].serviceProvidersMapTableName</b> - Name of the table with mapping of client_id (SP)
  *         to client name (depends on DataSource bean mitreIdStats)</li>
+ *     <li><b>filter.[name].ipdIdColumnName</b> - Name for the column which stores IDs of IdPs in statisticsTable</li>
+ *     <li><b>filter.[name].spIdColumnName</b> - Name for the column which stores IDs of SPs in statisticsTable</li>
  * </ul>
  *
  * @author Dominik Baránek <[email protected]>
@@ -52,12 +54,16 @@ public class ProxyStatisticsFilter extends PerunRequestFilter {
 	private static final String STATISTICS_TABLE_NAME = "statisticsTableName";
 	private static final String IDENTITY_PROVIDERS_MAP_TABLE_NAME = "identityProvidersMapTableName";
 	private static final String SERVICE_PROVIDERS_MAP_TABLE_NAME = "serviceProvidersMapTableName";
+	private static final String IDP_ID_COLUMN_NAME = "idpIdColumnName";
+	private static final String SP_ID_COLUMN_NAME = "spIdColumnName";
 
 	private final String idpNameAttributeName;
 	private final String idpEntityIdAttributeName;
 	private final String statisticsTableName;
 	private final String identityProvidersMapTableName;
 	private final String serviceProvidersMapTableName;
+	private final String idpIdColumnName;
+	private final String spIdColumnName;
 	/* END OF CONFIGURATION OPTIONS */
 
 	private final DataSource mitreIdStats;
@@ -73,6 +79,8 @@ public ProxyStatisticsFilter(PerunRequestFilterParams params) {
 		this.statisticsTableName = params.getProperty(STATISTICS_TABLE_NAME);
 		this.identityProvidersMapTableName = params.getProperty(IDENTITY_PROVIDERS_MAP_TABLE_NAME);
 		this.serviceProvidersMapTableName = params.getProperty(SERVICE_PROVIDERS_MAP_TABLE_NAME);
+		this.idpIdColumnName = params.getProperty(IDP_ID_COLUMN_NAME);
+		this.spIdColumnName = params.getProperty(SP_ID_COLUMN_NAME);
 		this.filterName = params.getFilterName();
 	}
 
@@ -120,8 +128,12 @@ private void insertOrUpdateLogin(String idpEntityId, String idpName, String spId
 			c = mitreIdStats.getConnection();
 			insertOrUpdateIdpMap(c, idpEntityId, idpName);
 			insertOrUpdateSpMap(c, spIdentifier, spName);
+
 			idpId = extractIdpId(c, idpEntityId);
+			log.trace("{} - extracted idpId: {}", filterName, idpId);
+
 			spId = extractSpId(c, spIdentifier);
+			log.trace("{} - extracted spId: {}", filterName, spId);
 		} catch (SQLException ex) {
 			log.warn("{} - caught SQLException", filterName);
 			log.debug("{} - details:", filterName, ex);
@@ -132,17 +144,18 @@ private void insertOrUpdateLogin(String idpEntityId, String idpName, String spId
 
 		try {
 			insertLogin(date, c, idpId, spId, userId);
+			log.trace("{} - login entry inserted ({}, {}, {}, {}, {})", filterName, idpEntityId, idpName,
+					spIdentifier, spName, userId);
 		} catch (SQLException ex) {
 			try {
 				updateLogin(date, c, idpId, spId, userId);
+				log.trace("{} - login entry updated ({}, {}, {}, {}, {})", filterName, idpEntityId, idpName,
+						spIdentifier, spName, userId);
 			} catch (SQLException e) {
 				log.warn("{} - caught SQLException", filterName);
 				log.debug("{} - details:", filterName, e);
 			}
 		}
-
-		log.trace("{} - login entry stored ({}, {}, {}, {}, {})", filterName, idpEntityId, idpName,
-			spIdentifier, spName, userId);
 	}
 
 	private int extractSpId(Connection c, String spIdentifier) throws SQLException {
@@ -170,21 +183,21 @@ private int extractIdpId(Connection c, String idpEntityId) throws SQLException {
 	private void insertOrUpdateIdpMap(Connection c, String idpEntityId, String idpName) throws SQLException {
 		try {
 			insertIdpMap(c, idpEntityId, idpName);
+			log.trace("{} - IdP map entry inserted", filterName);
 		} catch (SQLException ex) {
 			updateIdpMap(c, idpEntityId, idpName);
+			log.trace("{} - IdP map entry updated", filterName);
 		}
-
-		log.trace("{} - IdP map entry inserted", filterName);
 	}
 
 	private void insertOrUpdateSpMap(Connection c, String spIdentifier, String idpName) throws SQLException {
 		try {
 			insertSpMap(c, spIdentifier, idpName);
+			log.trace("{} - SP map entry inserted", filterName);
 		} catch (SQLException ex) {
 			updateSpMap(c, spIdentifier, idpName);
+			log.trace("{} - SP map entry updated", filterName);
 		}
-
-		log.trace("{} - SP map entry inserted", filterName);
 	}
 
 	private String changeParamEncoding(String original) {
@@ -197,13 +210,13 @@ private String changeParamEncoding(String original) {
 	}
 
 	private void logUserLogin(String idpEntityId, String spIdentifier, String spName, String userId) {
-		log.info("User identity: {}, service: {}, serviceName: {}, via IdP: {}", userId, spIdentifier,
+		log.info("{} - User identity: {}, service: {}, serviceName: {}, via IdP: {}", filterName, userId, spIdentifier,
 				spName, idpEntityId);
 	}
 
 	private void insertLogin(LocalDate date, Connection c, int idpId, int spId, String userId) throws SQLException {
 		String insertLoginQuery = "INSERT INTO " + statisticsTableName +
-			"(day, idpId, spId, user, logins)" +
+			"(day, " + idpIdColumnName + ", " + spIdColumnName + ", user, logins)" +
 			" VALUES(?, ?, ?, ?, '1')";
 
 		PreparedStatement preparedStatement = c.prepareStatement(insertLoginQuery);
@@ -216,7 +229,7 @@ private void insertLogin(LocalDate date, Connection c, int idpId, int spId, Stri
 
 	private void updateLogin(LocalDate date, Connection c, int idpId, int spId, String userId) throws SQLException {
 		String updateLoginQuery = "UPDATE " + statisticsTableName + " SET logins = logins + 1" +
-			" WHERE day = ? AND idpId = ? AND spId = ? AND user = ?";
+			" WHERE day = ? AND " + idpIdColumnName + " = ? AND " + spIdColumnName + " = ? AND user = ?";
 
 		PreparedStatement preparedStatement = c.prepareStatement(updateLoginQuery);
 		preparedStatement.setDate(1, Date.valueOf(date));
@@ -227,7 +240,7 @@ private void updateLogin(LocalDate date, Connection c, int idpId, int spId, Stri
 	}
 
 	private void insertIdpMap(Connection c, String idpEntityId, String idpName) throws SQLException {
-		String insertIdpMapQuery = "INSERT INTO " + identityProvidersMapTableName + "(identifier, name)" +
+		String insertIdpMapQuery = "INSERT INTO " + identityProvidersMapTableName + " (identifier, name)" +
 			" VALUES (?, ?)";
 
 		PreparedStatement preparedStatement = c.prepareStatement(insertIdpMapQuery);
@@ -237,7 +250,7 @@ private void insertIdpMap(Connection c, String idpEntityId, String idpName) thro
 	}
 
 	private void updateIdpMap(Connection c, String idpEntityId, String idpName) throws SQLException {
-		String updateIdpMapQuery = "UPDATE " + identityProvidersMapTableName + "SET name = ? WHERE identifier = ?";
+		String updateIdpMapQuery = "UPDATE " + identityProvidersMapTableName + " SET name = ? WHERE identifier = ?";
 
 		PreparedStatement preparedStatement = c.prepareStatement(updateIdpMapQuery);
 		preparedStatement.setString(1, idpName);
@@ -246,7 +259,7 @@ private void updateIdpMap(Connection c, String idpEntityId, String idpName) thro
 	}
 
 	private void insertSpMap(Connection c, String spIdentifier, String spName) throws SQLException {
-		String insertSpMapQuery = "INSERT INTO " + serviceProvidersMapTableName + "(identifier, name)" +
+		String insertSpMapQuery = "INSERT INTO " + serviceProvidersMapTableName + " (identifier, name)" +
 			" VALUES (?, ?)";
 
 		try (PreparedStatement preparedStatement = c.prepareStatement(insertSpMapQuery)) {
@@ -257,7 +270,7 @@ private void insertSpMap(Connection c, String spIdentifier, String spName) throw
 	}
 
 	private void updateSpMap(Connection c, String spIdentifier, String idpName) throws SQLException {
-		String updateSpMapQuery = "UPDATE " + serviceProvidersMapTableName + "SET name = ? WHERE identifier = ?";
+		String updateSpMapQuery = "UPDATE " + serviceProvidersMapTableName + " SET name = ? WHERE identifier = ?";
 
 		PreparedStatement preparedStatement = c.prepareStatement(updateSpMapQuery);
 		preparedStatement.setString(1, idpName);