Fix NPE on trying to send email for user without email address
Configuring an email address for service users is optional. If no email
address is configured for a service user and the owner of the service
user tries to generate an HTTP password for it then an NPE is thrown.
Fix this by using OutgoingEmail.add(RecipientType, Account.Id) which
checks if the preferred email of the recipient is null and as a plus
also checks if the account is active which avoids trying to send email
to inactive accounts.
Fix some more occurrences of the same root cause that Address.create()
expects a non-null email address.
Bug: Issue 12847
Bug: Issue 12862
Change-Id: Id222c6a99a4212b3745766fafa3a03b38ae0b8fd
diff --git a/java/com/google/gerrit/server/mail/send/AddKeySender.java b/java/com/google/gerrit/server/mail/send/AddKeySender.java
index 3b7b2aa..572c972 100644
--- a/java/com/google/gerrit/server/mail/send/AddKeySender.java
+++ b/java/com/google/gerrit/server/mail/send/AddKeySender.java
@@ -17,7 +17,6 @@
import com.google.common.base.Joiner;
import com.google.gerrit.exceptions.EmailException;
import com.google.gerrit.extensions.api.changes.RecipientType;
-import com.google.gerrit.mail.Address;
import com.google.gerrit.server.IdentifiedUser;
import com.google.gerrit.server.account.AccountSshKey;
import com.google.inject.assistedinject.Assisted;
@@ -58,7 +57,7 @@
protected void init() throws EmailException {
super.init();
setHeader("Subject", String.format("[Gerrit Code Review] New %s Keys Added", getKeyType()));
- add(RecipientType.TO, Address.create(getEmail()));
+ add(RecipientType.TO, user.getAccountId());
}
@Override
diff --git a/java/com/google/gerrit/server/mail/send/DeleteKeySender.java b/java/com/google/gerrit/server/mail/send/DeleteKeySender.java
index 3df7f05..bbbfa1d 100644
--- a/java/com/google/gerrit/server/mail/send/DeleteKeySender.java
+++ b/java/com/google/gerrit/server/mail/send/DeleteKeySender.java
@@ -17,7 +17,6 @@
import com.google.common.base.Joiner;
import com.google.gerrit.exceptions.EmailException;
import com.google.gerrit.extensions.api.changes.RecipientType;
-import com.google.gerrit.mail.Address;
import com.google.gerrit.server.IdentifiedUser;
import com.google.gerrit.server.account.AccountSshKey;
import com.google.inject.assistedinject.Assisted;
@@ -63,7 +62,7 @@
protected void init() throws EmailException {
super.init();
setHeader("Subject", String.format("[Gerrit Code Review] %s Keys Deleted", getKeyType()));
- add(RecipientType.TO, Address.create(getEmail()));
+ add(RecipientType.TO, user.getAccountId());
}
@Override
diff --git a/java/com/google/gerrit/server/mail/send/HttpPasswordUpdateSender.java b/java/com/google/gerrit/server/mail/send/HttpPasswordUpdateSender.java
index cec2bb5..abb8eda 100644
--- a/java/com/google/gerrit/server/mail/send/HttpPasswordUpdateSender.java
+++ b/java/com/google/gerrit/server/mail/send/HttpPasswordUpdateSender.java
@@ -16,7 +16,6 @@
import com.google.gerrit.exceptions.EmailException;
import com.google.gerrit.extensions.api.changes.RecipientType;
-import com.google.gerrit.mail.Address;
import com.google.gerrit.server.IdentifiedUser;
import com.google.inject.assistedinject.Assisted;
import com.google.inject.assistedinject.AssistedInject;
@@ -42,7 +41,7 @@
protected void init() throws EmailException {
super.init();
setHeader("Subject", "[Gerrit Code Review] HTTP password was " + operation);
- add(RecipientType.TO, Address.create(getEmail()));
+ add(RecipientType.TO, user.getAccountId());
}
@Override
