Skip to content

Commit a45aad0

Browse files
author
Yavor16
committed
fix faliing build add-auditlog
1 parent a405c98 commit a45aad0

File tree

8 files changed

+126
-12
lines changed

8 files changed

+126
-12
lines changed

‎multiapps-controller-core/src/main/java/org/cloudfoundry/multiapps/controller/core/Messages.java

+2
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,7 @@ public final class Messages {
189189
public static final String GET_INFO_FOR_UPLOAD_URL_JOB_AUDIT_LOG_MESSAGE = "Get info for upload from url job in space with id: {0}";
190190

191191
public static final String LIST_OPERATIONS_AUDIT_LOG_MESSAGE = "List operations for mta in space with id: {0}";
192+
public static final String LIST_OPERATION_ACTIONS_AUDIT_LOG_MESSAGE = "List operation action in space with id: {0}";
192193
public static final String EXECUTE_OPERATION_AUDIT_LOG_MESSAGE = "Execute operation in space with id: {0}";
193194
public static final String GET_OPERATION_LOGS_AUDIT_LOG_MESSAGE = "Get operation logs in space with id: {0}";
194195
public static final String GET_OPERATION_LOG_CONTENT_AUDIT_LOG_MESSAGE = "Get operation log content in space with id: {0}";
@@ -210,6 +211,7 @@ public final class Messages {
210211
public static final String UPLOAD_FROM_URL_JOB_INFO_AUDIT_LOG_CONFIG = "Upload from url job info";
211212

212213
public static final String OPERATION_LIST_AUDIT_LOG_CONFIG = "Operation list";
214+
public static final String OPERATION_ACTIONS_LIST_AUDIT_LOG_CONFIG = "Operation actions list";
213215
public static final String EXECUTE_OPERATION_AUDIT_LOG_CONFIG = "Operation action execute";
214216
public static final String LIST_OPERATION_LOGS_AUDIT_LOG_CONFIG = "Operation logs list";
215217
public static final String GET_OPERATION_LOG_CONTENT_AUDIT_LOG_CONFIG = "Operation log content info";

‎multiapps-controller-core/src/main/java/org/cloudfoundry/multiapps/controller/core/auditlogging/OperationsApiServiceAuditLog.java

+11
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,17 @@ public static void auditLogGetOperations(String username, String spaceId, String
3030
configIdentifiers));
3131
}
3232

33+
public static void auditLogGetOperationActions(String username, String spaceId, String operationId) {
34+
String performedAction = MessageFormat.format(Messages.LIST_OPERATION_ACTIONS_AUDIT_LOG_MESSAGE, spaceId);
35+
Map<String, String> configIdentifiers = createAuditLogGetOperationLogsConfigurationIdentifier(operationId);
36+
AuditLoggingProvider.getFacade()
37+
.logDataAccessAuditLog(new ExtentensionAuditLog(username,
38+
spaceId,
39+
performedAction,
40+
Messages.OPERATION_ACTIONS_LIST_AUDIT_LOG_CONFIG,
41+
configIdentifiers));
42+
}
43+
3344
public static void auditLogExecuteOperationAction(String username, String spaceId, String operationId, String actionId) {
3445
String performedAction = MessageFormat.format(Messages.EXECUTE_OPERATION_AUDIT_LOG_MESSAGE, spaceId);
3546
Map<String, String> configIdentifiers = createAuditLogExecuteOperationActionConfigurationIdentifier(operationId, actionId);

‎multiapps-controller-core/src/main/java/org/cloudfoundry/multiapps/controller/core/auditlogging/model/ConfigurationChangeActions.java

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
package org.cloudfoundry.multiapps.controller.core.auditlogging.model;
2+
3+
public enum ConfigurationChangeActions {
4+
5+
CONFIGURATION_CREATE("configuration-create"),
6+
CONFIGURATION_UPDATE("configuration-update"),
7+
CONFIGURATION_DELETE("configuration-delete");
8+
9+
private final String configurationAction;
10+
11+
ConfigurationChangeActions(String configurationAction) {
12+
this.configurationAction = configurationAction;
13+
}
14+
15+
public String getConfigurationChangeAction() {
16+
return this.configurationAction;
17+
}
18+
}

‎multiapps-controller-core/src/main/java/org/cloudfoundry/multiapps/controller/core/auditlogging/model/CustomAuditLog.java

+43
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
package org.cloudfoundry.multiapps.controller.core.auditlogging.model;
2+
3+
import org.cloudfoundry.multiapps.mta.model.AuditableConfiguration;
4+
import org.cloudfoundry.multiapps.mta.model.ConfigurationIdentifier;
5+
6+
import java.util.ArrayList;
7+
import java.util.Date;
8+
import java.util.List;
9+
import java.util.Map;
10+
11+
public abstract class CustomAuditLog implements AuditableConfiguration {
12+
13+
private String userId;
14+
private String spaceId;
15+
16+
public CustomAuditLog(String userId, String spaceId) {
17+
this.spaceId = spaceId;
18+
this.userId = userId;
19+
}
20+
21+
public String getSpaceId() {
22+
return spaceId;
23+
}
24+
25+
public String getUserId() {
26+
return userId;
27+
}
28+
29+
public String getTimeOfPerformedAction() {
30+
return new Date().toString();
31+
}
32+
33+
public abstract String getPerformedAction();
34+
35+
@Override
36+
public List<ConfigurationIdentifier> getConfigurationIdentifiers() {
37+
List<ConfigurationIdentifier> configurationIdentifiers = new ArrayList<>();
38+
configurationIdentifiers.add(new ConfigurationIdentifier("performed_action", getPerformedAction()));
39+
configurationIdentifiers.add(new ConfigurationIdentifier("time", getTimeOfPerformedAction()));
40+
configurationIdentifiers.add(new ConfigurationIdentifier("spaceId", getSpaceId()));
41+
return configurationIdentifiers;
42+
}
43+
}

‎multiapps-controller-core/src/main/java/org/cloudfoundry/multiapps/controller/core/auditlogging/model/ExtentensionAuditLog.java

+51
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
package org.cloudfoundry.multiapps.controller.core.auditlogging.model;
2+
3+
import org.cloudfoundry.multiapps.mta.model.ConfigurationIdentifier;
4+
5+
import java.util.HashMap;
6+
import java.util.List;
7+
import java.util.Map;
8+
9+
public class ExtentensionAuditLog extends CustomAuditLog {
10+
11+
private String performedAction;
12+
private String configuration;
13+
private Map<String, String> parameters;
14+
public ExtentensionAuditLog(String userId, String spaceId, String performedAction, String configuration) {
15+
super(userId, spaceId);
16+
this.performedAction = performedAction;
17+
this.configuration = configuration;
18+
this.parameters = new HashMap<>();
19+
}
20+
21+
public ExtentensionAuditLog(String userId, String spaceId, String performedAction, String configuration, Map<String, String> parameters) {
22+
this(userId, spaceId, performedAction, configuration);
23+
this.parameters = parameters;
24+
}
25+
26+
@Override
27+
public String getPerformedAction() {
28+
return performedAction;
29+
}
30+
31+
@Override
32+
public String getConfigurationType() {
33+
return configuration;
34+
}
35+
36+
@Override
37+
public String getConfigurationName() {
38+
return configuration;
39+
}
40+
41+
@Override
42+
public List<ConfigurationIdentifier> getConfigurationIdentifiers() {
43+
List<ConfigurationIdentifier> configurationIdentifier = super.getConfigurationIdentifiers();
44+
for (var parameter : parameters.entrySet()) {
45+
if (parameter.getValue() != null) {
46+
configurationIdentifier.add(new ConfigurationIdentifier(parameter.getKey(), parameter.getValue()));
47+
}
48+
}
49+
return configurationIdentifier;
50+
}
51+
}

‎multiapps-controller-web/src/main/java/org/cloudfoundry/multiapps/controller/web/api/impl/FilesApiServiceImpl.java

-7
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,7 @@
3939
import org.cloudfoundry.multiapps.controller.api.model.ImmutableFileMetadata;
4040
import org.cloudfoundry.multiapps.controller.client.util.CheckedSupplier;
4141
import org.cloudfoundry.multiapps.controller.client.util.ResilientOperationExecutor;
42-
import org.cloudfoundry.multiapps.controller.core.auditlogging.AuditLoggingProvider;
4342
import org.cloudfoundry.multiapps.controller.core.auditlogging.FilesApiServiceAuditLog;
44-
import org.cloudfoundry.multiapps.controller.core.auditlogging.model.ExtentensionAuditLog;
45-
import org.cloudfoundry.multiapps.controller.core.auditlogging.model.FileUploadAuditLog;
46-
import org.cloudfoundry.multiapps.controller.core.auditlogging.model.FileUploadFromUrlAuditLog;
47-
import org.cloudfoundry.multiapps.controller.core.auditlogging.model.FilesListAuditLog;
48-
import org.cloudfoundry.multiapps.controller.core.auditlogging.model.MtaListAuditLog;
49-
import org.cloudfoundry.multiapps.controller.core.auditlogging.model.UploadFromUrlJobInfo;
5043
import org.cloudfoundry.multiapps.controller.core.helpers.DescriptorParserFacadeFactory;
5144
import org.cloudfoundry.multiapps.controller.core.model.CachedMap;
5245
import org.cloudfoundry.multiapps.controller.core.util.ApplicationConfiguration;

‎multiapps-controller-web/src/main/java/org/cloudfoundry/multiapps/controller/web/api/impl/MtasApiServiceImpl.java

-2
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,7 @@
1717
import org.cloudfoundry.multiapps.controller.api.model.Metadata;
1818
import org.cloudfoundry.multiapps.controller.api.model.Module;
1919
import org.cloudfoundry.multiapps.controller.api.model.Mta;
20-
import org.cloudfoundry.multiapps.controller.core.auditlogging.AuditLoggingProvider;
2120
import org.cloudfoundry.multiapps.controller.core.auditlogging.MtasApiServiceAuditLog;
22-
import org.cloudfoundry.multiapps.controller.core.auditlogging.model.MtaListAuditLog;
2321
import org.cloudfoundry.multiapps.controller.core.cf.CloudControllerClientProvider;
2422
import org.cloudfoundry.multiapps.controller.core.cf.detect.DeployedMtaDetector;
2523
import org.cloudfoundry.multiapps.controller.core.cf.metadata.MtaMetadata;

‎multiapps-controller-web/src/main/java/org/cloudfoundry/multiapps/controller/web/api/impl/OperationsApiServiceImpl.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
import org.cloudfoundry.multiapps.controller.api.model.parameters.ParameterConversion;
3636
import org.cloudfoundry.multiapps.controller.core.auditlogging.AuditLoggingProvider;
3737
import org.cloudfoundry.multiapps.controller.core.auditlogging.OperationsApiServiceAuditLog;
38-
import org.cloudfoundry.multiapps.controller.core.auditlogging.model.OperationActionListAuditLog;
3938
import org.cloudfoundry.multiapps.controller.core.cf.CloudControllerClientFactory;
4039
import org.cloudfoundry.multiapps.controller.core.security.token.TokenService;
4140
import org.cloudfoundry.multiapps.controller.core.util.UserInfo;
@@ -212,8 +211,7 @@ private List<Operation> filterByQueryParameters(Integer lastRequestedOperationsC
212211

213212
@Override
214213
public ResponseEntity<List<String>> getOperationActions(String spaceGuid, String operationId) {
215-
AuditLoggingProvider.getFacade()
216-
.logDataAccessAuditLog(new OperationActionListAuditLog(spaceGuid, SecurityContextUtil.getUsername(), operationId));
214+
OperationsApiServiceAuditLog.auditLogGetOperationActions(spaceGuid, SecurityContextUtil.getUsername(), operationId);
217215
Operation operation = getOperationByOperationGuidAndSpaceGuid(operationId, spaceGuid);
218216
return ResponseEntity.ok()
219217
.body(getAvailableActions(operation));

0 commit comments

Comments
 (0)