netudima commented on code in PR #3655: URL: https://github.com/apache/cassandra/pull/3655#discussion_r1906163951
########## test/unit/org/apache/cassandra/transport/AuthMessageSizeLimitTest.java: ########## @@ -0,0 +1,178 @@ +/* + * 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.cassandra.transport; + +import java.io.IOException; + +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; + +import com.datastax.driver.core.Authenticator; +import com.datastax.driver.core.EndPoint; +import com.datastax.driver.core.PlainTextAuthProvider; +import org.apache.cassandra.Util; +import org.apache.cassandra.config.DatabaseDescriptor; +import org.apache.cassandra.cql3.CQLTester; +import org.apache.cassandra.cql3.QueryOptions; +import org.apache.cassandra.cql3.QueryProcessor; +import org.apache.cassandra.net.FrameEncoder; +import org.apache.cassandra.transport.messages.AuthResponse; +import org.apache.cassandra.transport.messages.QueryMessage; + +public class AuthMessageSizeLimitTest extends CQLTester +{ + private static final int TOO_BIG_MULTI_FRAME_AUTH_MESSAGE_SIZE = 2 * FrameEncoder.Payload.MAX_SIZE; + + // set MAX_CQL_MESSAGE_SIZE bigger than TOO_BIG_MULTI_FRAME_AUTH_MESSAGE_SIZE to ensure what the auth message size check is more restrictive + private static final int MAX_CQL_MESSAGE_SIZE = TOO_BIG_MULTI_FRAME_AUTH_MESSAGE_SIZE * 2; + + private static final QueryOptions V5_DEFAULT_OPTIONS = + QueryOptions.create(QueryOptions.DEFAULT.getConsistency(), + QueryOptions.DEFAULT.getValues(), + QueryOptions.DEFAULT.skipMetadata(), + QueryOptions.DEFAULT.getPageSize(), + QueryOptions.DEFAULT.getPagingState(), + QueryOptions.DEFAULT.getSerialConsistency(), + ProtocolVersion.V5, + KEYSPACE); + + @BeforeClass + public static void setUp() + { + DatabaseDescriptor.setNativeTransportReceiveQueueCapacityInBytes(1); + DatabaseDescriptor.setNativeTransportMaxRequestDataInFlightPerIpInBytes(MAX_CQL_MESSAGE_SIZE); + DatabaseDescriptor.setNativeTransportConcurrentRequestDataInFlightInBytes(MAX_CQL_MESSAGE_SIZE); + DatabaseDescriptor.setNativeTransportMaxMessageSizeInBytes(MAX_CQL_MESSAGE_SIZE); + requireNetwork(); + requireAuthentication(); + } + + @Before + public void setLimits() + { + ClientResourceLimits.setGlobalLimit(MAX_CQL_MESSAGE_SIZE); + ClientResourceLimits.setEndpointLimit(MAX_CQL_MESSAGE_SIZE); + } + + @After + public void dropCreatedTable() + { + try + { + QueryProcessor.executeOnceInternal("DROP TABLE " + KEYSPACE + ".test_table"); + } + catch (Throwable t) + { + // ignore + } + } + + @SuppressWarnings({"resource", "SameParameterValue"}) + private SimpleClient client() + { + try + { + return SimpleClient.builder(nativeAddr.getHostAddress(), nativePort) + .protocolVersion(ProtocolVersion.V5) + .useBeta() + .build() + .connect(false, false); + } + catch (IOException e) + { + throw new RuntimeException("Error initializing client", e); + } + } + + @Test + public void sendSmallAuthMessage() + { + doTest((client) -> + { + AuthResponse authResponse = createAuthMessage("cassandra", "cassandra"); + client.execute(authResponse); + + QueryMessage createTableMessage = new QueryMessage("CREATE TABLE test_table (pk int PRIMARY KEY, v text)", + V5_DEFAULT_OPTIONS); + client.execute(createTableMessage); + + int valueLessThanMessageMaxSize = MAX_CQL_MESSAGE_SIZE - 500; + QueryMessage queryMessage = createQueryMessage(valueLessThanMessageMaxSize); + client.execute(queryMessage); + } + ); + } + + @Test + public void sendTooBigAuthMultiFrameMessage() + { + doTest((client) -> + { + AuthResponse authResponse = createAuthMessage("cassandra", createIncorrectLongPassword(TOO_BIG_MULTI_FRAME_AUTH_MESSAGE_SIZE)); + try + { + client.execute(authResponse); + } catch (RuntimeException e) { + // ProtocolException: Auth CQL Message of size 262159 bytes exceeds allowed maximum of 130072 bytes + Assert.assertTrue(e.getCause() instanceof ProtocolException); + } + Util.spinAssertEquals(false, () -> client.connection.channel().isOpen(), 10); + + } + ); + } + + private void doTest(TestLogic testLogic) + { + try (SimpleClient client = client()) + { + testLogic.run(client); + } + } + private interface TestLogic + { + void run(SimpleClient simpleClient); + } + + private QueryMessage createQueryMessage(int valueSize) + { + StringBuilder query = new StringBuilder("INSERT INTO test_table (pk, v) VALUES (1, '"); + for (int i = 0; i < valueSize; i++) + query.append('a'); + query.append("')"); + return new QueryMessage(query.toString(), V5_DEFAULT_OPTIONS); + } + + private static String createIncorrectLongPassword(int length) { Review Comment: fixed ########## src/java/org/apache/cassandra/config/DatabaseDescriptor.java: ########## @@ -822,6 +825,21 @@ else if (conf.commitlog_segment_size.toMebibytes() >= 2048) else if (conf.commitlog_segment_size.toKibibytes() < 2 * conf.max_mutation_size.toKibibytes()) throw new ConfigurationException("commitlog_segment_size must be at least twice the size of max_mutation_size / 1024", false); + if (conf.native_transport_max_message_size == null) + { + conf.native_transport_max_message_size = new DataStorageSpec.LongBytesBound(calculateDefaultNativeTransportMaxMessageSizeInBytes()); + } else { + nativeTransportMaxMessageSizeConfiguredExplicitly = true; + long maxCqlMessageSize = conf.native_transport_max_message_size.toBytes(); + if (maxCqlMessageSize > conf.native_transport_max_request_data_in_flight.toBytes()) + throw new ConfigurationException("native_transport_max_message_size must no exceed native_transport_max_request_data_in_flight", false); Review Comment: fixed -- 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: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
