opendev/gerrit
Code Issues Proposed changes

Order methods in ProjectControl by visibility and add TODO

Browse Source 
This reordering makes it easier to see what parts still need work. For
allRefsAreVisible, this commit adds a TODO to clarify that this is
blocked by another work item.

Change-Id: Ia221bc903034341f7b485e0f6dcae5ca19c19813
This commit is contained in:
Patrick Hiesel
2017-09-22 15:56:57 +02:00
parent 4e914c9557
commit b60f7dece7
1 changed files with 48 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

93
gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectControl.java
View File

@@ -214,6 +214,54 @@ public class ProjectControl {
return state.getProject();
}
public boolean allRefsAreVisible(Set<String> ignore) {
// TODO(hiesel) Hide refs/changes and replace this method by a proper READ check of all refs
return user.isInternalUser() || canPerformOnAllRefs(Permission.READ, ignore);
}
/** Is this user a project owner? */
public boolean isOwner() {
return (isDeclaredOwner() && !controlForRef("refs/*").isBlocked(Permission.OWNER)) || isAdmin();
}
/** @return {@code Capable.OK} if the user can upload to at least one reference */
public Capable canPushToAtLeastOneRef() {
if (!canPerformOnAnyRef(Permission.PUSH)
&& !canPerformOnAnyRef(Permission.CREATE_TAG)
&& !isOwner()) {
return new Capable("Upload denied for project '" + state.getName() + "'");
}
if (state.isUseContributorAgreements()) {
return verifyActiveContributorAgreement();
}
return Capable.OK;
}
/** Can the user run upload pack? */
public boolean canRunUploadPack() {
for (AccountGroup.UUID group : uploadGroups) {
if (match(group)) {
return true;
}
}
return false;
}
/** Can the user run receive pack? */
public boolean canRunReceivePack() {
for (AccountGroup.UUID group : receiveGroups) {
if (match(group)) {
return true;
}
}
return false;
}
/** Does this user have ownership on at least one reference name? */
public boolean isOwnerAnyRef() {
return canPerformOnAnyRef(Permission.OWNER) || isAdmin();
}
/** Returns whether the project is hidden. */
private boolean isHidden() {
return getProject().getState().equals(com.google.gerrit.extensions.client.ProjectState.HIDDEN);
@@ -236,15 +284,6 @@ public class ProjectControl {
return false;
}
public boolean allRefsAreVisible(Set<String> ignore) {
return user.isInternalUser() || canPerformOnAllRefs(Permission.READ, ignore);
}
/** Is this user a project owner? */
public boolean isOwner() {
return (isDeclaredOwner() && !controlForRef("refs/*").isBlocked(Permission.OWNER)) || isAdmin();
}
boolean isAdmin() {
try {
perm.check(GlobalPermission.ADMINISTRATE_SERVER);
@@ -262,24 +301,6 @@ public class ProjectControl {
return declaredOwner;
}
/** Does this user have ownership on at least one reference name? */
public boolean isOwnerAnyRef() {
return canPerformOnAnyRef(Permission.OWNER) || isAdmin();
}
/** @return true if the user can upload to at least one reference */
public Capable canPushToAtLeastOneRef() {
if (!canPerformOnAnyRef(Permission.PUSH)
&& !canPerformOnAnyRef(Permission.CREATE_TAG)
&& !isOwner()) {
return new Capable("Upload denied for project '" + state.getName() + "'");
}
if (state.isUseContributorAgreements()) {
return verifyActiveContributorAgreement();
}
return Capable.OK;
}
private Capable verifyActiveContributorAgreement() {
metrics.claCheckCount.increment();
if (!(user.isIdentifiedUser())) {
@@ -409,24 +430,6 @@ public class ProjectControl {
}
}
public boolean canRunUploadPack() {
for (AccountGroup.UUID group : uploadGroups) {
if (match(group)) {
return true;
}
}
return false;
}
public boolean canRunReceivePack() {
for (AccountGroup.UUID group : receiveGroups) {
if (match(group)) {
return true;
}
}
return false;
}
boolean isReachableFromHeadsOrTags(Repository repo, RevCommit commit) {
try {
RefDatabase refdb = repo.getRefDatabase();