github
/
OpenID-Connect-Java-Spring-Server
mirror of https://github.com/mitreid-connect/OpenID-Connect-Java-Spring-Server
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #105 from dBucik/fix_stats 

Fix stats
pull/1580/head
Dominik František Bučík 2021-12-08 07:59:39 +01:00 committed by GitHub
parent c252db224c b5e6207919
commit 4fccabc3e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 80 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,9 +1,11 @@
package cz.muni.ics.oidc.server.filters.impl; package cz.muni.ics.oidc.server.filters.impl;
import static cz.muni.ics.oidc.server.filters.PerunFilterConstants.SAML_EPUID; import static java.nio.charset.StandardCharsets.ISO_8859_1;
import static java.nio.charset.StandardCharsets.UTF_8;
import cz.muni.ics.oauth2.model.ClientDetailsEntity; import cz.muni.ics.oauth2.model.ClientDetailsEntity;
import cz.muni.ics.oidc.BeanUtil; import cz.muni.ics.oidc.BeanUtil;
import cz.muni.ics.oidc.saml.SamlProperties;
import cz.muni.ics.oidc.server.filters.FilterParams; import cz.muni.ics.oidc.server.filters.FilterParams;
import cz.muni.ics.oidc.server.filters.FiltersUtils; import cz.muni.ics.oidc.server.filters.FiltersUtils;
import cz.muni.ics.oidc.server.filters.PerunRequestFilter; import cz.muni.ics.oidc.server.filters.PerunRequestFilter;
@ -68,11 +70,13 @@ public class ProxyStatisticsFilter extends PerunRequestFilter {
private final DataSource mitreIdStats; private final DataSource mitreIdStats;
private final String filterName; private final String filterName;
private final SamlProperties samlProperties;
public ProxyStatisticsFilter(PerunRequestFilterParams params) { public ProxyStatisticsFilter(PerunRequestFilterParams params) {
super(params); super(params);
BeanUtil beanUtil = params.getBeanUtil(); BeanUtil beanUtil = params.getBeanUtil();
this.mitreIdStats = beanUtil.getBean("mitreIdStats", DataSource.class); this.mitreIdStats = beanUtil.getBean("mitreIdStats", DataSource.class);
this.samlProperties = beanUtil.getBean(SamlProperties.class);
this.idpNameAttributeName = params.getProperty(IDP_NAME_ATTRIBUTE_NAME); this.idpNameAttributeName = params.getProperty(IDP_NAME_ATTRIBUTE_NAME);
this.idpEntityIdAttributeName = params.getProperty(IDP_ENTITY_ID_ATTRIBUTE_NAME); this.idpEntityIdAttributeName = params.getProperty(IDP_ENTITY_ID_ATTRIBUTE_NAME);
@ -90,31 +94,41 @@ public class ProxyStatisticsFilter extends PerunRequestFilter {
ClientDetailsEntity client = params.getClient(); ClientDetailsEntity client = params.getClient();
if (client == null) { if (client == null) {
log.debug("{} - skip execution: no client provided", filterName); log.warn("{} - skip execution: no client provided", filterName);
return true;
} else if (!StringUtils.hasText(client.getClientId())) {
log.warn("{} - skip execution: no client identifier provided", filterName);
return true;
} else if (!StringUtils.hasText(client.getClientName())) {
log.warn("{} - skip execution: no client name provided", filterName);
return true; return true;
} }
String clientIdentifier = client.getClientId();
String clientName = client.getClientName();
SAMLCredential samlCredential = FiltersUtils.getSamlCredential(request); SAMLCredential samlCredential = FiltersUtils.getSamlCredential(request);
if (samlCredential == null) {
String idpEntityId = samlCredential.getAttributeAsString(idpEntityIdAttributeName); log.warn("{} - skip execution: no authN object available, cannot extract user identifier and idp identifier",
idpEntityId = this.changeParamEncoding(idpEntityId); filterName);
String idpName = samlCredential.getAttributeAsString(idpNameAttributeName); return true;
idpName = this.changeParamEncoding(idpName); }
if (!StringUtils.hasText(idpEntityId) || !StringUtils.hasText(idpName)) { String userIdentifier = FiltersUtils.getExtLogin(samlCredential, samlProperties.getUserIdentifierAttribute());
log.debug("{} - skip execution: no source IDP provided", filterName); if (!StringUtils.hasText(userIdentifier)) {
log.warn("{} - skip execution: no user identifier provided", filterName);
return true;
} else if (!StringUtils.hasText(samlCredential.getAttributeAsString(idpEntityIdAttributeName))) {
log.warn("{} - skip execution: no authenticating idp identifier provided", filterName);
return true;
} else if (!StringUtils.hasText(samlCredential.getAttributeAsString(idpNameAttributeName))) {
log.warn("{} - skip execution: no authenticating idp identifier provided", filterName);
return true; return true;
} }
String userId = samlCredential.getAttributeAsString(SAML_EPUID); String idpEntityId = changeParamEncoding(samlCredential.getAttributeAsString(idpEntityIdAttributeName));
if (!StringUtils.hasText(userId)) { String idpName = changeParamEncoding(samlCredential.getAttributeAsString(idpNameAttributeName));
log.debug("{} - skip execution: no user ID available", filterName); String clientId = client.getClientId();
return true; String clientName = client.getClientName();
}
this.insertOrUpdateLogin(idpEntityId, idpName, clientIdentifier, clientName, userId); insertOrUpdateLogin(idpEntityId, idpName, clientId, clientName, userIdentifier);
this.logUserLogin(idpEntityId, clientIdentifier, clientName, userId); logUserLogin(idpEntityId, clientId, clientName, userIdentifier);
return true; return true;
} }
@ -130,10 +144,8 @@ public class ProxyStatisticsFilter extends PerunRequestFilter {
insertOrUpdateSpMap(c, spIdentifier, spName); insertOrUpdateSpMap(c, spIdentifier, spName);
idpId = extractIdpId(c, idpEntityId); idpId = extractIdpId(c, idpEntityId);
log.trace("{} - extracted idpId: {}", filterName, idpId);
spId = extractSpId(c, spIdentifier); spId = extractSpId(c, spIdentifier);
log.trace("{} - extracted spId: {}", filterName, spId); log.trace("{} - Extracted IDs for SP and IdP: spId={}, idpId ={}", filterName, spId, idpId);
} catch (SQLException ex) { } catch (SQLException ex) {
log.warn("{} - caught SQLException", filterName); log.warn("{} - caught SQLException", filterName);
log.debug("{} - details:", filterName, ex); log.debug("{} - details:", filterName, ex);
@ -159,24 +171,32 @@ public class ProxyStatisticsFilter extends PerunRequestFilter {
} }
private int extractSpId(Connection c, String spIdentifier) throws SQLException { private int extractSpId(Connection c, String spIdentifier) throws SQLException {
String getSpIdQuery = "SELECT * FROM " + serviceProvidersMapTableName + " WHERE identifier= ?"; String query = "SELECT " + spIdColumnName + " FROM " + serviceProvidersMapTableName +
" WHERE identifier = ? LIMIT 1";
try (PreparedStatement preparedStatement = c.prepareStatement(getSpIdQuery)) { try (PreparedStatement preparedStatement = c.prepareStatement(query)) {
preparedStatement.setString(1, spIdentifier); preparedStatement.setString(1, spIdentifier);
ResultSet rs = preparedStatement.executeQuery(); ResultSet rs = preparedStatement.executeQuery();
rs.first(); if (rs.next()) {
return rs.getInt("spId"); return rs.getInt(spIdColumnName);
} else {
throw new SQLException("No result found");
}
} }
} }
private int extractIdpId(Connection c, String idpEntityId) throws SQLException { private int extractIdpId(Connection c, String idpEntityId) throws SQLException {
String getIdPIdQuery = "SELECT * FROM " + identityProvidersMapTableName + " WHERE identifier = ?"; String query = "SELECT " + idpIdColumnName + " FROM " + identityProvidersMapTableName +
" WHERE identifier = ? LIMIT 1";
try (PreparedStatement preparedStatement = c.prepareStatement(getIdPIdQuery)) { try (PreparedStatement preparedStatement = c.prepareStatement(query)) {
preparedStatement.setString(1, idpEntityId); preparedStatement.setString(1, idpEntityId);
ResultSet rs = preparedStatement.executeQuery(); ResultSet rs = preparedStatement.executeQuery();
rs.first(); if (rs.next()) {
return rs.getInt("idpId"); return rs.getInt(idpIdColumnName);
} else {
throw new SQLException("No result found");
}
} }
} }
@ -202,8 +222,8 @@ public class ProxyStatisticsFilter extends PerunRequestFilter {
private String changeParamEncoding(String original) { private String changeParamEncoding(String original) {
if (original != null && !original.isEmpty()) { if (original != null && !original.isEmpty()) {
byte[] sourceBytes = original.getBytes(java.nio.charset.StandardCharsets.ISO_8859_1); byte[] sourceBytes = original.getBytes(ISO_8859_1);
return new String(sourceBytes, java.nio.charset.StandardCharsets.UTF_8); return new String(sourceBytes, UTF_8);
} }
return null; return null;
@ -219,44 +239,48 @@ public class ProxyStatisticsFilter extends PerunRequestFilter {
"(day, " + idpIdColumnName + ", " + spIdColumnName + ", user, logins)" + "(day, " + idpIdColumnName + ", " + spIdColumnName + ", user, logins)" +
" VALUES(?, ?, ?, ?, '1')"; " VALUES(?, ?, ?, ?, '1')";
PreparedStatement preparedStatement = c.prepareStatement(insertLoginQuery); try (PreparedStatement preparedStatement = c.prepareStatement(insertLoginQuery)) {
preparedStatement.setDate(1, Date.valueOf(date)); preparedStatement.setDate(1, Date.valueOf(date));
preparedStatement.setInt(2, idpId); preparedStatement.setInt(2, idpId);
preparedStatement.setInt(3, spId); preparedStatement.setInt(3, spId);
preparedStatement.setString(4, userId); preparedStatement.setString(4, userId);
preparedStatement.execute(); preparedStatement.execute();
} }
}
private void updateLogin(LocalDate date, Connection c, int idpId, int spId, String userId) throws SQLException { private void updateLogin(LocalDate date, Connection c, int idpId, int spId, String userId) throws SQLException {
String updateLoginQuery = "UPDATE " + statisticsTableName + " SET logins = logins + 1" + String updateLoginQuery = "UPDATE " + statisticsTableName + " SET logins = logins + 1" +
" WHERE day = ? AND " + idpIdColumnName + " = ? AND " + spIdColumnName + " = ? AND user = ?"; " WHERE day = ? AND " + idpIdColumnName + " = ? AND " + spIdColumnName + " = ? AND user = ?";
PreparedStatement preparedStatement = c.prepareStatement(updateLoginQuery); try (PreparedStatement preparedStatement = c.prepareStatement(updateLoginQuery)){
preparedStatement.setDate(1, Date.valueOf(date)); preparedStatement.setDate(1, Date.valueOf(date));
preparedStatement.setInt(2, idpId); preparedStatement.setInt(2, idpId);
preparedStatement.setInt(3, spId); preparedStatement.setInt(3, spId);
preparedStatement.setString(4, userId); preparedStatement.setString(4, userId);
preparedStatement.execute(); preparedStatement.execute();
} }
}
private void insertIdpMap(Connection c, String idpEntityId, String idpName) throws SQLException { 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 (?, ?)"; " VALUES (?, ?)";
PreparedStatement preparedStatement = c.prepareStatement(insertIdpMapQuery); try (PreparedStatement preparedStatement = c.prepareStatement(insertIdpMapQuery)) {
preparedStatement.setString(1, idpEntityId); preparedStatement.setString(1, idpEntityId);
preparedStatement.setString(2, idpName); preparedStatement.setString(2, idpName);
preparedStatement.execute(); preparedStatement.execute();
} }
}
private void updateIdpMap(Connection c, String idpEntityId, String idpName) throws SQLException { 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); try (PreparedStatement preparedStatement = c.prepareStatement(updateIdpMapQuery)) {
preparedStatement.setString(1, idpName); preparedStatement.setString(1, idpName);
preparedStatement.setString(2, idpEntityId); preparedStatement.setString(2, idpEntityId);
preparedStatement.execute(); preparedStatement.execute();
} }
}
private void insertSpMap(Connection c, String spIdentifier, String spName) throws SQLException { 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)" +
@ -272,10 +296,11 @@ public class ProxyStatisticsFilter extends PerunRequestFilter {
private void updateSpMap(Connection c, String spIdentifier, String idpName) throws SQLException { 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); try (PreparedStatement preparedStatement = c.prepareStatement(updateSpMapQuery)) {
preparedStatement.setString(1, idpName); preparedStatement.setString(1, idpName);
preparedStatement.setString(2, spIdentifier); preparedStatement.setString(2, spIdentifier);
preparedStatement.execute(); preparedStatement.execute();
} }
}
} }