opendev/gerrit
Code Issues Proposed changes

Merge "When resolving an account by ID check that it actually exists"

Browse Source
This commit is contained in:
Shawn Pearce
2013-03-13 03:52:07 +00:00
committed by Gerrit Code Review
parent e5e0638cc8 68366fd5a0
commit 5f9af5be22
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
gerrit-server/src/main/java/com/google/gerrit/server/account/AccountResolver.java
View File

@@ -71,11 +71,21 @@ public class AccountResolver {
public Set<Account.Id> findAll(String nameOrEmail) throws OrmException { public Set<Account.Id> findAll(String nameOrEmail) throws OrmException {
Matcher m = Pattern.compile("^.* \\(([1-9][0-9]*)\\)$").matcher(nameOrEmail); Matcher m = Pattern.compile("^.* \\(([1-9][0-9]*)\\)$").matcher(nameOrEmail);
if (m.matches()) { if (m.matches()) {
return Collections.singleton(Account.Id.parse(m.group(1))); Account.Id id = Account.Id.parse(m.group(1));
if (exists(id)) {
return Collections.singleton(id);
} else {
return Collections.emptySet();
}
} }
if (nameOrEmail.matches("^[1-9][0-9]*$")) { if (nameOrEmail.matches("^[1-9][0-9]*$")) {
return Collections.singleton(Account.Id.parse(nameOrEmail)); Account.Id id = Account.Id.parse(nameOrEmail);
if (exists(id)) {
return Collections.singleton(id);
} else {
return Collections.emptySet();
}
} }
if (nameOrEmail.matches(Account.USER_NAME_PATTERN)) { if (nameOrEmail.matches(Account.USER_NAME_PATTERN)) {
@@ -88,6 +98,10 @@ public class AccountResolver {
return findAllByNameOrEmail(nameOrEmail); return findAllByNameOrEmail(nameOrEmail);
} }
private boolean exists(Account.Id id) throws OrmException {
return schema.get().accounts().get(id) != null;
}
/** /**
* Locate exactly one account matching the name or name/email string. * Locate exactly one account matching the name or name/email string.
* *