Repository: metron Updated Branches: refs/heads/feature/METRON-1663-knoxsso 54880ba8f -> 1d927c975
METRON-1756 REST tests should use Embedded LDAP in metron-security (merrimanr) closes apache/metron#1186 Project: http://git-wip-us.apache.org/repos/asf/metron/repo Commit: http://git-wip-us.apache.org/repos/asf/metron/commit/1d927c97 Tree: http://git-wip-us.apache.org/repos/asf/metron/tree/1d927c97 Diff: http://git-wip-us.apache.org/repos/asf/metron/diff/1d927c97 Branch: refs/heads/feature/METRON-1663-knoxsso Commit: 1d927c975677424bc073838df6d906c3e3026bb5 Parents: 54880ba Author: merrimanr <[email protected]> Authored: Wed Sep 12 12:14:11 2018 -0500 Committer: rmerriman <[email protected]> Committed: Wed Sep 12 12:14:11 2018 -0500 ---------------------------------------------------------------------- metron-interface/metron-rest/pom.xml | 15 +++++++ .../src/main/resources/application-test.yml | 17 +------- .../metron/rest/config/TestSecurityConfig.java | 44 -------------------- .../AlertsUIControllerIntegrationTest.java | 3 +- .../GlobalConfigControllerIntegrationTest.java | 3 +- .../GrokControllerIntegrationTest.java | 3 +- .../HdfsControllerIntegrationTest.java | 3 +- .../KafkaControllerIntegrationTest.java | 3 +- .../MetaAlertControllerIntegrationTest.java | 3 +- .../SearchControllerIntegrationTest.java | 3 +- ...richmentConfigControllerIntegrationTest.java | 3 +- ...IndexingConfigControllerIntegrationTest.java | 3 +- ...orParserConfigControllerIntegrationTest.java | 3 +- .../StellarControllerIntegrationTest.java | 3 +- .../StormControllerIntegrationTest.java | 3 +- .../UpdateControllerIntegrationTest.java | 3 +- .../UserControllerIntegrationTest.java | 3 +- .../src/test/resources/log4j.properties | 5 ++- .../src/test/resources/schema.ldif | 22 ++++++++++ 19 files changed, 70 insertions(+), 75 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/metron/blob/1d927c97/metron-interface/metron-rest/pom.xml ---------------------------------------------------------------------- diff --git a/metron-interface/metron-rest/pom.xml b/metron-interface/metron-rest/pom.xml index d9d4bfe..223f873 100644 --- a/metron-interface/metron-rest/pom.xml +++ b/metron-interface/metron-rest/pom.xml @@ -372,6 +372,21 @@ <artifactId>org.eclipse.persistence.jpa</artifactId> <version>${eclipse.link.version}</version> </dependency> + + <dependency> + <groupId>org.apache.directory.server</groupId> + <artifactId>apacheds-all</artifactId> + <version>1.5.4</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.metron</groupId> + <artifactId>metron-ui-security</artifactId> + <version>${project.parent.version}</version> + <scope>test</scope> + <type>test-jar</type> + </dependency> </dependencies> <dependencyManagement> http://git-wip-us.apache.org/repos/asf/metron/blob/1d927c97/metron-interface/metron-rest/src/main/resources/application-test.yml ---------------------------------------------------------------------- diff --git a/metron-interface/metron-rest/src/main/resources/application-test.yml b/metron-interface/metron-rest/src/main/resources/application-test.yml index e6532fa..1202da7 100644 --- a/metron-interface/metron-rest/src/main/resources/application-test.yml +++ b/metron-interface/metron-rest/src/main/resources/application-test.yml @@ -62,19 +62,4 @@ meta: knox: sso: - url: - -ldap: - provider: - url: ldap://localhost:33389 - userdn: uid=admin,ou=people,dc=hadoop,dc=apache,dc=org - password: password - user: - dn.patterns: uid={0},ou=people,dc=hadoop,dc=apache,dc=org - passwordAttribute: userPassword - searchBase: ou=people,dc=hadoop,dc=apache,dc=org - searchFilter: "" - group: - searchBase: ou=groups,dc=hadoop,dc=apache,dc=org - searchFilter: "member={0}" - roleAttribute: "cn" + url: http://git-wip-us.apache.org/repos/asf/metron/blob/1d927c97/metron-interface/metron-rest/src/test/java/org/apache/metron/rest/config/TestSecurityConfig.java ---------------------------------------------------------------------- diff --git a/metron-interface/metron-rest/src/test/java/org/apache/metron/rest/config/TestSecurityConfig.java b/metron-interface/metron-rest/src/test/java/org/apache/metron/rest/config/TestSecurityConfig.java deleted file mode 100644 index 04e82b9..0000000 --- a/metron-interface/metron-rest/src/test/java/org/apache/metron/rest/config/TestSecurityConfig.java +++ /dev/null @@ -1,44 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.metron.rest.config; - -import static org.apache.metron.rest.MetronRestConstants.SECURITY_ROLE_ADMIN; -import static org.apache.metron.rest.MetronRestConstants.SECURITY_ROLE_USER; -import static org.apache.metron.rest.MetronRestConstants.TEST_PROFILE; - -import org.springframework.context.annotation.Configuration; -import org.springframework.core.annotation.Order; -import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; -import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; -import org.springframework.test.context.ActiveProfiles; - -@Configuration -@ActiveProfiles(TEST_PROFILE) -@Order(99) -public class TestSecurityConfig extends WebSecurityConfigurerAdapter { - @Override - public void configure(AuthenticationManagerBuilder auth) throws Exception { - // @formatter:off - auth.inMemoryAuthentication() - .withUser("user").password("password").roles(SECURITY_ROLE_USER).and() - .withUser("user1").password("password").roles(SECURITY_ROLE_USER).and() - .withUser("user2").password("password").roles(SECURITY_ROLE_USER).and() - .withUser("admin").password("password").roles(SECURITY_ROLE_USER, SECURITY_ROLE_ADMIN); - // @formatter:on - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/metron/blob/1d927c97/metron-interface/metron-rest/src/test/java/org/apache/metron/rest/controller/AlertsUIControllerIntegrationTest.java ---------------------------------------------------------------------- diff --git a/metron-interface/metron-rest/src/test/java/org/apache/metron/rest/controller/AlertsUIControllerIntegrationTest.java b/metron-interface/metron-rest/src/test/java/org/apache/metron/rest/controller/AlertsUIControllerIntegrationTest.java index 98b4819..bd1167a 100644 --- a/metron-interface/metron-rest/src/test/java/org/apache/metron/rest/controller/AlertsUIControllerIntegrationTest.java +++ b/metron-interface/metron-rest/src/test/java/org/apache/metron/rest/controller/AlertsUIControllerIntegrationTest.java @@ -18,6 +18,7 @@ package org.apache.metron.rest.controller; import static org.apache.metron.rest.MetronRestConstants.TEST_PROFILE; +import static org.apache.metron.ui.EmbeddedLdap.EMBEDDED_LDAP_PROFILE; import static org.hamcrest.Matchers.hasSize; import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.csrf; import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.httpBasic; @@ -48,7 +49,7 @@ import org.springframework.web.context.WebApplicationContext; @RunWith(SpringRunner.class) @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) -@ActiveProfiles(TEST_PROFILE) +@ActiveProfiles({TEST_PROFILE, EMBEDDED_LDAP_PROFILE}) public class AlertsUIControllerIntegrationTest { /** http://git-wip-us.apache.org/repos/asf/metron/blob/1d927c97/metron-interface/metron-rest/src/test/java/org/apache/metron/rest/controller/GlobalConfigControllerIntegrationTest.java ---------------------------------------------------------------------- diff --git a/metron-interface/metron-rest/src/test/java/org/apache/metron/rest/controller/GlobalConfigControllerIntegrationTest.java b/metron-interface/metron-rest/src/test/java/org/apache/metron/rest/controller/GlobalConfigControllerIntegrationTest.java index 4351959..be4c1b2 100644 --- a/metron-interface/metron-rest/src/test/java/org/apache/metron/rest/controller/GlobalConfigControllerIntegrationTest.java +++ b/metron-interface/metron-rest/src/test/java/org/apache/metron/rest/controller/GlobalConfigControllerIntegrationTest.java @@ -33,6 +33,7 @@ import org.springframework.web.context.WebApplicationContext; import static org.apache.metron.integration.utils.TestUtils.assertEventually; import static org.apache.metron.rest.MetronRestConstants.TEST_PROFILE; +import static org.apache.metron.ui.EmbeddedLdap.EMBEDDED_LDAP_PROFILE; import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.csrf; import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.httpBasic; import static org.springframework.security.test.web.servlet.setup.SecurityMockMvcConfigurers.springSecurity; @@ -44,7 +45,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. @RunWith(SpringRunner.class) @SpringBootTest(webEnvironment= SpringBootTest.WebEnvironment.RANDOM_PORT) -@ActiveProfiles(TEST_PROFILE) +@ActiveProfiles({TEST_PROFILE, EMBEDDED_LDAP_PROFILE}) public class GlobalConfigControllerIntegrationTest { /** http://git-wip-us.apache.org/repos/asf/metron/blob/1d927c97/metron-interface/metron-rest/src/test/java/org/apache/metron/rest/controller/GrokControllerIntegrationTest.java ---------------------------------------------------------------------- diff --git a/metron-interface/metron-rest/src/test/java/org/apache/metron/rest/controller/GrokControllerIntegrationTest.java b/metron-interface/metron-rest/src/test/java/org/apache/metron/rest/controller/GrokControllerIntegrationTest.java index 8888eb0..8d9c38c 100644 --- a/metron-interface/metron-rest/src/test/java/org/apache/metron/rest/controller/GrokControllerIntegrationTest.java +++ b/metron-interface/metron-rest/src/test/java/org/apache/metron/rest/controller/GrokControllerIntegrationTest.java @@ -34,6 +34,7 @@ import org.springframework.web.context.WebApplicationContext; import java.io.File; import static org.apache.metron.rest.MetronRestConstants.TEST_PROFILE; +import static org.apache.metron.ui.EmbeddedLdap.EMBEDDED_LDAP_PROFILE; import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.csrf; import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.httpBasic; import static org.springframework.security.test.web.servlet.setup.SecurityMockMvcConfigurers.springSecurity; @@ -45,7 +46,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. @RunWith(SpringRunner.class) @SpringBootTest(webEnvironment= SpringBootTest.WebEnvironment.RANDOM_PORT) -@ActiveProfiles(TEST_PROFILE) +@ActiveProfiles({TEST_PROFILE, EMBEDDED_LDAP_PROFILE}) public class GrokControllerIntegrationTest { /** http://git-wip-us.apache.org/repos/asf/metron/blob/1d927c97/metron-interface/metron-rest/src/test/java/org/apache/metron/rest/controller/HdfsControllerIntegrationTest.java ---------------------------------------------------------------------- diff --git a/metron-interface/metron-rest/src/test/java/org/apache/metron/rest/controller/HdfsControllerIntegrationTest.java b/metron-interface/metron-rest/src/test/java/org/apache/metron/rest/controller/HdfsControllerIntegrationTest.java index a6c3469..e015ffb 100644 --- a/metron-interface/metron-rest/src/test/java/org/apache/metron/rest/controller/HdfsControllerIntegrationTest.java +++ b/metron-interface/metron-rest/src/test/java/org/apache/metron/rest/controller/HdfsControllerIntegrationTest.java @@ -32,6 +32,7 @@ import org.springframework.test.web.servlet.setup.MockMvcBuilders; import org.springframework.web.context.WebApplicationContext; import static org.apache.metron.rest.MetronRestConstants.TEST_PROFILE; +import static org.apache.metron.ui.EmbeddedLdap.EMBEDDED_LDAP_PROFILE; import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.csrf; import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.httpBasic; import static org.springframework.security.test.web.servlet.setup.SecurityMockMvcConfigurers.springSecurity; @@ -43,7 +44,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. @RunWith(SpringRunner.class) @SpringBootTest(webEnvironment= SpringBootTest.WebEnvironment.RANDOM_PORT) -@ActiveProfiles(TEST_PROFILE) +@ActiveProfiles({TEST_PROFILE, EMBEDDED_LDAP_PROFILE}) public class HdfsControllerIntegrationTest { @Autowired http://git-wip-us.apache.org/repos/asf/metron/blob/1d927c97/metron-interface/metron-rest/src/test/java/org/apache/metron/rest/controller/KafkaControllerIntegrationTest.java ---------------------------------------------------------------------- diff --git a/metron-interface/metron-rest/src/test/java/org/apache/metron/rest/controller/KafkaControllerIntegrationTest.java b/metron-interface/metron-rest/src/test/java/org/apache/metron/rest/controller/KafkaControllerIntegrationTest.java index 5719a41..f48cae7 100644 --- a/metron-interface/metron-rest/src/test/java/org/apache/metron/rest/controller/KafkaControllerIntegrationTest.java +++ b/metron-interface/metron-rest/src/test/java/org/apache/metron/rest/controller/KafkaControllerIntegrationTest.java @@ -18,6 +18,7 @@ package org.apache.metron.rest.controller; import static org.apache.metron.rest.MetronRestConstants.TEST_PROFILE; +import static org.apache.metron.ui.EmbeddedLdap.EMBEDDED_LDAP_PROFILE; import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.csrf; import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.httpBasic; import static org.springframework.security.test.web.servlet.setup.SecurityMockMvcConfigurers.springSecurity; @@ -52,7 +53,7 @@ import org.springframework.web.util.NestedServletException; @RunWith(SpringRunner.class) @SpringBootTest(webEnvironment= SpringBootTest.WebEnvironment.RANDOM_PORT) -@ActiveProfiles(TEST_PROFILE) +@ActiveProfiles({TEST_PROFILE, EMBEDDED_LDAP_PROFILE}) public class KafkaControllerIntegrationTest { private static final int KAFKA_RETRY = 10; http://git-wip-us.apache.org/repos/asf/metron/blob/1d927c97/metron-interface/metron-rest/src/test/java/org/apache/metron/rest/controller/MetaAlertControllerIntegrationTest.java ---------------------------------------------------------------------- diff --git a/metron-interface/metron-rest/src/test/java/org/apache/metron/rest/controller/MetaAlertControllerIntegrationTest.java b/metron-interface/metron-rest/src/test/java/org/apache/metron/rest/controller/MetaAlertControllerIntegrationTest.java index b216990..ead20cd 100644 --- a/metron-interface/metron-rest/src/test/java/org/apache/metron/rest/controller/MetaAlertControllerIntegrationTest.java +++ b/metron-interface/metron-rest/src/test/java/org/apache/metron/rest/controller/MetaAlertControllerIntegrationTest.java @@ -19,6 +19,7 @@ package org.apache.metron.rest.controller; import static org.apache.metron.rest.MetronRestConstants.TEST_PROFILE; +import static org.apache.metron.ui.EmbeddedLdap.EMBEDDED_LDAP_PROFILE; import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.csrf; import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.httpBasic; import static org.springframework.security.test.web.servlet.setup.SecurityMockMvcConfigurers.springSecurity; @@ -56,7 +57,7 @@ import org.springframework.web.context.WebApplicationContext; @RunWith(SpringRunner.class) @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) -@ActiveProfiles(TEST_PROFILE) +@ActiveProfiles({TEST_PROFILE, EMBEDDED_LDAP_PROFILE}) public class MetaAlertControllerIntegrationTest extends DaoControllerTest { @Autowired http://git-wip-us.apache.org/repos/asf/metron/blob/1d927c97/metron-interface/metron-rest/src/test/java/org/apache/metron/rest/controller/SearchControllerIntegrationTest.java ---------------------------------------------------------------------- diff --git a/metron-interface/metron-rest/src/test/java/org/apache/metron/rest/controller/SearchControllerIntegrationTest.java b/metron-interface/metron-rest/src/test/java/org/apache/metron/rest/controller/SearchControllerIntegrationTest.java index aa7b6cd..7e8d7f4 100644 --- a/metron-interface/metron-rest/src/test/java/org/apache/metron/rest/controller/SearchControllerIntegrationTest.java +++ b/metron-interface/metron-rest/src/test/java/org/apache/metron/rest/controller/SearchControllerIntegrationTest.java @@ -19,6 +19,7 @@ package org.apache.metron.rest.controller; import static org.apache.metron.integration.utils.TestUtils.assertEventually; import static org.apache.metron.rest.MetronRestConstants.TEST_PROFILE; +import static org.apache.metron.ui.EmbeddedLdap.EMBEDDED_LDAP_PROFILE; import static org.hamcrest.Matchers.hasSize; import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.csrf; import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.httpBasic; @@ -55,7 +56,7 @@ import org.springframework.web.context.WebApplicationContext; @RunWith(SpringRunner.class) @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) -@ActiveProfiles(TEST_PROFILE) +@ActiveProfiles({TEST_PROFILE, EMBEDDED_LDAP_PROFILE}) public class SearchControllerIntegrationTest extends DaoControllerTest { /** http://git-wip-us.apache.org/repos/asf/metron/blob/1d927c97/metron-interface/metron-rest/src/test/java/org/apache/metron/rest/controller/SensorEnrichmentConfigControllerIntegrationTest.java ---------------------------------------------------------------------- diff --git a/metron-interface/metron-rest/src/test/java/org/apache/metron/rest/controller/SensorEnrichmentConfigControllerIntegrationTest.java b/metron-interface/metron-rest/src/test/java/org/apache/metron/rest/controller/SensorEnrichmentConfigControllerIntegrationTest.java index 15a2370..d2e9673 100644 --- a/metron-interface/metron-rest/src/test/java/org/apache/metron/rest/controller/SensorEnrichmentConfigControllerIntegrationTest.java +++ b/metron-interface/metron-rest/src/test/java/org/apache/metron/rest/controller/SensorEnrichmentConfigControllerIntegrationTest.java @@ -33,6 +33,7 @@ import org.springframework.web.context.WebApplicationContext; import static org.apache.metron.integration.utils.TestUtils.assertEventually; import static org.apache.metron.rest.MetronRestConstants.TEST_PROFILE; +import static org.apache.metron.ui.EmbeddedLdap.EMBEDDED_LDAP_PROFILE; import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.csrf; import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.httpBasic; import static org.springframework.security.test.web.servlet.setup.SecurityMockMvcConfigurers.springSecurity; @@ -45,7 +46,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. @RunWith(SpringRunner.class) @SpringBootTest(webEnvironment= SpringBootTest.WebEnvironment.RANDOM_PORT) -@ActiveProfiles(TEST_PROFILE) +@ActiveProfiles({TEST_PROFILE, EMBEDDED_LDAP_PROFILE}) public class SensorEnrichmentConfigControllerIntegrationTest { /** http://git-wip-us.apache.org/repos/asf/metron/blob/1d927c97/metron-interface/metron-rest/src/test/java/org/apache/metron/rest/controller/SensorIndexingConfigControllerIntegrationTest.java ---------------------------------------------------------------------- diff --git a/metron-interface/metron-rest/src/test/java/org/apache/metron/rest/controller/SensorIndexingConfigControllerIntegrationTest.java b/metron-interface/metron-rest/src/test/java/org/apache/metron/rest/controller/SensorIndexingConfigControllerIntegrationTest.java index d78bedf..213d95f 100644 --- a/metron-interface/metron-rest/src/test/java/org/apache/metron/rest/controller/SensorIndexingConfigControllerIntegrationTest.java +++ b/metron-interface/metron-rest/src/test/java/org/apache/metron/rest/controller/SensorIndexingConfigControllerIntegrationTest.java @@ -19,6 +19,7 @@ package org.apache.metron.rest.controller; import static org.apache.metron.integration.utils.TestUtils.assertEventually; import static org.apache.metron.rest.MetronRestConstants.TEST_PROFILE; +import static org.apache.metron.ui.EmbeddedLdap.EMBEDDED_LDAP_PROFILE; import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.csrf; import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.httpBasic; import static org.springframework.security.test.web.servlet.setup.SecurityMockMvcConfigurers.springSecurity; @@ -45,7 +46,7 @@ import org.springframework.web.context.WebApplicationContext; @RunWith(SpringRunner.class) @SpringBootTest(webEnvironment= SpringBootTest.WebEnvironment.RANDOM_PORT) -@ActiveProfiles(TEST_PROFILE) +@ActiveProfiles({TEST_PROFILE, EMBEDDED_LDAP_PROFILE}) public class SensorIndexingConfigControllerIntegrationTest { /** http://git-wip-us.apache.org/repos/asf/metron/blob/1d927c97/metron-interface/metron-rest/src/test/java/org/apache/metron/rest/controller/SensorParserConfigControllerIntegrationTest.java ---------------------------------------------------------------------- diff --git a/metron-interface/metron-rest/src/test/java/org/apache/metron/rest/controller/SensorParserConfigControllerIntegrationTest.java b/metron-interface/metron-rest/src/test/java/org/apache/metron/rest/controller/SensorParserConfigControllerIntegrationTest.java index c9adac9..eae0c9b 100644 --- a/metron-interface/metron-rest/src/test/java/org/apache/metron/rest/controller/SensorParserConfigControllerIntegrationTest.java +++ b/metron-interface/metron-rest/src/test/java/org/apache/metron/rest/controller/SensorParserConfigControllerIntegrationTest.java @@ -44,6 +44,7 @@ import java.util.concurrent.atomic.AtomicInteger; import static org.apache.metron.integration.utils.TestUtils.assertEventually; import static org.apache.metron.rest.MetronRestConstants.TEST_PROFILE; +import static org.apache.metron.ui.EmbeddedLdap.EMBEDDED_LDAP_PROFILE; import static org.hamcrest.Matchers.hasSize; import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.csrf; import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.httpBasic; @@ -57,7 +58,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. @RunWith(SpringRunner.class) @SpringBootTest(webEnvironment= SpringBootTest.WebEnvironment.RANDOM_PORT) -@ActiveProfiles(TEST_PROFILE) +@ActiveProfiles({TEST_PROFILE, EMBEDDED_LDAP_PROFILE}) public class SensorParserConfigControllerIntegrationTest { /** http://git-wip-us.apache.org/repos/asf/metron/blob/1d927c97/metron-interface/metron-rest/src/test/java/org/apache/metron/rest/controller/StellarControllerIntegrationTest.java ---------------------------------------------------------------------- diff --git a/metron-interface/metron-rest/src/test/java/org/apache/metron/rest/controller/StellarControllerIntegrationTest.java b/metron-interface/metron-rest/src/test/java/org/apache/metron/rest/controller/StellarControllerIntegrationTest.java index 7a57173..4b2cd20 100644 --- a/metron-interface/metron-rest/src/test/java/org/apache/metron/rest/controller/StellarControllerIntegrationTest.java +++ b/metron-interface/metron-rest/src/test/java/org/apache/metron/rest/controller/StellarControllerIntegrationTest.java @@ -31,6 +31,7 @@ import org.springframework.test.web.servlet.setup.MockMvcBuilders; import org.springframework.web.context.WebApplicationContext; import static org.apache.metron.rest.MetronRestConstants.TEST_PROFILE; +import static org.apache.metron.ui.EmbeddedLdap.EMBEDDED_LDAP_PROFILE; import static org.hamcrest.Matchers.greaterThan; import static org.hamcrest.Matchers.hasSize; import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.csrf; @@ -44,7 +45,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. @RunWith(SpringRunner.class) @SpringBootTest(webEnvironment= SpringBootTest.WebEnvironment.RANDOM_PORT) -@ActiveProfiles(TEST_PROFILE) +@ActiveProfiles({TEST_PROFILE, EMBEDDED_LDAP_PROFILE}) public class StellarControllerIntegrationTest { private String valid = "TO_LOWER(test)"; http://git-wip-us.apache.org/repos/asf/metron/blob/1d927c97/metron-interface/metron-rest/src/test/java/org/apache/metron/rest/controller/StormControllerIntegrationTest.java ---------------------------------------------------------------------- diff --git a/metron-interface/metron-rest/src/test/java/org/apache/metron/rest/controller/StormControllerIntegrationTest.java b/metron-interface/metron-rest/src/test/java/org/apache/metron/rest/controller/StormControllerIntegrationTest.java index 3986413..1d088f5 100644 --- a/metron-interface/metron-rest/src/test/java/org/apache/metron/rest/controller/StormControllerIntegrationTest.java +++ b/metron-interface/metron-rest/src/test/java/org/apache/metron/rest/controller/StormControllerIntegrationTest.java @@ -43,6 +43,7 @@ import java.util.HashMap; import java.util.Map; import static org.apache.metron.rest.MetronRestConstants.TEST_PROFILE; +import static org.apache.metron.ui.EmbeddedLdap.EMBEDDED_LDAP_PROFILE; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.hasSize; import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.httpBasic; @@ -54,7 +55,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. @RunWith(SpringRunner.class) @SpringBootTest(webEnvironment= SpringBootTest.WebEnvironment.RANDOM_PORT) -@ActiveProfiles(TEST_PROFILE) +@ActiveProfiles({TEST_PROFILE, EMBEDDED_LDAP_PROFILE}) public class StormControllerIntegrationTest { @Autowired http://git-wip-us.apache.org/repos/asf/metron/blob/1d927c97/metron-interface/metron-rest/src/test/java/org/apache/metron/rest/controller/UpdateControllerIntegrationTest.java ---------------------------------------------------------------------- diff --git a/metron-interface/metron-rest/src/test/java/org/apache/metron/rest/controller/UpdateControllerIntegrationTest.java b/metron-interface/metron-rest/src/test/java/org/apache/metron/rest/controller/UpdateControllerIntegrationTest.java index 6b8d5d3..71a5577 100644 --- a/metron-interface/metron-rest/src/test/java/org/apache/metron/rest/controller/UpdateControllerIntegrationTest.java +++ b/metron-interface/metron-rest/src/test/java/org/apache/metron/rest/controller/UpdateControllerIntegrationTest.java @@ -18,6 +18,7 @@ package org.apache.metron.rest.controller; import static org.apache.metron.rest.MetronRestConstants.TEST_PROFILE; +import static org.apache.metron.ui.EmbeddedLdap.EMBEDDED_LDAP_PROFILE; import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.csrf; import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.httpBasic; import static org.springframework.security.test.web.servlet.setup.SecurityMockMvcConfigurers.springSecurity; @@ -58,7 +59,7 @@ import org.springframework.web.context.WebApplicationContext; @RunWith(SpringRunner.class) @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) -@ActiveProfiles(TEST_PROFILE) +@ActiveProfiles({TEST_PROFILE, EMBEDDED_LDAP_PROFILE}) public class UpdateControllerIntegrationTest extends DaoControllerTest { @Autowired private UpdateService updateService; http://git-wip-us.apache.org/repos/asf/metron/blob/1d927c97/metron-interface/metron-rest/src/test/java/org/apache/metron/rest/controller/UserControllerIntegrationTest.java ---------------------------------------------------------------------- diff --git a/metron-interface/metron-rest/src/test/java/org/apache/metron/rest/controller/UserControllerIntegrationTest.java b/metron-interface/metron-rest/src/test/java/org/apache/metron/rest/controller/UserControllerIntegrationTest.java index b1e432e..735d0d8 100644 --- a/metron-interface/metron-rest/src/test/java/org/apache/metron/rest/controller/UserControllerIntegrationTest.java +++ b/metron-interface/metron-rest/src/test/java/org/apache/metron/rest/controller/UserControllerIntegrationTest.java @@ -29,6 +29,7 @@ import org.springframework.test.web.servlet.setup.MockMvcBuilders; import org.springframework.web.context.WebApplicationContext; import static org.apache.metron.rest.MetronRestConstants.TEST_PROFILE; +import static org.apache.metron.ui.EmbeddedLdap.EMBEDDED_LDAP_PROFILE; import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.httpBasic; import static org.springframework.security.test.web.servlet.setup.SecurityMockMvcConfigurers.springSecurity; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; @@ -37,7 +38,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. @RunWith(SpringRunner.class) @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) -@ActiveProfiles(TEST_PROFILE) +@ActiveProfiles({TEST_PROFILE, EMBEDDED_LDAP_PROFILE}) public class UserControllerIntegrationTest { private MockMvc mockMvc; http://git-wip-us.apache.org/repos/asf/metron/blob/1d927c97/metron-interface/metron-rest/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/metron-interface/metron-rest/src/test/resources/log4j.properties b/metron-interface/metron-rest/src/test/resources/log4j.properties index 492cecf..d49330e 100644 --- a/metron-interface/metron-rest/src/test/resources/log4j.properties +++ b/metron-interface/metron-rest/src/test/resources/log4j.properties @@ -13,4 +13,7 @@ log4j.rootLogger=ERROR, stdout log4j.appender.stdout=org.apache.log4j.ConsoleAppender log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd'T'HH:mm:ss.SSS} %-5p [%c] - %m%n \ No newline at end of file +log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd'T'HH:mm:ss.SSS} %-5p [%c] - %m%n + +log4j.logger.org.apache.directory.server.schema.registries.DefaultOidRegistry=OFF +log4j.logger.org.apache.directory.server.core.entry.DefaultServerAttribute=OFF http://git-wip-us.apache.org/repos/asf/metron/blob/1d927c97/metron-interface/metron-ui-security/src/test/resources/schema.ldif ---------------------------------------------------------------------- diff --git a/metron-interface/metron-ui-security/src/test/resources/schema.ldif b/metron-interface/metron-ui-security/src/test/resources/schema.ldif index 73d2dfd..3e5a0d8 100644 --- a/metron-interface/metron-ui-security/src/test/resources/schema.ldif +++ b/metron-interface/metron-ui-security/src/test/resources/schema.ldif @@ -63,6 +63,26 @@ sn: User uid: user userPassword: password +dn: uid=user1,ou=people,dc=metron,dc=apache,dc=org +objectclass:top +objectclass:person +objectclass:organizationalPerson +objectclass:inetOrgPerson +cn: Normal +sn: User +uid: user1 +userPassword: password + +dn: uid=user2,ou=people,dc=metron,dc=apache,dc=org +objectclass:top +objectclass:person +objectclass:organizationalPerson +objectclass:inetOrgPerson +cn: Normal +sn: User +uid: user2 +userPassword: password + dn: cn=admin,ou=groups,dc=metron,dc=apache,dc=org objectClass: groupOfNames objectClass: top @@ -75,3 +95,5 @@ objectClass: top cn: user member: uid=admin,ou=people,dc=metron,dc=apache,dc=org member: uid=user,ou=people,dc=metron,dc=apache,dc=org +member: uid=user1,ou=people,dc=metron,dc=apache,dc=org +member: uid=user2,ou=people,dc=metron,dc=apache,dc=org
