Merge pull request #6 from NihalHarish/migration_branch

 Support for Elasticsearch 6.6.2

Author: hardik-k-shah

THIRD-PARTY.txt

@@ -12,8 +12,8 @@ Lists of 114 third-party dependencies.
      (The Apache License, Version 2.0) Woodstox (com.fasterxml.woodstox:woodstox-core:5.0.3 - https://github.com/FasterXML/woodstox)
      (The Apache Software License, Version 2.0) zjsonpatch (com.flipkart.zjsonpatch:zjsonpatch:0.4.1 - https://github.com/flipkart-incubator/zjsonpatch/)
      (Apache 2) (GNU Lesser General Public License) LDAPTIVE CORE (com.floragunn:ldaptive:1.1.0-fg-fork1 - http://www.ldaptive.org/ldaptive)
-     (The Apache Software License, Version 2.0) OpenDistro Security (com.amazon.opendistroforelasticsearch:opendistro-elasticsearch-security:0.0.7.0 - https://github.com/opendistro-for-elasticsearch/security)
-     (The Apache Software License, Version 2.0) OpenDistro Security SSL (com.amazon.opendistroforelasticsearch:opendistro-elasticsearch-security-ssl:0.0.7.0 - https://github.com/opendistro-for-elasticsearch/security-ssl)
+     (The Apache Software License, Version 2.0) OpenDistro Security (com.amazon.opendistroforelasticsearch:opendistro-elasticsearch-security:0.0.8.0 - https://github.com/opendistro-for-elasticsearch/security)
+     (The Apache Software License, Version 2.0) OpenDistro Security SSL (com.amazon.opendistroforelasticsearch:opendistro-elasticsearch-security-ssl:0.0.8.0 - https://github.com/opendistro-for-elasticsearch/security-ssl)
      (Apache License 2.0) compiler (com.github.spullara.mustache.java:compiler:0.9.3 - http://github.com/spullara/mustache.java)
      (The Apache Software License, Version 2.0) json-flattener-java7 (com.github.wnameless:json-flattener-java7:0.4.1 - https://github.com/wnameless/json-flattener)
      (The Apache Software License, Version 2.0) FindBugs-jsr305 (com.google.code.findbugs:jsr305:1.3.9 - http://findbugs.sourceforge.net/)

pom.xml

@@ -14,18 +14,17 @@
   ~ express or implied. See the License for the specific language governing
   ~ permissions and limitations under the License.
   -->
-
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>com.amazon.opendistroforelasticsearch</groupId>
     <artifactId>opendistro_security_parent</artifactId>
-    <version>0.7.0.1</version>
+    <version>0.8.0.0</version>
   </parent>
 
   <artifactId>opendistro_security_advanced_modules</artifactId>
-  <version>0.7.0.1</version>
+  <version>0.8.0.0</version>
   <packaging>jar</packaging>
 
   <name>Open Distro Security Advanced Modules for Elasticsearch</name>
@@ -34,14 +33,14 @@
   <inceptionYear>2016</inceptionYear>
 
   <properties>
-    <security.version>0.7.0.1</security.version>
-    <elasticsearch.version>6.5.4</elasticsearch.version>
+    <security.version>0.8.0.0</security.version>
+    <elasticsearch.version>6.6.2</elasticsearch.version>
 
     <!-- deps -->
     <log4j.version>2.11.1</log4j.version>
     <jjwt.version>0.10.5</jjwt.version>
     <ldaptive.version>1.2.3</ldaptive.version>
-    <jackson-databind.version>2.8.11.1</jackson-databind.version>
+    <jackson-databind.version>2.8.11.2</jackson-databind.version>
     <http.commons.version>4.5.3</http.commons.version>
     <cxf.version>3.2.2</cxf.version>
     <guava.version>25.1-jre</guava.version>
@@ -55,7 +54,7 @@
     <url>https://github.com/opendistro-for-elasticsearch/security-advanced-modules</url>
     <connection>scm:git:[email protected]:opendistro-for-elasticsearch/security-advanced-modules.git</connection>
     <developerConnection>scm:git:[email protected]:opendistro-for-elasticsearch/security-advanced-modules.git</developerConnection>
-    <tag>v0.7.0.1</tag>
+    <tag>v0.8.0.0</tag>
   </scm>
 
   <issueManagement>
@@ -346,6 +345,14 @@
       <scope>test</scope>
     </dependency>
 
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-core</artifactId>
+      <version>${log4j.version}</version>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
+
   </dependencies>
   <build>
     <plugins>

src/main/java/com/amazon/opendistroforelasticsearch/security/dlic/rest/api/AbstractApiAction.java

@@ -80,12 +80,14 @@ public abstract class AbstractApiAction extends BaseRestHandler {
 	private String opendistrosecurityIndex;
 	private final RestApiPrivilegesEvaluator restApiPrivilegesEvaluator;
 	protected final AuditLog auditLog;
+	protected final Settings settings;
 
 	protected AbstractApiAction(final Settings settings, final Path configPath, final RestController controller,
 			final Client client, final AdminDNs adminDNs, final IndexBaseConfigurationRepository cl,
 			final ClusterService cs, final PrincipalExtractor principalExtractor, final PrivilegesEvaluator evaluator,
 			ThreadPool threadPool, AuditLog auditLog) {
 		super(settings);
+		this.settings = settings;
 		this.opendistrosecurityIndex = settings.get(ConfigConstants.OPENDISTRO_SECURITY_CONFIG_INDEX_NAME,
 				ConfigConstants.OPENDISTRO_SECURITY_DEFAULT_CONFIG_INDEX);