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

fix: 🐛 Fix inserting and reading properties in the stats filter

pull/1580/head
Dominik Frantisek Bucik 2021-12-09 16:25:41 +01:00
parent 231638c1aa
commit 31710bf5f5
No known key found for this signature in database
GPG Key ID: 25014C8DB2E7E62D
2 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
perun-oidc-server/src/main/java/cz/muni/ics/oidc/server/filters/PerunRequestFilterParams.java
View File

@ -31,6 +31,13 @@ public class PerunRequestFilterParams {
return this.properties.getProperty(propertyPrefix + '.' + name); return this.properties.getProperty(propertyPrefix + '.' + name);
} }
public String getProperty(String name, String defaultValue) {
if (this.properties.containsKey(propertyPrefix + '.' + name)) {
return this.properties.getProperty(propertyPrefix + '.' + name);
}
return defaultValue;
}
public BeanUtil getBeanUtil() { public BeanUtil getBeanUtil() {
return beanUtil; return beanUtil;
} }

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

@ -83,17 +83,16 @@ public class ProxyStatisticsFilter extends PerunRequestFilter {
this.mitreIdStats = beanUtil.getBean("mitreIdStats", DataSource.class); this.mitreIdStats = beanUtil.getBean("mitreIdStats", DataSource.class);
this.samlProperties = beanUtil.getBean(SamlProperties.class); this.samlProperties = beanUtil.getBean(SamlProperties.class);
Properties props = params.getProperties(); this.idpNameAttributeName = params.getProperty(IDP_NAME_ATTRIBUTE_NAME,
this.idpNameAttributeName = props.getProperty(IDP_NAME_ATTRIBUTE_NAME,
"urn:cesnet:proxyidp:attribute:sourceIdPName"); "urn:cesnet:proxyidp:attribute:sourceIdPName");
this.idpEntityIdAttributeName = props.getProperty(IDP_ENTITY_ID_ATTRIBUTE_NAME, this.idpEntityIdAttributeName = params.getProperty(IDP_ENTITY_ID_ATTRIBUTE_NAME,
"urn:cesnet:proxyidp:attribute:sourceIdPEntityID"); "urn:cesnet:proxyidp:attribute:sourceIdPEntityID");
this.statisticsTableName = props.getProperty(STATISTICS_TABLE_NAME, "statistics_per_user"); this.statisticsTableName = params.getProperty(STATISTICS_TABLE_NAME, "statistics_per_user");
this.identityProvidersMapTableName = props.getProperty(IDENTITY_PROVIDERS_MAP_TABLE_NAME, "statistics_idp"); this.identityProvidersMapTableName = params.getProperty(IDENTITY_PROVIDERS_MAP_TABLE_NAME, "statistics_idp");
this.serviceProvidersMapTableName = props.getProperty(SERVICE_PROVIDERS_MAP_TABLE_NAME, "statistics_sp"); this.serviceProvidersMapTableName = params.getProperty(SERVICE_PROVIDERS_MAP_TABLE_NAME, "statistics_sp");
this.idpIdColumnName = props.getProperty(IDP_ID_COLUMN_NAME, "idpId"); this.idpIdColumnName = params.getProperty(IDP_ID_COLUMN_NAME, "idpId");
this.spIdColumnName = props.getProperty(SP_ID_COLUMN_NAME, "spId"); this.spIdColumnName = params.getProperty(SP_ID_COLUMN_NAME, "spId");
this.usernameColumnName = props.getProperty(USERNAME_COLUMN_NAME, "user"); this.usernameColumnName = params.getProperty(USERNAME_COLUMN_NAME, "user");
this.filterName = params.getFilterName(); this.filterName = params.getFilterName();
} }
@ -156,7 +155,8 @@ public class ProxyStatisticsFilter extends PerunRequestFilter {
if (spId == null) { if (spId == null) {
return; return;
} }
log.trace("{} - Extracted IDs for SP and IdP: spId={}, idpId ={}", filterName, spId, idpId); log.trace("{} - Extracted IDs for SP and IdP: spId={}({}), idpId={}({})",
filterName, spId, spIdentifier, idpId, idpEntityId);
insertOrUpdateLogin(c, idpId, spId, userId); insertOrUpdateLogin(c, idpId, spId, userId);
} catch (SQLException ex) { } catch (SQLException ex) {
log.warn("{} - caught SQLException", filterName); log.warn("{} - caught SQLException", filterName);
@ -177,12 +177,14 @@ public class ProxyStatisticsFilter extends PerunRequestFilter {
String query = "SELECT COUNT(*) AS res FROM " + statisticsTableName + String query = "SELECT COUNT(*) AS res FROM " + statisticsTableName +
" WHERE " + idpIdColumnName + " = ?" + " WHERE " + idpIdColumnName + " = ?" +
" AND " + spIdColumnName + " = ?" + " AND " + spIdColumnName + " = ?" +
" AND " + usernameColumnName + " = ?"; " AND " + usernameColumnName + " = ?" +
" AND day = ?";
try (PreparedStatement ps = c.prepareStatement(query)) { try (PreparedStatement ps = c.prepareStatement(query)) {
ps.setLong(1, idpId); ps.setLong(1, idpId);
ps.setLong(2, spId); ps.setLong(2, spId);
ps.setString(3, userId); ps.setString(3, userId);
ps.setDate(4, Date.valueOf(LocalDate.now()));
ResultSet rs = ps.executeQuery(); ResultSet rs = ps.executeQuery();
if (rs.next()) { if (rs.next()) {
return rs.getInt("res") > 0; return rs.getInt("res") > 0;
@ -301,7 +303,8 @@ public class ProxyStatisticsFilter extends PerunRequestFilter {
ps.setLong(3, spId); ps.setLong(3, spId);
ps.setString(4, userId); ps.setString(4, userId);
ps.execute(); ps.execute();
log.debug("{} - login inserted", filterName); log.debug("{} - Inserted first login for combination: idpId={}, spId={}, userId={}",
filterName, idpId, spId, userId);
} catch (SQLException ex) { } catch (SQLException ex) {
log.warn("{} - caught SQLException when inserting login entry", filterName); log.warn("{} - caught SQLException when inserting login entry", filterName);
log.debug("{} - details:", filterName, ex); log.debug("{} - details:", filterName, ex);
@ -321,8 +324,8 @@ public class ProxyStatisticsFilter extends PerunRequestFilter {
ps.setLong(2, idpId); ps.setLong(2, idpId);
ps.setLong(3, spId); ps.setLong(3, spId);
ps.setString(4, userId); ps.setString(4, userId);
ps.execute(); log.debug("{} - Updated login count by 1 for combination: idpId={}, spId={}, userId={}",
log.debug("{} - login updated", filterName); filterName, idpId, spId, userId);
} catch (SQLException ex) { } catch (SQLException ex) {
log.warn("{} - caught SQLException when updating login entry", filterName); log.warn("{} - caught SQLException when updating login entry", filterName);
log.debug("{} - details:", filterName, ex); log.debug("{} - details:", filterName, ex);