opendev/gerrit
Code Issues Proposed changes

Reject access changes that don't create new commits

Browse Source 
Change-Id: I48cd5bd03551202441ba508362585431e717d7d3
This commit is contained in:
Han-Wen Nienhuys
2018-01-24 21:06:38 +01:00
parent e9838e645a
commit e36a878845
2 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
java/com/google/gerrit/server/restapi/project/CreateAccessChange.java
View File

@@ -22,6 +22,7 @@ import com.google.gerrit.common.errors.PermissionDeniedException;
import com.google.gerrit.extensions.api.access.ProjectAccessInput; import com.google.gerrit.extensions.api.access.ProjectAccessInput;
import com.google.gerrit.extensions.common.ChangeInfo; import com.google.gerrit.extensions.common.ChangeInfo;
import com.google.gerrit.extensions.restapi.AuthException; import com.google.gerrit.extensions.restapi.AuthException;
import com.google.gerrit.extensions.restapi.BadRequestException;
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.RestModifyView; import com.google.gerrit.extensions.restapi.RestModifyView;
@@ -51,6 +52,7 @@ import com.google.inject.Singleton;
import java.io.IOException; import java.io.IOException;
import java.util.List; import java.util.List;
import org.eclipse.jgit.errors.ConfigInvalidException; import org.eclipse.jgit.errors.ConfigInvalidException;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.ObjectInserter; import org.eclipse.jgit.lib.ObjectInserter;
import org.eclipse.jgit.lib.ObjectReader; import org.eclipse.jgit.lib.ObjectReader;
import org.eclipse.jgit.revwalk.RevCommit; import org.eclipse.jgit.revwalk.RevCommit;
@@ -118,6 +120,7 @@ public class CreateAccessChange implements RestModifyView<ProjectResource, Proje
try (MetaDataUpdate md = metaDataUpdateUser.create(rsrc.getNameKey())) { try (MetaDataUpdate md = metaDataUpdateUser.create(rsrc.getNameKey())) {
ProjectConfig config = ProjectConfig.read(md); ProjectConfig config = ProjectConfig.read(md);
ObjectId oldCommit = config.getRevision();
setAccess.validateChanges(config, removals, additions); setAccess.validateChanges(config, removals, additions);
setAccess.applyChanges(config, removals, additions); setAccess.applyChanges(config, removals, additions);
@@ -135,10 +138,15 @@ public class CreateAccessChange implements RestModifyView<ProjectResource, Proje
md.setMessage("Review access change"); md.setMessage("Review access change");
md.setInsertChangeId(true); md.setInsertChangeId(true);
Change.Id changeId = new Change.Id(seq.nextChangeId()); Change.Id changeId = new Change.Id(seq.nextChangeId());
RevCommit commit = RevCommit commit =
config.commitToNewRef( config.commitToNewRef(
md, new PatchSet.Id(changeId, Change.INITIAL_PATCH_SET_ID).toRefName()); md, new PatchSet.Id(changeId, Change.INITIAL_PATCH_SET_ID).toRefName());
if (commit.name().equals(oldCommit.getName())) {
throw new BadRequestException("no change");
}
try (ObjectInserter objInserter = md.getRepository().newObjectInserter(); try (ObjectInserter objInserter = md.getRepository().newObjectInserter();
ObjectReader objReader = objInserter.newReader(); ObjectReader objReader = objInserter.newReader();
RevWalk rw = new RevWalk(objReader); RevWalk rw = new RevWalk(objReader);

7
javatests/com/google/gerrit/acceptance/rest/project/AccessIT.java
View File

@@ -93,6 +93,13 @@ public class AccessIT extends AbstractDaemonTest {
p.get(), RefNames.REFS_CONFIG, null, initialHead, initialHead, updatedHead); p.get(), RefNames.REFS_CONFIG, null, initialHead, initialHead, updatedHead);
} }
@Test
public void createAccessChangeNop() throws Exception {
ProjectAccessInput accessInput = newProjectAccessInput();
exception.expect(BadRequestException.class);
pApi.accessChange(accessInput);
}
@Test @Test
public void createAccessChange() throws Exception { public void createAccessChange() throws Exception {
// User can see the branch // User can see the branch