import org.cacert.gigi.pages.account.domain.DomainOverview;
import org.cacert.gigi.pages.account.mail.MailOverview;
import org.cacert.gigi.pages.admin.TTPAdminPage;
-import org.cacert.gigi.pages.admin.support.FindDomainPage;
-import org.cacert.gigi.pages.admin.support.FindUserPage;
+import org.cacert.gigi.pages.admin.support.FindUserByDomainPage;
+import org.cacert.gigi.pages.admin.support.FindUserByEmailPage;
import org.cacert.gigi.pages.admin.support.SupportEnterTicketPage;
import org.cacert.gigi.pages.admin.support.SupportUserDetailsPage;
import org.cacert.gigi.pages.error.AccessDenied;
putPage(ViewOrgPage.DEFAULT_PATH + "/*", new ViewOrgPage(), "Organisation Admin");
putPage(SupportEnterTicketPage.PATH, new SupportEnterTicketPage(), "Support Console");
- putPage(FindUserPage.PATH, new FindUserPage(), "Support Console");
- putPage(FindDomainPage.PATH, new FindDomainPage(), "Support Console");
+ putPage(FindUserByEmailPage.PATH, new FindUserByEmailPage(), "Support Console");
+ putPage(FindUserByDomainPage.PATH, new FindUserByDomainPage(), "Support Console");
putPage(SupportUserDetailsPage.PATH + "*", new SupportUserDetailsPage(), null);
putPage(ChangePasswordPage.PATH, new ChangePasswordPage(), "My Account");
import java.io.IOException;
import java.util.Date;
+import java.util.LinkedList;
import java.util.Locale;
import org.cacert.gigi.GigiApiException;
}
return em;
}
+
+ public User getOwner() {
+ return owner;
+ }
+
+ public static EmailAddress[] findByAllEmail(String mail) {
+ LinkedList<EmailAddress> results = new LinkedList<EmailAddress>();
+ try (GigiPreparedStatement ps = new GigiPreparedStatement("SELECT `emails`.`id` FROM `emails` INNER JOIN `users` ON `users`.`id` = `emails`.`memid` INNER JOIN `certOwners` ON `certOwners`.`id` = `users`.`id` WHERE `emails`.`email` LIKE ? AND `emails`.`deleted` IS NULL AND `certOwners`.`deleted` IS NULL ORDER BY `users`.`id`, `emails`.`email` LIMIT 100")) {
+ ps.setString(1, mail);
+ GigiResultSet rs = ps.executeQuery();
+ while (rs.next()) {
+ results.add(EmailAddress.getById(rs.getInt(1)));
+ }
+ return results.toArray(new EmailAddress[results.size()]);
+ }
+ }
}
}
public String getTranslation(String text) {
+ if (text == null || text.equals("")) {
+ return text;
+ }
String string = translations.get(text);
if (string == null || string.equals("")) {
return text;
import java.util.Map;
import org.cacert.gigi.dbObjects.Assurance;
+import org.cacert.gigi.dbObjects.Name;
import org.cacert.gigi.localisation.Language;
import org.cacert.gigi.output.template.IterableDataset;
import org.cacert.gigi.output.template.Outputable;
Assurance assurance = assurances[i];
vars.put("id", assurance.getId());
vars.put("method", assurance.getMethod());
+ Name to = assurance.getTo();
if (assurer) {
- vars.put("verbVal", assurance.getTo().getOwner().getId());
- vars.put("myName", assurance.getTo());
+ vars.put("verbVal", to == null ? l.getTranslation("applicant's name removed") : to.getOwner().getId());
+ vars.put("myName", to == null ? l.getTranslation("applicant's name removed") : to);
} else {
vars.put("verbVal", assurance.getFrom().getPreferredName());
- vars.put("myName", assurance.getTo());
+ vars.put("myName", to == null ? l.getTranslation("own name removed") : to);
}
vars.put("date", assurance.getDate());
vars.put("location", assurance.getLocation());
import org.cacert.gigi.output.template.SprintfCommand;
import org.cacert.gigi.output.template.Template;
-public class FindDomainForm extends Form {
+public class FindUserByDomainForm extends Form {
private CertificateOwner res = null;
- private static final Template t = new Template(FindDomainForm.class.getResource("FindDomainForm.templ"));
+ private static final Template t = new Template(FindUserByDomainForm.class.getResource("FindUserByDomainForm.templ"));
- public FindDomainForm(HttpServletRequest hsr) {
+ public FindUserByDomainForm(HttpServletRequest hsr) {
super(hsr);
}
import org.cacert.gigi.pages.OneFormPage;
import org.cacert.gigi.util.AuthorizationContext;
-public class FindDomainPage extends OneFormPage {
+public class FindUserByDomainPage extends OneFormPage {
public static final String PATH = "/support/find/domain";
- public FindDomainPage() {
- super("Find Domain", FindDomainForm.class);
+ public FindUserByDomainPage() {
+ super("Find Domain", FindUserByDomainForm.class);
}
@Override
public String getSuccessPath(Form f) {
- CertificateOwner res = ((FindDomainForm) f).getRes();
+ CertificateOwner res = ((FindUserByDomainForm) f).getRes();
if (res instanceof User) {
return SupportUserDetailsPage.PATH + res.getId();
} else if (res instanceof Organisation) {
import javax.servlet.http.HttpServletRequest;
import org.cacert.gigi.GigiApiException;
-import org.cacert.gigi.dbObjects.User;
+import org.cacert.gigi.dbObjects.EmailAddress;
import org.cacert.gigi.localisation.Language;
import org.cacert.gigi.output.template.Form;
import org.cacert.gigi.output.template.SprintfCommand;
import org.cacert.gigi.output.template.Template;
-public class FindUserForm extends Form {
+public class FindUserByEmailForm extends Form {
- private User users[];
+ private EmailAddress emails[];
- private static final Template t = new Template(FindDomainForm.class.getResource("FindUserForm.templ"));
+ private static final Template t = new Template(FindUserByDomainForm.class.getResource("FindUserByEmailForm.templ"));
- public FindUserForm(HttpServletRequest hsr) {
+ public FindUserByEmailForm(HttpServletRequest hsr) {
super(hsr);
}
@Override
public boolean submit(PrintWriter out, HttpServletRequest req) throws GigiApiException {
- User[] users = User.findByEmail(req.getParameter("email"));
- if (users.length == 0) {
+ EmailAddress[] emails = EmailAddress.findByAllEmail(req.getParameter("email"));
+ if (emails.length == 0) {
throw new GigiApiException(SprintfCommand.createSimple("No users found matching {0}", req.getParameter("email")));
}
- this.users = users;
+ this.emails = emails;
return true;
}
t.output(out, l, vars);
}
- public User[] getUsers() {
- return users;
+ public EmailAddress[] getEmails() {
+ return emails;
}
}
<? if($first) {?>
<table class="table">
<tbody><tr>
- <th colspan="2"><?=_Find User?></th>
+ <th colspan="2"><?=_Find User by Email?></th>
</tr>
<tr>
<td><?=_Email?>:</td>
import javax.servlet.http.HttpServletResponse;
import org.cacert.gigi.GigiApiException;
-import org.cacert.gigi.dbObjects.User;
+import org.cacert.gigi.dbObjects.EmailAddress;
import org.cacert.gigi.localisation.Language;
import org.cacert.gigi.output.template.Form;
import org.cacert.gigi.output.template.IterableDataset;
import org.cacert.gigi.pages.Page;
import org.cacert.gigi.util.AuthorizationContext;
-public class FindUserPage extends Page {
+public class FindUserByEmailPage extends Page {
- public static final String PATH = "/support/find/user";
+ public static final String PATH = "/support/find/email";
- public FindUserPage() {
- super("Find User");
+ public FindUserByEmailPage() {
+ super("Find Email");
}
@Override
public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
HashMap<String, Object> vars = new HashMap<String, Object>();
vars.put("first", true);
- new FindUserForm(req).output(resp.getWriter(), Page.getLanguage(req), vars);
+ new FindUserByEmailForm(req).output(resp.getWriter(), Page.getLanguage(req), vars);
}
@Override
public void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException {
- FindUserForm form = Form.getForm(req, FindUserForm.class);
+ FindUserByEmailForm form = Form.getForm(req, FindUserByEmailForm.class);
try {
form.submit(resp.getWriter(), req);
- final User[] users = form.getUsers();
- if (users.length == 1) {
- resp.sendRedirect(SupportUserDetailsPage.PATH + users[0].getId());
+ final EmailAddress[] emails = form.getEmails();
+ if (emails.length == 1) {
+ resp.sendRedirect(SupportUserDetailsPage.PATH + emails[0].getOwner().getId());
} else {
HashMap<String, Object> vars = new HashMap<String, Object>();
vars.put("first", false);
@Override
public boolean next(Language l, Map<String, Object> vars) {
- if (i == users.length) {
+ if (i == emails.length) {
return false;
}
- vars.put("usrid", users[i].getId());
- vars.put("usermail", users[i].getEmail());
+ vars.put("usrid", emails[i].getOwner().getId());
+ vars.put("usermail", emails[i].getAddress());
i++;
return true;
}
public class SupportUserDetailsForm extends Form {
- private static final Template t = new Template(FindDomainForm.class.getResource("SupportUserDetailsForm.templ"));
+ private static final Template t = new Template(FindUserByDomainForm.class.getResource("SupportUserDetailsForm.templ"));
private SupportedUser user;
import org.cacert.gigi.dbObjects.Domain;
import org.cacert.gigi.dbObjects.Group;
import org.cacert.gigi.dbObjects.User;
-import org.cacert.gigi.pages.admin.support.FindDomainPage;
+import org.cacert.gigi.pages.admin.support.FindUserByDomainPage;
import org.cacert.gigi.pages.admin.support.SupportEnterTicketPage;
import org.cacert.gigi.pages.admin.support.SupportUserDetailsPage;
import org.cacert.gigi.testUtils.ClientTest;
@Test
public void testDomainSearch() throws MalformedURLException, UnsupportedEncodingException, IOException, GigiApiException {
- URLConnection uc = post(FindDomainPage.PATH, "process&domain=" + URLEncoder.encode(domainName, "UTF-8"));
+ URLConnection uc = post(FindUserByDomainPage.PATH, "process&domain=" + URLEncoder.encode(domainName, "UTF-8"));
assertEquals("https://" + ServerConstants.getWwwHostNamePortSecure() + SupportUserDetailsPage.PATH + tid, uc.getHeaderField("Location"));
}
@Test
public void testDomainSearchById() throws MalformedURLException, UnsupportedEncodingException, IOException, GigiApiException {
- URLConnection uc = post(FindDomainPage.PATH, "process&domain=#" + d.getId());
+ URLConnection uc = post(FindUserByDomainPage.PATH, "process&domain=#" + d.getId());
assertEquals("https://" + ServerConstants.getWwwHostNamePortSecure() + SupportUserDetailsPage.PATH + tid, uc.getHeaderField("Location"));
}
@Test
public void testDomainSearchNonExist() throws MalformedURLException, UnsupportedEncodingException, IOException, GigiApiException {
- URLConnection uc = post(FindDomainPage.PATH, "process&domain=" + URLEncoder.encode(createUniqueName() + ".de", "UTF-8"));
+ URLConnection uc = post(FindUserByDomainPage.PATH, "process&domain=" + URLEncoder.encode(createUniqueName() + ".de", "UTF-8"));
assertNotNull(fetchStartErrorMessage(IOUtils.readURL(uc)));
}
found = true;
}
assumeTrue(found);
- URLConnection uc = post(FindDomainPage.PATH, "process&domain=#" + id);
+ URLConnection uc = post(FindUserByDomainPage.PATH, "process&domain=#" + id);
assertNotNull(fetchStartErrorMessage(IOUtils.readURL(uc)));
}
}
import java.net.URLConnection;
import java.net.URLEncoder;
+import org.cacert.gigi.GigiApiException;
import org.cacert.gigi.dbObjects.Group;
-import org.cacert.gigi.pages.admin.support.FindUserPage;
+import org.cacert.gigi.dbObjects.User;
+import org.cacert.gigi.pages.admin.support.FindUserByEmailPage;
import org.cacert.gigi.pages.admin.support.SupportEnterTicketPage;
import org.cacert.gigi.pages.admin.support.SupportUserDetailsPage;
import org.cacert.gigi.testUtils.ClientTest;
String mail = createUniqueName() + "@example.com";
int id = createVerifiedUser("Först", "Secönd", mail, TEST_PASSWORD);
- URLConnection uc = post(cookie, FindUserPage.PATH, "process&email=" + URLEncoder.encode(mail, "UTF-8"), 0);
+ URLConnection uc = post(cookie, FindUserByEmailPage.PATH, "process&email=" + URLEncoder.encode(mail, "UTF-8"), 0);
assertEquals("https://" + ServerConstants.getWwwHostNamePortSecure() + SupportUserDetailsPage.PATH + id, uc.getHeaderField("Location"));
}
String mail = createUniqueName() + "@example.tld";
int id = createVerifiedUser("Först", "Secönd", mail, TEST_PASSWORD);
- URLConnection uc = post(cookie, FindUserPage.PATH, "process&email=" + URLEncoder.encode("%@example.tld", "UTF-8"), 0);
+ URLConnection uc = post(cookie, FindUserByEmailPage.PATH, "process&email=" + URLEncoder.encode("%@example.tld", "UTF-8"), 0);
assertEquals("https://" + ServerConstants.getWwwHostNamePortSecure() + SupportUserDetailsPage.PATH + id, uc.getHeaderField("Location"));
}
int id = createVerifiedUser("Först", "Secönd", mail, TEST_PASSWORD);
String mail2 = createUniqueName() + "@example.org";
int id2 = createVerifiedUser("Först", "Secönd", mail2, TEST_PASSWORD);
- URLConnection uc = post(cookie, FindUserPage.PATH, "process&email=" + URLEncoder.encode("%@example.org", "UTF-8"), 0);
+ URLConnection uc = post(cookie, FindUserByEmailPage.PATH, "process&email=" + URLEncoder.encode("%@example.org", "UTF-8"), 0);
String res = IOUtils.readURL(uc);
assertThat(res, containsString(SupportUserDetailsPage.PATH + id));
String mail2 = createUniqueName() + "@fxample.org";
int id2 = createVerifiedUser("Först", "Secönd", mail2, TEST_PASSWORD);
- URLConnection uc = post(cookie, FindUserPage.PATH, "process&email=" + URLEncoder.encode("%@_xample.org", "UTF-8"), 0);
+ URLConnection uc = post(cookie, FindUserByEmailPage.PATH, "process&email=" + URLEncoder.encode("%@_xample.org", "UTF-8"), 0);
String res = IOUtils.readURL(uc);
assertThat(res, containsString(SupportUserDetailsPage.PATH + id));
@Test
public void testWildcardMailSearchNoRes() throws MalformedURLException, UnsupportedEncodingException, IOException {
- URLConnection uc = post(FindUserPage.PATH, "process&email=" + URLEncoder.encode("%@_humpfelkumpf.org", "UTF-8"));
+ URLConnection uc = post(FindUserByEmailPage.PATH, "process&email=" + URLEncoder.encode("%@_humpfelkumpf.org", "UTF-8"));
assertNotNull(fetchStartErrorMessage(IOUtils.readURL(uc)));
}
@Test
public void testFulltextMailSearchNoRes() throws MalformedURLException, UnsupportedEncodingException, IOException {
- URLConnection uc = post(cookie, FindUserPage.PATH, "process&email=" + URLEncoder.encode(createUniqueName() + "@example.org", "UTF-8"), 0);
+ URLConnection uc = post(cookie, FindUserByEmailPage.PATH, "process&email=" + URLEncoder.encode(createUniqueName() + "@example.org", "UTF-8"), 0);
assertNotNull(fetchStartErrorMessage(IOUtils.readURL(uc)));
}
+
+ @Test
+ public void testSearchSecondEmailAddress() throws MalformedURLException, UnsupportedEncodingException, IOException, InterruptedException, GigiApiException {
+ String mail = createUniqueName() + "@example1.org";
+ int id = createVerifiedUser("Först", "Secönd", mail, TEST_PASSWORD);
+ User testuser = User.getById(id);
+ String mail2 = createUniqueName() + "@example1.org";
+ createVerifiedEmail(testuser, mail2);
+
+ URLConnection uc = post(cookie, FindUserByEmailPage.PATH, "process&email=" + URLEncoder.encode(mail2, "UTF-8"), 0);
+ assertEquals("https://" + ServerConstants.getWwwHostNamePortSecure() + SupportUserDetailsPage.PATH + id, uc.getHeaderField("Location"));
+ }
+
+ @Test
+ public void testWildcardMailSearchSecondEmailAddress() throws MalformedURLException, UnsupportedEncodingException, IOException, InterruptedException, GigiApiException {
+ clearCaches();
+ String mail = createUniqueName() + "@example2.org";
+ int id = createVerifiedUser("Först", "Secönd", mail, TEST_PASSWORD);
+ User testuser = User.getById(id);
+ String mail2 = createUniqueName() + "@example2.org";
+ createVerifiedEmail(testuser, mail2);
+
+ URLConnection uc = post(cookie, FindUserByEmailPage.PATH, "process&email=" + URLEncoder.encode("%@example2.org", "UTF-8"), 0);
+
+ String res = IOUtils.readURL(uc);
+ assertThat(res, containsString(mail));
+ assertThat(res, containsString(mail2));
+ }
+
+ @Test
+ public void testWildcardMailSearchMultipleEmailAddressOneAccount() throws MalformedURLException, UnsupportedEncodingException, IOException, InterruptedException, GigiApiException {
+ clearCaches();
+ String mail = createUniqueName() + "@example3.org";
+ int id = createVerifiedUser("Först", "Secönd", mail, TEST_PASSWORD);
+ User testuser = User.getById(id);
+ String mail2 = createUniqueName() + "@test3.org";
+ createVerifiedEmail(testuser, mail2);
+ String mail3 = createUniqueName() + "@test3.org";
+ createVerifiedEmail(testuser, mail3);
+
+ URLConnection uc = post(cookie, FindUserByEmailPage.PATH, "process&email=" + URLEncoder.encode("%@example3.org", "UTF-8"), 0);
+ assertEquals("https://" + ServerConstants.getWwwHostNamePortSecure() + SupportUserDetailsPage.PATH + id, uc.getHeaderField("Location"));
+
+ uc = post(cookie, FindUserByEmailPage.PATH, "process&email=" + URLEncoder.encode("%@test3.org", "UTF-8"), 0);
+
+ String res = IOUtils.readURL(uc);
+ assertThat(res, not(containsString(mail)));
+ assertThat(res, containsString(mail2));
+ assertThat(res, containsString(mail3));
+ }
+
+ @Test
+ public void testWildcardMailSearchMultipleEmailAddressMultipleAccounts() throws MalformedURLException, UnsupportedEncodingException, IOException, InterruptedException, GigiApiException {
+ String mail = createUniqueName() + "1@example4.org";
+ int id = createVerifiedUser("Först", "Secönd", mail, TEST_PASSWORD);
+ User testuser = User.getById(id);
+ String mail2 = createUniqueName() + "@test4.org";
+ createVerifiedEmail(testuser, mail2);
+
+ String mail3 = createUniqueName() + "2@example4.org";
+ int id2 = createVerifiedUser("Först", "Secönd", mail3, TEST_PASSWORD);
+ User testuser2 = User.getById(id2);
+ String mail4 = createUniqueName() + "@test4.org";
+ createVerifiedEmail(testuser2, mail4);
+
+ URLConnection uc = post(cookie, FindUserByEmailPage.PATH, "process&email=" + URLEncoder.encode("%@example4.org", "UTF-8"), 0);
+
+ String res = IOUtils.readURL(uc);
+ assertThat(res, containsString(mail));
+ assertThat(res, not(containsString(mail2)));
+ assertThat(res, containsString(mail3));
+ assertThat(res, not(containsString(mail4)));
+
+ uc = post(cookie, FindUserByEmailPage.PATH, "process&email=" + URLEncoder.encode("%@test4.org", "UTF-8"), 0);
+
+ res = IOUtils.readURL(uc);
+ assertThat(res, not(containsString(mail)));
+ assertThat(res, containsString(mail2));
+ assertThat(res, not(containsString(mail3)));
+ assertThat(res, containsString(mail4));
+ }
}
import java.net.MalformedURLException;
import org.cacert.gigi.dbObjects.Group;
-import org.cacert.gigi.pages.admin.support.FindDomainPage;
-import org.cacert.gigi.pages.admin.support.FindUserPage;
+import org.cacert.gigi.pages.admin.support.FindUserByDomainPage;
+import org.cacert.gigi.pages.admin.support.FindUserByEmailPage;
import org.cacert.gigi.pages.admin.support.SupportEnterTicketPage;
import org.cacert.gigi.testUtils.ClientTest;
import org.junit.Test;
@Test
public void testFulltextMailSearch() throws MalformedURLException, UnsupportedEncodingException, IOException {
- assertEquals(403, get(FindUserPage.PATH).getResponseCode());
+ assertEquals(403, get(FindUserByEmailPage.PATH).getResponseCode());
assertEquals(302, post(cookie, SupportEnterTicketPage.PATH, "ticketno=a20140808.8&setTicket=action", 0).getResponseCode());
- assertEquals(200, get(FindUserPage.PATH).getResponseCode());
- assertEquals(200, get(FindDomainPage.PATH).getResponseCode());
+ assertEquals(200, get(FindUserByEmailPage.PATH).getResponseCode());
+ assertEquals(200, get(FindUserByDomainPage.PATH).getResponseCode());
assertEquals(302, post(cookie, SupportEnterTicketPage.PATH, "ticketno=a20140808.8&deleteTicket=action", 0).getResponseCode());
- assertEquals(403, get(FindUserPage.PATH).getResponseCode());
+ assertEquals(403, get(FindUserByEmailPage.PATH).getResponseCode());
}
}
}
public EmailAddress createVerifiedEmail(User u) throws InterruptedException, GigiApiException {
- EmailAddress adrr = new EmailAddress(u, createUniqueName() + "test@test.tld", Locale.ENGLISH);
+ return createVerifiedEmail(u, createUniqueName() + "test@test.tld");
+ }
+
+ public EmailAddress createVerifiedEmail(User u, String email) throws InterruptedException, GigiApiException {
+ EmailAddress addr = new EmailAddress(u, email, Locale.ENGLISH);
TestMail testMail = getMailReceiver().receive();
- assertEquals(adrr.getAddress(), testMail.getTo());
+ assertEquals(addr.getAddress(), testMail.getTo());
String hash = testMail.extractLink().substring(testMail.extractLink().lastIndexOf('=') + 1);
- adrr.verify(hash);
+ addr.verify(hash);
getMailReceiver().clearMails();
- return adrr;
+ return addr;
}
public static URLConnection cookie(URLConnection openConnection, String cookie) {
projects / gigi.git / commitdiff