[backend/frontend] Update UI endpoint list and add UI endpoint Overvi…

…ew (#2114)
OpenBAS-Platform · Jan 8, 2025 · 6fc2a1c · 6fc2a1c
1 parent 673123e
commit 6fc2a1c
Show file tree

Hide file tree

Showing 107 changed files with 1,505 additions and 803 deletions.
diff --git a/...lectors/expectations_expiration_manager/service/ExpectationsExpirationManagerService.java b/...lectors/expectations_expiration_manager/service/ExpectationsExpirationManagerService.java
@@ -6,7 +6,7 @@
 
 import io.openbas.collectors.expectations_expiration_manager.config.ExpectationsExpirationManagerConfig;
 import io.openbas.database.model.InjectExpectation;
-import io.openbas.inject_expectation.InjectExpectationService;
+import io.openbas.service.InjectExpectationService;
 import jakarta.validation.constraints.NotNull;
 import java.util.List;
 import lombok.RequiredArgsConstructor;

diff --git a/...o/openbas/execution/ExecutableInject.java → ...o/openbas/execution/ExecutableInject.java b/...o/openbas/execution/ExecutableInject.java → ...o/openbas/execution/ExecutableInject.java
diff --git a/...o/openbas/execution/ExecutionContext.java → ...o/openbas/execution/ExecutionContext.java b/...o/openbas/execution/ExecutionContext.java → ...o/openbas/execution/ExecutionContext.java
diff --git a/...as/execution/ExecutionContextService.java → ...as/execution/ExecutionContextService.java b/...as/execution/ExecutionContextService.java → ...as/execution/ExecutionContextService.java
diff --git a/...execution/ExecutionExecutorException.java → ...execution/ExecutionExecutorException.java b/...execution/ExecutionExecutorException.java → ...execution/ExecutionExecutorException.java
diff --git a/...s/execution/ExecutionExecutorService.java → ...s/execution/ExecutionExecutorService.java b/...s/execution/ExecutionExecutorService.java → ...s/execution/ExecutionExecutorService.java
@@ -1,6 +1,5 @@
 package io.openbas.execution;
 
-import io.openbas.asset.AssetGroupService;
 import io.openbas.database.model.*;
 import io.openbas.database.model.Executor;
 import io.openbas.database.repository.InjectStatusRepository;
@@ -11,6 +10,7 @@
 import io.openbas.executors.openbas.service.OpenBASExecutorContextService;
 import io.openbas.executors.tanium.config.TaniumExecutorConfig;
 import io.openbas.executors.tanium.service.TaniumExecutorContextService;
+import io.openbas.service.AssetGroupService;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.logging.Level;

diff --git a/...ava/io/openbas/execution/ProtectUser.java → ...ava/io/openbas/execution/ProtectUser.java b/...ava/io/openbas/execution/ProtectUser.java → ...ava/io/openbas/execution/ProtectUser.java
diff --git a/openbas-api/src/main/java/io/openbas/executors/caldera/CalderaExecutor.java b/openbas-api/src/main/java/io/openbas/executors/caldera/CalderaExecutor.java
@@ -1,12 +1,12 @@
 package io.openbas.executors.caldera;
 
-import io.openbas.asset.EndpointService;
 import io.openbas.executors.caldera.client.CalderaExecutorClient;
 import io.openbas.executors.caldera.config.CalderaExecutorConfig;
 import io.openbas.executors.caldera.service.CalderaExecutorContextService;
 import io.openbas.executors.caldera.service.CalderaExecutorService;
 import io.openbas.integrations.ExecutorService;
 import io.openbas.integrations.InjectorService;
+import io.openbas.service.EndpointService;
 import io.openbas.service.PlatformSettingsService;
 import jakarta.annotation.PostConstruct;
 import java.time.Duration;

diff --git a/...caldera/client/CalderaExecutorClient.java → ...caldera/client/CalderaExecutorClient.java b/...caldera/client/CalderaExecutorClient.java → ...caldera/client/CalderaExecutorClient.java
diff --git a/...ecutors/caldera/client/model/Ability.java → ...ecutors/caldera/client/model/Ability.java b/...ecutors/caldera/client/model/Ability.java → ...ecutors/caldera/client/model/Ability.java
diff --git a/...cutors/caldera/client/model/Executor.java → ...cutors/caldera/client/model/Executor.java b/...cutors/caldera/client/model/Executor.java → ...cutors/caldera/client/model/Executor.java
diff --git a/...s/caldera/client/model/ExploitResult.java → ...s/caldera/client/model/ExploitResult.java b/...s/caldera/client/model/ExploitResult.java → ...s/caldera/client/model/ExploitResult.java
diff --git a/.../executors/caldera/client/model/Fact.java → .../executors/caldera/client/model/Fact.java b/.../executors/caldera/client/model/Fact.java → .../executors/caldera/client/model/Fact.java
diff --git a/.../executors/caldera/client/model/Link.java → .../executors/caldera/client/model/Link.java b/.../executors/caldera/client/model/Link.java → .../executors/caldera/client/model/Link.java
diff --git a/...xecutors/caldera/client/model/Result.java → ...xecutors/caldera/client/model/Result.java b/...xecutors/caldera/client/model/Result.java → ...xecutors/caldera/client/model/Result.java
diff --git a/...caldera/config/CalderaExecutorConfig.java → ...caldera/config/CalderaExecutorConfig.java b/...caldera/config/CalderaExecutorConfig.java → ...caldera/config/CalderaExecutorConfig.java
diff --git a/...penbas/executors/caldera/model/Agent.java → ...penbas/executors/caldera/model/Agent.java b/...penbas/executors/caldera/model/Agent.java → ...penbas/executors/caldera/model/Agent.java
diff --git a/...ervice/CalderaExecutorContextService.java → ...ervice/CalderaExecutorContextService.java b/...ervice/CalderaExecutorContextService.java → ...ervice/CalderaExecutorContextService.java
diff --git a/openbas-api/src/main/java/io/openbas/executors/caldera/service/CalderaExecutorService.java b/openbas-api/src/main/java/io/openbas/executors/caldera/service/CalderaExecutorService.java
@@ -4,13 +4,13 @@
 import static java.time.ZoneOffset.UTC;
 
 import com.cronutils.utils.VisibleForTesting;
-import io.openbas.asset.EndpointService;
 import io.openbas.database.model.*;
 import io.openbas.executors.caldera.client.CalderaExecutorClient;
 import io.openbas.executors.caldera.config.CalderaExecutorConfig;
 import io.openbas.executors.caldera.model.Agent;
 import io.openbas.integrations.ExecutorService;
 import io.openbas.integrations.InjectorService;
+import io.openbas.service.EndpointService;
 import io.openbas.service.PlatformSettingsService;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;

diff --git a/...tors/crowdstrike/CrowdStrikeExecutor.java → ...tors/crowdstrike/CrowdStrikeExecutor.java b/...tors/crowdstrike/CrowdStrikeExecutor.java → ...tors/crowdstrike/CrowdStrikeExecutor.java
@@ -1,12 +1,12 @@
 package io.openbas.executors.crowdstrike;
 
-import io.openbas.asset.EndpointService;
 import io.openbas.executors.crowdstrike.client.CrowdStrikeExecutorClient;
 import io.openbas.executors.crowdstrike.config.CrowdStrikeExecutorConfig;
 import io.openbas.executors.crowdstrike.service.CrowdStrikeExecutorContextService;
 import io.openbas.executors.crowdstrike.service.CrowdStrikeExecutorService;
 import io.openbas.integrations.ExecutorService;
 import io.openbas.integrations.InjectorService;
+import io.openbas.service.EndpointService;
 import jakarta.annotation.PostConstruct;
 import java.time.Duration;
 import lombok.RequiredArgsConstructor;

diff --git a/...ike/client/CrowdStrikeExecutorClient.java → ...ike/client/CrowdStrikeExecutorClient.java b/...ike/client/CrowdStrikeExecutorClient.java → ...ike/client/CrowdStrikeExecutorClient.java
diff --git a/...ike/config/CrowdStrikeExecutorConfig.java → ...ike/config/CrowdStrikeExecutorConfig.java b/...ike/config/CrowdStrikeExecutorConfig.java → ...ike/config/CrowdStrikeExecutorConfig.java
diff --git a/...ors/crowdstrike/model/Authentication.java → ...ors/crowdstrike/model/Authentication.java b/...ors/crowdstrike/model/Authentication.java → ...ors/crowdstrike/model/Authentication.java
diff --git a/.../crowdstrike/model/CrowdStrikeDevice.java → .../crowdstrike/model/CrowdStrikeDevice.java b/.../crowdstrike/model/CrowdStrikeDevice.java → .../crowdstrike/model/CrowdStrikeDevice.java
diff --git a/...crowdstrike/model/CrowdStrikeSession.java → ...crowdstrike/model/CrowdStrikeSession.java b/...crowdstrike/model/CrowdStrikeSession.java → ...crowdstrike/model/CrowdStrikeSession.java
diff --git a/...ors/crowdstrike/model/ResourcesHosts.java → ...ors/crowdstrike/model/ResourcesHosts.java b/...ors/crowdstrike/model/ResourcesHosts.java → ...ors/crowdstrike/model/ResourcesHosts.java
diff --git a/...s/crowdstrike/model/ResourcesSession.java → ...s/crowdstrike/model/ResourcesSession.java b/...s/crowdstrike/model/ResourcesSession.java → ...s/crowdstrike/model/ResourcesSession.java
diff --git a/...ce/CrowdStrikeExecutorContextService.java → ...ce/CrowdStrikeExecutorContextService.java b/...ce/CrowdStrikeExecutorContextService.java → ...ce/CrowdStrikeExecutorContextService.java
diff --git a/...e/service/CrowdStrikeExecutorService.java → ...e/service/CrowdStrikeExecutorService.java b/...e/service/CrowdStrikeExecutorService.java → ...e/service/CrowdStrikeExecutorService.java
@@ -3,7 +3,6 @@
 import static java.time.Instant.now;
 import static java.time.ZoneOffset.UTC;
 
-import io.openbas.asset.EndpointService;
 import io.openbas.database.model.Agent;
 import io.openbas.database.model.Endpoint;
 import io.openbas.database.model.Executor;
@@ -13,6 +12,7 @@
 import io.openbas.executors.crowdstrike.model.CrowdStrikeDevice;
 import io.openbas.integrations.ExecutorService;
 import io.openbas.integrations.InjectorService;
+import io.openbas.service.EndpointService;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import java.time.Instant;

diff --git a/...as/executors/openbas/OpenBASExecutor.java → ...as/executors/openbas/OpenBASExecutor.java b/...as/executors/openbas/OpenBASExecutor.java → ...as/executors/openbas/OpenBASExecutor.java
diff --git a/...ervice/OpenBASExecutorContextService.java → ...ervice/OpenBASExecutorContextService.java b/...ervice/OpenBASExecutorContextService.java → ...ervice/OpenBASExecutorContextService.java
diff --git a/...nbas/executors/tanium/TaniumExecutor.java → ...nbas/executors/tanium/TaniumExecutor.java b/...nbas/executors/tanium/TaniumExecutor.java → ...nbas/executors/tanium/TaniumExecutor.java
@@ -1,12 +1,12 @@
 package io.openbas.executors.tanium;
 
-import io.openbas.asset.EndpointService;
 import io.openbas.executors.tanium.client.TaniumExecutorClient;
 import io.openbas.executors.tanium.config.TaniumExecutorConfig;
 import io.openbas.executors.tanium.service.TaniumExecutorContextService;
 import io.openbas.executors.tanium.service.TaniumExecutorService;
 import io.openbas.integrations.ExecutorService;
 import io.openbas.integrations.InjectorService;
+import io.openbas.service.EndpointService;
 import jakarta.annotation.PostConstruct;
 import java.time.Duration;
 import lombok.RequiredArgsConstructor;

diff --git a/...s/tanium/client/TaniumExecutorClient.java → ...s/tanium/client/TaniumExecutorClient.java b/...s/tanium/client/TaniumExecutorClient.java → ...s/tanium/client/TaniumExecutorClient.java
diff --git a/...s/tanium/config/TaniumExecutorConfig.java → ...s/tanium/config/TaniumExecutorConfig.java b/...s/tanium/config/TaniumExecutorConfig.java → ...s/tanium/config/TaniumExecutorConfig.java
diff --git a/...executors/tanium/model/DataEndpoints.java → ...executors/tanium/model/DataEndpoints.java b/...executors/tanium/model/DataEndpoints.java → ...executors/tanium/model/DataEndpoints.java
diff --git a/...xecutors/tanium/model/EdgesEndpoints.java → ...xecutors/tanium/model/EdgesEndpoints.java b/...xecutors/tanium/model/EdgesEndpoints.java → ...xecutors/tanium/model/EdgesEndpoints.java
diff --git a/...bas/executors/tanium/model/Endpoints.java → ...bas/executors/tanium/model/Endpoints.java b/...bas/executors/tanium/model/Endpoints.java → ...bas/executors/tanium/model/Endpoints.java
diff --git a/.../executors/tanium/model/NodeEndpoint.java → .../executors/tanium/model/NodeEndpoint.java b/.../executors/tanium/model/NodeEndpoint.java → .../executors/tanium/model/NodeEndpoint.java
diff --git a/...io/openbas/executors/tanium/model/Os.java → ...io/openbas/executors/tanium/model/Os.java b/...io/openbas/executors/tanium/model/Os.java → ...io/openbas/executors/tanium/model/Os.java
diff --git a/...bas/executors/tanium/model/Processor.java → ...bas/executors/tanium/model/Processor.java b/...bas/executors/tanium/model/Processor.java → ...bas/executors/tanium/model/Processor.java
diff --git a/...xecutors/tanium/model/TaniumEndpoint.java → ...xecutors/tanium/model/TaniumEndpoint.java b/...xecutors/tanium/model/TaniumEndpoint.java → ...xecutors/tanium/model/TaniumEndpoint.java
diff --git a/...utors/tanium/openbas-tanium-packages.json → ...utors/tanium/openbas-tanium-packages.json b/...utors/tanium/openbas-tanium-packages.json → ...utors/tanium/openbas-tanium-packages.json
diff --git a/...service/TaniumExecutorContextService.java → ...service/TaniumExecutorContextService.java b/...service/TaniumExecutorContextService.java → ...service/TaniumExecutorContextService.java
diff --git a/...tanium/service/TaniumExecutorService.java → ...tanium/service/TaniumExecutorService.java b/...tanium/service/TaniumExecutorService.java → ...tanium/service/TaniumExecutorService.java
@@ -3,14 +3,14 @@
 import static java.time.Instant.now;
 import static java.time.ZoneOffset.UTC;
 
-import io.openbas.asset.EndpointService;
 import io.openbas.database.model.*;
 import io.openbas.executors.tanium.client.TaniumExecutorClient;
 import io.openbas.executors.tanium.config.TaniumExecutorConfig;
 import io.openbas.executors.tanium.model.NodeEndpoint;
 import io.openbas.executors.tanium.model.TaniumEndpoint;
 import io.openbas.integrations.ExecutorService;
 import io.openbas.integrations.InjectorService;
+import io.openbas.service.EndpointService;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import java.time.Instant;

diff --git a/...ava/io/openbas/helper/TemplateHelper.java → ...ava/io/openbas/helper/TemplateHelper.java b/...ava/io/openbas/helper/TemplateHelper.java → ...ava/io/openbas/helper/TemplateHelper.java
diff --git a/openbas-api/src/main/java/io/openbas/injectors/caldera/CalderaExecutor.java b/openbas-api/src/main/java/io/openbas/injectors/caldera/CalderaExecutor.java
@@ -12,15 +12,12 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import io.openbas.asset.AssetGroupService;
-import io.openbas.asset.EndpointService;
 import io.openbas.database.model.*;
 import io.openbas.database.model.InjectExpectation.EXPECTATION_TYPE;
 import io.openbas.database.model.PayloadCommandBlock;
 import io.openbas.database.repository.InjectRepository;
 import io.openbas.execution.ExecutableInject;
 import io.openbas.executors.Injector;
-import io.openbas.inject_expectation.InjectExpectationService;
 import io.openbas.injectors.caldera.client.model.Ability;
 import io.openbas.injectors.caldera.client.model.Agent;
 import io.openbas.injectors.caldera.client.model.ExploitResult;
@@ -31,6 +28,9 @@
 import io.openbas.model.expectation.DetectionExpectation;
 import io.openbas.model.expectation.ManualExpectation;
 import io.openbas.model.expectation.PreventionExpectation;
+import io.openbas.service.AssetGroupService;
+import io.openbas.service.EndpointService;
+import io.openbas.service.InjectExpectationService;
 import io.openbas.utils.Time;
 import jakarta.validation.constraints.NotNull;
 import java.util.*;

diff --git a/openbas-api/src/main/java/io/openbas/injectors/caldera/CalderaGarbageCollector.java b/openbas-api/src/main/java/io/openbas/injectors/caldera/CalderaGarbageCollector.java
@@ -1,9 +1,9 @@
 package io.openbas.injectors.caldera;
 
-import io.openbas.asset.EndpointService;
 import io.openbas.injectors.caldera.client.CalderaInjectorClient;
 import io.openbas.injectors.caldera.config.CalderaInjectorConfig;
 import io.openbas.injectors.caldera.service.CalderaGarbageCollectorService;
+import io.openbas.service.EndpointService;
 import jakarta.annotation.PostConstruct;
 import java.time.Duration;
 import lombok.RequiredArgsConstructor;

diff --git a/...pi/src/main/java/io/openbas/injectors/caldera/service/CalderaGarbageCollectorService.java b/...pi/src/main/java/io/openbas/injectors/caldera/service/CalderaGarbageCollectorService.java
@@ -2,11 +2,11 @@
 
 import static java.time.Instant.now;
 
-import io.openbas.asset.EndpointService;
 import io.openbas.database.model.Endpoint;
 import io.openbas.database.specification.EndpointSpecification;
 import io.openbas.injectors.caldera.client.CalderaInjectorClient;
 import io.openbas.injectors.caldera.client.model.Agent;
+import io.openbas.service.EndpointService;
 import io.openbas.utils.Time;
 import jakarta.validation.constraints.NotBlank;
 import java.util.ArrayList;

diff --git a/openbas-api/src/main/java/io/openbas/injectors/challenge/ChallengeExecutor.java b/openbas-api/src/main/java/io/openbas/injectors/challenge/ChallengeExecutor.java
@@ -11,14 +11,14 @@
 import io.openbas.execution.ExecutableInject;
 import io.openbas.execution.ExecutionContext;
 import io.openbas.executors.Injector;
-import io.openbas.inject_expectation.InjectExpectationService;
 import io.openbas.injectors.challenge.model.ChallengeContent;
 import io.openbas.injectors.challenge.model.ChallengeVariable;
 import io.openbas.injectors.email.service.EmailService;
 import io.openbas.model.ExecutionProcess;
 import io.openbas.model.Expectation;
 import io.openbas.model.expectation.ChallengeExpectation;
 import io.openbas.model.expectation.ManualExpectation;
+import io.openbas.service.InjectExpectationService;
 import jakarta.annotation.Resource;
 import jakarta.validation.constraints.NotNull;
 import java.util.ArrayList;

diff --git a/openbas-api/src/main/java/io/openbas/injectors/channel/ChannelExecutor.java b/openbas-api/src/main/java/io/openbas/injectors/channel/ChannelExecutor.java
@@ -11,14 +11,14 @@
 import io.openbas.execution.ExecutableInject;
 import io.openbas.execution.ExecutionContext;
 import io.openbas.executors.Injector;
-import io.openbas.inject_expectation.InjectExpectationService;
 import io.openbas.injectors.channel.model.ArticleVariable;
 import io.openbas.injectors.channel.model.ChannelContent;
 import io.openbas.injectors.email.service.EmailService;
 import io.openbas.model.ExecutionProcess;
 import io.openbas.model.Expectation;
 import io.openbas.model.expectation.ChannelExpectation;
 import io.openbas.model.expectation.ManualExpectation;
+import io.openbas.service.InjectExpectationService;
 import jakarta.annotation.Resource;
 import jakarta.validation.constraints.NotNull;
 import java.util.ArrayList;

diff --git a/openbas-api/src/main/java/io/openbas/injectors/email/EmailExecutor.java b/openbas-api/src/main/java/io/openbas/injectors/email/EmailExecutor.java
@@ -8,12 +8,12 @@
 import io.openbas.execution.ExecutableInject;
 import io.openbas.execution.ExecutionContext;
 import io.openbas.executors.Injector;
-import io.openbas.inject_expectation.InjectExpectationService;
 import io.openbas.injectors.email.model.EmailContent;
 import io.openbas.injectors.email.service.EmailService;
 import io.openbas.model.ExecutionProcess;
 import io.openbas.model.Expectation;
 import io.openbas.model.expectation.ManualExpectation;
+import io.openbas.service.InjectExpectationService;
 import jakarta.annotation.Resource;
 import jakarta.validation.constraints.NotNull;
 import java.util.List;

diff --git a/openbas-api/src/main/java/io/openbas/injectors/openbas/OpenBASImplantExecutor.java b/openbas-api/src/main/java/io/openbas/injectors/openbas/OpenBASImplantExecutor.java
@@ -9,18 +9,18 @@
 import static io.openbas.model.expectation.PreventionExpectation.preventionExpectationForAsset;
 import static io.openbas.model.expectation.PreventionExpectation.preventionExpectationForAssetGroup;
 
-import io.openbas.asset.AssetGroupService;
 import io.openbas.database.model.*;
 import io.openbas.database.repository.InjectRepository;
 import io.openbas.execution.ExecutableInject;
 import io.openbas.executors.Injector;
-import io.openbas.inject_expectation.InjectExpectationService;
 import io.openbas.injectors.openbas.model.OpenBASImplantInjectContent;
 import io.openbas.model.ExecutionProcess;
 import io.openbas.model.Expectation;
 import io.openbas.model.expectation.DetectionExpectation;
 import io.openbas.model.expectation.ManualExpectation;
 import io.openbas.model.expectation.PreventionExpectation;
+import io.openbas.service.AssetGroupService;
+import io.openbas.service.InjectExpectationService;
 import jakarta.validation.constraints.NotNull;
 import java.util.*;
 import java.util.stream.Stream;

diff --git a/openbas-api/src/main/java/io/openbas/injectors/opencti/OpenCTIExecutor.java b/openbas-api/src/main/java/io/openbas/injectors/opencti/OpenCTIExecutor.java
@@ -6,12 +6,12 @@
 import io.openbas.database.model.*;
 import io.openbas.execution.ExecutableInject;
 import io.openbas.executors.Injector;
-import io.openbas.inject_expectation.InjectExpectationService;
 import io.openbas.injectors.opencti.model.CaseContent;
 import io.openbas.injectors.opencti.service.OpenCTIService;
 import io.openbas.model.ExecutionProcess;
 import io.openbas.model.Expectation;
 import io.openbas.model.expectation.ManualExpectation;
+import io.openbas.service.InjectExpectationService;
 import jakarta.validation.constraints.NotNull;
 import java.util.List;
 import java.util.stream.Stream;

diff --git a/openbas-api/src/main/java/io/openbas/injectors/ovh/OvhSmsExecutor.java b/openbas-api/src/main/java/io/openbas/injectors/ovh/OvhSmsExecutor.java
@@ -10,12 +10,12 @@
 import io.openbas.execution.ExecutionContext;
 import io.openbas.execution.ProtectUser;
 import io.openbas.executors.Injector;
-import io.openbas.inject_expectation.InjectExpectationService;
 import io.openbas.injectors.ovh.model.OvhSmsContent;
 import io.openbas.injectors.ovh.service.OvhSmsService;
 import io.openbas.model.ExecutionProcess;
 import io.openbas.model.Expectation;
 import io.openbas.model.expectation.ManualExpectation;
+import io.openbas.service.InjectExpectationService;
 import jakarta.validation.constraints.NotNull;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;

diff --git a/openbas-api/src/main/java/io/openbas/rest/agent/AgentApi.java b/openbas-api/src/main/java/io/openbas/rest/agent/AgentApi.java
@@ -2,7 +2,7 @@
 
 import static io.openbas.database.model.User.ROLE_USER;
 
-import io.openbas.rest.agent.service.AgentService;
+import io.openbas.service.AgentService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.access.annotation.Secured;
 import org.springframework.web.bind.annotation.RestController;