You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by st...@apache.org on 2016/04/03 10:04:07 UTC
ambari git commit: AMBARI-15665. Unable to Create Cluster Fails Due
To Audit Logger. (Daniel Gergley via stoader)
Repository: ambari
Updated Branches:
refs/heads/trunk d312e310d -> 836647a36
AMBARI-15665. Unable to Create Cluster Fails Due To Audit Logger. (Daniel Gergley via stoader)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/836647a3
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/836647a3
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/836647a3
Branch: refs/heads/trunk
Commit: 836647a36966b1b534e1419b30d4b31858773478
Parents: d312e31
Author: Daniel Gergely <dg...@hortonworks.com>
Authored: Sat Apr 2 11:29:37 2016 +0200
Committer: Toader, Sebastian <st...@hortonworks.com>
Committed: Sat Apr 2 11:29:37 2016 +0200
----------------------------------------------------------------------
.../server/audit/event/AbstractUserAuditEvent.java | 4 +++-
.../request/eventcreator/AlertGroupEventCreator.java | 7 -------
.../request/eventcreator/AlertTargetEventCreator.java | 6 ------
.../request/eventcreator/BlueprintEventCreator.java | 5 -----
.../eventcreator/BlueprintExportEventCreator.java | 4 ----
.../request/eventcreator/ComponentEventCreator.java | 4 ----
.../eventcreator/ConfigurationChangeEventCreator.java | 5 -----
.../request/eventcreator/CredentialEventCreator.java | 4 ----
.../request/eventcreator/DefaultEventCreator.java | 4 ----
.../audit/request/eventcreator/GroupEventCreator.java | 5 -----
.../audit/request/eventcreator/HostEventCreator.java | 6 ------
.../request/eventcreator/MemberEventCreator.java | 6 ------
.../request/eventcreator/PrivilegeEventCreator.java | 5 -----
.../request/eventcreator/RepositoryEventCreator.java | 5 -----
.../eventcreator/RepositoryVersionEventCreator.java | 6 ------
.../request/eventcreator/RequestEventCreator.java | 4 ----
.../ServiceConfigDownloadEventCreator.java | 4 ----
.../request/eventcreator/ServiceEventCreator.java | 7 +------
.../eventcreator/UnauthorizedEventCreator.java | 4 ----
.../request/eventcreator/UpgradeEventCreator.java | 4 ----
.../request/eventcreator/UpgradeItemEventCreator.java | 4 ----
.../audit/request/eventcreator/UserEventCreator.java | 14 +++-----------
.../eventcreator/ViewInstanceEventCreator.java | 6 ------
.../eventcreator/ViewPrivilegeEventCreator.java | 4 ----
.../server/audit/request/DefaultEventCreatorTest.java | 2 +-
.../AmbariAuthenticationFilterTest.java | 1 +
26 files changed, 9 insertions(+), 121 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/836647a3/ambari-server/src/main/java/org/apache/ambari/server/audit/event/AbstractUserAuditEvent.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/AbstractUserAuditEvent.java b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/AbstractUserAuditEvent.java
index a968a64..6aab071 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/AbstractUserAuditEvent.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/AbstractUserAuditEvent.java
@@ -18,6 +18,8 @@
package org.apache.ambari.server.audit.event;
+import org.apache.ambari.server.security.authorization.AuthorizationHelper;
+
/**
* Base class for audit events which are result of user actions. It appends
* to audit event details the user name and remote ip of the host
@@ -31,7 +33,7 @@ public abstract class AbstractUserAuditEvent extends AbstractAuditEvent {
/**
* Name of the user started the operation
*/
- private String userName;
+ private String userName = AuthorizationHelper.getAuthenticatedName();
/**
* Ip of the user who started the operation. Note: remote ip might not be the original ip (proxies, routers can modify it)
http://git-wip-us.apache.org/repos/asf/ambari/blob/836647a3/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/AlertGroupEventCreator.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/AlertGroupEventCreator.java b/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/AlertGroupEventCreator.java
index 103fd4d..366dfff 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/AlertGroupEventCreator.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/AlertGroupEventCreator.java
@@ -19,7 +19,6 @@
package org.apache.ambari.server.audit.request.eventcreator;
import java.util.Collections;
-import java.util.Date;
import java.util.List;
import java.util.Set;
@@ -33,8 +32,6 @@ import org.apache.ambari.server.audit.event.request.DeleteAlertGroupRequestAudit
import org.apache.ambari.server.audit.request.RequestAuditEventCreator;
import org.apache.ambari.server.controller.spi.Resource;
import org.apache.ambari.server.controller.utilities.PropertyHelper;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.core.userdetails.User;
import com.google.common.collect.ImmutableSet;
@@ -84,7 +81,6 @@ public class AlertGroupEventCreator implements RequestAuditEventCreator {
*/
@Override
public AuditEvent createAuditEvent(Request request, Result result) {
- String username = ((User) SecurityContextHolder.getContext().getAuthentication().getPrincipal()).getUsername();
switch (request.getRequestType()) {
case POST:
@@ -94,7 +90,6 @@ public class AlertGroupEventCreator implements RequestAuditEventCreator {
.withResultStatus(result.getStatus())
.withUrl(request.getURI())
.withRemoteIp(request.getRemoteAddress())
- .withUserName(username)
.withName(getName(request))
.withDefinitionIds(getDefinitionIds(request))
.withNotificationIds(getNotificationIds(request))
@@ -106,7 +101,6 @@ public class AlertGroupEventCreator implements RequestAuditEventCreator {
.withResultStatus(result.getStatus())
.withUrl(request.getURI())
.withRemoteIp(request.getRemoteAddress())
- .withUserName(username)
.withName(getName(request))
.withDefinitionIds(getDefinitionIds(request))
.withNotificationIds(getNotificationIds(request))
@@ -118,7 +112,6 @@ public class AlertGroupEventCreator implements RequestAuditEventCreator {
.withResultStatus(result.getStatus())
.withUrl(request.getURI())
.withRemoteIp(request.getRemoteAddress())
- .withUserName(username)
.withId(request.getResource().getKeyValueMap().get(Resource.Type.AlertGroup))
.build();
default:
http://git-wip-us.apache.org/repos/asf/ambari/blob/836647a3/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/AlertTargetEventCreator.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/AlertTargetEventCreator.java b/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/AlertTargetEventCreator.java
index 29a241e..abad559 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/AlertTargetEventCreator.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/AlertTargetEventCreator.java
@@ -32,8 +32,6 @@ import org.apache.ambari.server.audit.event.request.DeleteAlertTargetRequestAudi
import org.apache.ambari.server.audit.request.RequestAuditEventCreator;
import org.apache.ambari.server.controller.spi.Resource;
import org.apache.ambari.server.controller.utilities.PropertyHelper;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.core.userdetails.User;
import com.google.common.collect.ImmutableSet;
@@ -83,7 +81,6 @@ public class AlertTargetEventCreator implements RequestAuditEventCreator {
*/
@Override
public AuditEvent createAuditEvent(Request request, Result result) {
- String username = ((User) SecurityContextHolder.getContext().getAuthentication().getPrincipal()).getUsername();
switch (request.getRequestType()) {
case POST:
@@ -93,7 +90,6 @@ public class AlertTargetEventCreator implements RequestAuditEventCreator {
.withResultStatus(result.getStatus())
.withUrl(request.getURI())
.withRemoteIp(request.getRemoteAddress())
- .withUserName(username)
.withName(getProperty(request, "name"))
.withDescription(getProperty(request, "description"))
.withAlertStates(getPropertyList(request, "alert_states"))
@@ -109,7 +105,6 @@ public class AlertTargetEventCreator implements RequestAuditEventCreator {
.withResultStatus(result.getStatus())
.withUrl(request.getURI())
.withRemoteIp(request.getRemoteAddress())
- .withUserName(username)
.withName(getProperty(request, "name"))
.withDescription(getProperty(request, "description"))
.withAlertStates(getPropertyList(request, "alert_states"))
@@ -125,7 +120,6 @@ public class AlertTargetEventCreator implements RequestAuditEventCreator {
.withResultStatus(result.getStatus())
.withUrl(request.getURI())
.withRemoteIp(request.getRemoteAddress())
- .withUserName(username)
.withId(request.getResource().getKeyValueMap().get(Resource.Type.AlertTarget))
.build();
default:
http://git-wip-us.apache.org/repos/asf/ambari/blob/836647a3/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/BlueprintEventCreator.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/BlueprintEventCreator.java b/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/BlueprintEventCreator.java
index bdd6dbe..a91a9c1 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/BlueprintEventCreator.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/BlueprintEventCreator.java
@@ -28,8 +28,6 @@ import org.apache.ambari.server.audit.event.request.AddBlueprintRequestAuditEven
import org.apache.ambari.server.audit.event.request.DeleteBlueprintRequestAuditEvent;
import org.apache.ambari.server.audit.request.RequestAuditEventCreator;
import org.apache.ambari.server.controller.spi.Resource;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.core.userdetails.User;
import com.google.common.collect.ImmutableSet;
@@ -79,7 +77,6 @@ public class BlueprintEventCreator implements RequestAuditEventCreator {
*/
@Override
public AuditEvent createAuditEvent(Request request, Result result) {
- String username = ((User) SecurityContextHolder.getContext().getAuthentication().getPrincipal()).getUsername();
switch (request.getRequestType()) {
case POST:
@@ -89,7 +86,6 @@ public class BlueprintEventCreator implements RequestAuditEventCreator {
.withResultStatus(result.getStatus())
.withUrl(request.getURI())
.withRemoteIp(request.getRemoteAddress())
- .withUserName(username)
.withBlueprintName(request.getResource().getKeyValueMap().get(Resource.Type.Blueprint))
.build();
case DELETE:
@@ -99,7 +95,6 @@ public class BlueprintEventCreator implements RequestAuditEventCreator {
.withResultStatus(result.getStatus())
.withUrl(request.getURI())
.withRemoteIp(request.getRemoteAddress())
- .withUserName(username)
.withBlueprintName(request.getResource().getKeyValueMap().get(Resource.Type.Blueprint))
.build();
default:
http://git-wip-us.apache.org/repos/asf/ambari/blob/836647a3/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/BlueprintExportEventCreator.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/BlueprintExportEventCreator.java b/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/BlueprintExportEventCreator.java
index 1416021..85379d8 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/BlueprintExportEventCreator.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/BlueprintExportEventCreator.java
@@ -27,8 +27,6 @@ import org.apache.ambari.server.audit.event.AuditEvent;
import org.apache.ambari.server.audit.event.request.BlueprintExportRequestAuditEvent;
import org.apache.ambari.server.audit.request.RequestAuditEventCreator;
import org.apache.ambari.server.controller.spi.Resource;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.core.userdetails.User;
import com.google.common.collect.ImmutableSet;
@@ -78,7 +76,6 @@ public class BlueprintExportEventCreator implements RequestAuditEventCreator {
*/
@Override
public AuditEvent createAuditEvent(Request request, Result result) {
- String username = ((User) SecurityContextHolder.getContext().getAuthentication().getPrincipal()).getUsername();
if (!request.getURI().contains("format=blueprint")) {
return null;
}
@@ -88,7 +85,6 @@ public class BlueprintExportEventCreator implements RequestAuditEventCreator {
.withResultStatus(result.getStatus())
.withUrl(request.getURI())
.withRemoteIp(request.getRemoteAddress())
- .withUserName(username)
.build();
}
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/836647a3/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/ComponentEventCreator.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/ComponentEventCreator.java b/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/ComponentEventCreator.java
index 8034d24..870a797 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/ComponentEventCreator.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/ComponentEventCreator.java
@@ -30,8 +30,6 @@ import org.apache.ambari.server.audit.request.RequestAuditEventCreator;
import org.apache.ambari.server.controller.internal.RequestOperationLevel;
import org.apache.ambari.server.controller.spi.Resource;
import org.apache.ambari.server.controller.utilities.PropertyHelper;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.core.userdetails.User;
import com.google.common.collect.ImmutableSet;
@@ -82,7 +80,6 @@ public class ComponentEventCreator implements RequestAuditEventCreator {
*/
@Override
public AuditEvent createAuditEvent(Request request, Result result) {
- String username = ((User) SecurityContextHolder.getContext().getAuthentication().getPrincipal()).getUsername();
String operation = getOperation(request);
@@ -93,7 +90,6 @@ public class ComponentEventCreator implements RequestAuditEventCreator {
StartOperationRequestAuditEvent.StartOperationAuditEventBuilder auditEventBuilder = StartOperationRequestAuditEvent.builder()
.withOperation(operation)
- .withUserName(username)
.withRemoteIp(request.getRemoteAddress())
.withTimestamp(System.currentTimeMillis())
.withRequestId(String.valueOf(requestId));
http://git-wip-us.apache.org/repos/asf/ambari/blob/836647a3/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/ConfigurationChangeEventCreator.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/ConfigurationChangeEventCreator.java b/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/ConfigurationChangeEventCreator.java
index 7e58893..b671138 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/ConfigurationChangeEventCreator.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/ConfigurationChangeEventCreator.java
@@ -30,8 +30,6 @@ import org.apache.ambari.server.audit.event.request.ConfigurationChangeRequestAu
import org.apache.ambari.server.audit.request.RequestAuditEventCreator;
import org.apache.ambari.server.controller.spi.Resource;
import org.apache.ambari.server.controller.utilities.PropertyHelper;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.core.userdetails.User;
import com.google.common.collect.ImmutableSet;
@@ -81,7 +79,6 @@ public class ConfigurationChangeEventCreator implements RequestAuditEventCreator
*/
@Override
public AuditEvent createAuditEvent(Request request, Result result) {
- String username = ((User) SecurityContextHolder.getContext().getAuthentication().getPrincipal()).getUsername();
if (!request.getBody().getPropertySets().isEmpty()) {
Map<String, Object> map = request.getBody().getPropertySets().iterator().next();
@@ -94,7 +91,6 @@ public class ConfigurationChangeEventCreator implements RequestAuditEventCreator
.withResultStatus(result.getStatus())
.withUrl(request.getURI())
.withRemoteIp(request.getRemoteAddress())
- .withUserName(username)
.withOldName(oldName)
.withNewName(newName)
.build();
@@ -107,7 +103,6 @@ public class ConfigurationChangeEventCreator implements RequestAuditEventCreator
.withResultStatus(result.getStatus())
.withUrl(request.getURI())
.withRemoteIp(request.getRemoteAddress())
- .withUserName(username)
.withVersionNote(getServiceConfigVersionNote(result))
.withVersionNumber(getServiceConfigVersion(result))
.build();
http://git-wip-us.apache.org/repos/asf/ambari/blob/836647a3/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/CredentialEventCreator.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/CredentialEventCreator.java b/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/CredentialEventCreator.java
index 3b1f462..0647553 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/CredentialEventCreator.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/CredentialEventCreator.java
@@ -28,8 +28,6 @@ import org.apache.ambari.server.audit.event.request.AddCredentialRequestAuditEve
import org.apache.ambari.server.audit.request.RequestAuditEventCreator;
import org.apache.ambari.server.controller.spi.Resource;
import org.apache.ambari.server.controller.utilities.PropertyHelper;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.core.userdetails.User;
import com.google.common.collect.ImmutableSet;
@@ -79,7 +77,6 @@ public class CredentialEventCreator implements RequestAuditEventCreator {
*/
@Override
public AuditEvent createAuditEvent(Request request, Result result) {
- String username = ((User) SecurityContextHolder.getContext().getAuthentication().getPrincipal()).getUsername();
return AddCredentialRequestAuditEvent.builder()
.withTimestamp(System.currentTimeMillis())
@@ -87,7 +84,6 @@ public class CredentialEventCreator implements RequestAuditEventCreator {
.withResultStatus(result.getStatus())
.withUrl(request.getURI())
.withRemoteIp(request.getRemoteAddress())
- .withUserName(username)
.withClusterName(getProperty(request, "cluster_name"))
.withType(getProperty(request, "type"))
.withAlias(getProperty(request, "alias"))
http://git-wip-us.apache.org/repos/asf/ambari/blob/836647a3/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/DefaultEventCreator.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/DefaultEventCreator.java b/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/DefaultEventCreator.java
index d0f57f2..feda291 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/DefaultEventCreator.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/DefaultEventCreator.java
@@ -29,8 +29,6 @@ import org.apache.ambari.server.audit.request.RequestAuditEvent;
import org.apache.ambari.server.audit.request.RequestAuditEventCreator;
import org.apache.ambari.server.audit.request.RequestAuditLogger;
import org.apache.ambari.server.controller.spi.Resource;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.core.userdetails.User;
import com.google.common.collect.ImmutableSet;
@@ -74,11 +72,9 @@ public class DefaultEventCreator implements RequestAuditEventCreator {
*/
@Override
public AuditEvent createAuditEvent(final Request request, final Result result) {
- String username = ((User) SecurityContextHolder.getContext().getAuthentication().getPrincipal()).getUsername();
return RequestAuditEvent.builder()
.withTimestamp(System.currentTimeMillis())
- .withUserName(username)
.withRemoteIp(request.getRemoteAddress())
.withRequestType(request.getRequestType())
.withUrl(request.getURI())
http://git-wip-us.apache.org/repos/asf/ambari/blob/836647a3/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/GroupEventCreator.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/GroupEventCreator.java b/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/GroupEventCreator.java
index d926d94..30fef98 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/GroupEventCreator.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/GroupEventCreator.java
@@ -29,8 +29,6 @@ import org.apache.ambari.server.audit.event.request.DeleteGroupRequestAuditEvent
import org.apache.ambari.server.audit.request.RequestAuditEventCreator;
import org.apache.ambari.server.controller.spi.Resource;
import org.apache.ambari.server.controller.utilities.PropertyHelper;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.core.userdetails.User;
import com.google.common.collect.ImmutableSet;
@@ -80,7 +78,6 @@ public class GroupEventCreator implements RequestAuditEventCreator {
*/
@Override
public AuditEvent createAuditEvent(Request request, Result result) {
- String username = ((User) SecurityContextHolder.getContext().getAuthentication().getPrincipal()).getUsername();
switch (request.getRequestType()) {
case POST:
@@ -90,7 +87,6 @@ public class GroupEventCreator implements RequestAuditEventCreator {
.withResultStatus(result.getStatus())
.withUrl(request.getURI())
.withRemoteIp(request.getRemoteAddress())
- .withUserName(username)
.withGroupName(getGroupName(request))
.build();
case DELETE:
@@ -100,7 +96,6 @@ public class GroupEventCreator implements RequestAuditEventCreator {
.withResultStatus(result.getStatus())
.withUrl(request.getURI())
.withRemoteIp(request.getRemoteAddress())
- .withUserName(username)
.withGroupName(request.getResource().getKeyValueMap().get(Resource.Type.Group))
.build();
default:
http://git-wip-us.apache.org/repos/asf/ambari/blob/836647a3/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/HostEventCreator.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/HostEventCreator.java b/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/HostEventCreator.java
index 910280d..7bc0133 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/HostEventCreator.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/HostEventCreator.java
@@ -31,8 +31,6 @@ import org.apache.ambari.server.audit.event.request.DeleteHostRequestAuditEvent;
import org.apache.ambari.server.audit.request.RequestAuditEventCreator;
import org.apache.ambari.server.controller.spi.Resource;
import org.apache.ambari.server.controller.utilities.PropertyHelper;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.core.userdetails.User;
import com.google.common.collect.ImmutableSet;
@@ -83,7 +81,6 @@ public class HostEventCreator implements RequestAuditEventCreator {
*/
@Override
public AuditEvent createAuditEvent(Request request, Result result) {
- String username = ((User) SecurityContextHolder.getContext().getAuthentication().getPrincipal()).getUsername();
switch (request.getRequestType()) {
case DELETE:
@@ -93,7 +90,6 @@ public class HostEventCreator implements RequestAuditEventCreator {
.withResultStatus(result.getStatus())
.withUrl(request.getURI())
.withRemoteIp(request.getRemoteAddress())
- .withUserName(username)
.withHostName(request.getResource().getKeyValueMap().get(Resource.Type.Host))
.build();
case POST:
@@ -103,7 +99,6 @@ public class HostEventCreator implements RequestAuditEventCreator {
.withResultStatus(result.getStatus())
.withUrl(request.getURI())
.withRemoteIp(request.getRemoteAddress())
- .withUserName(username)
.withHostName(getHostName(request))
.build();
case QUERY_POST:
@@ -113,7 +108,6 @@ public class HostEventCreator implements RequestAuditEventCreator {
.withResultStatus(result.getStatus())
.withUrl(request.getURI())
.withRemoteIp(request.getRemoteAddress())
- .withUserName(username)
.withHostName(getHostNameFromQuery(request))
.withComponent(getHostComponent(request))
.build();
http://git-wip-us.apache.org/repos/asf/ambari/blob/836647a3/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/MemberEventCreator.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/MemberEventCreator.java b/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/MemberEventCreator.java
index a3c3164..f0158f5 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/MemberEventCreator.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/MemberEventCreator.java
@@ -33,8 +33,6 @@ import org.apache.ambari.server.audit.event.request.RemoveUserFromGroupRequestAu
import org.apache.ambari.server.audit.request.RequestAuditEventCreator;
import org.apache.ambari.server.controller.spi.Resource;
import org.apache.ambari.server.controller.utilities.PropertyHelper;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.core.userdetails.User;
import com.google.common.collect.ImmutableSet;
@@ -84,7 +82,6 @@ public class MemberEventCreator implements RequestAuditEventCreator {
*/
@Override
public AuditEvent createAuditEvent(Request request, Result result) {
- String username = ((User) SecurityContextHolder.getContext().getAuthentication().getPrincipal()).getUsername();
switch (request.getRequestType()) {
case POST:
@@ -94,7 +91,6 @@ public class MemberEventCreator implements RequestAuditEventCreator {
.withResultStatus(result.getStatus())
.withUrl(request.getURI())
.withRemoteIp(request.getRemoteAddress())
- .withUserName(username)
.withAffectedUserName(getUserName(request))
.withGroupName(getGroupName(request))
.build();
@@ -105,7 +101,6 @@ public class MemberEventCreator implements RequestAuditEventCreator {
.withResultStatus(result.getStatus())
.withUrl(request.getURI())
.withRemoteIp(request.getRemoteAddress())
- .withUserName(username)
.withAffectedUserName(getUserName(request))
.withGroupName(getGroupName(request))
.build();
@@ -116,7 +111,6 @@ public class MemberEventCreator implements RequestAuditEventCreator {
.withResultStatus(result.getStatus())
.withUrl(request.getURI())
.withRemoteIp(request.getRemoteAddress())
- .withUserName(username)
.withGroupName(getGroupNameForPut(request))
.withUserNameList(getUsers(request))
.build();
http://git-wip-us.apache.org/repos/asf/ambari/blob/836647a3/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/PrivilegeEventCreator.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/PrivilegeEventCreator.java b/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/PrivilegeEventCreator.java
index bdc7b59..11168f1 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/PrivilegeEventCreator.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/PrivilegeEventCreator.java
@@ -33,8 +33,6 @@ import org.apache.ambari.server.audit.event.request.PrivilegeChangeRequestAuditE
import org.apache.ambari.server.audit.request.RequestAuditEventCreator;
import org.apache.ambari.server.controller.spi.Resource;
import org.apache.ambari.server.controller.utilities.PropertyHelper;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.core.userdetails.User;
import com.google.common.collect.ImmutableSet;
@@ -84,7 +82,6 @@ public class PrivilegeEventCreator implements RequestAuditEventCreator {
*/
@Override
public AuditEvent createAuditEvent(Request request, Result result) {
- String username = ((User) SecurityContextHolder.getContext().getAuthentication().getPrincipal()).getUsername();
Map<String, List<String>> users = getEntities(request, "USER");
Map<String, List<String>> groups = getEntities(request, "GROUP");
@@ -97,7 +94,6 @@ public class PrivilegeEventCreator implements RequestAuditEventCreator {
.withResultStatus(result.getStatus())
.withUrl(request.getURI())
.withRemoteIp(request.getRemoteAddress())
- .withUserName(username)
.withUsers(users)
.withGroups(groups)
.build();
@@ -109,7 +105,6 @@ public class PrivilegeEventCreator implements RequestAuditEventCreator {
.withResultStatus(result.getStatus())
.withUrl(request.getURI())
.withRemoteIp(request.getRemoteAddress())
- .withUserName(username)
.withRole(role)
.withGroup(groups.get(role) == null ? null : groups.get(role).get(0))
.withUser(users.get(role) == null ? null : users.get(role).get(0))
http://git-wip-us.apache.org/repos/asf/ambari/blob/836647a3/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/RepositoryEventCreator.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/RepositoryEventCreator.java b/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/RepositoryEventCreator.java
index fe6f8cc..ca3bac4 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/RepositoryEventCreator.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/RepositoryEventCreator.java
@@ -29,8 +29,6 @@ import org.apache.ambari.server.audit.event.request.UpdateRepositoryRequestAudit
import org.apache.ambari.server.audit.request.RequestAuditEventCreator;
import org.apache.ambari.server.controller.spi.Resource;
import org.apache.ambari.server.controller.utilities.PropertyHelper;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.core.userdetails.User;
import com.google.common.collect.ImmutableSet;
@@ -80,7 +78,6 @@ public class RepositoryEventCreator implements RequestAuditEventCreator {
*/
@Override
public AuditEvent createAuditEvent(Request request, Result result) {
- String username = ((User) SecurityContextHolder.getContext().getAuthentication().getPrincipal()).getUsername();
switch (request.getRequestType()) {
case POST:
@@ -90,7 +87,6 @@ public class RepositoryEventCreator implements RequestAuditEventCreator {
.withResultStatus(result.getStatus())
.withUrl(request.getURI())
.withRemoteIp(request.getRemoteAddress())
- .withUserName(username)
.withRepo(getProperty(request, PropertyHelper.getPropertyId("Repositories", "repo_id")))
.withStackName(getProperty(request, PropertyHelper.getPropertyId("Repositories", "stack_name")))
.withStackVersion(getProperty(request, PropertyHelper.getPropertyId("Repositories", "stack_version")))
@@ -104,7 +100,6 @@ public class RepositoryEventCreator implements RequestAuditEventCreator {
.withResultStatus(result.getStatus())
.withUrl(request.getURI())
.withRemoteIp(request.getRemoteAddress())
- .withUserName(username)
.withRepo(getProperty(request, PropertyHelper.getPropertyId("Repositories", "repo_id")))
.withStackName(getProperty(request, PropertyHelper.getPropertyId("Repositories", "stack_name")))
.withStackVersion(getProperty(request, PropertyHelper.getPropertyId("Repositories", "stack_version")))
http://git-wip-us.apache.org/repos/asf/ambari/blob/836647a3/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/RepositoryVersionEventCreator.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/RepositoryVersionEventCreator.java b/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/RepositoryVersionEventCreator.java
index 7c9c731..3f5e2d0 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/RepositoryVersionEventCreator.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/RepositoryVersionEventCreator.java
@@ -34,8 +34,6 @@ import org.apache.ambari.server.audit.event.request.DeleteRepositoryVersionReque
import org.apache.ambari.server.audit.request.RequestAuditEventCreator;
import org.apache.ambari.server.controller.spi.Resource;
import org.apache.ambari.server.controller.utilities.PropertyHelper;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.core.userdetails.User;
import com.google.common.collect.ImmutableSet;
@@ -85,7 +83,6 @@ public class RepositoryVersionEventCreator implements RequestAuditEventCreator {
*/
@Override
public AuditEvent createAuditEvent(Request request, Result result) {
- String username = ((User) SecurityContextHolder.getContext().getAuthentication().getPrincipal()).getUsername();
switch (request.getRequestType()) {
case POST:
@@ -95,7 +92,6 @@ public class RepositoryVersionEventCreator implements RequestAuditEventCreator {
.withResultStatus(result.getStatus())
.withUrl(request.getURI())
.withRemoteIp(request.getRemoteAddress())
- .withUserName(username)
.withStackName(getProperty(request, PropertyHelper.getPropertyId("RepositoryVersions", "stack_name")))
.withStackVersion(getProperty(request, PropertyHelper.getPropertyId("RepositoryVersions", "stack_version")))
.withDisplayName(getProperty(request, PropertyHelper.getPropertyId("RepositoryVersions", "display_name")))
@@ -109,7 +105,6 @@ public class RepositoryVersionEventCreator implements RequestAuditEventCreator {
.withResultStatus(result.getStatus())
.withUrl(request.getURI())
.withRemoteIp(request.getRemoteAddress())
- .withUserName(username)
.withStackName(getProperty(request, PropertyHelper.getPropertyId("RepositoryVersions", "stack_name")))
.withStackVersion(getProperty(request, PropertyHelper.getPropertyId("RepositoryVersions", "stack_version")))
.withDisplayName(getProperty(request, PropertyHelper.getPropertyId("RepositoryVersions", "display_name")))
@@ -123,7 +118,6 @@ public class RepositoryVersionEventCreator implements RequestAuditEventCreator {
.withResultStatus(result.getStatus())
.withUrl(request.getURI())
.withRemoteIp(request.getRemoteAddress())
- .withUserName(username)
.withStackName(request.getResource().getKeyValueMap().get(Resource.Type.Stack))
.withStackVersion(request.getResource().getKeyValueMap().get(Resource.Type.StackVersion))
.withRepoVersion(request.getResource().getKeyValueMap().get(Resource.Type.RepositoryVersion))
http://git-wip-us.apache.org/repos/asf/ambari/blob/836647a3/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/RequestEventCreator.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/RequestEventCreator.java b/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/RequestEventCreator.java
index fd13973..3a33114 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/RequestEventCreator.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/RequestEventCreator.java
@@ -28,8 +28,6 @@ import org.apache.ambari.server.audit.event.request.AddRequestRequestAuditEvent;
import org.apache.ambari.server.audit.request.RequestAuditEventCreator;
import org.apache.ambari.server.controller.internal.RequestOperationLevel;
import org.apache.ambari.server.controller.spi.Resource;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.core.userdetails.User;
import com.google.common.collect.ImmutableSet;
@@ -80,7 +78,6 @@ public class RequestEventCreator implements RequestAuditEventCreator {
*/
@Override
public AuditEvent createAuditEvent(Request request, Result result) {
- String username = ((User) SecurityContextHolder.getContext().getAuthentication().getPrincipal()).getUsername();
switch (request.getRequestType()) {
case POST:
@@ -90,7 +87,6 @@ public class RequestEventCreator implements RequestAuditEventCreator {
.withResultStatus(result.getStatus())
.withUrl(request.getURI())
.withRemoteIp(request.getRemoteAddress())
- .withUserName(username)
.withCommand(request.getBody().getRequestInfoProperties().get("command"))
.withClusterName(request.getBody().getRequestInfoProperties().get(RequestOperationLevel.OPERATION_CLUSTER_ID))
.build();
http://git-wip-us.apache.org/repos/asf/ambari/blob/836647a3/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/ServiceConfigDownloadEventCreator.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/ServiceConfigDownloadEventCreator.java b/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/ServiceConfigDownloadEventCreator.java
index 681cfb8..0999010 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/ServiceConfigDownloadEventCreator.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/ServiceConfigDownloadEventCreator.java
@@ -27,8 +27,6 @@ import org.apache.ambari.server.audit.event.AuditEvent;
import org.apache.ambari.server.audit.event.request.ClientConfigDownloadRequestAuditEvent;
import org.apache.ambari.server.audit.request.RequestAuditEventCreator;
import org.apache.ambari.server.controller.spi.Resource;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.core.userdetails.User;
import com.google.common.collect.ImmutableSet;
@@ -77,14 +75,12 @@ public class ServiceConfigDownloadEventCreator implements RequestAuditEventCreat
*/
@Override
public AuditEvent createAuditEvent(Request request, Result result) {
- String username = ((User) SecurityContextHolder.getContext().getAuthentication().getPrincipal()).getUsername();
return ClientConfigDownloadRequestAuditEvent.builder()
.withTimestamp(System.currentTimeMillis())
.withRequestType(request.getRequestType())
.withResultStatus(result.getStatus())
.withUrl(request.getURI())
.withRemoteIp(request.getRemoteAddress())
- .withUserName(username)
.withService(request.getResource().getKeyValueMap().get(Resource.Type.Service))
.withComponent(request.getResource().getKeyValueMap().get(Resource.Type.Component))
.build();
http://git-wip-us.apache.org/repos/asf/ambari/blob/836647a3/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/ServiceEventCreator.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/ServiceEventCreator.java b/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/ServiceEventCreator.java
index 2e2b91d..65d94f9 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/ServiceEventCreator.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/ServiceEventCreator.java
@@ -31,8 +31,6 @@ import org.apache.ambari.server.audit.request.RequestAuditEventCreator;
import org.apache.ambari.server.controller.internal.RequestOperationLevel;
import org.apache.ambari.server.controller.spi.Resource;
import org.apache.ambari.server.controller.utilities.PropertyHelper;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.core.userdetails.User;
import com.google.common.collect.ImmutableSet;
@@ -83,7 +81,6 @@ public class ServiceEventCreator implements RequestAuditEventCreator {
*/
@Override
public AuditEvent createAuditEvent(Request request, Result result) {
- String username = ((User) SecurityContextHolder.getContext().getAuthentication().getPrincipal()).getUsername();
if (request.getRequestType() == Request.Type.DELETE) {
return DeleteServiceRequestAuditEvent.builder()
@@ -92,8 +89,7 @@ public class ServiceEventCreator implements RequestAuditEventCreator {
.withResultStatus(result.getStatus())
.withUrl(request.getURI())
.withRemoteIp(request.getRemoteAddress())
- .withUserName(username)
- .withService(request.getResource().getKeyValueMap().get(Resource.Type.Service))
+ .withService(request.getResource().getKeyValueMap().get(Resource.Type.Service))
.build();
}
@@ -106,7 +102,6 @@ public class ServiceEventCreator implements RequestAuditEventCreator {
StartOperationRequestAuditEvent.StartOperationAuditEventBuilder auditEventBuilder = StartOperationRequestAuditEvent.builder()
.withOperation(operation)
- .withUserName(username)
.withRemoteIp(request.getRemoteAddress())
.withTimestamp(System.currentTimeMillis())
.withRequestId(String.valueOf(requestId));
http://git-wip-us.apache.org/repos/asf/ambari/blob/836647a3/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/UnauthorizedEventCreator.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/UnauthorizedEventCreator.java b/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/UnauthorizedEventCreator.java
index d53aa68..db3c934 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/UnauthorizedEventCreator.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/UnauthorizedEventCreator.java
@@ -27,8 +27,6 @@ import org.apache.ambari.server.audit.event.AccessUnauthorizedAuditEvent;
import org.apache.ambari.server.audit.event.AuditEvent;
import org.apache.ambari.server.audit.request.RequestAuditEventCreator;
import org.apache.ambari.server.controller.spi.Resource;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.core.userdetails.User;
import com.google.common.collect.ImmutableSet;
@@ -73,12 +71,10 @@ public class UnauthorizedEventCreator implements RequestAuditEventCreator {
@Override
public AuditEvent createAuditEvent(Request request, Result result) {
- String username = ((User) SecurityContextHolder.getContext().getAuthentication().getPrincipal()).getUsername();
AccessUnauthorizedAuditEvent ae = AccessUnauthorizedAuditEvent.builder()
.withRemoteIp(request.getRemoteAddress())
.withResourcePath(request.getURI())
.withTimestamp(System.currentTimeMillis())
- .withUserName(username)
.build();
return ae;
http://git-wip-us.apache.org/repos/asf/ambari/blob/836647a3/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/UpgradeEventCreator.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/UpgradeEventCreator.java b/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/UpgradeEventCreator.java
index b8a6873..f9f4152 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/UpgradeEventCreator.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/UpgradeEventCreator.java
@@ -28,8 +28,6 @@ import org.apache.ambari.server.audit.event.request.AddUpgradeRequestAuditEvent;
import org.apache.ambari.server.audit.request.RequestAuditEventCreator;
import org.apache.ambari.server.controller.spi.Resource;
import org.apache.ambari.server.controller.utilities.PropertyHelper;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.core.userdetails.User;
import com.google.common.collect.ImmutableSet;
@@ -79,7 +77,6 @@ public class UpgradeEventCreator implements RequestAuditEventCreator {
*/
@Override
public AuditEvent createAuditEvent(Request request, Result result) {
- String username = ((User) SecurityContextHolder.getContext().getAuthentication().getPrincipal()).getUsername();
return AddUpgradeRequestAuditEvent.builder()
.withTimestamp(System.currentTimeMillis())
@@ -87,7 +84,6 @@ public class UpgradeEventCreator implements RequestAuditEventCreator {
.withResultStatus(result.getStatus())
.withUrl(request.getURI())
.withRemoteIp(request.getRemoteAddress())
- .withUserName(username)
.withRepositoryVersion(getProperty(request, "repository_version"))
.withUpgradeType(getProperty(request, "upgrade_type"))
.withClusterName(getProperty(request, "cluster_name"))
http://git-wip-us.apache.org/repos/asf/ambari/blob/836647a3/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/UpgradeItemEventCreator.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/UpgradeItemEventCreator.java b/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/UpgradeItemEventCreator.java
index 9f83172..1869909 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/UpgradeItemEventCreator.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/UpgradeItemEventCreator.java
@@ -28,8 +28,6 @@ import org.apache.ambari.server.audit.event.request.UpdateUpgradeItemRequestAudi
import org.apache.ambari.server.audit.request.RequestAuditEventCreator;
import org.apache.ambari.server.controller.spi.Resource;
import org.apache.ambari.server.controller.utilities.PropertyHelper;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.core.userdetails.User;
import com.google.common.collect.ImmutableSet;
@@ -79,7 +77,6 @@ public class UpgradeItemEventCreator implements RequestAuditEventCreator {
*/
@Override
public AuditEvent createAuditEvent(Request request, Result result) {
- String username = ((User) SecurityContextHolder.getContext().getAuthentication().getPrincipal()).getUsername();
return UpdateUpgradeItemRequestAuditEvent.builder()
.withTimestamp(System.currentTimeMillis())
@@ -87,7 +84,6 @@ public class UpgradeItemEventCreator implements RequestAuditEventCreator {
.withResultStatus(result.getStatus())
.withUrl(request.getURI())
.withRemoteIp(request.getRemoteAddress())
- .withUserName(username)
.withStatus(getProperty(request, "status"))
.withStageId(getProperty(request, "stage_id"))
.withRequestId(getProperty(request, "request_id"))
http://git-wip-us.apache.org/repos/asf/ambari/blob/836647a3/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/UserEventCreator.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/UserEventCreator.java b/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/UserEventCreator.java
index 2b4e5c1..89f0755 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/UserEventCreator.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/UserEventCreator.java
@@ -32,8 +32,6 @@ import org.apache.ambari.server.audit.event.request.UserPasswordChangeRequestAud
import org.apache.ambari.server.audit.request.RequestAuditEventCreator;
import org.apache.ambari.server.controller.spi.Resource;
import org.apache.ambari.server.controller.utilities.PropertyHelper;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.core.userdetails.User;
import com.google.common.collect.ImmutableSet;
@@ -83,7 +81,6 @@ public class UserEventCreator implements RequestAuditEventCreator {
*/
@Override
public AuditEvent createAuditEvent(Request request, Result result) {
- String username = ((User) SecurityContextHolder.getContext().getAuthentication().getPrincipal()).getUsername();
switch (request.getRequestType()) {
case POST:
@@ -93,7 +90,6 @@ public class UserEventCreator implements RequestAuditEventCreator {
.withResultStatus(result.getStatus())
.withUrl(request.getURI())
.withRemoteIp(request.getRemoteAddress())
- .withUserName(username)
.withCreatedUsername(getUsername(request))
.withActive(isActive(request))
.withAdmin(isAdmin(request))
@@ -105,7 +101,6 @@ public class UserEventCreator implements RequestAuditEventCreator {
.withResultStatus(result.getStatus())
.withUrl(request.getURI())
.withRemoteIp(request.getRemoteAddress())
- .withUserName(username)
.withDeletedUsername(request.getResource().getKeyValueMap().get(Resource.Type.User))
.build();
case PUT:
@@ -116,8 +111,7 @@ public class UserEventCreator implements RequestAuditEventCreator {
.withResultStatus(result.getStatus())
.withUrl(request.getURI())
.withRemoteIp(request.getRemoteAddress())
- .withUserName(username)
- .withAffectedUsername(getUsername(request))
+ .withAffectedUsername(getUsername(request))
.withActive(isActive(request))
.build();
}
@@ -128,8 +122,7 @@ public class UserEventCreator implements RequestAuditEventCreator {
.withResultStatus(result.getStatus())
.withUrl(request.getURI())
.withRemoteIp(request.getRemoteAddress())
- .withUserName(username)
- .withAffectedUsername(getUsername(request))
+ .withAffectedUsername(getUsername(request))
.withAdmin(isAdmin(request))
.build();
}
@@ -140,8 +133,7 @@ public class UserEventCreator implements RequestAuditEventCreator {
.withResultStatus(result.getStatus())
.withUrl(request.getURI())
.withRemoteIp(request.getRemoteAddress())
- .withUserName(username)
- .withAffectedUsername(getUsername(request))
+ .withAffectedUsername(getUsername(request))
.build();
}
default:
http://git-wip-us.apache.org/repos/asf/ambari/blob/836647a3/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/ViewInstanceEventCreator.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/ViewInstanceEventCreator.java b/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/ViewInstanceEventCreator.java
index 611b1ea..a9a3fcd 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/ViewInstanceEventCreator.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/ViewInstanceEventCreator.java
@@ -30,8 +30,6 @@ import org.apache.ambari.server.audit.event.request.DeleteViewInstanceRequestAud
import org.apache.ambari.server.audit.request.RequestAuditEventCreator;
import org.apache.ambari.server.controller.spi.Resource;
import org.apache.ambari.server.controller.utilities.PropertyHelper;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.core.userdetails.User;
import com.google.common.collect.ImmutableSet;
@@ -81,7 +79,6 @@ public class ViewInstanceEventCreator implements RequestAuditEventCreator {
*/
@Override
public AuditEvent createAuditEvent(Request request, Result result) {
- String username = ((User) SecurityContextHolder.getContext().getAuthentication().getPrincipal()).getUsername();
switch (request.getRequestType()) {
@@ -92,7 +89,6 @@ public class ViewInstanceEventCreator implements RequestAuditEventCreator {
.withResultStatus(result.getStatus())
.withUrl(request.getURI())
.withRemoteIp(request.getRemoteAddress())
- .withUserName(username)
.withType(getProperty(request, PropertyHelper.getPropertyId("ViewInstanceInfo", "view_name")))
.withVersion(getProperty(request, PropertyHelper.getPropertyId("ViewInstanceInfo", "version")))
.withName(getProperty(request, PropertyHelper.getPropertyId("ViewInstanceInfo", "instance_name")))
@@ -107,7 +103,6 @@ public class ViewInstanceEventCreator implements RequestAuditEventCreator {
.withResultStatus(result.getStatus())
.withUrl(request.getURI())
.withRemoteIp(request.getRemoteAddress())
- .withUserName(username)
.withType(getProperty(request, PropertyHelper.getPropertyId("ViewInstanceInfo", "view_name")))
.withVersion(getProperty(request, PropertyHelper.getPropertyId("ViewInstanceInfo", "version")))
.withName(getProperty(request, PropertyHelper.getPropertyId("ViewInstanceInfo", "instance_name")))
@@ -122,7 +117,6 @@ public class ViewInstanceEventCreator implements RequestAuditEventCreator {
.withResultStatus(result.getStatus())
.withUrl(request.getURI())
.withRemoteIp(request.getRemoteAddress())
- .withUserName(username)
.withType(request.getResource().getKeyValueMap().get(Resource.Type.View))
.withVersion(request.getResource().getKeyValueMap().get(Resource.Type.ViewVersion))
.withName(request.getResource().getKeyValueMap().get(Resource.Type.ViewInstance))
http://git-wip-us.apache.org/repos/asf/ambari/blob/836647a3/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/ViewPrivilegeEventCreator.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/ViewPrivilegeEventCreator.java b/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/ViewPrivilegeEventCreator.java
index 18b860a..d2d7bd9 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/ViewPrivilegeEventCreator.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/ViewPrivilegeEventCreator.java
@@ -32,8 +32,6 @@ import org.apache.ambari.server.audit.event.request.ViewPrivilegeChangeRequestAu
import org.apache.ambari.server.audit.request.RequestAuditEventCreator;
import org.apache.ambari.server.controller.spi.Resource;
import org.apache.ambari.server.controller.utilities.PropertyHelper;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.core.userdetails.User;
import com.google.common.collect.ImmutableSet;
@@ -83,7 +81,6 @@ public class ViewPrivilegeEventCreator implements RequestAuditEventCreator {
*/
@Override
public AuditEvent createAuditEvent(Request request, Result result) {
- String username = ((User) SecurityContextHolder.getContext().getAuthentication().getPrincipal()).getUsername();
Map<String, List<String>> users = getEntities(request, "USER");
@@ -95,7 +92,6 @@ public class ViewPrivilegeEventCreator implements RequestAuditEventCreator {
.withResultStatus(result.getStatus())
.withUrl(request.getURI())
.withRemoteIp(request.getRemoteAddress())
- .withUserName(username)
.withType(getProperty(request, PropertyHelper.getPropertyId("PrivilegeInfo", "view_name")))
.withVersion(getProperty(request, PropertyHelper.getPropertyId("PrivilegeInfo", "version")))
.withName(getProperty(request, PropertyHelper.getPropertyId("PrivilegeInfo", "instance_name")))
http://git-wip-us.apache.org/repos/asf/ambari/blob/836647a3/ambari-server/src/test/java/org/apache/ambari/server/audit/request/DefaultEventCreatorTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/audit/request/DefaultEventCreatorTest.java b/ambari-server/src/test/java/org/apache/ambari/server/audit/request/DefaultEventCreatorTest.java
index 5c23059..1e063ec 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/audit/request/DefaultEventCreatorTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/audit/request/DefaultEventCreatorTest.java
@@ -111,7 +111,7 @@ public class DefaultEventCreatorTest {
@Override
public String getName() {
- return null;
+ return ((User) getPrincipal()).getUsername();
}
};
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/836647a3/ambari-server/src/test/java/org/apache/ambari/server/security/authentication/AmbariAuthenticationFilterTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/security/authentication/AmbariAuthenticationFilterTest.java b/ambari-server/src/test/java/org/apache/ambari/server/security/authentication/AmbariAuthenticationFilterTest.java
index 13636b1..f6a885d 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/security/authentication/AmbariAuthenticationFilterTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/security/authentication/AmbariAuthenticationFilterTest.java
@@ -103,6 +103,7 @@ public class AmbariAuthenticationFilterTest {
.andReturn(roles);
expect(AuthorizationHelper.getAuthorizationNames(authentication))
.andReturn(Arrays.asList("perm1", "perm2"));
+ expect(AuthorizationHelper.getAuthenticatedName()).andReturn("perm1");
expect(request.getHeader("X-Forwarded-For")).andReturn("1.2.3.4");
expect(authentication.getName()).andReturn("admin");
mockedAuditLogger.log(anyObject(AuditEvent.class));