opendev/gerrit
Code Issues Proposed changes

Merge "CreateChange: add a visibility check for the target branch"

Browse Source
This commit is contained in:
xchangcheng
2019-01-25 09:59:27 +00:00
committed by Gerrit Code Review
parent a89587d3be a0ef8f6095
commit bb68fdde18
2 changed files with 31 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
java/com/google/gerrit/server/restapi/change/CreateChange.java
View File

@@ -30,6 +30,7 @@ import com.google.gerrit.extensions.restapi.AuthException;
import com.google.gerrit.extensions.restapi.BadRequestException; import com.google.gerrit.extensions.restapi.BadRequestException;
import com.google.gerrit.extensions.restapi.MethodNotAllowedException; import com.google.gerrit.extensions.restapi.MethodNotAllowedException;
import com.google.gerrit.extensions.restapi.ResourceConflictException; import com.google.gerrit.extensions.restapi.ResourceConflictException;
import com.google.gerrit.extensions.restapi.ResourceNotFoundException;
import com.google.gerrit.extensions.restapi.Response; import com.google.gerrit.extensions.restapi.Response;
import com.google.gerrit.extensions.restapi.RestApiException; import com.google.gerrit.extensions.restapi.RestApiException;
import com.google.gerrit.extensions.restapi.TopLevelResource; import com.google.gerrit.extensions.restapi.TopLevelResource;
@@ -196,6 +197,12 @@ public class CreateChange
Project.NameKey project = rsrc.getNameKey(); Project.NameKey project = rsrc.getNameKey();
String refName = RefNames.fullName(input.branch); String refName = RefNames.fullName(input.branch);
try {
permissionBackend.currentUser().project(project).ref(refName).check(RefPermission.READ);
} catch (AuthException e) {
throw new ResourceNotFoundException(String.format("ref %s not found", refName));
}
permissionBackend permissionBackend
.currentUser() .currentUser()
.project(project) .project(project)

34
javatests/com/google/gerrit/acceptance/rest/change/CreateChangeIT.java
View File

@@ -267,16 +267,6 @@ public class CreateChangeIT extends AbstractDaemonTest {
in, UnprocessableEntityException.class, "Base change not found: " + in.baseChange); in, UnprocessableEntityException.class, "Base change not found: " + in.baseChange);
} }
@Test
public void createChangeOnInvisibleBranchFails() throws Exception {
changeInTwoBranches("invisible-branch", "a.txt", "branchB", "b.txt");
block(project, "refs/heads/invisible-branch", READ, REGISTERED_USERS);
ChangeInput in = newChangeInput(ChangeStatus.NEW);
in.branch = "invisible-branch";
assertCreateFails(in, ResourceNotFoundException.class, "");
}
@Test @Test
public void noteDbCommit() throws Exception { public void noteDbCommit() throws Exception {
ChangeInfo c = assertCreateSucceeds(newChangeInput(ChangeStatus.NEW)); ChangeInfo c = assertCreateSucceeds(newChangeInput(ChangeStatus.NEW));
@@ -456,6 +446,30 @@ public class CreateChangeIT extends AbstractDaemonTest {
assertThat(revInfo.commit.message).isEqualTo(input.message + "\n"); assertThat(revInfo.commit.message).isEqualTo(input.message + "\n");
} }
@Test
public void createChangeOnExistingBranchNotPermitted() throws Exception {
createBranch(new Branch.NameKey(project, "foo"));
blockRead("refs/heads/*");
requestScopeOperations.setApiUser(user.id);
ChangeInput input = newChangeInput(ChangeStatus.NEW);
input.branch = "foo";
assertCreateFails(input, ResourceNotFoundException.class, "ref refs/heads/foo not found");
}
@Test
public void createChangeOnNonExistingBranchNotPermitted() throws Exception {
blockRead("refs/heads/*");
requestScopeOperations.setApiUser(user.id);
ChangeInput input = newChangeInput(ChangeStatus.NEW);
input.branch = "foo";
// sets this option to be true to make sure permission check happened before this option could
// be considered.
input.newBranch = true;
assertCreateFails(input, ResourceNotFoundException.class, "ref refs/heads/foo not found");
}
private ChangeInput newChangeInput(ChangeStatus status) { private ChangeInput newChangeInput(ChangeStatus status) {
ChangeInput in = new ChangeInput(); ChangeInput in = new ChangeInput();
in.project = project.get(); in.project = project.get();