Merge pull request #1019 from zalando/aruha-2134

Audit log gets correct user id
zalando · Feb 7, 2019 · e268a28 · e268a28
2 parents 115b7b6 + 6e51ddc
commit e268a28
Show file tree

Hide file tree

Showing 31 changed files with 107 additions and 123 deletions.
diff --git a/src/main/java/org/zalando/nakadi/config/RepositoriesConfig.java b/src/main/java/org/zalando/nakadi/config/RepositoriesConfig.java
@@ -24,7 +24,6 @@
 import org.zalando.nakadi.validation.JsonSchemaEnrichment;
 import org.zalando.nakadi.validation.ValidationStrategy;
 
-import java.util.Optional;
 import java.util.Set;
 
 @Configuration
@@ -46,7 +45,7 @@ public FeatureToggleService featureToggleServiceLocal(final ZooKeeperHolder zooK
                 final boolean defaultState = featuresConfig.getDefaultState(featureStr);
                 LOG.info("Setting feature {} to {}", featureStr, defaultState);
                 final FeatureWrapper featureWrapper = new FeatureWrapper(Feature.valueOf(featureStr), defaultState);
-                featureToggleService.setFeature(featureWrapper, Optional.empty());
+                featureToggleService.setFeature(featureWrapper);
             }
         }
         return featureToggleService;

diff --git a/src/main/java/org/zalando/nakadi/controller/CursorsController.java b/src/main/java/org/zalando/nakadi/controller/CursorsController.java
@@ -36,7 +36,6 @@
 
 import static org.springframework.http.ResponseEntity.noContent;
 import static org.springframework.http.ResponseEntity.ok;
-import static org.zalando.nakadi.util.RequestUtils.getUser;
 
 @RestController
 public class CursorsController {
@@ -101,7 +100,7 @@ public ResponseEntity<?> resetCursors(
             @Valid @RequestBody final ItemsWrapper<SubscriptionCursorWithoutToken> cursors,
             final NativeWebRequest request)
             throws NoSuchEventTypeException, InvalidCursorException, InternalNakadiException {
-        cursorsService.resetCursors(subscriptionId, convertToNakadiCursors(cursors), getUser(request));
+        cursorsService.resetCursors(subscriptionId, convertToNakadiCursors(cursors));
         return noContent().build();
     }
 

diff --git a/src/main/java/org/zalando/nakadi/controller/EventTypeController.java b/src/main/java/org/zalando/nakadi/controller/EventTypeController.java
@@ -45,7 +45,6 @@
 import static org.springframework.http.ResponseEntity.status;
 import static org.zalando.nakadi.service.FeatureToggleService.Feature.DISABLE_EVENT_TYPE_CREATION;
 import static org.zalando.nakadi.service.FeatureToggleService.Feature.DISABLE_EVENT_TYPE_DELETION;
-import static org.zalando.nakadi.util.RequestUtils.getUser;
 
 @RestController
 @RequestMapping(value = "/event-types")
@@ -89,7 +88,7 @@ public ResponseEntity<?> create(@Valid @RequestBody final EventTypeBase eventTyp
             throw new ValidationException(errors);
         }
 
-        eventTypeService.create(eventType, getUser(request));
+        eventTypeService.create(eventType);
 
         return ResponseEntity.status(HttpStatus.CREATED).headers(generateWarningHeaders(eventType)).build();
     }
@@ -106,7 +105,7 @@ public ResponseEntity<?> delete(@PathVariable("name") final String eventTypeName
             throw new ForbiddenOperationException("Event Type deletion is disabled");
         }
 
-        eventTypeService.delete(eventTypeName, getUser(request));
+        eventTypeService.delete(eventTypeName);
 
         return status(HttpStatus.OK).build();
     }
@@ -128,7 +127,7 @@ public ResponseEntity<?> update(
             throw new ValidationException(errors);
         }
 
-        eventTypeService.update(name, eventType, getUser(request));
+        eventTypeService.update(name, eventType);
 
         return status(HttpStatus.OK).headers(generateWarningHeaders(eventType)).build();
     }

diff --git a/src/main/java/org/zalando/nakadi/controller/PostSubscriptionController.java b/src/main/java/org/zalando/nakadi/controller/PostSubscriptionController.java
@@ -30,7 +30,6 @@
 import static org.apache.http.HttpHeaders.CONTENT_LOCATION;
 import static org.springframework.http.HttpStatus.OK;
 import static org.zalando.nakadi.service.FeatureToggleService.Feature.DISABLE_SUBSCRIPTION_CREATION;
-import static org.zalando.nakadi.util.RequestUtils.getUser;
 
 
 @RestController
@@ -66,8 +65,7 @@ public ResponseEntity<?> createOrGetSubscription(@Valid @RequestBody final Subsc
                 throw new SubscriptionCreationDisabledException("Subscription creation is temporarily unavailable");
             }
             try {
-                final Subscription subscription = subscriptionService.createSubscription(subscriptionBase,
-                        getUser(request));
+                final Subscription subscription = subscriptionService.createSubscription(subscriptionBase);
                 return prepareLocationResponse(subscription);
             } catch (final DuplicatedSubscriptionException ex) {
                 throw new InconsistentStateException("Unexpected problem occurred when creating subscription", ex);
@@ -87,7 +85,7 @@ public ResponseEntity<?> updateSubscription(
         if (errors.hasErrors()) {
             throw new ValidationException(errors);
         }
-        subscriptionService.updateSubscription(subscriptionId, subscription, getUser(request));
+        subscriptionService.updateSubscription(subscriptionId, subscription);
         return ResponseEntity.noContent().build();
 
     }

diff --git a/src/main/java/org/zalando/nakadi/controller/SettingsController.java b/src/main/java/org/zalando/nakadi/controller/SettingsController.java
@@ -21,7 +21,6 @@
 import javax.validation.Valid;
 
 import static org.zalando.nakadi.domain.ResourceImpl.ADMIN_RESOURCE;
-import static org.zalando.nakadi.util.RequestUtils.getUser;
 
 @RestController
 @RequestMapping(value = "/settings")
@@ -56,7 +55,7 @@ public ResponseEntity blacklist(@PathVariable("blacklist_type") final BlacklistS
         if (!adminService.isAdmin(AuthorizationService.Operation.WRITE)) {
             throw new ForbiddenOperationException("Admin privileges are required to perform this operation");
         }
-        blacklistService.blacklist(name, blacklistType, getUser(request));
+        blacklistService.blacklist(name, blacklistType);
         return ResponseEntity.noContent().build();
     }
 
@@ -68,7 +67,7 @@ public ResponseEntity whitelist(@PathVariable("blacklist_type") final BlacklistS
         if (!adminService.isAdmin(AuthorizationService.Operation.WRITE)) {
             throw new ForbiddenOperationException("Admin privileges are required to perform this operation");
         }
-        blacklistService.whitelist(name, blacklistType, getUser(request));
+        blacklistService.whitelist(name, blacklistType);
         return ResponseEntity.noContent().build();
     }
 
@@ -88,7 +87,7 @@ public ResponseEntity<?> setFeature(@RequestBody final FeatureToggleService.Feat
         if (!adminService.isAdmin(AuthorizationService.Operation.WRITE)) {
             throw new ForbiddenOperationException("Admin privileges are required to perform this operation");
         }
-        featureToggleService.setFeature(featureWrapper, getUser(request));
+        featureToggleService.setFeature(featureWrapper);
         return ResponseEntity.noContent().build();
     }
 
@@ -111,7 +110,7 @@ public ResponseEntity<?> updateAdmins(@Valid @RequestBody final ResourceAuthoriz
         if (errors.hasErrors()) {
             throw new ValidationException(errors);
         }
-        adminService.updateAdmins(authz.toPermissionsList(ADMIN_RESOURCE), getUser(request));
+        adminService.updateAdmins(authz.toPermissionsList(ADMIN_RESOURCE));
         return ResponseEntity.ok().build();
     }
 }
diff --git a/src/main/java/org/zalando/nakadi/controller/StoragesController.java b/src/main/java/org/zalando/nakadi/controller/StoragesController.java
@@ -28,7 +28,6 @@
 import static org.springframework.http.HttpStatus.NO_CONTENT;
 import static org.springframework.http.HttpStatus.OK;
 import static org.springframework.http.ResponseEntity.status;
-import static org.zalando.nakadi.util.RequestUtils.getUser;
 
 @RestController
 public class StoragesController {
@@ -61,7 +60,7 @@ public ResponseEntity<?> createStorage(@RequestBody final String storage,
         if (!adminService.isAdmin(AuthorizationService.Operation.WRITE)) {
             throw new ForbiddenOperationException("Admin privileges required to perform this operation");
         }
-        storageService.createStorage(new JSONObject(storage), getUser(request));
+        storageService.createStorage(new JSONObject(storage));
         return status(CREATED).build();
     }
 
@@ -82,7 +81,7 @@ public ResponseEntity<?> deleteStorage(@PathVariable("id") final String id, fina
         if (!adminService.isAdmin(AuthorizationService.Operation.WRITE)) {
             throw new ForbiddenOperationException("Admin privileges required to perform this operation");
         }
-        storageService.deleteStorage(id, getUser(request));
+        storageService.deleteStorage(id);
         return status(NO_CONTENT).build();
     }
 

diff --git a/src/main/java/org/zalando/nakadi/controller/SubscriptionController.java b/src/main/java/org/zalando/nakadi/controller/SubscriptionController.java
@@ -26,7 +26,6 @@
 import static org.springframework.http.HttpStatus.NO_CONTENT;
 import static org.springframework.http.HttpStatus.OK;
 import static org.springframework.http.ResponseEntity.status;
-import static org.zalando.nakadi.util.RequestUtils.getUser;
 
 
 @RestController
@@ -66,7 +65,7 @@ public ResponseEntity<?> deleteSubscription(@PathVariable("id") final String sub
                                                 final NativeWebRequest request)
             throws DbWriteOperationsBlockedException, NoSuchSubscriptionException, NoSuchEventTypeException,
             ServiceTemporarilyUnavailableException, InternalNakadiException {
-        subscriptionService.deleteSubscription(subscriptionId, getUser(request));
+        subscriptionService.deleteSubscription(subscriptionId);
         return status(NO_CONTENT).build();
     }
 

diff --git a/src/main/java/org/zalando/nakadi/controller/TimelinesController.java b/src/main/java/org/zalando/nakadi/controller/TimelinesController.java
@@ -21,7 +21,6 @@
 import java.util.stream.Collectors;
 
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
-import static org.zalando.nakadi.util.RequestUtils.getUser;
 
 @RestController
 @RequestMapping(value = "/event-types/{name}/timelines", produces = APPLICATION_JSON_VALUE)
@@ -40,7 +39,7 @@ public ResponseEntity<?> createTimeline(@PathVariable("name") final String event
                                             final NativeWebRequest request)
             throws AccessDeniedException, TimelineException, TopicRepositoryException, InconsistentStateException,
             RepositoryProblemException {
-        timelineService.createTimeline(eventTypeName, timelineRequest.getStorageId(), getUser(request));
+        timelineService.createTimeline(eventTypeName, timelineRequest.getStorageId());
         return ResponseEntity.status(HttpStatus.CREATED).build();
     }
 

diff --git a/src/main/java/org/zalando/nakadi/service/AdminService.java b/src/main/java/org/zalando/nakadi/service/AdminService.java
@@ -58,7 +58,7 @@ public List<Permission> getAdmins() {
         return addDefaultAdmin(authorizationDbRepository.listAdmins());
     }
 
-    public void updateAdmins(final List<Permission> newAdmins, final Optional<String> user)
+    public void updateAdmins(final List<Permission> newAdmins)
             throws DbWriteOperationsBlockedException {
         if (featureToggleService.isFeatureEnabled(FeatureToggleService.Feature.DISABLE_DB_WRITE_OPERATIONS)) {
             throw new DbWriteOperationsBlockedException("Cannot update admins: write operations on DB " +
@@ -77,8 +77,7 @@ public void updateAdmins(final List<Permission> newAdmins, final Optional<String
                 Optional.of(ResourceAuthorization.fromPermissionsList(newAdmins)),
                 NakadiAuditLogPublisher.ResourceType.ADMINS,
                 NakadiAuditLogPublisher.ActionType.UPDATED,
-                "-",
-                user);
+                "-");
     }
 
     public boolean isAdmin(final AuthorizationService.Operation operation) throws PluginException {

diff --git a/src/main/java/org/zalando/nakadi/service/BlacklistService.java b/src/main/java/org/zalando/nakadi/service/BlacklistService.java
@@ -106,7 +106,7 @@ public Map<String, Map<String, Set<String>>> getBlacklist() {
                         "apps", getChildren(Type.PRODUCER_APP)));
     }
 
-    public void blacklist(final String name, final Type type, final Optional<String> user) throws RuntimeException {
+    public void blacklist(final String name, final Type type) throws RuntimeException {
         try {
             final boolean oldValue = isBlocked(type, name);
 
@@ -128,14 +128,13 @@ public void blacklist(final String name, final Type type, final Optional<String>
                     Optional.of(newEntry),
                     NakadiAuditLogPublisher.ResourceType.BLACKLIST_ENTRY,
                     actionType,
-                    newEntry.getId(),
-                    user);
+                    newEntry.getId());
         } catch (final Exception e) {
             throw new RuntimeException("Issue occurred while creating node in zk", e);
         }
     }
 
-    public void whitelist(final String name, final Type type, final Optional<String> user) throws RuntimeException {
+    public void whitelist(final String name, final Type type) throws RuntimeException {
         try {
             final CuratorFramework curator = zooKeeperHolder.get();
             final String path = createBlacklistEntryPath(name, type);
@@ -148,8 +147,7 @@ public void whitelist(final String name, final Type type, final Optional<String>
                         Optional.empty(),
                         NakadiAuditLogPublisher.ResourceType.BLACKLIST_ENTRY,
                         NakadiAuditLogPublisher.ActionType.DELETED,
-                        entry.getId(),
-                        user);
+                        entry.getId());
             }
         } catch (final Exception e) {
             throw new RuntimeException("Issue occurred while deleting node from zk", e);

diff --git a/src/main/java/org/zalando/nakadi/service/CursorsService.java b/src/main/java/org/zalando/nakadi/service/CursorsService.java
@@ -164,7 +164,7 @@ public List<SubscriptionCursorWithoutToken> getSubscriptionCursors(final String
         return cursorsListBuilder.build();
     }
 
-    public void resetCursors(final String subscriptionId, final List<NakadiCursor> cursors, final Optional<String> user)
+    public void resetCursors(final String subscriptionId, final List<NakadiCursor> cursors)
             throws ServiceTemporarilyUnavailableException, NoSuchSubscriptionException,
             UnableProcessException, OperationTimeoutException, ZookeeperException,
             InternalNakadiException, NoSuchEventTypeException, InvalidCursorException {
@@ -207,8 +207,7 @@ public void resetCursors(final String subscriptionId, final List<NakadiCursor> c
                     Optional.of(new ItemsWrapper<>(newCursors)),
                     NakadiAuditLogPublisher.ResourceType.CURSORS,
                     NakadiAuditLogPublisher.ActionType.UPDATED,
-                    subscriptionId,
-                    user);
+                    subscriptionId);
         }
     }
 

diff --git a/src/main/java/org/zalando/nakadi/service/EventTypeService.java b/src/main/java/org/zalando/nakadi/service/EventTypeService.java
@@ -135,7 +135,7 @@ public List<EventType> list() {
         return eventTypeRepository.list();
     }
 
-    public void create(final EventTypeBase eventType, final Optional<String> user)
+    public void create(final EventTypeBase eventType)
             throws TopicCreationException,
             InternalNakadiException,
             NoSuchPartitionStrategyException,
@@ -182,7 +182,7 @@ public void create(final EventTypeBase eventType, final Optional<String> user)
 
         nakadiAuditLogPublisher.publish(Optional.empty(), Optional.of(eventType),
                 NakadiAuditLogPublisher.ResourceType.EVENT_TYPE, NakadiAuditLogPublisher.ActionType.CREATED,
-                eventType.getName(), user);
+                eventType.getName());
     }
 
     private void validateCompaction(final EventTypeBase eventType) throws
@@ -219,7 +219,7 @@ private void setDefaultEventTypeOptions(final EventTypeBase eventType) {
         }
     }
 
-    public void delete(final String eventTypeName, final Optional<String> user) throws EventTypeDeletionException,
+    public void delete(final String eventTypeName) throws EventTypeDeletionException,
             AccessDeniedException, NoSuchEventTypeException, ConflictException, ServiceTemporarilyUnavailableException,
             DbWriteOperationsBlockedException {
         if (featureToggleService.isFeatureEnabled(FeatureToggleService.Feature.DISABLE_DB_WRITE_OPERATIONS)) {
@@ -287,7 +287,7 @@ public void delete(final String eventTypeName, final Optional<String> user) thro
 
         nakadiAuditLogPublisher.publish(Optional.of(eventType), Optional.empty(),
                 NakadiAuditLogPublisher.ResourceType.EVENT_TYPE, NakadiAuditLogPublisher.ActionType.DELETED,
-                eventType.getName(), user);
+                eventType.getName());
     }
 
     private Multimap<TopicRepository, String> deleteEventTypeIfNoSubscriptions(final String eventType) {
@@ -325,8 +325,7 @@ private boolean hasSubscriptions(final String eventTypeName) {
     }
 
     public void update(final String eventTypeName,
-                       final EventTypeBase eventTypeBase,
-                       final Optional<String> user)
+                       final EventTypeBase eventTypeBase)
             throws TopicConfigException,
             InconsistentStateException,
             NakadiRuntimeException,
@@ -388,7 +387,7 @@ public void update(final String eventTypeName,
 
         nakadiAuditLogPublisher.publish(Optional.of(original), Optional.of(eventType),
                 NakadiAuditLogPublisher.ResourceType.EVENT_TYPE, NakadiAuditLogPublisher.ActionType.UPDATED,
-                eventType.getName(), user);
+                eventType.getName());
     }
 
     private void updateRetentionTime(final EventType original, final EventType eventType) {

diff --git a/src/main/java/org/zalando/nakadi/service/FeatureToggleService.java b/src/main/java/org/zalando/nakadi/service/FeatureToggleService.java
@@ -5,13 +5,12 @@
 
 import java.util.Arrays;
 import java.util.List;
-import java.util.Optional;
 import java.util.stream.Collectors;
 
 @Service
 public interface FeatureToggleService {
 
-    void setFeature(FeatureWrapper feature, Optional<String> user);
+    void setFeature(FeatureWrapper feature);
 
     boolean isFeatureEnabled(Feature feature);
 

diff --git a/src/main/java/org/zalando/nakadi/service/FeatureToggleServiceZk.java b/src/main/java/org/zalando/nakadi/service/FeatureToggleServiceZk.java
@@ -56,7 +56,7 @@ public boolean isFeatureEnabled(final Feature feature) {
         }
     }
 
-    public void setFeature(final FeatureWrapper feature, final Optional<String> user) {
+    public void setFeature(final FeatureWrapper feature) {
         try {
             final boolean oldState = isFeatureEnabled(feature.getFeature());
             final CuratorFramework curator = zkHolder.get();
@@ -75,8 +75,7 @@ public void setFeature(final FeatureWrapper feature, final Optional<String> user
                         Optional.of(feature),
                         NakadiAuditLogPublisher.ResourceType.FEATURE,
                         NakadiAuditLogPublisher.ActionType.UPDATED,
-                        feature.getFeature().getId(),
-                        user);
+                        feature.getFeature().getId());
             }
         } catch (final KeeperException.NoNodeException nne) {
             LOG.debug("Feature {} was already disabled", feature.getFeature().getId());

diff --git a/src/main/java/org/zalando/nakadi/service/NakadiAuditLogInitialization.java b/src/main/java/org/zalando/nakadi/service/NakadiAuditLogInitialization.java
@@ -16,7 +16,6 @@
 import org.zalando.nakadi.exceptions.runtime.NakadiBaseException;
 
 import java.io.IOException;
-import java.util.Optional;
 
 @Component
 @ConfigurationProperties(prefix = "nakadi.audit")
@@ -62,7 +61,7 @@ public void onApplicationEvent(final ContextRefreshedEvent event) throws IOExcep
         final EventTypeBase eventType = objectMapper.readValue(auditEventTypeString, typeReference);
 
         try {
-            eventTypeService.create(eventType, Optional.of(owningApplication));
+            eventTypeService.create(eventType);
         } catch (final DuplicatedEventTypeNameException e) {
             LOG.debug("Audit event type already exists " + eventType.getName());
         } catch (final NakadiBaseException e) {