Merge branch 'stable-2.15' into stable-2.16
* stable-2.15: GerritGlobalModule: Move binding of mail sender factories to EmailModule PostGpgKeys: Don't attempt to send notification when no keys were added Update rules_closure to latest version Change-Id: I2b59480cb503f025f0ebbf1e827cfbb217695eff
This commit is contained in:
David Pursehouse
commit
29153205fd
@ -15,9 +15,9 @@ http_archive(
|
||||
|
||||
http_archive(
|
||||
name = "io_bazel_rules_closure",
|
||||
sha256 = "34abd9170fdbfdfc6f3b63f2c18cee3cbcb2ddbd5e3c97324add0aa7809ed875",
|
||||
strip_prefix = "rules_closure-9d543facf886631e4ed379996e60ce3533188adc",
|
||||
urls = ["https://github.com/bazelbuild/rules_closure/archive/9d543facf886631e4ed379996e60ce3533188adc.tar.gz"],
|
||||
sha256 = "1c05fea22c9630cf1047f25d008780756373a60ddd4d2a6993cf9858279c5da6",
|
||||
strip_prefix = "rules_closure-50d3dc9e6d27a5577a0f95708466718825d579f4",
|
||||
urls = ["https://github.com/bazelbuild/rules_closure/archive/50d3dc9e6d27a5577a0f95708466718825d579f4.tar.gz"],
|
||||
)
|
||||
|
||||
# Transitive dependency of rules_closure and protobuf
|
||||
|
||||
@ -194,10 +194,11 @@ public class PostGpgKeys implements RestModifyView<AccountResource, GpgKeysInput
|
||||
throws BadRequestException, ResourceConflictException, PGPException, IOException {
|
||||
try (PublicKeyStore store = storeProvider.get()) {
|
||||
List<String> addedKeys = new ArrayList<>();
|
||||
IdentifiedUser user = rsrc.getUser();
|
||||
for (PGPPublicKeyRing keyRing : keyRings) {
|
||||
PGPPublicKey key = keyRing.getPublicKey();
|
||||
// Don't check web of trust; admins can fill in certifications later.
|
||||
CheckResult result = checkerFactory.create(rsrc.getUser(), store).disableTrust().check(key);
|
||||
CheckResult result = checkerFactory.create(user, store).disableTrust().check(key);
|
||||
if (!result.isOk()) {
|
||||
throw new BadRequestException(
|
||||
String.format(
|
||||
@ -212,7 +213,7 @@ public class PostGpgKeys implements RestModifyView<AccountResource, GpgKeysInput
|
||||
}
|
||||
CommitBuilder cb = new CommitBuilder();
|
||||
PersonIdent committer = serverIdent.get();
|
||||
cb.setAuthor(rsrc.getUser().newCommitterIdent(committer.getWhen(), committer.getTimeZone()));
|
||||
cb.setAuthor(user.newCommitterIdent(committer.getWhen(), committer.getTimeZone()));
|
||||
cb.setCommitter(committer);
|
||||
|
||||
RefUpdate.Result saveResult = store.save(cb);
|
||||
@ -220,12 +221,14 @@ public class PostGpgKeys implements RestModifyView<AccountResource, GpgKeysInput
|
||||
case NEW:
|
||||
case FAST_FORWARD:
|
||||
case FORCED:
|
||||
try {
|
||||
addKeyFactory.create(rsrc.getUser(), addedKeys).send();
|
||||
} catch (EmailException e) {
|
||||
logger.atSevere().withCause(e).log(
|
||||
"Cannot send GPG key added message to %s",
|
||||
rsrc.getUser().getAccount().getPreferredEmail());
|
||||
if (!addedKeys.isEmpty()) {
|
||||
try {
|
||||
addKeyFactory.create(user, addedKeys).send();
|
||||
} catch (EmailException e) {
|
||||
logger.atSevere().withCause(e).log(
|
||||
"Cannot send GPG key added message to %s",
|
||||
rsrc.getUser().getAccount().getPreferredEmail());
|
||||
}
|
||||
}
|
||||
break;
|
||||
case NO_CHANGE:
|
||||
|
||||
@ -138,19 +138,11 @@ import com.google.gerrit.server.mail.AutoReplyMailFilter;
|
||||
import com.google.gerrit.server.mail.EmailModule;
|
||||
import com.google.gerrit.server.mail.ListMailFilter;
|
||||
import com.google.gerrit.server.mail.MailFilter;
|
||||
import com.google.gerrit.server.mail.send.AddKeySender;
|
||||
import com.google.gerrit.server.mail.send.AddReviewerSender;
|
||||
import com.google.gerrit.server.mail.send.CreateChangeSender;
|
||||
import com.google.gerrit.server.mail.send.DeleteReviewerSender;
|
||||
import com.google.gerrit.server.mail.send.FromAddressGenerator;
|
||||
import com.google.gerrit.server.mail.send.FromAddressGeneratorProvider;
|
||||
import com.google.gerrit.server.mail.send.InboundEmailRejectionSender;
|
||||
import com.google.gerrit.server.mail.send.MailSoyTofuProvider;
|
||||
import com.google.gerrit.server.mail.send.MailTemplates;
|
||||
import com.google.gerrit.server.mail.send.MergedSender;
|
||||
import com.google.gerrit.server.mail.send.RegisterNewEmailSender;
|
||||
import com.google.gerrit.server.mail.send.ReplacePatchSetSender;
|
||||
import com.google.gerrit.server.mail.send.SetAssigneeSender;
|
||||
import com.google.gerrit.server.mime.FileTypeRegistry;
|
||||
import com.google.gerrit.server.mime.MimeUtilFileTypeRegistry;
|
||||
import com.google.gerrit.server.notedb.NoteDbModule;
|
||||
@ -255,22 +247,14 @@ public class GerritGlobalModule extends FactoryModule {
|
||||
|
||||
bind(AccountResolver.class);
|
||||
|
||||
factory(AddReviewerSender.Factory.class);
|
||||
factory(DeleteReviewerSender.Factory.class);
|
||||
factory(AddKeySender.Factory.class);
|
||||
factory(CapabilityCollection.Factory.class);
|
||||
factory(ChangeData.AssistedFactory.class);
|
||||
factory(ChangeJson.AssistedFactory.class);
|
||||
factory(CreateChangeSender.Factory.class);
|
||||
factory(LabelsJson.Factory.class);
|
||||
factory(MergedSender.Factory.class);
|
||||
factory(MergeUtil.Factory.class);
|
||||
factory(PatchScriptFactory.Factory.class);
|
||||
factory(ProjectState.Factory.class);
|
||||
factory(RegisterNewEmailSender.Factory.class);
|
||||
factory(ReplacePatchSetSender.Factory.class);
|
||||
factory(RevisionJson.Factory.class);
|
||||
factory(SetAssigneeSender.Factory.class);
|
||||
factory(InboundEmailRejectionSender.Factory.class);
|
||||
bind(PermissionCollection.Factory.class);
|
||||
bind(AccountVisibility.class).toProvider(AccountVisibilityProvider.class).in(SINGLETON);
|
||||
|
||||
@ -16,20 +16,34 @@ package com.google.gerrit.server.mail;
|
||||
|
||||
import com.google.gerrit.extensions.config.FactoryModule;
|
||||
import com.google.gerrit.server.mail.send.AbandonedSender;
|
||||
import com.google.gerrit.server.mail.send.AddKeySender;
|
||||
import com.google.gerrit.server.mail.send.AddReviewerSender;
|
||||
import com.google.gerrit.server.mail.send.CommentSender;
|
||||
import com.google.gerrit.server.mail.send.CreateChangeSender;
|
||||
import com.google.gerrit.server.mail.send.DeleteReviewerSender;
|
||||
import com.google.gerrit.server.mail.send.DeleteVoteSender;
|
||||
import com.google.gerrit.server.mail.send.MergedSender;
|
||||
import com.google.gerrit.server.mail.send.RegisterNewEmailSender;
|
||||
import com.google.gerrit.server.mail.send.ReplacePatchSetSender;
|
||||
import com.google.gerrit.server.mail.send.RestoredSender;
|
||||
import com.google.gerrit.server.mail.send.RevertedSender;
|
||||
import com.google.gerrit.server.mail.send.SetAssigneeSender;
|
||||
|
||||
public class EmailModule extends FactoryModule {
|
||||
@Override
|
||||
protected void configure() {
|
||||
factory(AbandonedSender.Factory.class);
|
||||
factory(AddKeySender.Factory.class);
|
||||
factory(AddReviewerSender.Factory.class);
|
||||
factory(CommentSender.Factory.class);
|
||||
factory(CreateChangeSender.Factory.class);
|
||||
factory(DeleteReviewerSender.Factory.class);
|
||||
factory(DeleteVoteSender.Factory.class);
|
||||
factory(MergedSender.Factory.class);
|
||||
factory(RegisterNewEmailSender.Factory.class);
|
||||
factory(ReplacePatchSetSender.Factory.class);
|
||||
factory(RestoredSender.Factory.class);
|
||||
factory(RevertedSender.Factory.class);
|
||||
factory(SetAssigneeSender.Factory.class);
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user