Apache
/
druid
mirror of https://github.com/apache/druid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[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.
This commit is contained in:
Nishant Bangarwa 2019-06-04 08:02:50 +05:30 committed by Fangjin Yang
parent 0de7983db5
commit fdc03bd336
2 changed files with 55 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extensions-core/druid-kerberos/src/main/java/org/apache/druid/security/kerberos/DruidKerberosUtil.java
View File

@ -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,

54
extensions-core/druid-kerberos/src/test/java/org/apache/druid/security/kerberos/KerberosUtilTest.java Normal file
View File

@ -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")));
}
}