diff options
| author | James Moger <james.moger@gitblit.com> | 2013-11-25 00:00:41 -0500 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2013-11-29 11:05:51 -0500 |
| commit | f19b78e12517db6c4dcbb1981423830ea39916b3 (patch) | |
| tree | 018f2389bf235c25bb3a2eda73ae9ecd71d7f3a1 /src/main/java/com/gitblit/models/UserModel.java | |
| parent | 04a98505a4ab8f48aee22800fcac193d9367d0ae (diff) | |
| download | gitblit-f19b78e12517db6c4dcbb1981423830ea39916b3.tar.gz gitblit-f19b78e12517db6c4dcbb1981423830ea39916b3.zip | |
Revised committer verification to require email address
Change-Id: I5298c93e03099813f5713a4effd87913429aa3dc
Diffstat (limited to 'src/main/java/com/gitblit/models/UserModel.java')
| -rw-r--r-- | src/main/java/com/gitblit/models/UserModel.java | 13 |
1 files changed, 5 insertions, 8 deletions
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<UserModel> * @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;
}
|