From 3cd7fefd7afb5a8a2f70290b9bbeb453c5f9382b Mon Sep 17 00:00:00 2001
From: ulrich
Date: Thu, 02 Feb 2017 05:31:34 +0000
Subject: [PATCH] Doku ergaenzt
---
src/java/de/uhilger/um/api/UserMgr.java | 43 +++++++++++++++++++++++++++----------------
1 files changed, 27 insertions(+), 16 deletions(-)
diff --git a/src/java/de/uhilger/um/api/UserMgr.java b/src/java/de/uhilger/um/api/UserMgr.java
index cf6982a..1399575 100644
--- a/src/java/de/uhilger/um/api/UserMgr.java
+++ b/src/java/de/uhilger/um/api/UserMgr.java
@@ -24,10 +24,12 @@
import de.uhilger.transit.web.WebKontext;
import de.uhilger.um.Digester;
import de.uhilger.um.daten.User;
+import de.uhilger.um.daten.UserData;
import de.uhilger.um.daten.UserRole;
import java.sql.Connection;
import java.util.List;
import java.util.Properties;
+import java.util.logging.Logger;
import javax.servlet.ServletContext;
/**
@@ -57,6 +59,8 @@
*/
public class UserMgr implements WebKontext {
+ private static final Logger logger = Logger.getLogger(UserMgr.class.getName());
+
/** Zeiger zum Servlet-Kontext dieser Anwendung */
private ServletContext ctx;
@@ -85,6 +89,8 @@
/** Mapper-Objekt fuer Benutzer */
private static final Record UserMapper = new GenericRecord(User.class);
+ /** Mapper-Objekt fuer Benutzerdaten */
+ //private static final Record UserDataMapper = new GenericRecord(UserData.class);
/** Mapper-Objekt fuer Benutzerrollen */
private static final Record UserRoleMapper = new GenericRecord(UserRole.class);
@@ -94,14 +100,18 @@
String kw = user.getPw();
String digesterClassName = ctx.getInitParameter(P_DIGESTER);
Digester digester = (Digester) Class.forName(digesterClassName).newInstance();
- String digestedPw = digester.digest(kw, Digester.MD5, null);
+ /*
+ MD5 geht nicht mehr,
+ vgl. http://stackoverflow.com/questions/39967289/how-to-use-digest-authentication-in-tomcat-8-5
+ */
+ String digestedPw = digester.digest(kw, Digester.SHA256, null);
user.setPw(digestedPw);
getDb().insert(user, UserMapper);
return user;
}
public List getUserNameList() {
- return getDb().select(getSql(SQL_GET_USER_NAME_LIST), WITHOUT_BLOBS);
+ return removeHeadline(getDb().select(getSql(SQL_GET_USER_NAME_LIST), WITHOUT_BLOBS));
}
public User deleteUser(User user) {
@@ -116,32 +126,33 @@
/* ------------ Rollen ------------------ */
- public UserRole grantRole(String userId, String roleName) {
- UserRole ur = new UserRole();
- ur.setRole(roleName);
- ur.setUser(userId);
- getDb().insert(ur, UserRoleMapper);
- return ur;
+ public UserRole grantRole(UserRole role) {
+ getDb().insert(role, UserRoleMapper);
+ return role;
}
- public UserRole revokeRole(String userId, String roleName) {
- UserRole ur = new UserRole();
- ur.setRole(roleName);
- ur.setUser(userId);
- getDb().delete(ur, UserRoleMapper);
- return ur;
+ public UserRole revokeRole(UserRole role) {
+ getDb().delete(role, UserRoleMapper);
+ return role;
}
public List getRoleNamesGranted() {
- return getDb().select(getSql(SQL_GET_ROLE_LIST), WITHOUT_BLOBS);
+ return removeHeadline(getDb().select(getSql(SQL_GET_ROLE_LIST), WITHOUT_BLOBS));
}
public List getUserRoleNames(String userId) {
- return getDb().select(getSql(SQL_GET_USER_ROLES), WITHOUT_BLOBS, userId);
+ return removeHeadline(getDb().select(getSql(SQL_GET_USER_ROLES), WITHOUT_BLOBS, userId));
}
/* ----------- Helfer ---- */
+ private List removeHeadline(List list) {
+ if(list != null && list.size() > 0) {
+ list.remove(0);
+ }
+ return list;
+ }
+
/**
* Ein benanntes SQL-Kommando ermitteln
* @param id Name des gewuenschten SQL-Kommandos
--
Gitblit v1.9.3