opendev/gerrit
Code Issues Proposed changes

Merge "GetAccess: Fix read config permission check"

Browse Source
This commit is contained in:
Paladox none
2017-10-25 15:59:06 +00:00
committed by Gerrit Code Review
parent e9595d09d5 f5bd0f71d3
commit d662ad56c1
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/ProjectAccessFactory.java
View File

@@ -125,6 +125,8 @@ class ProjectAccessFactory extends Handler<ProjectAccess> {
} }
} }
// The following implementation must match the GetAccess REST API endpoint.
List<AccessSection> local = new ArrayList<>(); List<AccessSection> local = new ArrayList<>();
Set<String> ownerOf = new HashSet<>(); Set<String> ownerOf = new HashSet<>();
Map<AccountGroup.UUID, Boolean> visibleGroups = new HashMap<>(); Map<AccountGroup.UUID, Boolean> visibleGroups = new HashMap<>();

4
gerrit-server/src/main/java/com/google/gerrit/server/project/GetAccess.java
View File

@@ -162,10 +162,12 @@ public class GetAccess implements RestReadView<ProjectResource> {
throw new ResourceNotFoundException(rsrc.getName()); throw new ResourceNotFoundException(rsrc.getName());
} }
// The following implementation must match the ProjectAccessFactory JSON RPC endpoint.
info.local = new HashMap<>(); info.local = new HashMap<>();
info.ownerOf = new HashSet<>(); info.ownerOf = new HashSet<>();
Map<AccountGroup.UUID, GroupInfo> visibleGroups = new HashMap<>(); Map<AccountGroup.UUID, GroupInfo> visibleGroups = new HashMap<>();
boolean canReadConfig = check(perm, ProjectPermission.READ_CONFIG); boolean canReadConfig = check(perm, RefNames.REFS_CONFIG, READ);
boolean canWriteConfig = check(perm, ProjectPermission.WRITE_CONFIG); boolean canWriteConfig = check(perm, ProjectPermission.WRITE_CONFIG);
for (AccessSection section : config.getAccessSections()) { for (AccessSection section : config.getAccessSections()) {