[incubator-druid] branch master updated: [druid-kerberos] Fix checking of host URI when reading cookies from cookie store (#7825)

[fj...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

fjy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-druid.git


The following commit(s) were added to refs/heads/master by this push:
     new fdc03bd  [druid-kerberos] Fix checking of host URI when reading cookies from cookie store (#7825)
fdc03bd is described below

commit fdc03bd336443ae88330d987785496bb73718862
Author: Nishant Bangarwa <ni...@gmail.com>
AuthorDate: Tue Jun 4 08:02:50 2019 +0530

    [druid-kerberos] Fix checking of host URI when reading cookies from cookie store (#7825)
    
    Reading of auth cookie was not checking URI of the server where request was being sent.  This was causing cookie set for one server to be sent to another one and extra authentication round trips between internal druid services.
---
 .../druid/security/kerberos/DruidKerberosUtil.java |  2 +-
 .../druid/security/kerberos/KerberosUtilTest.java  | 54 ++++++++++++++++++++++
 2 files changed, 55 insertions(+), 1 deletion(-)

diff --git a/extensions-core/druid-kerberos/src/main/java/org/apache/druid/security/kerberos/DruidKerberosUtil.java b/extensions-core/druid-kerberos/src/main/java/org/apache/druid/security/kerberos/DruidKerberosUtil.java
index bd43888..f3f0a4d 100644
--- a/extensions-core/druid-kerberos/src/main/java/org/apache/druid/security/kerberos/DruidKerberosUtil.java
+++ b/extensions-core/druid-kerberos/src/main/java/org/apache/druid/security/kerberos/DruidKerberosUtil.java
@@ -137,7 +137,7 @@ public class DruidKerberosUtil
       return null;
     }
     boolean isSSL = "https".equals(uri.getScheme());
-    List<HttpCookie> cookies = cookieStore.getCookies();
+    List<HttpCookie> cookies = cookieStore.get(uri);
 
     for (HttpCookie c : cookies) {
       // If this is a secured cookie and the current connection is non-secured,
diff --git a/extensions-core/druid-kerberos/src/test/java/org/apache/druid/security/kerberos/KerberosUtilTest.java b/extensions-core/druid-kerberos/src/test/java/org/apache/druid/security/kerberos/KerberosUtilTest.java
new file mode 100644
index 0000000..b4e056b
--- /dev/null
+++ b/extensions-core/druid-kerberos/src/test/java/org/apache/druid/security/kerberos/KerberosUtilTest.java
@@ -0,0 +1,54 @@
+/*
+ * 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.druid.security.kerberos;
+
+import org.apache.hadoop.security.authentication.client.AuthenticatedURL;
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.net.CookieManager;
+import java.net.CookieStore;
+import java.net.HttpCookie;
+import java.net.URI;
+import java.net.URISyntaxException;
+
+public class KerberosUtilTest
+{
+
+  @Test
+  public void testDruidUtil() throws URISyntaxException
+  {
+    CookieManager manager = new CookieManager();
+    CookieStore cookieStore = manager.getCookieStore();
+    HttpCookie cookie1 = new HttpCookie(AuthenticatedURL.AUTH_COOKIE, "cookie1");
+    cookie1.setSecure(true);
+    cookieStore.add(new URI("http://test1.druid.apache.com/abc/def"), cookie1);
+
+    // mismatch domain name
+    Assert.assertNull(DruidKerberosUtil.getAuthCookie(cookieStore, new URI("https://test2.druid.apache.com/def")));
+
+    // cookie is secure and the url is unsecure
+    Assert.assertNull(DruidKerberosUtil.getAuthCookie(cookieStore, new URI("http://test1.druid.apache.com/def")));
+
+    Assert.assertEquals(cookie1, DruidKerberosUtil.getAuthCookie(cookieStore, new URI("https://test1.druid.apache.com/def")));
+
+
+  }
+}


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org