Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Adapting for the privilege change regarding resource annotations in redback.

This commit is contained in:
Martin Stockhammer 2020-09-09 12:51:02 +02:00
parent 780886fcdc
commit 61a94c93a5
5 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
archiva-modules/archiva-base/archiva-security-common/src/main/java/org/apache/archiva/security/common/ArchivaRoleConstants.java
View File

@ -64,6 +64,8 @@ public class ArchivaRoleConstants
public static final String OPERATION_REPOSITORY_UPLOAD = "archiva-upload-repository"; public static final String OPERATION_REPOSITORY_UPLOAD = "archiva-upload-repository";
public static final String OPERATION_FILE_UPLOAD = "archiva-upload-file";
public static final String OPERATION_REPOSITORY_DELETE = "archiva-delete-artifact"; public static final String OPERATION_REPOSITORY_DELETE = "archiva-delete-artifact";
public static final String OPERATION_MERGE_REPOSITORY = "archiva-merge-repository"; public static final String OPERATION_MERGE_REPOSITORY = "archiva-merge-repository";

11
archiva-modules/archiva-base/archiva-security-common/src/main/resources/META-INF/redback/redback.xml
View File

@ -83,6 +83,11 @@
<name>archiva-upload-repository</name> <name>archiva-upload-repository</name>
<description>Upload Archiva Repository</description> <description>Upload Archiva Repository</description>
</operation> </operation>
<operation>
<id>archiva-upload-file</id>
<name>archiva-upload-file</name>
<description>Upload File to Archiva</description>
</operation>
<operation> <operation>
<id>archiva-access-repository</id> <id>archiva-access-repository</id>
<name>archiva-access-repository</name> <name>archiva-access-repository</name>
@ -257,6 +262,12 @@
<operation>archiva-upload-repository</operation> <operation>archiva-upload-repository</operation>
<resource>${resource}</resource> <resource>${resource}</resource>
</permission> </permission>
<permission>
<id>archiva-upload-file</id>
<name>Archiva Upload File to Archiva</name>
<operation>archiva-upload-file</operation>
<resource>global</resource>
</permission>
<permission> <permission>
<id>archiva-view-audit-logs</id> <id>archiva-view-audit-logs</id>
<name>Archiva View Audit Logs</name> <name>Archiva View Audit Logs</name>

6
archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/BrowseService.java
View File

@ -149,7 +149,7 @@ public interface BrowseService
@Path("metadata/{g}/{a}/{v}/{key}/{value}") @Path("metadata/{g}/{a}/{v}/{key}/{value}")
@PUT @PUT
@Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML }) @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
@RedbackAuthorization(noPermission = false, noRestriction = false, permissions = "archiva-add-metadata") @RedbackAuthorization( permissions = "archiva-add-metadata", resource = "{repositoryId}")
ActionStatus addMetadata( @PathParam("g") String groupId, @PathParam("a") String artifactId, ActionStatus addMetadata( @PathParam("g") String groupId, @PathParam("a") String artifactId,
@PathParam("v") String version, @PathParam("key") String key, @PathParam("value") String value, @PathParam("v") String version, @PathParam("key") String key, @PathParam("value") String value,
@QueryParam("repositoryId") String repositoryId ) @QueryParam("repositoryId") String repositoryId )
@ -158,7 +158,7 @@ public interface BrowseService
@Path("metadata/{g}/{a}/{v}/{key}") @Path("metadata/{g}/{a}/{v}/{key}")
@DELETE @DELETE
@Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML }) @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
@RedbackAuthorization(noPermission = false, noRestriction = false, permissions = "archiva-add-metadata") @RedbackAuthorization( permissions = "archiva-add-metadata", resource = "{repositoryId}")
ActionStatus deleteMetadata( @PathParam("g") String groupId, @PathParam("a") String artifactId, ActionStatus deleteMetadata( @PathParam("g") String groupId, @PathParam("a") String artifactId,
@PathParam("v") String version, @PathParam("key") String key, @PathParam("v") String version, @PathParam("key") String key,
@QueryParam("repositoryId") String repositoryId ) @QueryParam("repositoryId") String repositoryId )
@ -166,7 +166,7 @@ public interface BrowseService
@Path("importMetadata") @Path("importMetadata")
@POST @POST
@RedbackAuthorization(noPermission = false, noRestriction = false, permissions = "archiva-add-metadata") @RedbackAuthorization( permissions = "archiva-add-metadata", resource = "{repository}")
ActionStatus importMetadata( MetadataAddRequest metadataAddRequest, @QueryParam("repository") String repository ) ActionStatus importMetadata( MetadataAddRequest metadataAddRequest, @QueryParam("repository") String repository )
throws ArchivaRestServiceException; throws ArchivaRestServiceException;

4
archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/MergeRepositoriesService.java
View File

@ -48,7 +48,7 @@ public interface MergeRepositoriesService
@Path ("mergeConflictedArtifacts/{sourceRepositoryId}/{targetRepositoryId}") @Path ("mergeConflictedArtifacts/{sourceRepositoryId}/{targetRepositoryId}")
@GET @GET
@Produces ({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML }) @Produces ({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
@RedbackAuthorization (permissions = ArchivaRoleConstants.OPERATION_MERGE_REPOSITORY) @RedbackAuthorization (permissions = ArchivaRoleConstants.OPERATION_MERGE_REPOSITORY, resource = "{sourceRepositoryId}")
List<Artifact> getMergeConflictedArtifacts( @PathParam ("sourceRepositoryId") String sourceRepositoryId, List<Artifact> getMergeConflictedArtifacts( @PathParam ("sourceRepositoryId") String sourceRepositoryId,
@PathParam ("targetRepositoryId") String targetRepositoryId ) @PathParam ("targetRepositoryId") String targetRepositoryId )
throws ArchivaRestServiceException; throws ArchivaRestServiceException;
@ -59,7 +59,7 @@ public interface MergeRepositoriesService
*/ */
@Path ("mergeRepositories/{sourceRepositoryId}/{targetRepositoryId}/{skipConflicts}") @Path ("mergeRepositories/{sourceRepositoryId}/{targetRepositoryId}/{skipConflicts}")
@GET @GET
@RedbackAuthorization (permissions = ArchivaRoleConstants.OPERATION_MERGE_REPOSITORY) @RedbackAuthorization (permissions = ArchivaRoleConstants.OPERATION_MERGE_REPOSITORY, resource = "{sourceRepositoryId}")
void mergeRepositories( @PathParam ("sourceRepositoryId") String sourceRepositoryId, void mergeRepositories( @PathParam ("sourceRepositoryId") String sourceRepositoryId,
@PathParam ("targetRepositoryId") String targetRepositoryId, @PathParam ("targetRepositoryId") String targetRepositoryId,
@PathParam ("skipConflicts") boolean skipConflicts ) @PathParam ("skipConflicts") boolean skipConflicts )

8
archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/FileUploadService.java
View File

@ -48,14 +48,14 @@ public interface FileUploadService
@POST @POST
@Consumes( MediaType.MULTIPART_FORM_DATA ) @Consumes( MediaType.MULTIPART_FORM_DATA )
@Produces( { MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML } ) @Produces( { MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML } )
@RedbackAuthorization( permissions = ArchivaRoleConstants.OPERATION_REPOSITORY_UPLOAD ) @RedbackAuthorization( permissions = ArchivaRoleConstants.OPERATION_FILE_UPLOAD )
FileMetadata post( MultipartBody multipartBody ) FileMetadata post( MultipartBody multipartBody )
throws ArchivaRestServiceException; throws ArchivaRestServiceException;
@Path( "{fileName}" ) @Path( "{fileName}" )
@DELETE @DELETE
@Produces( { MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML } ) @Produces( { MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML } )
@RedbackAuthorization( permissions = ArchivaRoleConstants.OPERATION_REPOSITORY_UPLOAD ) @RedbackAuthorization( permissions = ArchivaRoleConstants.OPERATION_FILE_UPLOAD )
Boolean deleteFile( @PathParam( "fileName" ) String fileName ) Boolean deleteFile( @PathParam( "fileName" ) String fileName )
throws ArchivaRestServiceException; throws ArchivaRestServiceException;
@ -63,7 +63,7 @@ public interface FileUploadService
@Path( "sessionFileMetadatas" ) @Path( "sessionFileMetadatas" )
@GET @GET
@Produces( { MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML } ) @Produces( { MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML } )
@RedbackAuthorization( permissions = ArchivaRoleConstants.OPERATION_REPOSITORY_UPLOAD ) @RedbackAuthorization( permissions = ArchivaRoleConstants.OPERATION_FILE_UPLOAD )
List<FileMetadata> getSessionFileMetadatas() List<FileMetadata> getSessionFileMetadatas()
throws ArchivaRestServiceException; throws ArchivaRestServiceException;
@ -80,7 +80,7 @@ public interface FileUploadService
@Path( "clearUploadedFiles" ) @Path( "clearUploadedFiles" )
@GET @GET
@Produces( { MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML } ) @Produces( { MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML } )
@RedbackAuthorization( permissions = ArchivaRoleConstants.OPERATION_REPOSITORY_UPLOAD ) @RedbackAuthorization( permissions = ArchivaRoleConstants.OPERATION_FILE_UPLOAD )
Boolean clearUploadedFiles() Boolean clearUploadedFiles()
throws ArchivaRestServiceException; throws ArchivaRestServiceException;