opendev/gerrit
Code Issues Proposed changes

Merge "DefaultRefFilter: Look up user ref from repo"

Browse Source
This commit is contained in:
David Pursehouse
2019-07-18 07:01:46 +00:00
committed by Gerrit Code Review
parent ab7a2027ac 455ff91c44
commit c32a5eb02d
2 changed files with 32 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
java/com/google/gerrit/server/permissions/DefaultRefFilter.java
View File

@@ -208,7 +208,7 @@ class DefaultRefFilter {
logger.atFinest().log("Filter refs (refs = %s)", refs);
if (projectState.isAllUsers()) {
refs = addUsersSelfSymref(refs);
refs = addUsersSelfSymref(repo, refs);
}
// TODO(hiesel): Remove when optimization is done.
@@ -397,19 +397,24 @@ class DefaultRefFilter {
return refs;
}
private Map<String, Ref> addUsersSelfSymref(Map<String, Ref> refs) {
private Map<String, Ref> addUsersSelfSymref(Repository repo, Map<String, Ref> refs)
throws PermissionBackendException {
if (user.isIdentifiedUser()) {
String refName = RefNames.refsUsers(user.getAccountId());
Ref r = refs.get(refName);
if (r == null) {
logger.atWarning().log("User ref %s not found", refName);
return refs;
}
try {
Ref r = repo.exactRef(refName);
if (r == null) {
logger.atWarning().log("User ref %s not found", refName);
return refs;
}
SymbolicRef s = new SymbolicRef(REFS_USERS_SELF, r);
refs = new HashMap<>(refs);
refs.put(s.getName(), s);
logger.atFinest().log("Added %s as alias for user ref %s", REFS_USERS_SELF, refName);
SymbolicRef s = new SymbolicRef(REFS_USERS_SELF, r);
refs = new HashMap<>(refs);
refs.put(s.getName(), s);
logger.atFinest().log("Added %s as alias for user ref %s", REFS_USERS_SELF, refName);
} catch (IOException e) {
throw new PermissionBackendException(e);
}
}
return refs;
}