From 3ff00acb3cb64ecc7da04f946a6e1c19c63199d2 Mon Sep 17 00:00:00 2001
From: ulrich <not disclosed>
Date: Wed, 01 Feb 2017 17:37:30 +0000
Subject: [PATCH] wegkopierte Teile entfernt
---
src/java/de/uhilger/um/api/UserMgr.java | 126 ++++++++++++++++++++++++-----------------
1 files changed, 74 insertions(+), 52 deletions(-)
diff --git a/src/java/de/uhilger/um/api/UserMgr.java b/src/java/de/uhilger/um/api/UserMgr.java
index 6b1a321..1399575 100644
--- a/src/java/de/uhilger/um/api/UserMgr.java
+++ b/src/java/de/uhilger/um/api/UserMgr.java
@@ -1,33 +1,35 @@
/*
- Nutzerverwaltung - A Generic User Manager
- Copyright (c) 2016 Ulrich Hilger
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * Nutzerverwaltung - User and role management in your browser
+ * Copyright (C) 2011-2016 Ulrich Hilger, http://uhilger.de
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/
*/
+
package de.uhilger.um.api;
import de.uhilger.baselink.GenericRecord;
import de.uhilger.baselink.PersistenceManager;
import de.uhilger.baselink.Record;
import de.uhilger.transit.web.WebKontext;
-import de.uhilger.um.App;
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;
/**
@@ -42,12 +44,10 @@
* Auf diese Weise sind keine statischen Abhängigkeiten in den Code
* gewandert. Die folgenden Elemente werden vom UserMgr im ServletContext
* erwartet:
- *
- * [noch auspraegen]
- *
- * PersistenceManager
- * SQL-Properties
- * Digester
+ * <ul>
+ * <li>PersistenceManager</li>
+ * <li>SQL-Properties</li>
+ * <li>Digester</li>
* </p>
*
* @author Copyright (c) Ulrich Hilger, http://uhilger.de
@@ -59,45 +59,66 @@
*/
public class UserMgr implements WebKontext {
- private ServletContext ctx;
+ private static final Logger logger = Logger.getLogger(UserMgr.class.getName());
- private static final Record UserMapper = new GenericRecord(User.class);
- private static final Record UserRoleMapper = new GenericRecord(UserRole.class);
+ /** Zeiger zum Servlet-Kontext dieser Anwendung */
+ private ServletContext ctx;
/** Name, unter dem das Properties-Objekt mit den SQL-Befehlen im ServletContext hinterlegt ist */
public static final String UM_SQL_PROPERTIES = "umSqlProperties";
+ /** Name, unter dem das Digester-Objekt im ServletContext hinterlegt ist */
+ public static final String P_DIGESTER = "digester";
+
/** Name, unter dem das Zugriffsobjekt zur Datenbank im ServletContext hinterlegt ist */
public static final String UM_DB = "umDb";
+ /** Boolean-Konstante zur Kennzeichnung von Datenbankergebnissen ohne Blobs */
+ public static final boolean WITHOUT_BLOBS = false;
+
+ /** Referenz zum SQL-Befehl zur Ermittlung der Benutzer */
public static final String SQL_GET_USER_LIST = "getUserList";
+ /** Referenz zum SQL-Befehl zur Ermittlung der Benutzer-Namen */
public static final String SQL_GET_USER_NAME_LIST = "getUserNameList";
+ /** Referenz zum SQL-Befehl zur Ermittlung der Rollen */
public static final String SQL_GET_ROLE_LIST = "getRoleList";
+ /** Referenz zum SQL-Befehl zur Ermittlung der Rollen eines Benutzers */
public static final String SQL_GET_USER_ROLES = "getUserRoles";
- public static final String SQL_DELETE_USER = "deleteUser";
+ /** Referenz zum SQL-Befehl zum Loeschen aller Rollen eines Nutzers */
public static final String SQL_DELETE_USER_ROLES = "deleteUserRoles";
+
+ /** 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);
/* ----------- Benutzer -------------- */
- public User createUser(User user) {
+ public User createUser(User user) throws ClassNotFoundException, InstantiationException, IllegalAccessException {
String kw = user.getPw();
- String digestedPw = App.getDigester().digest(kw, Digester.MD5, null);
+ String digesterClassName = ctx.getInitParameter(P_DIGESTER);
+ Digester digester = (Digester) Class.forName(digesterClassName).newInstance();
+ /*
+ 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);
- App.getDatabase().insert(user, UserMapper);
+ getDb().insert(user, UserMapper);
return user;
}
public List getUserNameList() {
- String sql = getSqlStatement(SQL_GET_USER_NAME_LIST);
- return App.getDatabase().select(sql, App.WITHOUT_BLOBS);
+ return removeHeadline(getDb().select(getSql(SQL_GET_USER_NAME_LIST), WITHOUT_BLOBS));
}
public User deleteUser(User user) {
- PersistenceManager pm = App.getDatabase();
+ PersistenceManager pm = getDb();
Connection c = pm.getConnection();
pm.startTransaction(c);
- String sql = getSqlStatement(SQL_DELETE_USER_ROLES);
- pm.execute(c, sql, user.getId());
+ pm.execute(c, getSql(SQL_DELETE_USER_ROLES), user.getId());
User deletedUser = (User) pm.delete(c, user, UserMapper);
pm.commit(c);
return deletedUser;
@@ -105,46 +126,47 @@
/* ------------ Rollen ------------------ */
- public UserRole grantRole(String userId, String roleName) {
- UserRole ur = new UserRole();
- ur.setRole(roleName);
- ur.setUser(userId);
- App.getDatabase().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);
- App.getDatabase().delete(ur, UserRoleMapper);
- return ur;
+ public UserRole revokeRole(UserRole role) {
+ getDb().delete(role, UserRoleMapper);
+ return role;
}
public List getRoleNamesGranted() {
- String sql = getSqlStatement(SQL_GET_ROLE_LIST);
- return App.getDatabase().select(sql, App.WITHOUT_BLOBS);
+ return removeHeadline(getDb().select(getSql(SQL_GET_ROLE_LIST), WITHOUT_BLOBS));
}
public List getUserRoleNames(String userId) {
- String sql = getSqlStatement(SQL_GET_USER_ROLES);
- return App.getDatabase().select(sql, App.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
* @return das SQL-Kommando mit der in id angegebenen Bezeichnung
*/
- private String getSqlStatement(String id) {
+ private String getSql(String id) {
Properties sql = (Properties) ctx.getAttribute(UserMgr.UM_SQL_PROPERTIES);
return sql.getProperty(id);
}
+ private PersistenceManager getDb() {
+ return (PersistenceManager) ctx.getAttribute(UM_DB);
+ }
+
/* ------------- Implementierung WebKontext ------------- */
@Override
--
Gitblit v1.9.3