Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-16 18:26:16 +01:00
Code Issues Packages Projects Releases Activity

Use PermissionDescriptor instead of String

Browse Source
This commit is contained in:
René Pfeuffer
2019-01-17 13:21:20 +01:00
parent 7462613c16
commit ad65c8cd02
14 changed files with 243 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scm-webapp/src/main/java/sonia/scm/api/v2/resources/GlobalPermissionPocResource.java
View File

@@ -86,15 +86,15 @@ public class GlobalPermissionPocResource {
@Path("")
public Response getAll() {
String[] permissions = securitySystem.getAvailablePermissions().stream().map(PermissionDescriptor::getValue).toArray(String[]::new);
return Response.ok(new PerminssionListDto(permissions)).build();
return Response.ok(new PermissionListDto(permissions)).build();
}
protected void assignExemplaryPermissions() {
AssignedPermission groupPermission = new AssignedPermission("configurers", true,"configuration:*");
AssignedPermission groupPermission = new AssignedPermission("configurers", true, new PermissionDescriptor("configuration:*"));
log.info("try to add new permission: {}", groupPermission);
securitySystem.addPermission(groupPermission);
AssignedPermission userPermission = new AssignedPermission("rene", "group:*");
AssignedPermission userPermission = new AssignedPermission("rene", new PermissionDescriptor("group:*"));
log.info("try to add new permission: {}", userPermission);
securitySystem.addPermission(userPermission);
}

2
scm-webapp/src/main/java/sonia/scm/api/v2/resources/PerminssionListDto.java → scm-webapp/src/main/java/sonia/scm/api/v2/resources/PermissionListDto.java
View File

@@ -9,7 +9,7 @@ import lombok.Setter;
@Setter
@AllArgsConstructor
@NoArgsConstructor
public class PerminssionListDto {
public class PermissionListDto {
private String[] permissions;
}

32
scm-webapp/src/main/java/sonia/scm/api/v2/resources/UserResource.java
View File

@@ -5,6 +5,7 @@ import com.webcohesion.enunciate.metadata.rs.StatusCodes;
import com.webcohesion.enunciate.metadata.rs.TypeHint;
import org.apache.shiro.authc.credential.PasswordService;
import sonia.scm.security.AssignedPermission;
import sonia.scm.security.PermissionDescriptor;
import sonia.scm.security.SecuritySystem;
import sonia.scm.user.User;
import sonia.scm.user.UserManager;
@@ -153,7 +154,34 @@ public class UserResource {
@ResponseCode(code = 500, condition = "internal server error")
})
public Response getPermissions(@PathParam("id") String id) {
String[] permissions = securitySystem.getPermissions(p -> !p.isGroupPermission() && p.getName().equals(id)).stream().map(AssignedPermission::getPermission).toArray(String[]::new);
return Response.ok(new PerminssionListDto(permissions)).build();
String[] permissions =
securitySystem.getPermissions(p -> !p.isGroupPermission() && p.getName().equals(id))
.stream()
.map(AssignedPermission::getPermission)
.map(PermissionDescriptor::getValue)
.toArray(String[]::new);
return Response.ok(new PermissionListDto(permissions)).build();
}
/**
* Sets permissions for a user. Overwrites all existing permissions.
*
* @param id id of the user to be modified
* @param newPermissions New list of permissions for the user
*/
@PUT
@Path("permissions")
@Consumes(VndMediaType.PASSWORD_OVERWRITE)
@StatusCodes({
@ResponseCode(code = 204, condition = "update success"),
@ResponseCode(code = 400, condition = "Invalid body"),
@ResponseCode(code = 401, condition = "not authenticated / invalid credentials"),
@ResponseCode(code = 403, condition = "not authorized, the current user does not have the correct privilege"),
@ResponseCode(code = 404, condition = "not found, no user with the specified id/name available"),
@ResponseCode(code = 500, condition = "internal server error")
})
@TypeHint(TypeHint.NO_CONTENT.class)
public Response overwritePermissions(@PathParam("id") String id, PermissionListDto newPermissions) {
return Response.noContent().build();
}
}