diff --git a/pom.xml b/pom.xml index 35f947d..78bf5ae 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ de.jalin.ldapadmin ldapadmin war - 1.0.1 + 1.0.2 LDAP Admin Webapp diff --git a/src/main/java/de/jalin/ldapadmin/beans/User.java b/src/main/java/de/jalin/ldapadmin/beans/User.java index daa5ceb..559aed4 100644 --- a/src/main/java/de/jalin/ldapadmin/beans/User.java +++ b/src/main/java/de/jalin/ldapadmin/beans/User.java @@ -18,8 +18,7 @@ public class User implements Serializable, LDAPBean { private String firstname; private String lastname; private String displayname; - private String emailInternal; - private String emailExternal; + private String email; private String phone; private String mobile; private List groups; @@ -79,20 +78,12 @@ public class User implements Serializable, LDAPBean { this.displayname = displayname; } - public String getEmailInternal() { - return emailInternal; + public String getEmail() { + return email; } - public void setEmailInternal(String email) { - this.emailInternal = email; - } - - public String getEmailExternal() { - return emailExternal; - } - - public void setEmailExternal(String email) { - this.emailExternal = email; + public void setEmail(String email) { + this.email = email; } public String getPhone() { @@ -121,7 +112,7 @@ public class User implements Serializable, LDAPBean { @Override public String toString() { - return getFirstname() + " " + getLastname() + " (" + getLogin() + ", " + getEmailExternal() + ")"; + return getFirstname() + " " + getLastname() + " (" + getLogin() + ", " + getEmail() + ")"; } @Override diff --git a/src/main/java/de/jalin/ldapadmin/ldap/LDAPConfig.java b/src/main/java/de/jalin/ldapadmin/ldap/LDAPConfig.java index c221ee0..d61bbde 100644 --- a/src/main/java/de/jalin/ldapadmin/ldap/LDAPConfig.java +++ b/src/main/java/de/jalin/ldapadmin/ldap/LDAPConfig.java @@ -16,7 +16,6 @@ public class LDAPConfig { private String smtpFromAddress; private String smtpHost; private String smtpPort; - private String smtpInternalDomains; private String pacAdmin; private String pacPassword; private String tempDir; @@ -28,7 +27,6 @@ public class LDAPConfig { smtpHost = "localhost"; smtpPort = "25"; smtpFromAddress = "nobody@example.com"; - smtpInternalDomains = "example.com,example.org"; tempDir = System.getProperty("java.io.tmpdir"); try { final Properties props = loadConfig(); @@ -38,7 +36,6 @@ public class LDAPConfig { smtpHost = props.getProperty("smtp.host", smtpHost); smtpPort = props.getProperty("smtp.port", smtpPort); smtpFromAddress = props.getProperty("smtp.from", smtpFromAddress); - smtpInternalDomains = props.getProperty("smtp.internal", smtpInternalDomains); pacAdmin = props.getProperty("pac.user", "xyz00"); pacPassword = props.getProperty("pac.password", "secret"); tempDir = props.getProperty("temp.dir", tempDir); @@ -78,10 +75,6 @@ public class LDAPConfig { return smtpFromAddress; } - public String getSmtpInternalDomains() { - return smtpInternalDomains; - } - public String getTempDir() { return tempDir; } diff --git a/src/main/java/de/jalin/ldapadmin/ldap/UsersDAO.java b/src/main/java/de/jalin/ldapadmin/ldap/UsersDAO.java index a5b1fe1..8bdc14f 100644 --- a/src/main/java/de/jalin/ldapadmin/ldap/UsersDAO.java +++ b/src/main/java/de/jalin/ldapadmin/ldap/UsersDAO.java @@ -30,8 +30,7 @@ public class UsersDAO { final User usr = new User(); usr.setFirstname(session.getStringValue(attribs, "givenName")); usr.setLastname(session.getStringValue(attribs, "sn")); - usr.setEmailInternal(session.getStringValue(attribs, "mail")); - usr.setEmailExternal(session.getStringValue(attribs, "description")); + usr.setEmail(session.getStringValue(attribs, "mail")); usr.setLogin(session.getStringValue(attribs, "uid")); usr.setPhone(session.getStringValue(attribs, "telephoneNumber")); usr.setMobile(session.getStringValue(attribs, "mobile")); @@ -68,15 +67,11 @@ public class UsersDAO { } attributes.put("sn", lastname); final BasicAttribute mail = new BasicAttribute("mail"); - final String emailInternal = usr.getEmailInternal(); - if (hasValue(emailInternal)) { - mail.add(emailInternal); + final String email = usr.getEmail(); + if (hasValue(email)) { + mail.add(email); } attributes.put(mail); - final String emailExternal = usr.getEmailExternal(); - if (hasValue(emailExternal)) { - attributes.put("description", emailExternal); - } attributes.put("uid", uid); attributes.put("cn", uid); final String telephone = usr.getPhone(); @@ -107,8 +102,7 @@ public class UsersDAO { final User usr = new User(); usr.setFirstname(session.getStringValue(attribs, "givenName")); usr.setLastname(session.getStringValue(attribs, "sn")); - usr.setEmailExternal(session.getStringValue(attribs, "description")); - usr.setEmailInternal(session.getStringValue(attribs, "mail")); + usr.setEmail(session.getStringValue(attribs, "mail")); usr.setLogin(session.getStringValue(attribs, "uid")); usr.setPhone(session.getStringValue(attribs, "telephoneNumber")); usr.setMobile(session.getStringValue(attribs, "mobile")); @@ -127,13 +121,9 @@ public class UsersDAO { final List updates = new ArrayList(); addStringAttrUpdate(updates, attribs, "displayName", usr.getDisplayname()); final ArrayList emailAdressList = new ArrayList(); - final String emailInternal = usr.getEmailInternal(); - if (hasValue(emailInternal)) { - emailAdressList.add(emailInternal); - } - final String emailExternal = usr.getEmailExternal(); - if (hasValue(emailExternal)) { - addStringAttrUpdate(updates, attribs, "description", emailExternal); + final String email = usr.getEmail(); + if (hasValue(email)) { + emailAdressList.add(email); } addMultiValueAttrUpdate(updates, attribs, "mail", emailAdressList); addStringAttrUpdate(updates, attribs, "givenName", usr.getFirstname()); diff --git a/src/main/java/de/jalin/ldapadmin/web/ProfileServlet.java b/src/main/java/de/jalin/ldapadmin/web/ProfileServlet.java index 8ef1c7c..da8c7c9 100644 --- a/src/main/java/de/jalin/ldapadmin/web/ProfileServlet.java +++ b/src/main/java/de/jalin/ldapadmin/web/ProfileServlet.java @@ -19,7 +19,7 @@ import de.jalin.ldapadmin.ldap.LDAPSessionException; import de.jalin.ldapadmin.ldap.SimplePasswordException; import de.jalin.ldapadmin.ldap.UsersDAO; -@WebServlet(name = "LdapProfile", urlPatterns = {"/profile", "/profile/*"}, loadOnStartup = 1) +@WebServlet(name = "LdapProfile", urlPatterns = {"/", "/profile", "/profile/*"}, loadOnStartup = 1) public class ProfileServlet extends AbstractLDAPServlet { private static final long serialVersionUID = 1L; diff --git a/src/main/java/de/jalin/ldapadmin/web/ResetPasswordServlet.java b/src/main/java/de/jalin/ldapadmin/web/ResetPasswordServlet.java index 86c3154..ff6ff8a 100644 --- a/src/main/java/de/jalin/ldapadmin/web/ResetPasswordServlet.java +++ b/src/main/java/de/jalin/ldapadmin/web/ResetPasswordServlet.java @@ -142,12 +142,9 @@ public class ResetPasswordServlet extends AbstractLDAPServlet { final SortedMap usersMap = usrDAO.loadUsers(); final Collection allUsers = usersMap.values(); for (User usr : allUsers) { - if (usr.getEmailInternal() != null && usr.getEmailInternal().equalsIgnoreCase(loginOrEMail)) { + if (usr.getEmail() != null && usr.getEmail().equalsIgnoreCase(loginOrEMail)) { login = usr.getLogin(); - email = usr.getEmailExternal(); - if (email == null || email.isEmpty()) { - email = usr.getEmailInternal(); - } + email = usr.getEmail(); salutation = usr.getFirstname() + " " + usr.getLastname(); } } @@ -155,10 +152,7 @@ public class ResetPasswordServlet extends AbstractLDAPServlet { final User usr = usrDAO.read("uid=" + loginOrEMail + ",ou=users,"); if (usr != null) { login = usr.getLogin(); - email = usr.getEmailExternal(); - if (email == null || email.isEmpty()) { - email = usr.getEmailInternal(); - } + email = usr.getEmail(); salutation = usr.getFirstname() + " " + usr.getLastname(); } } diff --git a/src/main/java/de/jalin/ldapadmin/web/UserServlet.java b/src/main/java/de/jalin/ldapadmin/web/UserServlet.java index 04d82fb..9c2e34a 100644 --- a/src/main/java/de/jalin/ldapadmin/web/UserServlet.java +++ b/src/main/java/de/jalin/ldapadmin/web/UserServlet.java @@ -85,7 +85,6 @@ public class UserServlet extends AbstractLDAPServlet { final String firstname = req.getParameter("firstname"); final String lastname = req.getParameter("lastname"); final String email = req.getParameter("email"); - final String emailExt = req.getParameter("extemail"); final String phone = req.getParameter("phone"); final String mobile = req.getParameter("mobile"); final String password = req.getParameter("password"); @@ -98,8 +97,7 @@ public class UserServlet extends AbstractLDAPServlet { usr.setFirstname(firstname); usr.setLastname(lastname); usr.setDisplayname(firstname + " " + lastname); - usr.setEmailInternal(email); - usr.setEmailExternal(emailExt); + usr.setEmail(email); usr.setPhone(phone); usr.setMobile(mobile); final List memberships = new ArrayList<>(); diff --git a/src/main/resources/de/jalin/ldapadmin/contact.properties b/src/main/resources/de/jalin/ldapadmin/contact.properties deleted file mode 100644 index 10b3a3f..0000000 --- a/src/main/resources/de/jalin/ldapadmin/contact.properties +++ /dev/null @@ -1,2 +0,0 @@ -contact.title=LDAP Administration -contact.text=We 'll answer your questions gladly. \ No newline at end of file diff --git a/src/main/resources/de/jalin/ldapadmin/contact_de.properties b/src/main/resources/de/jalin/ldapadmin/contact_de.properties deleted file mode 100644 index 9c73e3b..0000000 --- a/src/main/resources/de/jalin/ldapadmin/contact_de.properties +++ /dev/null @@ -1,2 +0,0 @@ -contact.title=LDAP Administration -contact.text=Ihre Fragen beantworten wir Ihnen gern. \ No newline at end of file diff --git a/src/main/resources/de/jalin/ldapadmin/contact_en.properties b/src/main/resources/de/jalin/ldapadmin/contact_en.properties deleted file mode 100644 index 10b3a3f..0000000 --- a/src/main/resources/de/jalin/ldapadmin/contact_en.properties +++ /dev/null @@ -1,2 +0,0 @@ -contact.title=LDAP Administration -contact.text=We 'll answer your questions gladly. \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index 877e0cf..0dfcc17 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -11,7 +11,7 @@ *.js - /index.jsp + /profile 403 @@ -28,8 +28,6 @@ Public access - / - /index.jsp *.css *.js /css/* @@ -43,9 +41,9 @@ Profile Area + / /profile /profile/* - / ldapadmin diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp deleted file mode 100644 index 29fdcad..0000000 --- a/src/main/webapp/index.jsp +++ /dev/null @@ -1,19 +0,0 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> - - - - - - - - -
-

-

- E-Mail an service@example.com -
- - - diff --git a/src/main/webapp/template/empty-navbar.jsp b/src/main/webapp/template/empty-navbar.jsp index 7580cd3..eb6edd9 100644 --- a/src/main/webapp/template/empty-navbar.jsp +++ b/src/main/webapp/template/empty-navbar.jsp @@ -11,16 +11,13 @@ - "> + diff --git a/src/main/webapp/template/navbar.jsp b/src/main/webapp/template/navbar.jsp index 69e6c76..6f654d8 100644 --- a/src/main/webapp/template/navbar.jsp +++ b/src/main/webapp/template/navbar.jsp @@ -11,7 +11,7 @@ - "> + -
- -
- + value="${user.email}" placeholder="Enter email">
diff --git a/src/test/java/de/jalin/ldapadmin/ldap/TestCreateGroup.java b/src/test/java/de/jalin/ldapadmin/ldap/TestCreateGroup.java index 3994498..4646ba9 100644 --- a/src/test/java/de/jalin/ldapadmin/ldap/TestCreateGroup.java +++ b/src/test/java/de/jalin/ldapadmin/ldap/TestCreateGroup.java @@ -61,7 +61,7 @@ public class TestCreateGroup { final User newUser = new User(); newUser.setDn(USERS_DN.replace("${uid}", uid)); newUser.setDisplayname(fn + " " + ln); - newUser.setEmailInternal(fn.toLowerCase() + "." + ln.toLowerCase() + "@example.com"); + newUser.setEmail(fn.toLowerCase() + "." + ln.toLowerCase() + "@example.com"); newUser.setFirstname(fn); newUser.setLastname(ln); newUser.setLogin(uid); diff --git a/src/test/java/de/jalin/ldapadmin/ldap/TestCreateUser.java b/src/test/java/de/jalin/ldapadmin/ldap/TestCreateUser.java index fdb98e1..8a358c5 100644 --- a/src/test/java/de/jalin/ldapadmin/ldap/TestCreateUser.java +++ b/src/test/java/de/jalin/ldapadmin/ldap/TestCreateUser.java @@ -40,8 +40,7 @@ public class TestCreateUser { final User newUser = new User(); newUser.setDn(USERS_DN); newUser.setDisplayname("Peter Petersen"); - newUser.setEmailInternal("peter.petersen@example.com"); - newUser.setEmailExternal("peter.petersen@external.com"); + newUser.setEmail("peter.petersen@example.com"); newUser.setFirstname("Peter"); newUser.setLastname("Petersen"); newUser.setLogin("pet"); @@ -51,8 +50,7 @@ public class TestCreateUser { dao.create(newUser); final User createdUser = dao.loadUsers().get(USERS_DN); assertNotNull("should exist", createdUser); - assertTrue("peter.petersen@example.com".equals(createdUser.getEmailInternal())); - assertTrue("peter.petersen@external.com".equals(createdUser.getEmailExternal())); + assertTrue("peter.petersen@example.com".equals(createdUser.getEmail())); } catch (LDAPSessionException | RequiredAttributeException | AlreadyBoundException e) { fail(e.getMessage()); } diff --git a/src/test/java/de/jalin/ldapadmin/ldap/TestDeleteUser.java b/src/test/java/de/jalin/ldapadmin/ldap/TestDeleteUser.java index 7e37de1..e692118 100644 --- a/src/test/java/de/jalin/ldapadmin/ldap/TestDeleteUser.java +++ b/src/test/java/de/jalin/ldapadmin/ldap/TestDeleteUser.java @@ -40,7 +40,7 @@ public class TestDeleteUser { final User newUser = new User(); newUser.setDn(USERS_DN); newUser.setDisplayname("Hein Hanssen"); - newUser.setEmailInternal("hein.hanssen@example.com"); + newUser.setEmail("hein.hanssen@example.com"); newUser.setFirstname("Hein"); newUser.setLastname("Hanssen"); newUser.setLogin("hei"); diff --git a/src/test/java/de/jalin/ldapadmin/ldap/TestReadUser.java b/src/test/java/de/jalin/ldapadmin/ldap/TestReadUser.java index bf2afbc..19f177f 100644 --- a/src/test/java/de/jalin/ldapadmin/ldap/TestReadUser.java +++ b/src/test/java/de/jalin/ldapadmin/ldap/TestReadUser.java @@ -40,7 +40,7 @@ public class TestReadUser { final User newUser = new User(); newUser.setDn(USERS_DN); newUser.setDisplayname("Chris Christansen"); - newUser.setEmailInternal("chris.christansen@example.com"); + newUser.setEmail("chris.christansen@example.com"); newUser.setFirstname("Chris"); newUser.setLastname("Christansen"); newUser.setLogin("chr"); @@ -52,7 +52,7 @@ public class TestReadUser { assertNotNull("should exist", createdUser); final User readUser = dao.read(USERS_DN); assertNotNull(readUser); - assertTrue("chris.christansen@example.com".equals(readUser.getEmailInternal())); + assertTrue("chris.christansen@example.com".equals(readUser.getEmail())); } catch (LDAPSessionException | RequiredAttributeException | AlreadyBoundException e) { fail(e.getMessage()); } diff --git a/src/test/java/de/jalin/ldapadmin/ldap/TestUpdateAsBindUser.java b/src/test/java/de/jalin/ldapadmin/ldap/TestUpdateAsBindUser.java index 0a594a4..beb6de5 100644 --- a/src/test/java/de/jalin/ldapadmin/ldap/TestUpdateAsBindUser.java +++ b/src/test/java/de/jalin/ldapadmin/ldap/TestUpdateAsBindUser.java @@ -48,7 +48,7 @@ public class TestUpdateAsBindUser { final User newUser = new User(); newUser.setDn(USERS_DN); newUser.setDisplayname("Paul Paulsen"); - newUser.setEmailInternal("paul.paulsen@example.com"); + newUser.setEmail("paul.paulsen@example.com"); newUser.setFirstname("Paul"); newUser.setLastname("Pausen"); newUser.setLogin("pau"); diff --git a/src/test/java/de/jalin/ldapadmin/ldap/TestUpdateAsSimpleUser.java b/src/test/java/de/jalin/ldapadmin/ldap/TestUpdateAsSimpleUser.java index 7a5379d..0e5451e 100644 --- a/src/test/java/de/jalin/ldapadmin/ldap/TestUpdateAsSimpleUser.java +++ b/src/test/java/de/jalin/ldapadmin/ldap/TestUpdateAsSimpleUser.java @@ -31,7 +31,7 @@ public class TestUpdateAsSimpleUser { final User newUser = new User(); newUser.setDn(USERS_DN); newUser.setDisplayname("Paul Petersen"); - newUser.setEmailInternal("paul.petersen@example.com"); + newUser.setEmail("paul.petersen@example.com"); newUser.setFirstname("Paul"); newUser.setLastname("Petersen"); newUser.setLogin("plp"); @@ -61,7 +61,7 @@ public class TestUpdateAsSimpleUser { final User newUser = new User(); newUser.setDn(USERS_DN); newUser.setDisplayname("Micha Michaelsen"); - newUser.setEmailInternal("micha.michaelsen@example.com"); + newUser.setEmail("micha.michaelsen@example.com"); newUser.setFirstname("Michael"); newUser.setLastname("Michaelsen"); newUser.setLogin("mic"); diff --git a/src/test/java/de/jalin/ldapadmin/ldap/TestUpdateUser.java b/src/test/java/de/jalin/ldapadmin/ldap/TestUpdateUser.java index c9085c1..b806caf 100644 --- a/src/test/java/de/jalin/ldapadmin/ldap/TestUpdateUser.java +++ b/src/test/java/de/jalin/ldapadmin/ldap/TestUpdateUser.java @@ -43,7 +43,7 @@ public class TestUpdateUser { final User newUser = new User(); newUser.setDn(USERS_DN); newUser.setDisplayname("Klaas Clahsen"); - newUser.setEmailInternal("klaas.clahsen@example.com"); + newUser.setEmail("klaas.clahsen@example.com"); newUser.setFirstname("Klaas"); newUser.setLastname("Klahsen"); newUser.setLogin("kla");