1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
|
// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
package com.yahoo.vespa.hosted.controller;
import com.yahoo.config.provision.SystemName;
import com.yahoo.config.provision.TenantName;
import com.yahoo.vespa.hosted.controller.api.integration.stubs.MockMailer;
import com.yahoo.vespa.hosted.controller.application.MailVerifier;
import com.yahoo.vespa.hosted.controller.tenant.CloudTenant;
import com.yahoo.vespa.hosted.controller.tenant.Email;
import com.yahoo.vespa.hosted.controller.tenant.PendingMailVerification;
import com.yahoo.vespa.hosted.controller.tenant.Tenant;
import com.yahoo.vespa.hosted.controller.tenant.TenantBilling;
import com.yahoo.vespa.hosted.controller.tenant.TenantContact;
import com.yahoo.vespa.hosted.controller.tenant.TenantContacts;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import java.time.Duration;
import java.util.List;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* @author olaa
*/
class MailVerifierTest {
private final ControllerTester tester = new ControllerTester(SystemName.Public);
private final MockMailer mailer = tester.serviceRegistry().mailer();
private final MailVerifier mailVerifier = new MailVerifier(tester.serviceRegistry().consoleUrls(), tester.controller().tenants(), mailer, tester.curator(), tester.clock());
private static final TenantName tenantName = TenantName.from("scoober");
private static final String mail = "unverified@bar.com";
private static final List<TenantContacts.Audience> audiences = List.of(TenantContacts.Audience.NOTIFICATIONS, TenantContacts.Audience.TENANT);
@BeforeEach
public void setup() {
tester.createTenant(tenantName.value(), Tenant.Type.cloud);
tester.controller().tenants().lockOrThrow(tenantName, LockedTenant.Cloud.class, lockedTenant -> {
var contacts = List.of(
new TenantContacts.EmailContact(audiences, new Email("verified@bar.com", true)),
new TenantContacts.EmailContact(audiences, new Email(mail, false)),
new TenantContacts.EmailContact(audiences, new Email("another-unverified@bar.com", false))
);
lockedTenant = lockedTenant.withInfo(lockedTenant.get().info().withContacts(new TenantContacts(contacts)));
tester.controller().tenants().store(lockedTenant);
});
}
@Test
public void test_new_mail_verification() {
mailVerifier.sendMailVerification(tenantName, mail, PendingMailVerification.MailType.NOTIFICATIONS);
// Verify mail is sent
assertEquals(1, mailer.inbox(mail).size());
// Verify ZK data is updated
var writtenMailVerification = tester.curator().listPendingMailVerifications().get(0);
assertEquals(PendingMailVerification.MailType.NOTIFICATIONS, writtenMailVerification.getMailType());
assertEquals(tenantName, writtenMailVerification.getTenantName());
assertEquals(tester.clock().instant().plus(Duration.ofDays(7)), writtenMailVerification.getVerificationDeadline());
assertEquals(mail, writtenMailVerification.getMailAddress());
// Mail verification is no-op if deadline has passed
tester.clock().advance(Duration.ofDays(14));
assertFalse(mailVerifier.verifyMail(writtenMailVerification.getVerificationCode()));
assertFalse(tester.curator().listPendingMailVerifications().isEmpty());
// Mail is verified
tester.clock().retreat(Duration.ofDays(14));
mailVerifier.verifyMail(writtenMailVerification.getVerificationCode());
assertTrue(tester.curator().listPendingMailVerifications().isEmpty());
var tenant = tester.controller().tenants().require(tenantName, CloudTenant.class);
var expectedContacts = List.of(
new TenantContacts.EmailContact(audiences, new Email("verified@bar.com", true)),
new TenantContacts.EmailContact(audiences, new Email(mail, true)),
new TenantContacts.EmailContact(audiences, new Email("another-unverified@bar.com", false))
);
assertEquals(expectedContacts, tenant.info().contacts().all());
}
@Test
public void resending_verification_deletes_old_one() {
var pendingMailVerification = mailVerifier.sendMailVerification(tenantName, mail, PendingMailVerification.MailType.NOTIFICATIONS);
var tenant = tester.controller().tenants().require(tenantName, CloudTenant.class);
// Unknown mail is no-op
var resentVerification = mailVerifier.resendMailVerification(tenantName, "unknown-mail", PendingMailVerification.MailType.NOTIFICATIONS);
assertTrue(resentVerification.isEmpty());
assertTrue(tester.curator().getPendingMailVerification(pendingMailVerification.getVerificationCode()).isPresent());
// Verification mail is re-sent, old data is replaced
resentVerification = mailVerifier.resendMailVerification(tenantName, mail, PendingMailVerification.MailType.NOTIFICATIONS);
assertTrue(resentVerification.isPresent());
assertTrue(tester.curator().getPendingMailVerification(pendingMailVerification.getVerificationCode()).isEmpty());
assertTrue(tester.curator().getPendingMailVerification(resentVerification.get().getVerificationCode()).isPresent());
}
@Test
public void test_billing_mail_verification() {
var billingMail = "billing@foo.bar";
tester.controller().tenants().lockOrThrow(tenantName, LockedTenant.Cloud.class, lockedTenant -> {
var tenantBilling = TenantBilling.empty().withContact(TenantContact.empty().withEmail(new Email(billingMail, false)));
lockedTenant = lockedTenant.withInfo(lockedTenant.get().info().withBilling(tenantBilling));
tester.controller().tenants().store(lockedTenant);
});
mailVerifier.sendMailVerification(tenantName, billingMail, PendingMailVerification.MailType.BILLING);
// Assert written verification data
var writtenMailVerification = tester.curator().listPendingMailVerifications().get(0);
assertEquals(PendingMailVerification.MailType.BILLING, writtenMailVerification.getMailType());
assertEquals(tenantName, writtenMailVerification.getTenantName());
assertEquals(tester.clock().instant().plus(Duration.ofDays(7)), writtenMailVerification.getVerificationDeadline());
assertEquals(billingMail, writtenMailVerification.getMailAddress());
// Assert mail is verified
mailVerifier.verifyMail(writtenMailVerification.getVerificationCode());
assertTrue(tester.curator().listPendingMailVerifications().isEmpty());
var tenant = tester.controller().tenants().require(tenantName, CloudTenant.class);
var expectedBillingContact = TenantContact.empty().withEmail(new Email(billingMail, true));
assertEquals(expectedBillingContact, tenant.info().billingContact().contact());
}
}
|
