opendev/gerrit
Code Issues Proposed changes

Fix infinite loops when walking project hierarchy

Browse Source 
Always walk up the tree using a special iterator that knows how
to track visited project names and breaks any cycle, ensuring
All-Projects is always reached.

Change-Id: Ib6ad9505b3225bfa40ba067c799ce18130eafd29
This commit is contained in:
Shawn Pearce
2013-01-15 03:21:14 +00:00
parent 7cbbed1e7d
commit 740a217fac
10 changed files with 174 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gerrit-server/src/main/java/com/google/gerrit/server/project/GetDashboard.java
View File

@@ -17,10 +17,8 @@ package com.google.gerrit.server.project;
import static com.google.gerrit.server.git.GitRepositoryManager.REFS_DASHBOARDS;
import com.google.common.base.Strings;
import com.google.common.collect.Sets;
import com.google.gerrit.extensions.restapi.ResourceNotFoundException;
import com.google.gerrit.extensions.restapi.RestReadView;
import com.google.gerrit.reviewdb.client.Project;
import com.google.gerrit.server.project.DashboardsCollection.DashboardInfo;
import com.google.inject.Inject;
@@ -28,7 +26,6 @@ import org.eclipse.jgit.errors.ConfigInvalidException;
import org.kohsuke.args4j.Option;
import java.io.IOException;
import java.util.Set;
class GetDashboard implements RestReadView<DashboardResource> {
private final DashboardsCollection dashboards;
@@ -78,10 +75,7 @@ class GetDashboard implements RestReadView<DashboardResource> {
throw new ResourceNotFoundException();
}
Set<Project.NameKey> seen = Sets.newHashSet();
seen.add(ctl.getProject().getNameKey());
ProjectState ps = ctl.getProjectState().getParentState();
while (ps != null && seen.add(ps.getProject().getNameKey())) {
for (ProjectState ps : ctl.getProjectState().tree()) {
id = ps.getProject().getDefaultDashboard();
if ("default".equals(id)) {
throw new ResourceNotFoundException();
@@ -89,7 +83,6 @@ class GetDashboard implements RestReadView<DashboardResource> {
ctl = ps.controlFor(ctl.getCurrentUser());
return dashboards.parse(new ProjectResource(ctl), id);
}
ps = ps.getParentState();
}
throw new ResourceNotFoundException();
}