opendev/gerrit
Code Issues Proposed changes

CreateEmail: Simplify check for development mode

Browse Source 
In development mode (when auth.type is DEVELOPMENT_BECOME_ANY_ACCOUNT),
the validation of new email addresses is always skipped.

The only time AuthConfig is needed is when checking the auth type, so
rather than keeping a reference to AuthType and checking every time,
use it to initialize a flag once in the constructor.

Also log a warning when skipping validation in developer mode.

Change-Id: I3c3faf262b1ebca4a96b1c9a3d1e8c0fc26c70ac
This commit is contained in:
David Pursehouse
2016-09-09 10:31:53 +09:00
parent ef8c4a415c
commit 09ca2e715b
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
gerrit-server/src/main/java/com/google/gerrit/server/account/CreateEmail.java
View File

@@ -14,10 +14,11 @@
package com.google.gerrit.server.account; package com.google.gerrit.server.account;
import static com.google.gerrit.extensions.client.AuthType.DEVELOPMENT_BECOME_ANY_ACCOUNT;
import com.google.gerrit.common.errors.EmailException; import com.google.gerrit.common.errors.EmailException;
import com.google.gerrit.extensions.api.accounts.EmailInput; import com.google.gerrit.extensions.api.accounts.EmailInput;
import com.google.gerrit.extensions.client.AccountFieldName; import com.google.gerrit.extensions.client.AccountFieldName;
import com.google.gerrit.extensions.client.AuthType;
import com.google.gerrit.extensions.restapi.AuthException; import com.google.gerrit.extensions.restapi.AuthException;
import com.google.gerrit.extensions.restapi.BadRequestException; import com.google.gerrit.extensions.restapi.BadRequestException;
import com.google.gerrit.extensions.restapi.MethodNotAllowedException; import com.google.gerrit.extensions.restapi.MethodNotAllowedException;
@@ -50,11 +51,11 @@ public class CreateEmail implements RestModifyView<AccountResource, EmailInput>
private final Provider<CurrentUser> self; private final Provider<CurrentUser> self;
private final Realm realm; private final Realm realm;
private final AuthConfig authConfig;
private final AccountManager accountManager; private final AccountManager accountManager;
private final RegisterNewEmailSender.Factory registerNewEmailFactory; private final RegisterNewEmailSender.Factory registerNewEmailFactory;
private final PutPreferred putPreferred; private final PutPreferred putPreferred;
private final String email; private final String email;
private final boolean isDevMode;
@Inject @Inject
CreateEmail(Provider<CurrentUser> self, CreateEmail(Provider<CurrentUser> self,
@@ -66,11 +67,11 @@ public class CreateEmail implements RestModifyView<AccountResource, EmailInput>
@Assisted String email) { @Assisted String email) {
this.self = self; this.self = self;
this.realm = realm; this.realm = realm;
this.authConfig = authConfig;
this.accountManager = accountManager; this.accountManager = accountManager;
this.registerNewEmailFactory = registerNewEmailFactory; this.registerNewEmailFactory = registerNewEmailFactory;
this.putPreferred = putPreferred; this.putPreferred = putPreferred;
this.email = email; this.email = email;
this.isDevMode = authConfig.getAuthType() == DEVELOPMENT_BECOME_ANY_ACCOUNT;
} }
@Override @Override
@@ -113,8 +114,10 @@ public class CreateEmail implements RestModifyView<AccountResource, EmailInput>
EmailInfo info = new EmailInfo(); EmailInfo info = new EmailInfo();
info.email = email; info.email = email;
if (input.noConfirmation if (input.noConfirmation || isDevMode) {
|| authConfig.getAuthType() == AuthType.DEVELOPMENT_BECOME_ANY_ACCOUNT) { if (isDevMode) {
log.warn("skipping email validation in developer mode");
}
try { try {
accountManager.link(user.getAccountId(), accountManager.link(user.getAccountId(),
AuthRequest.forEmail(email)); AuthRequest.forEmail(email));