cmccabe commented on code in PR #13114: URL: https://github.com/apache/kafka/pull/13114#discussion_r1124830672
########## metadata/src/test/java/org/apache/kafka/image/ScramImageTest.java: ########## @@ -0,0 +1,161 @@ +/* + * 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.kafka.image; + +import org.apache.kafka.clients.admin.ScramMechanism; +import org.apache.kafka.common.metadata.RemoveUserScramCredentialRecord; +import org.apache.kafka.common.metadata.UserScramCredentialRecord; +import org.apache.kafka.image.writer.ImageWriterOptions; +import org.apache.kafka.image.writer.RecordListWriter; +import org.apache.kafka.server.common.MetadataVersion; +import org.apache.kafka.server.util.MockRandom; +import org.apache.kafka.metadata.RecordTestUtils; +import org.apache.kafka.server.common.ApiMessageAndVersion; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.Timeout; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Random; + +import static org.apache.kafka.clients.admin.ScramMechanism.SCRAM_SHA_256; +import static org.apache.kafka.clients.admin.ScramMechanism.SCRAM_SHA_512; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.fail; + + +@Timeout(value = 40) +public class ScramImageTest { + final static ScramImage IMAGE1; + + final static List<ApiMessageAndVersion> DELTA1_RECORDS; + + final static ScramDelta DELTA1; + + final static ScramImage IMAGE2; + + static byte[] randomBuffer(Random random, int length) { + byte[] buf = new byte[length]; + random.nextBytes(buf); + return buf; + } + + static ScramCredentialData randomScramCredentialData(Random random) { + return new ScramCredentialData( + randomBuffer(random, 1024), + randomBuffer(random, 1024), + 1024 + random.nextInt(1024)); + } + + static { + MockRandom random = new MockRandom(); + + Map<ScramMechanism, Map<String, ScramCredentialData>> image1mechanisms = new HashMap<>(); + + Map<String, ScramCredentialData> image1sha256 = new HashMap<>(); + image1sha256.put("alpha", randomScramCredentialData(random)); + image1sha256.put("beta", randomScramCredentialData(random)); + image1mechanisms.put(SCRAM_SHA_256, image1sha256); + + Map<String, ScramCredentialData> image1sha512 = new HashMap<>(); + image1sha512.put("alpha", randomScramCredentialData(random)); + image1sha512.put("gamma", randomScramCredentialData(random)); + image1mechanisms.put(SCRAM_SHA_512, image1sha512); + + IMAGE1 = new ScramImage(image1mechanisms); + + DELTA1_RECORDS = new ArrayList<>(); + DELTA1_RECORDS.add(new ApiMessageAndVersion(new RemoveUserScramCredentialRecord(). + setName("gamma"). + setMechanism(SCRAM_SHA_512.type()), (short) 0)); + ScramCredentialData secondAlpha256Credential = randomScramCredentialData(random); + DELTA1_RECORDS.add(new ApiMessageAndVersion(new UserScramCredentialRecord(). + setName("alpha"). + setMechanism(SCRAM_SHA_256.type()). + setIterations(secondAlpha256Credential.iterations()). + setSalt(secondAlpha256Credential.salt()). + setSaltedPassword(secondAlpha256Credential.saltedPassword()), (short) 0)); + DELTA1 = new ScramDelta(IMAGE1); + RecordTestUtils.replayAll(DELTA1, DELTA1_RECORDS); + + Map<ScramMechanism, Map<String, ScramCredentialData>> image2mechanisms = new HashMap<>(); + + Map<String, ScramCredentialData> image2sha256 = new HashMap<>(); + image2sha256.put("alpha", secondAlpha256Credential); + image2sha256.put("beta", image1sha256.get("beta")); + image2mechanisms.put(SCRAM_SHA_256, image2sha256); + + Map<String, ScramCredentialData> image2sha512 = new HashMap<>(); + image2sha512.put("alpha", image1sha512.get("alpha")); + image2mechanisms.put(SCRAM_SHA_512, image2sha512); + + IMAGE2 = new ScramImage(image2mechanisms); + } + + @Test + public void testEmptyImageRoundTrip() throws Throwable { + testToImageAndBack(ScramImage.EMPTY); + } + + @Test + public void testImage1RoundTrip() throws Throwable { + testToImageAndBack(IMAGE1); + } + + @Test + public void testApplyDelta1() throws Throwable { + assertEquals(IMAGE2, DELTA1.apply()); + } + + @Test + public void testImage2RoundTrip() throws Throwable { + testToImageAndBack(IMAGE2); + } + + private void testToImageAndBack(ScramImage image) throws Throwable { + RecordListWriter writer = new RecordListWriter(); + image.write(writer, new ImageWriterOptions.Builder().build()); + ScramDelta delta = new ScramDelta(ScramImage.EMPTY); + RecordTestUtils.replayAll(delta, writer.records()); + ScramImage nextImage = delta.apply(); + assertEquals(image, nextImage); + } + + @Test + public void testEmptyWithInvalidIBP() throws Throwable { + ImageWriterOptions imageWriterOptions = new ImageWriterOptions.Builder(). + setMetadataVersion(MetadataVersion.IBP_3_4_IV0).build(); + RecordListWriter writer = new RecordListWriter(); + ScramImage.EMPTY.write(writer, imageWriterOptions); + } + + @Test + public void testImage1withInvalidIBP() throws Throwable { + ImageWriterOptions imageWriterOptions = new ImageWriterOptions.Builder(). + setMetadataVersion(MetadataVersion.IBP_3_4_IV0).build(); + RecordListWriter writer = new RecordListWriter(); + try { + IMAGE1.write(writer, imageWriterOptions); + fail("expected exception writing IMAGE with SCRAM records for MetadataVersion.IBP_3_4_IV0"); Review Comment: You should be able to catch this with assertThrows and inspect the exception a bit. But we can do this in a follow-on. -- 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: jira-unsubscr...@kafka.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
