From f19b78e12517db6c4dcbb1981423830ea39916b3 Mon Sep 17 00:00:00 2001 From: James Moger Date: Mon, 25 Nov 2013 00:00:41 -0500 Subject: Revised committer verification to require email address Change-Id: I5298c93e03099813f5713a4effd87913429aa3dc --- src/main/java/com/gitblit/models/UserModel.java | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'src/main/java/com/gitblit/models/UserModel.java') diff --git a/src/main/java/com/gitblit/models/UserModel.java b/src/main/java/com/gitblit/models/UserModel.java index 446db3ab..0b59927f 100644 --- a/src/main/java/com/gitblit/models/UserModel.java +++ b/src/main/java/com/gitblit/models/UserModel.java @@ -648,22 +648,19 @@ public class UserModel implements Principal, Serializable, Comparable * @return true, if the name and email address match this account */ public boolean is(String name, String email) { - // at a minimum a usename or display name must be supplied - if (StringUtils.isEmpty(name)) { + // at a minimum a username or display name AND email address must be supplied + if (StringUtils.isEmpty(name) || StringUtils.isEmpty(email)) { return false; } boolean nameVerified = name.equalsIgnoreCase(username) || name.equalsIgnoreCase(getDisplayName()); boolean emailVerified = false; if (StringUtils.isEmpty(emailAddress)) { // user account has not specified an email address - // rely on username/displayname verification - emailVerified = true; + // fail + emailVerified = false; } else { // user account has specified an email address - // require email address verification - if (!StringUtils.isEmpty(email)) { - emailVerified = email.equalsIgnoreCase(emailAddress); - } + emailVerified = email.equalsIgnoreCase(emailAddress); } return nameVerified && emailVerified; } -- cgit v1.2.3