shauryachats commented on code in PR #16066: URL: https://github.com/apache/pinot/pull/16066#discussion_r2143189579
########## pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/TimeSeriesAuthIntegrationTest.java: ########## @@ -0,0 +1,177 @@ +/** + * 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.pinot.integration.tests; + +import java.io.File; +import java.io.IOException; +import java.net.URI; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.Future; +import org.apache.hc.core5.http.Header; +import org.apache.hc.core5.http.NameValuePair; +import org.apache.hc.core5.http.message.BasicHeader; +import org.apache.hc.core5.http.message.BasicNameValuePair; +import org.apache.http.HttpStatus; +import org.apache.pinot.client.Connection; +import org.apache.pinot.client.ConnectionFactory; +import org.apache.pinot.client.JsonAsyncHttpPinotClientTransportFactory; +import org.apache.pinot.common.exception.HttpErrorStatusException; +import org.apache.pinot.common.utils.FileUploadDownloadClient; +import org.apache.pinot.common.utils.URIUtils; +import org.apache.pinot.common.utils.http.HttpClient; +import org.apache.pinot.controller.helix.ControllerRequestClient; +import org.apache.pinot.spi.config.table.TableType; +import org.apache.pinot.spi.env.PinotConfiguration; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import static org.apache.pinot.integration.tests.BasicAuthTestUtils.AUTH_HEADER; +import static org.apache.pinot.integration.tests.BasicAuthTestUtils.AUTH_TOKEN; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNotNull; +import static org.testng.Assert.assertTrue; + + +public class TimeSeriesAuthIntegrationTest extends TimeSeriesIntegrationTest { + protected static final Logger LOGGER = LoggerFactory.getLogger(TimeSeriesAuthIntegrationTest.class); + + @Override + protected Map<String, String> getHeaders() { + return BasicAuthTestUtils.AUTH_HEADER; + } + + @Override + public ControllerRequestClient getControllerRequestClient() { + if (_controllerRequestClient == null) { + _controllerRequestClient = + new ControllerRequestClient(_controllerRequestURLBuilder, getHttpClient(), AUTH_HEADER); + } + return _controllerRequestClient; + } + + @Override + protected Connection getPinotConnection() { + if (_pinotConnection == null) { + JsonAsyncHttpPinotClientTransportFactory factory = new JsonAsyncHttpPinotClientTransportFactory(); + factory.setHeaders(AUTH_HEADER); + + _pinotConnection = + ConnectionFactory.fromZookeeper(getZkUrl() + "/" + getHelixClusterName(), factory.buildTransport()); + } + return _pinotConnection; + } + + @Override + protected void overrideControllerConf(Map<String, Object> properties) { + BasicAuthTestUtils.addControllerConfiguration(properties); + } + + @Override + protected void overrideBrokerConf(PinotConfiguration brokerConf) { + super.overrideBrokerConf(brokerConf); + BasicAuthTestUtils.addBrokerConfiguration(brokerConf); + } + + @Override + protected void overrideServerConf(PinotConfiguration serverConf) { + super.overrideServerConf(serverConf); + BasicAuthTestUtils.addServerConfiguration(serverConf); + } + + // TODO: Enhance base method to support custom headers. + @Override + protected void uploadSegments(String tableName, TableType tableType, List<File> tarDirs) Review Comment: We are overriding this method because when auth is enabled, the controller needs to pass in the `AUTH_TOKEN` to upload segments. While the new test only intends to test auth in the query path, the setup for the authenticated cluster requires authenticated calls to upload the segments to the servers. ########## pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/TimeSeriesAuthIntegrationTest.java: ########## @@ -0,0 +1,177 @@ +/** + * 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.pinot.integration.tests; + +import java.io.File; +import java.io.IOException; +import java.net.URI; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.Future; +import org.apache.hc.core5.http.Header; +import org.apache.hc.core5.http.NameValuePair; +import org.apache.hc.core5.http.message.BasicHeader; +import org.apache.hc.core5.http.message.BasicNameValuePair; +import org.apache.http.HttpStatus; +import org.apache.pinot.client.Connection; +import org.apache.pinot.client.ConnectionFactory; +import org.apache.pinot.client.JsonAsyncHttpPinotClientTransportFactory; +import org.apache.pinot.common.exception.HttpErrorStatusException; +import org.apache.pinot.common.utils.FileUploadDownloadClient; +import org.apache.pinot.common.utils.URIUtils; +import org.apache.pinot.common.utils.http.HttpClient; +import org.apache.pinot.controller.helix.ControllerRequestClient; +import org.apache.pinot.spi.config.table.TableType; +import org.apache.pinot.spi.env.PinotConfiguration; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import static org.apache.pinot.integration.tests.BasicAuthTestUtils.AUTH_HEADER; +import static org.apache.pinot.integration.tests.BasicAuthTestUtils.AUTH_TOKEN; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNotNull; +import static org.testng.Assert.assertTrue; + + +public class TimeSeriesAuthIntegrationTest extends TimeSeriesIntegrationTest { + protected static final Logger LOGGER = LoggerFactory.getLogger(TimeSeriesAuthIntegrationTest.class); + + @Override + protected Map<String, String> getHeaders() { + return BasicAuthTestUtils.AUTH_HEADER; + } + + @Override + public ControllerRequestClient getControllerRequestClient() { + if (_controllerRequestClient == null) { + _controllerRequestClient = + new ControllerRequestClient(_controllerRequestURLBuilder, getHttpClient(), AUTH_HEADER); + } + return _controllerRequestClient; + } + + @Override + protected Connection getPinotConnection() { + if (_pinotConnection == null) { + JsonAsyncHttpPinotClientTransportFactory factory = new JsonAsyncHttpPinotClientTransportFactory(); + factory.setHeaders(AUTH_HEADER); + + _pinotConnection = + ConnectionFactory.fromZookeeper(getZkUrl() + "/" + getHelixClusterName(), factory.buildTransport()); + } + return _pinotConnection; + } + + @Override + protected void overrideControllerConf(Map<String, Object> properties) { + BasicAuthTestUtils.addControllerConfiguration(properties); + } + + @Override + protected void overrideBrokerConf(PinotConfiguration brokerConf) { + super.overrideBrokerConf(brokerConf); + BasicAuthTestUtils.addBrokerConfiguration(brokerConf); + } + + @Override + protected void overrideServerConf(PinotConfiguration serverConf) { + super.overrideServerConf(serverConf); + BasicAuthTestUtils.addServerConfiguration(serverConf); + } + + // TODO: Enhance base method to support custom headers. + @Override + protected void uploadSegments(String tableName, TableType tableType, List<File> tarDirs) + throws Exception { + List<File> segmentTarFiles = new ArrayList<>(); + for (File tarDir : tarDirs) { + File[] tarFiles = tarDir.listFiles(); + assertNotNull(tarFiles); + Collections.addAll(segmentTarFiles, tarFiles); + } + int numSegments = segmentTarFiles.size(); + assertTrue(numSegments > 0); + + URI uploadSegmentHttpURI = URI.create(getControllerRequestURLBuilder().forSegmentUpload()); + NameValuePair + tableNameValuePair = new BasicNameValuePair(FileUploadDownloadClient.QueryParameters.TABLE_NAME, tableName); + NameValuePair tableTypeValuePair = new BasicNameValuePair(FileUploadDownloadClient.QueryParameters.TABLE_TYPE, + tableType.name()); + List<NameValuePair> parameters = Arrays.asList(tableNameValuePair, tableTypeValuePair); + List<Header> headers = List.of(new BasicHeader("Authorization", AUTH_TOKEN)); + + try (FileUploadDownloadClient fileUploadDownloadClient = new FileUploadDownloadClient()) { + if (numSegments == 1) { + File segmentTarFile = segmentTarFiles.get(0); + if (System.currentTimeMillis() % 2 == 0) { Review Comment: This is directly copied from another integration test [CursorWithAuthIntegrationTest](https://github.com/apache/pinot/blob/master/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/CursorWithAuthIntegrationTest.java) which tests the auth flow. I have added a TODO in the above code to consolidate this logic within the base `BaseClusterIntegrationTestSet` since the logic is exactly same, just this one passes an additional `AUTH_TOKEN`. Reusing the TimeSeriesIntegrationTest is not possible here because the setup task of the integration test also relies on the authentication being enabled. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org For additional commands, e-mail: commits-h...@pinot.apache.org
