From be64041ea4cf251d20121a375d95420d7e5296e6 Mon Sep 17 00:00:00 2001 From: ulrich Date: Sat, 02 Jan 2021 14:58:48 +0000 Subject: [PATCH] Derby Port umgestellt auf 1528 --- src/java/de/uhilger/um/api/UserMgr.java | 81 ++++++++++++---------------------------- 1 files changed, 24 insertions(+), 57 deletions(-) diff --git a/src/java/de/uhilger/um/api/UserMgr.java b/src/java/de/uhilger/um/api/UserMgr.java index 1399575..864587f 100644 --- a/src/java/de/uhilger/um/api/UserMgr.java +++ b/src/java/de/uhilger/um/api/UserMgr.java @@ -1,6 +1,6 @@ /* * Nutzerverwaltung - User and role management in your browser - * Copyright (C) 2011-2016 Ulrich Hilger, http://uhilger.de + * Copyright (C) 2011-2017 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 @@ -18,19 +18,13 @@ 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.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; /** * <p>Die Methoden der Klasse UserMgr sind @@ -57,12 +51,9 @@ * * @version 2, December 27, 2016 */ -public class UserMgr implements WebKontext { +public class UserMgr extends Api /*implements WebKontext, RequestKontext*/ { private static final Logger logger = Logger.getLogger(UserMgr.class.getName()); - - /** 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"; @@ -86,27 +77,21 @@ public static final String SQL_GET_USER_ROLES = "getUserRoles"; /** Referenz zum SQL-Befehl zum Loeschen aller Rollen eines Nutzers */ public static final String SQL_DELETE_USER_ROLES = "deleteUserRoles"; + public static final String SQL_GET_USER_DATA = "getUserData"; - /** 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); + public static final String MP_USER = "userMapper"; + public static final String MP_USER_DATA = "userDataMapper"; + public static final String MP_USER_ROLE = "userRoleMapper"; /* ----------- Benutzer -------------- */ - public User createUser(User user) throws ClassNotFoundException, InstantiationException, IllegalAccessException { + public User createUser(User user) throws ClassNotFoundException, InstantiationException, IllegalAccessException { String kw = user.getPw(); - String digesterClassName = ctx.getInitParameter(P_DIGESTER); + String digesterClassName = getServletContext().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); - getDb().insert(user, UserMapper); + user.setPw(digestedPw); + getDb().insert(user, getMapper(MP_USER)); return user; } @@ -114,25 +99,34 @@ return removeHeadline(getDb().select(getSql(SQL_GET_USER_NAME_LIST), WITHOUT_BLOBS)); } + public List getUserList() { + return getDb().select(getSql(SQL_GET_USER_LIST), getMapper(MP_USER), WITHOUT_BLOBS); + } + public User deleteUser(User user) { PersistenceManager pm = getDb(); Connection c = pm.getConnection(); pm.startTransaction(c); pm.execute(c, getSql(SQL_DELETE_USER_ROLES), user.getId()); - User deletedUser = (User) pm.delete(c, user, UserMapper); + User deletedUser = (User) pm.delete(c, user, getMapper(MP_USER)); pm.commit(c); return deletedUser; } - + + public String logout() { + getRequest().getSession().invalidate(); + return "logged out"; + } + /* ------------ Rollen ------------------ */ public UserRole grantRole(UserRole role) { - getDb().insert(role, UserRoleMapper); + getDb().insert(role, getMapper(MP_USER_ROLE)); return role; } public UserRole revokeRole(UserRole role) { - getDb().delete(role, UserRoleMapper); + getDb().delete(role, getMapper(MP_USER_ROLE)); return role; } @@ -153,31 +147,4 @@ 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 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 - public ServletContext getServletContext() { - return ctx; - } - - @Override - public void setServletContext(ServletContext servletContext) { - this.ctx = servletContext; - } - - -} +} \ No newline at end of file -- Gitblit v1.9.3