ATLAS-1310: attempt LDAP authentication only when enabled

release-log.txt

@@ -9,8 +9,10 @@ ATLAS-1060 Add composite indexes for exact match performance improvements for al
 ATLAS-1127 Modify creation and modification timestamps to Date instead of Long(sumasai)
 
 ALL CHANGES:
+ATLAS-1310 attempt LDAP authentication only when enabled (mneethiraj)
+ATLAS-1309 updated HBase model with addition of column-family and column entity-defs (mneethiraj)
 ATLAS-916 Return System Attributes in get entity definition (svimal2106)
-ATLAS-1242 update TypesResource API implementation to use new v2 TypesREST API
+ATLAS-1242 update TypesResource API implementation to use new v2 TypesREST API (sarath.kum4r@gmail.com via mneethiraj)
 ATLAS-1306 bootstrap type-load ignores model file contents if a type in the file already exists
 ATLAS-1299 The project org.apache.atlas:atlas-hbase-client-shaded - build error (shwethags)
 ATLAS-1246 Upgrade versions of dependencies (shwethags)

webapp/src/main/java/org/apache/atlas/web/security/AtlasAuthenticationProvider.java

@@ -37,6 +37,7 @@ public class AtlasAuthenticationProvider extends
     private boolean fileAuthenticationMethodEnabled = true;
     private String ldapType = "NONE";
     public static final String FILE_AUTH_METHOD = "atlas.authentication.method.file";
+    public static final String LDAP_AUTH_METHOD = "atlas.authentication.method.ldap";
     public static final String LDAP_TYPE = "atlas.authentication.method.ldap.type";
 
 
@@ -59,11 +60,16 @@ public class AtlasAuthenticationProvider extends
 
             this.fileAuthenticationMethodEnabled = configuration.getBoolean(
                     FILE_AUTH_METHOD, true);
-            this.ldapType = configuration.getString(LDAP_TYPE, "NONE");
+
+            boolean ldapAuthenticationEnabled = configuration.getBoolean(LDAP_AUTH_METHOD, false);
+
+            if (ldapAuthenticationEnabled) {
+                this.ldapType = configuration.getString(LDAP_TYPE, "NONE");
+            } else {
+                this.ldapType = "NONE";
+            }
         } catch (Exception e) {
-            LOG.error(
-                    "Error while getting atlas.login.method application properties",
-                    e);
+            LOG.error("Error while getting atlas.login.method application properties", e);
         }
     }