You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by of...@apache.org on 2020/06/30 14:45:22 UTC
[incubator-dlab] branch develop updated: [DLAB-1899] Added folder
creation to audit
This is an automated email from the ASF dual-hosted git repository.
ofuks pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/develop by this push:
new ea91f7d [DLAB-1899] Added folder creation to audit
ea91f7d is described below
commit ea91f7d8ddb1a919bf074b56d6c645cf138864e2
Author: Oleh Fuks <ol...@gmail.com>
AuthorDate: Tue Jun 30 17:45:02 2020 +0300
[DLAB-1899] Added folder creation to audit
---
.../java/com/epam/dlab/backendapi/resources/BucketResource.java | 7 ++++---
.../main/java/com/epam/dlab/backendapi/service/BucketService.java | 2 +-
.../com/epam/dlab/backendapi/service/impl/BucketServiceImpl.java | 3 ++-
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/BucketResource.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/BucketResource.java
index 4ceb55e..a8195e9 100644
--- a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/BucketResource.java
+++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/BucketResource.java
@@ -52,7 +52,8 @@ import java.nio.file.Paths;
@Path("/bucket")
@Slf4j
public class BucketResource {
- private static final String AUDIT_UPLOAD_MESSAGE = "File name: %s. File size: %d.";
+ private static final String AUDIT_UPLOAD_OBJECT_MESSAGE = "File name: %s. File size: %d.";
+ private static final String AUDIT_UPLOAD_FOLDER_MESSAGE = "Folder name: %s.";
private static final String AUDIT_MESSAGE = "File name: %s.";
private static final String OBJECT_FORM_FIELD = "object";
private static final String BUCKET_FORM_FIELD = "bucket";
@@ -93,7 +94,7 @@ public class BucketResource {
@Produces(MediaType.APPLICATION_JSON)
@RolesAllowed("/api/bucket/upload")
public Response uploadFolder(@Auth UserInfo userInfo, @Valid FolderUploadDTO dto) {
- bucketService.uploadFolder(userInfo, dto.getBucket(), dto.getFolder(), dto.getEndpoint());
+ bucketService.uploadFolder(userInfo, dto.getBucket(), dto.getFolder(), dto.getEndpoint(), String.format(AUDIT_UPLOAD_FOLDER_MESSAGE, dto.getFolder()));
return Response.ok().build();
}
@@ -146,7 +147,7 @@ public class BucketResource {
fileSize = Long.parseLong(Streams.asString(stream));
}
} else {
- bucketService.uploadObject(userInfo, bucket, object, endpoint, stream, item.getContentType(), fileSize, String.format(AUDIT_UPLOAD_MESSAGE, object, fileSize));
+ bucketService.uploadObject(userInfo, bucket, object, endpoint, stream, item.getContentType(), fileSize, String.format(AUDIT_UPLOAD_OBJECT_MESSAGE, object, fileSize));
}
} catch (Exception e) {
log.error("Cannot upload object {} to bucket {}. {}", object, bucket, e.getMessage(), e);
diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/BucketService.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/BucketService.java
index f7632fe..1173fea 100644
--- a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/BucketService.java
+++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/BucketService.java
@@ -31,7 +31,7 @@ public interface BucketService {
void uploadObject(UserInfo userInfo, String bucket, String object, String endpoint, InputStream inputStream, String contentType, long fileSize, String auditInfo);
- void uploadFolder(UserInfo userInfo, String bucket, String folder, String endpoint);
+ void uploadFolder(UserInfo userInfo, String bucket, String folder, String endpoint, String auditInfo);
void downloadObject(UserInfo userInfo, String bucket, String object, String endpoint, HttpServletResponse resp, String auditInfo);
diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/BucketServiceImpl.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/BucketServiceImpl.java
index c2f9617..0d27a86 100644
--- a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/BucketServiceImpl.java
+++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/BucketServiceImpl.java
@@ -106,8 +106,9 @@ public class BucketServiceImpl implements BucketService {
log.info("Finished uploading file {} for user {} to bucket {}", object, userInfo.getName(), bucket);
}
+ @Audit(action = UPLOAD, type = BUCKET)
@Override
- public void uploadFolder(UserInfo userInfo, String bucket, String folder, String endpoint) {
+ public void uploadFolder(@User UserInfo userInfo, @ResourceName String bucket, String folder, String endpoint, @Info String auditInfo) {
log.info("Uploading folder {} for user {} to bucket {}", folder, userInfo.getName(), bucket);
try {
if (!folder.endsWith("/")) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org