nizhikov commented on code in PR #15832:
URL: https://github.com/apache/kafka/pull/15832#discussion_r1587315800


##########
core/src/test/java/kafka/admin/UserScramCredentialsCommandTest.java:
##########
@@ -0,0 +1,184 @@
+/*
+ * 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 kafka.admin;
+
+import kafka.server.BaseRequestTest;
+import kafka.utils.Exit;
+import org.apache.kafka.test.TestUtils;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+import scala.Console;
+
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
+import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+import java.util.OptionalInt;
+import java.util.concurrent.atomic.AtomicReference;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+@SuppressWarnings("dontUseSystemExit")
+public class UserScramCredentialsCommandTest extends BaseRequestTest {
+    private static final String USER1 = "user1";
+    private static final String USER2 = "user2";
+
+    @Override
+    public int brokerCount() {
+        return 1;
+    }
+
+    static class ConfigCommandResult {
+        public final String stdout;
+        public final OptionalInt exitStatus;
+
+        public ConfigCommandResult(String stdout) {
+            this(stdout, OptionalInt.empty());
+        }
+
+        public ConfigCommandResult(String stdout, OptionalInt exitStatus) {
+            this.stdout = stdout;
+            this.exitStatus = exitStatus;
+        }
+    }
+
+    private ConfigCommandResult runConfigCommandViaBroker(String...args) {
+        ByteArrayOutputStream byteArrayOutputStream = new 
ByteArrayOutputStream();
+        String utf8 = StandardCharsets.UTF_8.name();
+        PrintStream printStream;
+        try {
+            printStream = new PrintStream(byteArrayOutputStream, true, utf8);
+        } catch (UnsupportedEncodingException e) {
+            throw new RuntimeException(e);
+        }
+        AtomicReference<OptionalInt> exitStatus = new 
AtomicReference<>(OptionalInt.empty());
+        Exit.setExitProcedure((status, __) -> {
+            exitStatus.set(OptionalInt.of((Integer) status));
+            throw new RuntimeException();
+        });
+
+        List<String> commandArgs = new 
ArrayList<>(Arrays.asList("--bootstrap-server", 
bootstrapServers(listenerName())));
+        commandArgs.addAll(Arrays.asList(args));
+        try {
+            Console.withOut(printStream, () -> {
+                ConfigCommand.main(commandArgs.toArray(new String[0]));
+                return null;
+            });
+            return new 
ConfigCommandResult(byteArrayOutputStream.toString(utf8));
+        } catch (Exception e) {
+            return new ConfigCommandResult("", exitStatus.get());
+        } finally {
+            printStream.close();
+            Exit.resetExitProcedure();
+        }
+    }
+
+    @ParameterizedTest
+    @ValueSource(strings = {"kraft", "zk"})
+    public void testUserScramCredentialsRequests(String quorum) throws 
Exception {
+        createAndAlterUser(USER1);
+        // now do the same thing for user2
+        createAndAlterUser(USER2);
+
+        // describe both
+        // we don't know the order that quota or scram users come out, so we 
have 2 possibilities for each, 4 total
+        String quotaPossibilityAOut = quotaMessage(USER1) + 
quotaMessage(USER2);
+        String quotaPossibilityBOut = quotaMessage(USER2) + 
quotaMessage(USER1);
+        String scramPossibilityAOut = describeUserMessage(USER1) + 
describeUserMessage(USER2);
+        String scramPossibilityBOut = describeUserMessage(USER2) + 
describeUserMessage(USER1);
+        describeUsers(
+            quotaPossibilityAOut + scramPossibilityAOut,
+            quotaPossibilityAOut + scramPossibilityBOut,
+            quotaPossibilityBOut + scramPossibilityAOut,
+            quotaPossibilityBOut + scramPossibilityBOut);
+
+        // now delete configs, in opposite order, for user1 and user2, and 
describe
+        deleteConfig(USER1, "consumer_byte_rate");
+        deleteConfig(USER2, "SCRAM-SHA-256");
+        describeUsers(quotaMessage(USER2) + describeUserMessage(USER1));
+
+        // now delete the rest of the configs, for user1 and user2, and 
describe
+        deleteConfig(USER1, "SCRAM-SHA-256");
+        deleteConfig(USER2, "consumer_byte_rate");
+        describeUsers("");
+    }
+
+    @ParameterizedTest
+    @ValueSource(strings = {"kraft", "zk"})
+    public void testAlterWithEmptyPassword(String quorum) {
+        String user1 = "user1";
+        ConfigCommandResult result = runConfigCommandViaBroker("--user", 
user1, "--alter", "--add-config", "SCRAM-SHA-256=[iterations=4096,password=]");
+        assertTrue(result.exitStatus.isPresent(), "Expected System.exit() to 
be called with an empty password");
+        assertEquals(1, result.exitStatus.getAsInt(), "Expected empty password 
to cause failure with exit status=1");
+    }
+
+    @ParameterizedTest
+    @ValueSource(strings = {"kraft", "zk"})
+    public void testDescribeUnknownUser(String quorum) {
+        String unknownUser = "unknownUser";
+        ConfigCommandResult result = runConfigCommandViaBroker("--user", 
unknownUser, "--describe");
+        assertFalse(result.exitStatus.isPresent(), "Expected System.exit() to 
not be called with an unknown user");
+        assertEquals("", result.stdout);
+    }
+
+    private void createAndAlterUser(String user) throws InterruptedException {
+        // create and describe a credential
+        ConfigCommandResult result = runConfigCommandViaBroker("--user", user, 
"--alter", "--add-config", 
"SCRAM-SHA-256=[iterations=4096,password=foo-secret]");
+        assertEquals(updateUserMessage(user), result.stdout);
+        TestUtils.waitUntilTrue(
+            () -> Objects.equals(runConfigCommandViaBroker("--user", user, 
"--describe").stdout, describeUserMessage(user)),
+            () -> "Failed to describe SCRAM credential change '" + user + "'");
+        // create a user quota and describe the user again
+        result = runConfigCommandViaBroker("--user", user, "--alter", 
"--add-config", "consumer_byte_rate=20000");
+        assertEquals(updateUserMessage(user), result.stdout);
+        TestUtils.waitUntilTrue(
+            () -> Objects.equals(runConfigCommandViaBroker("--user", user, 
"--describe").stdout, quotaMessage(user) + describeUserMessage(user)),
+            () -> "Failed to describe Quota change for '" + user + "'");
+    }
+
+    private void deleteConfig(String user, String config) {
+        ConfigCommandResult result = runConfigCommandViaBroker("--user", user, 
"--alter", "--delete-config", config);
+        assertEquals(updateUserMessage(user), result.stdout);
+    }
+
+    private void describeUsers(String... msgs) throws InterruptedException {
+        TestUtils.waitUntilTrue(

Review Comment:
   I'd rather keep at as is.
   Looks like @soarez agreed as PR approved by him :)



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

Reply via email to