Repository: sentry Updated Branches: refs/heads/master 49e4958f3 -> 9c28d202a
SENTRY-1844 - When setting web authentication type to none, sentry fails to start - Reviewed by: Dapeng Sun. Re-applied by Sergio Pena. Project: http://git-wip-us.apache.org/repos/asf/sentry/repo Commit: http://git-wip-us.apache.org/repos/asf/sentry/commit/9c28d202 Tree: http://git-wip-us.apache.org/repos/asf/sentry/tree/9c28d202 Diff: http://git-wip-us.apache.org/repos/asf/sentry/diff/9c28d202 Branch: refs/heads/master Commit: 9c28d202a8eb692ef58c76f2a9e145c6d912d183 Parents: 49e4958 Author: Donghui Xu <[email protected]> Authored: Mon Jul 24 15:21:12 2017 +0800 Committer: Sergio Pena <[email protected]> Committed: Tue Aug 29 14:11:21 2017 -0500 ---------------------------------------------------------------------- .../db/service/thrift/SentryWebServer.java | 4 +- .../TestSentryWebServiceForAuthTypeNone.java | 64 ++++++++++++++++++++ 2 files changed, 66 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/sentry/blob/9c28d202/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/service/thrift/SentryWebServer.java ---------------------------------------------------------------------- diff --git a/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/service/thrift/SentryWebServer.java b/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/service/thrift/SentryWebServer.java index 84324c3..3f4a2ff 100644 --- a/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/service/thrift/SentryWebServer.java +++ b/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/service/thrift/SentryWebServer.java @@ -122,8 +122,8 @@ public class SentryWebServer { contextHandlerCollection.setHandlers(new Handler[]{contextHandler, servletContextHandler}); String authMethod = conf.get(ServerConfig.SENTRY_WEB_SECURITY_TYPE); - if (!ServerConfig.SENTRY_WEB_SECURITY_TYPE_NONE.equals(authMethod)) { - /* + if (!ServerConfig.SENTRY_WEB_SECURITY_TYPE_NONE.equalsIgnoreCase(authMethod)) { + /** * SentryAuthFilter is a subclass of AuthenticationFilter and * AuthenticationFilter tagged as private and unstable interface: * While there are not guarantees that this interface will not change, http://git-wip-us.apache.org/repos/asf/sentry/blob/9c28d202/sentry-service/sentry-service-server/src/test/java/org/apache/sentry/provider/db/service/thrift/TestSentryWebServiceForAuthTypeNone.java ---------------------------------------------------------------------- diff --git a/sentry-service/sentry-service-server/src/test/java/org/apache/sentry/provider/db/service/thrift/TestSentryWebServiceForAuthTypeNone.java b/sentry-service/sentry-service-server/src/test/java/org/apache/sentry/provider/db/service/thrift/TestSentryWebServiceForAuthTypeNone.java new file mode 100644 index 0000000..82bef39 --- /dev/null +++ b/sentry-service/sentry-service-server/src/test/java/org/apache/sentry/provider/db/service/thrift/TestSentryWebServiceForAuthTypeNone.java @@ -0,0 +1,64 @@ +/** + * 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.sentry.provider.db.service.thrift; + +import java.net.HttpURLConnection; +import java.net.URL; + +import org.apache.commons.io.IOUtils; +import org.apache.sentry.service.thrift.SentryServiceIntegrationBase; +import org.apache.sentry.service.thrift.ServiceConstants.ServerConfig; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; + +public class TestSentryWebServiceForAuthTypeNone extends SentryServiceIntegrationBase { + + @BeforeClass + public static void setup() throws Exception { + webServerEnabled = true; + webSecurity = false; + beforeSetup(); + setupConf(); + conf.set(ServerConfig.SENTRY_WEB_SECURITY_TYPE, "none"); + startSentryService(); + afterSetup(); + } + + @Override + @Before + public void before() throws Exception { + } + + @Override + @After + public void after() { + } + + @Test + public void testWebServerConnection() throws Exception { + final URL url = new URL("http://"+ SentryServiceIntegrationBase.SERVER_HOST + ":" + SentryServiceIntegrationBase.webServerPort + "/ping"); + HttpURLConnection conn = (HttpURLConnection) url.openConnection(); + Assert.assertEquals(HttpURLConnection.HTTP_OK, conn.getResponseCode()); + String response = IOUtils.toString(conn.getInputStream()); + Assert.assertEquals("pong\n", response); + } +}
