From 6240cdca43495122d436de8488395bf7fd5eae12 Mon Sep 17 00:00:00 2001
From: ulrich <not disclosed>
Date: Tue, 27 Dec 2016 16:39:26 +0000
Subject: [PATCH] Tomcat-spezifischen Digester in eine Schnittstelle ausgelagert und per Deployment Descriptor konfigurierbar eingebunden
---
src/java/de/uhilger/um/api/UserMgr.java | 71 ++++++++++++++++++++---------------
1 files changed, 41 insertions(+), 30 deletions(-)
diff --git a/src/java/de/uhilger/um/api/UserMgr.java b/src/java/de/uhilger/um/api/UserMgr.java
index 0c2dd04..dc2c169 100644
--- a/src/java/de/uhilger/um/api/UserMgr.java
+++ b/src/java/de/uhilger/um/api/UserMgr.java
@@ -1,22 +1,47 @@
+/*
+ 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/>.
+ */
package de.uhilger.um.api;
import de.uhilger.baselink.GenericRecord;
+import de.uhilger.baselink.PersistenceManager;
import de.uhilger.baselink.Record;
import de.uhilger.um.App;
+import de.uhilger.um.Digester;
import de.uhilger.um.daten.User;
import de.uhilger.um.daten.UserRole;
+import java.sql.Connection;
import java.util.List;
-import org.apache.catalina.realm.RealmBase;
/**
* Klasse zur Verwaltung von Benutzern und Rollen
- * in einer Datenbank
+ * in einer Datenbank. Die Datenbankverbindung wird
+ * vom zentralen Anwendungsobjekt bereitgestellt.
*
- * @author Ulrich Hilger
+ * Die SQL-Befehle finden sich in WEB-INF/sql.properties
+ *
+ * @author Copyright (c) Ulrich Hilger, http://uhilger.de
+ * @author Published under the terms and conditions of the
+ * <a href="http://www.gnu.org/licenses/agpl-3.0" target="_blank">GNU Affero
+ * General Public License</a>
+ *
+ * @version 2, December 27, 2016
*/
public class UserMgr {
-
- private static final String MD5 = "MD5";
private static final Record UserMapper = new GenericRecord(User.class);
private static final Record UserRoleMapper = new GenericRecord(UserRole.class);
@@ -26,12 +51,13 @@
public static final String SQL_GET_ROLE_LIST = "getRoleList";
public static final String SQL_GET_USER_ROLES = "getUserRoles";
public static final String SQL_DELETE_USER = "deleteUser";
+ public static final String SQL_DELETE_USER_ROLES = "deleteUserRoles";
/* ----------- Benutzer -------------- */
public User createUser(User user) {
String kw = user.getPw();
- String digestedPw = RealmBase.Digest(kw, MD5, null);
+ String digestedPw = App.getDigester().digest(kw, Digester.MD5, null);
user.setPw(digestedPw);
App.getDatabase().insert(user, UserMapper);
return user;
@@ -44,17 +70,16 @@
}
public User deleteUser(User user) {
- return (User) App.getDatabase().delete(user, UserMapper);
+ PersistenceManager pm = App.getDatabase();
+ Connection c = pm.getConnection();
+ pm.startTransaction(c);
+ String sql = App.getSqlStatement(SQL_DELETE_USER_ROLES);
+ pm.execute(c, sql, user.getId());
+ User deletedUser = (User) pm.delete(c, user, UserMapper);
+ pm.commit(c);
+ return deletedUser;
}
-
- /*
- public List getUserList() {
- String sql = App.getSqlStatement(SQL_GET_USER_LIST);
- List users = App.getDatabase().select(sql, UserMapper, App.WITHOUT_BLOBS);
- return users;
- }
- */
-
+
/* ------------ Rollen ------------------ */
public UserRole grantRole(String userId, String roleName) {
@@ -79,24 +104,10 @@
return roleNames;
}
- /**
- *
- *
- * list.get(recordno).get(fieldno)
- *
- * @param userId ID des Benutzers
- * @return List<List<String>> Rollennamen des Benutzers
- */
public List getUserRoleNames(String userId) {
String sql = App.getSqlStatement(SQL_GET_USER_ROLES);
List roleNames = App.getDatabase().select(sql, App.WITHOUT_BLOBS, userId);
return roleNames;
- }
-
- /* ------------ sonstige Methoden -------------- */
-
- public String hallo() {
- return "Hallo Welt";
}
}
--
Gitblit v1.9.3