[NAE-1909] Elasticsearch index per URI node

CHANGELOG.md

@@ -13,6 +13,7 @@ Full Changelog: [https://github.com/netgrif/application-engine/commits/v6.3.2](h
 - [NAE-1908] NAE-1906 Improvements
 - [NAE-1937] Fix the problem with empty string in filter
 - [NAE-1884] Improve execution of auto trigger tasks
+- [NAE-1942] Authorization Bypass Process Download
 
 ### Added
 - [NAE-1901] Taskref list rendering update

src/main/groovy/com/netgrif/application/engine/startup/ElasticsearchRunner.groovy

@@ -1,5 +1,6 @@
 package com.netgrif.application.engine.startup
 
+import com.netgrif.application.engine.configuration.ElasticsearchConfiguration
 import com.netgrif.application.engine.configuration.properties.UriProperties
 import com.netgrif.application.engine.elastic.domain.ElasticCase
 import com.netgrif.application.engine.elastic.domain.ElasticPetriNet
@@ -42,20 +43,41 @@ class ElasticsearchRunner extends AbstractOrderedCommandLineRunner {
     @Autowired
     private IElasticIndexService template
 
+    @Autowired
+    private ElasticsearchConfiguration properties
+
     @Override
     void run(String... args) throws Exception {
         if (drop) {
-            log.info("Dropping Elasticsearch database [${url}:${port}/${clusterName}]")
-            template.deleteIndex(ElasticPetriNet.class)
-            template.deleteIndex(ElasticCase.class)
-            template.deleteIndex(ElasticTask.class)
-        }
-        if (!template.indexExists(petriNetIndex)) {
-            log.info "Creating Elasticsearch case index [${petriNetIndex}]"
-            template.createIndex(ElasticPetriNet.class)
-        } else {
-            log.info "Elasticsearch case index exists [${caseIndex}]"
+            log.info("Dropping Elasticsearch database [${url}:${port}/${clusterName}]");
+            if (template.indexExists(caseIndex)) {
+                template.deleteIndex(ElasticCase.class)
+            }
+            if (template.indexExists(taskIndex)) {
+                template.deleteIndex(ElasticTask.class)
+            }
+            if (!template.indexExists(petriNetIndex)) {
+                log.info "Creating Elasticsearch case index [${petriNetIndex}]"
+                template.createIndex(ElasticPetriNet.class)
+            }
+            try {
+                template.getAllDynamicIndexes().forEach(indexName -> {
+                    if (template.indexExists(indexName)) {
+                        log.info("Deleting dynamic index {}", indexName);
+                        template.deleteIndex(indexName);
+                    } else {
+                        log.warn("Index {} does not exist, skipping deletion.", indexName);
+                    }
+                })
+            } catch (Exception e){
+                log.warn("Index {} does not exist, skipping deletion.", e.message);
+            }
+            if (template.indexExists(uriProperties.index)) {
+                template.deleteIndex(UriNode.class)
+            }
+            template.evictAllCaches();
         }
+
         if (!template.indexExists(caseIndex)) {
             log.info "Creating Elasticsearch case index [${caseIndex}]"
             template.createIndex(ElasticCase.class)

src/main/java/com/netgrif/application/engine/ApplicationEngine.java

@@ -23,14 +23,14 @@
 import java.util.ArrayList;
 import java.util.List;
 
+@Slf4j
+@Aspect
 @EnableCaching
-@EnableHypermediaSupport(type = EnableHypermediaSupport.HypermediaType.HAL)
-@EnableGlobalMethodSecurity(prePostEnabled = true)
-@EnableAspectJAutoProxy
-@SpringBootApplication(exclude= {DataSourceAutoConfiguration.class})
 @EnableMongoAuditing
-@Aspect
-@Slf4j
+@EnableAspectJAutoProxy
+@EnableGlobalMethodSecurity(prePostEnabled = true)
+@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class})
+@EnableHypermediaSupport(type = EnableHypermediaSupport.HypermediaType.HAL)
 public class ApplicationEngine {
 
     @Around("execution(* com.netgrif.application.engine.startup.AbstractOrderedCommandLineRunner+.run(..))")

src/main/java/com/netgrif/application/engine/configuration/ElasticServiceConfiguration.java

@@ -4,9 +4,11 @@
 import com.netgrif.application.engine.elastic.domain.ElasticCaseRepository;
 import com.netgrif.application.engine.elastic.domain.ElasticTaskRepository;
 import com.netgrif.application.engine.elastic.service.ElasticCaseService;
+import com.netgrif.application.engine.elastic.service.ElasticIndexService;
 import com.netgrif.application.engine.elastic.service.ElasticTaskService;
 import com.netgrif.application.engine.elastic.service.executors.Executor;
 import com.netgrif.application.engine.elastic.service.interfaces.IElasticCaseService;
+import com.netgrif.application.engine.elastic.service.interfaces.IElasticIndexService;
 import com.netgrif.application.engine.elastic.service.interfaces.IElasticTaskService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -23,9 +25,6 @@
 )
 public class ElasticServiceConfiguration {
 
-    @Autowired
-    private ElasticCaseRepository caseRepository;
-
     @Autowired
     private ElasticTaskRepository taskRepository;
 
@@ -54,18 +53,22 @@ public Executor reindexingTaskTaskExecutor() {
     @Bean
     @Primary
     public IElasticCaseService elasticCaseService() {
-        return new ElasticCaseService(caseRepository, elasticsearchTemplate, executor());
+        return new ElasticCaseService(elasticsearchTemplate, executor());
     }
 
     @Bean
     @Primary
     public IElasticTaskService elasticTaskService() {
         return new ElasticTaskService(elasticsearchTemplate);
     }
+    @Bean
+    public IElasticIndexService elasticIndexService() {
+        return new ElasticIndexService(elasticsearchTemplate);
+    }
 
     @Bean
     public IElasticCaseService reindexingTaskElasticCaseService() {
-        return new ElasticCaseService(caseRepository, elasticsearchTemplate, reindexingTaskCaseExecutor());
+        return new ElasticCaseService(elasticsearchTemplate, reindexingTaskCaseExecutor());
     }
 
 

src/main/java/com/netgrif/application/engine/configuration/ElasticsearchConfiguration.java

@@ -65,7 +65,6 @@ public String elasticUriIndex() {
 
     @Bean
     public RestHighLevelClient client() {
-
         return new RestHighLevelClient(
                 RestClient.builder(new HttpHost(url, port, "http")));
     }

src/main/java/com/netgrif/application/engine/configuration/properties/CacheProperties.java

@@ -19,11 +19,31 @@ public class CacheProperties {
 
     private String petriNetCache = "petriNetCache";
 
+    private String caseIndexByNodeId = "caseIndexByNodeId";
+
+    private String caseIndexDynamic = "caseIndexDynamic";
+
+    private String caseIndexAll = "caseIndexAll";
+
+    private String caseIndexByMenuTaskId = "caseIndexByMenuTaskId";
+
     private List<String> additional = new ArrayList<>();
 
     public Set<String> getAllCaches() {
-        Set<String> caches = new LinkedHashSet<>(Arrays.asList(petriNetById, petriNetByIdentifier, petriNetNewest, petriNetCache));
+        List<String> cacheNames = Arrays.asList(
+                petriNetById,
+                petriNetByIdentifier,
+                petriNetNewest,
+                petriNetCache,
+                caseIndexByNodeId,
+                caseIndexDynamic,
+                caseIndexAll,
+                caseIndexByMenuTaskId
+        );
+
+        Set<String> caches = new LinkedHashSet<>(cacheNames);
         caches.addAll(additional);
         return caches;
     }
+
 }

src/main/java/com/netgrif/application/engine/elastic/domain/IndexAwareElasticSearchRequest.java

@@ -0,0 +1,57 @@
+package com.netgrif.application.engine.elastic.domain;
+
+
+import com.netgrif.application.engine.elastic.web.requestbodies.CaseSearchRequest;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import java.util.*;
+
+@NoArgsConstructor
+public class IndexAwareElasticSearchRequest extends ArrayList<CaseSearchRequest> implements List<CaseSearchRequest> {
+
+    /**
+     * taskIds of task "view" in preference_menu_item (by default part of URL)
+     */
+    @Getter
+    @Setter
+    private List<String> menuItemIds;
+
+    /**
+     * actual index name in elasticsearch
+     */
+    @Getter
+    @Setter
+    private List<String> indexNames;
+
+    @Getter
+    @Setter
+    private boolean allIndex;
+
+    private IndexAwareElasticSearchRequest(List<String> menuItemIds, List<String> indexNames, Boolean allIndex) {
+        this.menuItemIds = menuItemIds;
+        this.indexNames = indexNames;
+        this.allIndex = Objects.requireNonNullElse(allIndex, false);
+    }
+
+    public static IndexAwareElasticSearchRequest all() {
+        return new IndexAwareElasticSearchRequest(null, null, true);
+    }
+
+    public static IndexAwareElasticSearchRequest ofIndex(String indexName) {
+        return new IndexAwareElasticSearchRequest(null, Collections.singletonList(indexName), false);
+    }
+
+    public static IndexAwareElasticSearchRequest ofIndexes(List<String> indexNames) {
+        return new IndexAwareElasticSearchRequest(null, Collections.unmodifiableList(indexNames), false);
+    }
+
+    public static IndexAwareElasticSearchRequest ofMenuItems(List<String> menuItemIds) {
+        return new IndexAwareElasticSearchRequest(Collections.unmodifiableList(Optional.ofNullable(menuItemIds).orElse(Collections.emptyList())), null, false);
+    }
+
+    public boolean doQueryAll() {
+        return this.allIndex;
+    }
+}