IMPALA-10874: Upgrade impyla to the latest version

This patch upgrades impyla to the latest version 0.18a1, which supports
cookie retention for LDAP authentications. Also adds unit-test cases
for implyla's HTTP test with LDAP authentication.

Testing:
 - Passed core tests.

Change-Id: I990e5cdde4e98d6ab3581fe48f53a5d0590ce492
Reviewed-on: http://gerrit.cloudera.org:8080/17795
Reviewed-by: Impala Public Jenkins <impala-public-jenkins@cloudera.com>
Tested-by: Impala Public Jenkins <impala-public-jenkins@cloudera.com>

fe/src/test/java/org/apache/impala/customcluster/LdapImpylaHttpTest.java

@@ -33,6 +33,9 @@ import org.apache.directory.server.annotations.CreateLdapServer;
 import org.apache.directory.server.annotations.CreateTransport;
 import org.apache.directory.server.core.annotations.ApplyLdifFiles;
 import org.apache.directory.server.core.integ.CreateLdapServerRule;
+import org.apache.impala.util.Metrics;
+import org.apache.log4j.Logger;
+import com.google.common.collect.Range;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.ClassRule;
@@ -48,6 +51,7 @@ import org.junit.Test;
     transports = { @CreateTransport(protocol = "LDAP", address = "localhost") })
 @ApplyLdifFiles({"users.ldif"})
 public class LdapImpylaHttpTest {
+  private static final Logger LOG = Logger.getLogger(LdapImpylaHttpTest.class);
 
   @ClassRule
   public static CreateLdapServerRule serverRule = new CreateLdapServerRule();
@@ -68,6 +72,8 @@ public class LdapImpylaHttpTest {
   // Includes a special character to test HTTP path encoding.
   private static final String delegateUser_ = "proxyUser$";
 
+  Metrics metrics = new Metrics();
+
   @Before
   public void setUp() throws Exception {
     String uri =
@@ -79,6 +85,7 @@ public class LdapImpylaHttpTest {
         uri, dn, testUser_, delegateUser_);
     int ret = CustomClusterRunner.StartImpalaCluster(ldapArgs);
     assertEquals(ret, 0);
+    verifyMetrics(zero, zero, zero, zero);
   }
 
   @After
@@ -86,28 +93,116 @@ public class LdapImpylaHttpTest {
     CustomClusterRunner.StartImpalaCluster();
   }
 
+  private void verifyMetrics(Range<Long> expectedBasicSuccess,
+      Range<Long> expectedBasicFailure, Range<Long> expectedCookieSuccess,
+      Range<Long> expectedCookieFailure) throws Exception {
+    long actualBasicSuccess = (long) metrics.getMetric(
+        "impala.thrift-server.hiveserver2-http-frontend.total-basic-auth-success");
+    assertTrue("Expected: " + expectedBasicSuccess + ", Actual: " + actualBasicSuccess,
+        expectedBasicSuccess.contains(actualBasicSuccess));
+    long actualBasicFailure = (long) metrics.getMetric(
+        "impala.thrift-server.hiveserver2-http-frontend.total-basic-auth-failure");
+    assertTrue("Expected: " + expectedBasicFailure + ", Actual: " + actualBasicFailure,
+        expectedBasicFailure.contains(actualBasicFailure));
+
+    long actualCookieSuccess = (long) metrics.getMetric(
+        "impala.thrift-server.hiveserver2-http-frontend.total-cookie-auth-success");
+    assertTrue("Expected: " + expectedCookieSuccess + ", Actual: " + actualCookieSuccess,
+        expectedCookieSuccess.contains(actualCookieSuccess));
+    long actualCookieFailure = (long) metrics.getMetric(
+        "impala.thrift-server.hiveserver2-http-frontend.total-cookie-auth-failure");
+    assertTrue("Expected: " + expectedCookieFailure + ", Actual: " + actualCookieFailure,
+        expectedCookieFailure.contains(actualCookieFailure));
+  }
+
+  private static final Range<Long> zero = Range.closed(0L, 0L);
+  private static final Range<Long> one = Range.closed(1L, 1L);
+
   /**
    * Tests ldap authentication using impala-shell.
    */
   @Test
   public void testImpylaHttpLdapAuth() throws Exception {
-    // 1. Valid username and password. Should succeed.
-    String[] validCmd = buildCommand(testUser_, testPassword_, null);
+    // 1. Valid username and password with default HTTP cookie names. Should succeed.
+    String[] validCmd = buildCommand(testUser_, testPassword_, null, null);
     RunShellCommand.Run(validCmd, /*shouldSucceed*/ true, testUser_, "");
+    // Check that cookies are being used.
+    verifyMetrics(Range.atLeast(1L), zero, Range.atLeast(6L), zero);
+
     // 2. Invalid username password combination. Should fail.
-    String[] invalidCmd = buildCommand("foo", "bar", null);
+    long successBasicAuthBefore =
+        (long) metrics.getMetric("impala.thrift-server.hiveserver2-http-frontend."
+            + "total-basic-auth-success");
+    long successCookieAuthBefore =
+        (long) metrics.getMetric("impala.thrift-server.hiveserver2-http-frontend."
+            + "total-cookie-auth-success");
+    String[] invalidCmd = buildCommand("foo", "bar", null, null);
     RunShellCommand.Run(
         invalidCmd, /*shouldSucceed*/ false, "", "HTTP code 401: Unauthorized");
+    // Check that basic authentication fails after retrying three times.
+    verifyMetrics(Range.closed(successBasicAuthBefore, successBasicAuthBefore),
+        Range.closed(3L, 3L),
+        Range.closed(successCookieAuthBefore, successCookieAuthBefore), zero);
+
     // 3. Without username and password. Should fail.
+    long failedBasicAuthBefore =
+        (long) metrics.getMetric("impala.thrift-server.hiveserver2-http-frontend."
+            + "total-basic-auth-failure");
     String[] noAuthCmd = {"impala-python", helper_, "--query", query_};
     RunShellCommand.Run(
         noAuthCmd, /*shouldSucceed*/ false, "", "HTTP code 401: Unauthorized");
+    // Check that there is no authentication attempt.
+    verifyMetrics(Range.closed(successBasicAuthBefore, successBasicAuthBefore),
+        Range.closed(failedBasicAuthBefore, failedBasicAuthBefore),
+        Range.closed(successCookieAuthBefore, successCookieAuthBefore), zero);
+
+    // 4. Valid username and password, but empty string for HTTP cookie names.
+    // Should succeed without cookie authentication.
+    String[] emptyCookieNamesCmd = buildCommand(testUser_, testPassword_, null, "");
+    RunShellCommand.Run(emptyCookieNamesCmd, /*shouldSucceed*/ true, testUser_, "");
+    // Check that cookies are not being used.
+    verifyMetrics(Range.atLeast(successBasicAuthBefore + 7L),
+        Range.closed(failedBasicAuthBefore, failedBasicAuthBefore),
+        Range.closed(successCookieAuthBefore, successCookieAuthBefore), zero);
+
+    // 5. Valid username, password, and HTTP cookie names.
+    // Should succeed with cookie authentication.
+    successBasicAuthBefore =
+        (long) metrics.getMetric("impala.thrift-server.hiveserver2-http-frontend."
+            + "total-basic-auth-success");
+    String[] validCookieNamesCmd =
+        buildCommand(testUser_, testPassword_, null, "impala.auth");
+    RunShellCommand.Run(validCookieNamesCmd, /*shouldSucceed*/ true, testUser_, "");
+    // Check that cookies are being used.
+    verifyMetrics(Range.atLeast(successBasicAuthBefore + 1L),
+        Range.closed(failedBasicAuthBefore, failedBasicAuthBefore),
+        Range.atLeast(successCookieAuthBefore + 6L), zero);
+
+    // 6. Valid username and password, but HTTP cookie names don't consist of
+    // "impala.auth". Should succeed with cookie authentication failures.
+    successBasicAuthBefore =
+        (long) metrics.getMetric("impala.thrift-server.hiveserver2-http-frontend."
+            + "total-basic-auth-success");
+    successCookieAuthBefore =
+        (long) metrics.getMetric("impala.thrift-server.hiveserver2-http-frontend."
+            + "total-cookie-auth-success");
+    String[] nonAuthCookieNamesCmd = buildCommand(testUser_, testPassword_, null,
+        "impala.session.id");
+    RunShellCommand.Run(nonAuthCookieNamesCmd , /*shouldSucceed*/ true, testUser_, "");
+    // Check that cookies are not being used.
+    verifyMetrics(Range.atLeast(successBasicAuthBefore + 7L),
+        Range.closed(failedBasicAuthBefore, failedBasicAuthBefore),
+        Range.closed(successCookieAuthBefore, successCookieAuthBefore), zero);
   }
 
-  private String[] buildCommand(String user, String password, String httpPath) {
+  private String[] buildCommand(String user, String password, String httpPath,
+      String cookieNames) {
     List<String> command = Lists.newArrayList(Arrays.asList("impala-python", helper_,
         "--user", user, "--password", password, "--query", query_));
     if (httpPath != null) command.addAll(Arrays.asList("--http_path", httpPath));
+    if (cookieNames != null) {
+      command.addAll(Arrays.asList("--http_cookie_names", cookieNames));
+    }
     return command.toArray(new String[0]);
   }
 
@@ -124,21 +219,22 @@ public class LdapImpylaHttpTest {
     // Run with an invalid proxy user.
     //String[] command = {"impala-python", helper_, "--user", testUser2_, "--password",
     //    testPassword2_, "--http_path=/?doAs=" + delegateUser_, "--query", query};
-    String[] cmd = buildCommand(testUser2_, testPassword2_, "/?doAs=" + delegateUser_);
+    String[] cmd =
+        buildCommand(testUser2_, testPassword2_, "/?doAs=" + delegateUser_, null);
     RunShellCommand.Run(cmd, /*shouldSucceed*/ false, "",
         String.format(errTemplate, testUser2_, delegateUser_));
 
     // Run with a valid proxy user but invalid delegate user.
-    cmd = buildCommand(testUser_, testPassword_, "/?doAs=" + invalidDelegateUser);
+    cmd = buildCommand(testUser_, testPassword_, "/?doAs=" + invalidDelegateUser, null);
     RunShellCommand.Run(cmd, /*shouldSucceed*/ false, "",
         String.format(errTemplate, testUser_, invalidDelegateUser));
 
     // 'doAs' parameter that cannot be decoded.
-    cmd = buildCommand(testUser_, testPassword_, "/?doAs=%");
+    cmd = buildCommand(testUser_, testPassword_, "/?doAs=%", null);
     RunShellCommand.Run(cmd, /*shouldSucceed*/ false, "", "httplib.BadStatusLine");
 
     // Successfully delegate.
-    cmd = buildCommand(testUser_, testPassword_, "/?doAs=" + delegateUser_);
+    cmd = buildCommand(testUser_, testPassword_, "/?doAs=" + delegateUser_, null);
     RunShellCommand.Run(cmd, /*shouldSucceed*/ true, delegateUser_, "");
   }
 }

infra/python/deps/requirements.txt

@@ -34,11 +34,11 @@ hdfs == 2.0.2
   docopt == 0.6.2
   execnet == 1.4.0
     apipkg == 1.4
-impyla == 0.17a3
-  bitarray == 1.2.1
-  sasl == 0.2.1
+impyla == 0.18a1
+  bitarray == 2.3.0
+  pure-sasl == 0.6.2
   # six == 1.14.0 (specified separately)
-  thrift_sasl == 0.4.3a1
+  thrift_sasl == 0.4.3
 kazoo == 2.2.1
 pexpect == 3.3
 pg8000 == 1.10.2
@@ -60,6 +60,7 @@ requests == 2.20.0
    idna == 2.8
    urllib3 == 1.24.2
    certifi == 2020.12.5
+sasl == 0.2.1
 sh == 1.11
 six == 1.14.0
 sqlparse == 0.3.1

tests/util/run_impyla_http_query.py

@@ -36,7 +36,8 @@ def run_query(query, args):
     auth_mechanism = 'LDAP'
   conn = impyla.connect(host=args.host, port=args.port, user=args.user,
                         password=args.password, auth_mechanism=auth_mechanism,
-                        use_http_transport=True, http_path=args.http_path)
+                        use_http_transport=True, http_path=args.http_path,
+                        http_cookie_names=args.http_cookie_names)
   cursor = conn.cursor()
   cursor.execute(query)
   result = cursor.fetchall()
@@ -51,6 +52,7 @@ def main():
   parser.add_argument("--http_path", default="")
   parser.add_argument("--user")
   parser.add_argument("--password")
+  parser.add_argument("--http_cookie_names", default=['impala.auth', 'impala.session.id'])
   parser.add_argument("--query", default="select 42")
   args = parser.parse_args()
   run_query(args.query, args)