pcvolkmer/onkostar-plugin-dnpm
1
0
Fork 0
mirror of https://github.com/pcvolkmer/onkostar-plugin-dnpm.git synced 2025-07-04 18:12:55 +00:00
Code Issues Activity

Issue #24: Extrahiere Service mit Datenbankanfragen

Browse Source
This commit is contained in:
Paul-Christian Volkmer
2023-04-10 14:26:35 +02:00
parent 44396ff04a
commit 5b9b12afc9
6 changed files with 347 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/DNPM/security/AbstractDelegatedPermissionEvaluator.java
View File

@ -3,11 +3,8 @@ package DNPM.security;
import de.itc.onkostar.api.IOnkostarApi;
import de.itc.onkostar.api.Patient;
import de.itc.onkostar.api.Procedure;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.security.access.PermissionEvaluator;
import javax.sql.DataSource;
public abstract class AbstractDelegatedPermissionEvaluator implements PermissionEvaluator {
protected static final String PATIENT = Patient.class.getSimpleName();
@ -16,11 +13,11 @@ public abstract class AbstractDelegatedPermissionEvaluator implements Permission
protected final IOnkostarApi onkostarApi;
protected final JdbcTemplate jdbcTemplate;
protected final SecurityService securityService;
protected AbstractDelegatedPermissionEvaluator(final IOnkostarApi onkostarApi, final DataSource dataSource) {
protected AbstractDelegatedPermissionEvaluator(final IOnkostarApi onkostarApi, final SecurityService securityService) {
this.onkostarApi = onkostarApi;
this.jdbcTemplate = new JdbcTemplate(dataSource);
this.securityService = securityService;
}
}

49
src/main/java/DNPM/security/FormBasedPermissionEvaluator.java
View File

@ -1,15 +1,11 @@
package DNPM.security;
import de.itc.onkostar.api.IOnkostarApi;
import de.itc.onkostar.api.Patient;
import de.itc.onkostar.api.Procedure;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.stereotype.Component;
import javax.sql.DataSource;
import java.io.Serializable;
import java.util.List;
/**
* Permission-Evaluator zur Auswertung der Berechtigung auf Objekte aufgrund der Formularberechtigung
@ -17,8 +13,8 @@ import java.util.List;
@Component
public class FormBasedPermissionEvaluator extends AbstractDelegatedPermissionEvaluator {
public FormBasedPermissionEvaluator(final IOnkostarApi onkostarApi, final DataSource dataSource) {
super(onkostarApi, dataSource);
public FormBasedPermissionEvaluator(final IOnkostarApi onkostarApi, final SecurityService securityService) {
super(onkostarApi, securityService);
}
/**
@ -32,15 +28,11 @@ public class FormBasedPermissionEvaluator extends AbstractDelegatedPermissionEva
*/
@Override
public boolean hasPermission(Authentication authentication, Object targetObject, Object permissionType) {
if (permissionType instanceof PermissionType) {
if (targetObject instanceof Patient) {
return true;
} else if (targetObject instanceof Procedure) {
return getFormNamesForPermission(authentication, (PermissionType)permissionType)
.contains(((Procedure)targetObject).getFormName());
}
if (permissionType instanceof PermissionType && targetObject instanceof Procedure) {
return this.securityService.getFormNamesForPermission(authentication, (PermissionType)permissionType)
.contains(((Procedure)targetObject).getFormName());
}
return false;
return true;
}
/**
@ -55,36 +47,13 @@ public class FormBasedPermissionEvaluator extends AbstractDelegatedPermissionEva
*/
@Override
public boolean hasPermission(Authentication authentication, Serializable targetId, String targetType, Object permissionType) {
if (targetId instanceof Integer) {
if (PATIENT.equals(targetType)) {
return true;
}
if (permissionType instanceof PermissionType && targetId instanceof Integer && PROCEDURE.equals(targetType)) {
var procedure = this.onkostarApi.getProcedure((int)targetId);
if (null != procedure) {
return getFormNamesForPermission(authentication, (PermissionType) permissionType).contains(procedure.getFormName());
return this.securityService.getFormNamesForPermission(authentication, (PermissionType) permissionType).contains(procedure.getFormName());
}
}
return false;
return true;
}
List<String> getFormNamesForPermission(Authentication authentication, PermissionType permissionType) {
var sql = "SELECT df.name FROM formular_usergroup_zugriff " +
" JOIN data_form df ON formular_usergroup_zugriff.formular_id = df.id " +
" JOIN usergroup u ON formular_usergroup_zugriff.usergroup_id = u.id " +
" JOIN akteur_usergroup au ON u.id = au.usergroup_id " +
" JOIN akteur a on au.akteur_id = a.id " +
" WHERE a.login = ? AND a.aktiv AND a.anmelden_moeglich ";
if (PermissionType.READ_WRITE == permissionType) {
sql += " AND formular_usergroup_zugriff.bearbeiten ";
}
var userDetails = (UserDetails)authentication.getPrincipal();
return jdbcTemplate
.query(sql, new Object[]{userDetails.getUsername()}, (rs, rowNum) -> rs.getString("name"));
}
}

35
src/main/java/DNPM/security/PersonPoolBasedPermissionEvaluator.java
View File

@ -4,12 +4,9 @@ import de.itc.onkostar.api.IOnkostarApi;
import de.itc.onkostar.api.Patient;
import de.itc.onkostar.api.Procedure;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.stereotype.Component;
import javax.sql.DataSource;
import java.io.Serializable;
import java.util.List;
/**
* Permission-Evaluator zur Auswertung der Berechtigung auf Objekte aufgrund der Personenstammberechtigung
@ -17,8 +14,8 @@ import java.util.List;
@Component
public class PersonPoolBasedPermissionEvaluator extends AbstractDelegatedPermissionEvaluator {
public PersonPoolBasedPermissionEvaluator(final IOnkostarApi onkostarApi, final DataSource dataSource) {
super(onkostarApi, dataSource);
public PersonPoolBasedPermissionEvaluator(final IOnkostarApi onkostarApi, final SecurityService securityService) {
super(onkostarApi, securityService);
}
/**
@ -32,10 +29,10 @@ public class PersonPoolBasedPermissionEvaluator extends AbstractDelegatedPermiss
public boolean hasPermission(Authentication authentication, Object targetObject, Object permissionType) {
if (permissionType instanceof PermissionType) {
if (targetObject instanceof Patient) {
return getPersonPoolIdsForPermission(authentication, (PermissionType)permissionType)
return this.securityService.getPersonPoolIdsForPermission(authentication, (PermissionType)permissionType)
.contains(((Patient)targetObject).getPersonPoolCode());
} else if (targetObject instanceof Procedure) {
return getPersonPoolIdsForPermission(authentication, (PermissionType)permissionType)
return this.securityService.getPersonPoolIdsForPermission(authentication, (PermissionType)permissionType)
.contains(((Procedure)targetObject).getPatient().getPersonPoolCode());
}
}
@ -52,10 +49,10 @@ public class PersonPoolBasedPermissionEvaluator extends AbstractDelegatedPermiss
*/
@Override
public boolean hasPermission(Authentication authentication, Serializable targetId, String targetType, Object permissionType) {
if (targetId instanceof Integer) {
if (targetId instanceof Integer && permissionType instanceof PermissionType) {
var personPoolCode = getPersonPoolCode((int)targetId, targetType);
if (null != personPoolCode && permissionType instanceof PermissionType) {
return getPersonPoolIdsForPermission(authentication, (PermissionType) permissionType).contains(personPoolCode);
if (null != personPoolCode) {
return this.securityService.getPersonPoolIdsForPermission(authentication, (PermissionType) permissionType).contains(personPoolCode);
}
}
return false;
@ -80,23 +77,5 @@ public class PersonPoolBasedPermissionEvaluator extends AbstractDelegatedPermiss
return null;
}
List<String> getPersonPoolIdsForPermission(Authentication authentication, PermissionType permissionType) {
var sql = "SELECT p.kennung FROM personenstamm_zugriff " +
" JOIN usergroup u ON personenstamm_zugriff.benutzergruppe_id = u.id " +
" JOIN akteur_usergroup au ON u.id = au.usergroup_id " +
" JOIN akteur a ON au.akteur_id = a.id " +
" JOIN personenstamm p on personenstamm_zugriff.personenstamm_id = p.id " +
" WHERE a.login = ? AND a.aktiv AND a.anmelden_moeglich ";
if (PermissionType.READ_WRITE == permissionType) {
sql += " AND personenstamm_zugriff.bearbeiten ";
}
var userDetails = (UserDetails)authentication.getPrincipal();
return jdbcTemplate
.query(sql, new Object[]{userDetails.getUsername()}, (rs, rowNum) -> rs.getString("kennung"));
}
}

60
src/main/java/DNPM/security/SecurityService.java Normal file
View File

@ -0,0 +1,60 @@
package DNPM.security;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.stereotype.Service;
import javax.sql.DataSource;
import java.util.List;
/**
* Service mit Methoden zum Feststellen von sicherheitsrelevanten Informationen eines Benutzers
*/
@Service
public class SecurityService {
private final JdbcTemplate jdbcTemplate;
public SecurityService(final DataSource dataSource) {
this.jdbcTemplate = new JdbcTemplate(dataSource);
}
List<String> getPersonPoolIdsForPermission(Authentication authentication, PermissionType permissionType) {
var sql = "SELECT p.kennung FROM personenstamm_zugriff " +
" JOIN usergroup u ON personenstamm_zugriff.benutzergruppe_id = u.id " +
" JOIN akteur_usergroup au ON u.id = au.usergroup_id " +
" JOIN akteur a ON au.akteur_id = a.id " +
" JOIN personenstamm p on personenstamm_zugriff.personenstamm_id = p.id " +
" WHERE a.login = ? AND a.aktiv AND a.anmelden_moeglich ";
if (PermissionType.READ_WRITE == permissionType) {
sql += " AND personenstamm_zugriff.bearbeiten ";
}
var userDetails = (UserDetails)authentication.getPrincipal();
return jdbcTemplate
.query(sql, new Object[]{userDetails.getUsername()}, (rs, rowNum) -> rs.getString("kennung"));
}
List<String> getFormNamesForPermission(Authentication authentication, PermissionType permissionType) {
var sql = "SELECT df.name FROM formular_usergroup_zugriff " +
" JOIN data_form df ON formular_usergroup_zugriff.formular_id = df.id " +
" JOIN usergroup u ON formular_usergroup_zugriff.usergroup_id = u.id " +
" JOIN akteur_usergroup au ON u.id = au.usergroup_id " +
" JOIN akteur a on au.akteur_id = a.id " +
" WHERE a.login = ? AND a.aktiv AND a.anmelden_moeglich ";
if (PermissionType.READ_WRITE == permissionType) {
sql += " AND formular_usergroup_zugriff.bearbeiten ";
}
var userDetails = (UserDetails)authentication.getPrincipal();
return jdbcTemplate
.query(sql, new Object[]{userDetails.getUsername()}, (rs, rowNum) -> rs.getString("name"));
}
}