-/*\r
- * Copyright (C) 2001, 2002 The Mir-coders group\r
- *\r
- * This file is part of Mir.\r
- *\r
- * Mir is free software; you can redistribute it and/or modify\r
- * it under the terms of the GNU General Public License as published by\r
- * the Free Software Foundation; either version 2 of the License, or\r
- * (at your option) any later version.\r
- *\r
- * Mir is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\r
- * GNU General Public License for more details.\r
- *\r
- * You should have received a copy of the GNU General Public License\r
- * along with Mir; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\r
- *\r
- * In addition, as a special exception, The Mir-coders gives permission to link\r
- * the code of this program with the com.oreilly.servlet library, any library\r
- * licensed under the Apache Software License, The Sun (tm) Java Advanced\r
- * Imaging library (JAI), The Sun JIMI library (or with modified versions of\r
- * the above that use the same license as the above), and distribute linked\r
- * combinations including the two. You must obey the GNU General Public\r
- * License in all respects for all of the code used other than the above\r
- * mentioned libraries. If you modify this file, you may extend this exception\r
- * to your version of the file, but you are not obligated to do so. If you do\r
- * not wish to do so, delete this exception statement from your version.\r
- */\r
-\r
-package mircoders.module;\r
-\r
-import java.util.HashMap;\r
-import java.util.Map;\r
-\r
-import mir.entity.EntityList;\r
-import mir.log.LoggerWrapper;\r
-import mir.module.AbstractModule;\r
-import mir.module.ModuleExc;\r
-import mir.module.ModuleFailure;\r
-import mir.storage.StorageObject;\r
-import mir.util.JDBCStringRoutines;\r
-import mircoders.entity.EntityUsers;\r
-import mircoders.global.MirGlobal;\r
-\r
-\r
-/*\r
- * Users Module -\r
- *\r
- *\r
- * @author RK\r
- */\r
-\r
-public class ModuleUsers extends AbstractModule\r
-{\r
- static LoggerWrapper logger = new LoggerWrapper("Module.Users");\r
-\r
- public ModuleUsers(StorageObject theStorage)\r
- {\r
- if (theStorage == null)\r
- logger.warn("ModuleUsers(): StorageObject was null!");\r
-\r
- this.theStorage = theStorage;\r
- }\r
-\r
- /**\r
- * Authenticate and lookup a user\r
- *\r
- * @param user The user to lookup\r
- * @param password The password\r
- * @return The authenticated user, or <code>null</code> if the user\r
- * doesn't exist, or the supplied password is invalid.\r
- * @throws ModuleException\r
- */\r
-\r
- public EntityUsers getUserForLogin(String user, String password) throws ModuleExc, ModuleFailure {\r
- try {\r
- String whereString =\r
- "login='" + JDBCStringRoutines.escapeStringLiteral(user) + "' " +\r
- "and password='" + JDBCStringRoutines.escapeStringLiteral(\r
- MirGlobal.localizer().adminInterface().makePasswordDigest(password)) +\r
- "' " +\r
- "and is_admin='1'";\r
-\r
- EntityList userList = getByWhereClause(whereString, -1);\r
-\r
- if (userList != null && userList.getCount() == 1)\r
- return (EntityUsers) userList.elementAt(0);\r
- else\r
- return null;\r
- }\r
- catch (Throwable t) {\r
- throw new ModuleFailure(t);\r
- }\r
- }\r
-\r
- private Map digestPassword(Map aValues) throws ModuleExc, ModuleFailure {\r
- Map result = aValues;\r
-\r
- try {\r
- if (aValues.containsKey("password")) {\r
- result = new HashMap();\r
- result.putAll(aValues);\r
- result.put("password",\r
- MirGlobal.localizer().adminInterface().\r
- makePasswordDigest( (String) aValues.get("password")));\r
- }\r
- }\r
- catch (Throwable t) {\r
- throw new ModuleFailure("ModuleUsers.add: " + t.getMessage(), t);\r
- }\r
-\r
- return result;\r
- }\r
-\r
- public String add (Map theValues) throws ModuleExc, ModuleFailure {\r
- try {\r
- return super.add(digestPassword(theValues));\r
- }\r
- catch (Throwable t) {\r
- throw new ModuleFailure(t);\r
- }\r
- }\r
-\r
- /**\r
- * Standardfunktion, um einen Datensatz via StorageObject zu aktualisieren\r
- * @param theValues Hash mit Spalte/Wert-Paaren\r
- * @return Id des eingef?gten Objekts\r
- * @exception ModuleException\r
- */\r
- public String set (Map theValues) throws ModuleExc, ModuleFailure {\r
- try {\r
- return super.set(digestPassword(theValues));\r
- }\r
- catch (Throwable t) {\r
- throw new ModuleFailure(t);\r
- }\r
- }\r
+/*
+ * Copyright (C) 2001, 2002 The Mir-coders group
+ *
+ * This file is part of Mir.
+ *
+ * Mir 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 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Mir 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 Mir; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * In addition, as a special exception, The Mir-coders gives permission to link
+ * the code of this program with any library licensed under the Apache Software License,
+ * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
+ * (or with modified versions of the above that use the same license as the above),
+ * and distribute linked combinations including the two. You must obey the
+ * GNU General Public License in all respects for all of the code used other than
+ * the above mentioned libraries. If you modify this file, you may extend this
+ * exception to your version of the file, but you are not obligated to do so.
+ * If you do not wish to do so, delete this exception statement from your version.
+ */
+
+package mircoders.module;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import mir.entity.EntityList;
+import mir.log.LoggerWrapper;
+import mir.module.AbstractModule;
+import mir.module.ModuleExc;
+import mir.module.ModuleFailure;
+import mir.util.JDBCStringRoutines;
+import mircoders.entity.EntityUsers;
+import mircoders.global.MirGlobal;
+import mircoders.storage.DatabaseUsers;
+
+
+/*
+ * Users Module -
+ *
+ *
+ * @author RK
+ */
+
+public class ModuleUsers extends AbstractModule
+{
+ static LoggerWrapper logger = new LoggerWrapper("Module.Users");
+
+ public ModuleUsers() {
+ super(DatabaseUsers.getInstance());
+ }
+
+ /**
+ * Authenticate and lookup a user
+ *
+ * @param user The user to lookup
+ * @param password The password
+ * @return The authenticated user, or <code>null</code> if the user
+ * doesn't exist, or the supplied password is invalid.
+ * @throws ModuleExc
+ */
+
+ public EntityUsers getUserForLogin(String user, String password) throws ModuleExc, ModuleFailure {
+ try {
+ String whereString =
+ "login='" + JDBCStringRoutines.escapeStringLiteral(user) + "' " +
+ "and (" +
+ " password='" + JDBCStringRoutines.escapeStringLiteral(MirGlobal.localizer().adminInterface().makePasswordDigest(password)) + "'" +
+ " or password='" + JDBCStringRoutines.escapeStringLiteral(password) + "'" +
+ " )" +
+ "and is_admin='1'";
+
+ EntityList userList = getByWhereClause(whereString, -1);
+
+ if (userList != null && userList.size() == 1) {
+ EntityUsers result = (EntityUsers) userList.elementAt(0);
+
+ if (result.getFieldValue("is_disabled") == null ||
+ result.getFieldValue("is_disabled").equals("0"))
+ return result;
+ }
+
+ return null;
+ }
+ catch (Throwable t) {
+ throw new ModuleFailure(t);
+ }
+ }
+
+ public boolean checkUserPassword(EntityUsers aUser, String aPassword) throws ModuleExc, ModuleFailure {
+ try {
+ return aUser.getFieldValue("password").equals(MirGlobal.localizer().adminInterface().makePasswordDigest(aPassword));
+ }
+ catch (Throwable t) {
+ throw new ModuleFailure(t);
+ }
+ }
+
+ private Map digestPassword(Map aValues) throws ModuleFailure {
+ Map result = aValues;
+
+ try {
+ if (aValues.containsKey("password")) {
+ result = new HashMap();
+ result.putAll(aValues);
+ result.put("password",
+ MirGlobal.localizer().adminInterface().
+ makePasswordDigest( (String) aValues.get("password")));
+ }
+ }
+ catch (Throwable t) {
+ throw new ModuleFailure("ModuleUsers.add: " + t.getMessage(), t);
+ }
+
+ return result;
+ }
+
+ /**
+ *
+ * @param theValues
+ * @return
+ * @throws ModuleExc
+ * @throws ModuleFailure
+ */
+
+ public String add (Map theValues) throws ModuleExc, ModuleFailure {
+ try {
+ return super.add(digestPassword(theValues));
+ }
+ catch (Throwable t) {
+ throw new ModuleFailure(t);
+ }
+ }
+
+ public String set (Map theValues) throws ModuleExc, ModuleFailure {
+ try {
+ return super.set(digestPassword(theValues));
+ }
+ catch (Throwable t) {
+ throw new ModuleFailure(t);
+ }
+ }
+
+ public void recordLogin(EntityUsers aUser) throws ModuleExc, ModuleFailure {
+ try {
+ String sql = "update webdb_users set lastlogin=now() where id = " + aUser.getId();
+
+ database.executeUpdate(sql);
+ }
+ catch (Throwable t) {
+// no propagation of this error for now, to allow mir to still function
+// with older db schemas
+// throw new ModuleFailure(t);
+ }
+ }
}
\ No newline at end of file
projects / mir.git / blobdiff