-
Notifications
You must be signed in to change notification settings - Fork 518
[server] Manage users for sasl/plain authentication via cluster properties. #3047
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
loserwang1024
wants to merge
1
commit into
apache:main
Choose a base branch
from
loserwang1024:fluss-add-user
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -83,7 +83,8 @@ public static Supplier<ClientAuthenticator> loadClientAuthenticatorSupplier( | |||||||||||||||||||||||||||||||||
| * authenticators. | ||||||||||||||||||||||||||||||||||
| */ | ||||||||||||||||||||||||||||||||||
| public static Map<String, Supplier<ServerAuthenticator>> loadServerAuthenticatorSuppliers( | ||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||
| public static Map<String, Supplier<ServerAuthenticator>> loadServerAuthenticatorSuppliers( | |
| public static Map<String, Supplier<ServerAuthenticator>> loadServerAuthenticatorSuppliers( | |
| Configuration configuration) { | |
| return loadServerAuthenticatorSuppliers(() -> configuration); | |
| } | |
| /** | |
| * Loads suppliers for server authenticators for each endpoint, based on listener-specific | |
| * protocols. | |
| * | |
| * @param configurationSupplier The configuration supplier containing authentication settings | |
| * and protocol definitions. | |
| * @return A map mapping listener names to suppliers for their corresponding server | |
| * authenticators. | |
| */ | |
| public static Map<String, Supplier<ServerAuthenticator>> loadServerAuthenticatorSuppliers( |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
108 changes: 108 additions & 0 deletions
108
...-common/src/main/java/org/apache/fluss/flink/procedure/AppendClusterConfigsProcedure.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,108 @@ | ||
| /* | ||
| * 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.fluss.flink.procedure; | ||
|
|
||
| import org.apache.fluss.config.cluster.AlterConfig; | ||
| import org.apache.fluss.config.cluster.AlterConfigOpType; | ||
|
|
||
| import org.apache.flink.table.annotation.ArgumentHint; | ||
| import org.apache.flink.table.annotation.DataTypeHint; | ||
| import org.apache.flink.table.annotation.ProcedureHint; | ||
| import org.apache.flink.table.procedure.ProcedureContext; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
|
|
||
| /** | ||
| * Procedure to append values to list-type cluster configurations dynamically. | ||
| * | ||
| * <p>This procedure appends new values to existing list-type configurations. The APPEND operation | ||
| * only works on configurations defined as list types (e.g., {@code security.sasl.users}). The | ||
| * changes are: | ||
| * | ||
| * <ul> | ||
| * <li>Validated by the CoordinatorServer before persistence | ||
| * <li>Persisted in ZooKeeper for durability | ||
| * <li>Applied to all relevant servers (Coordinator and TabletServers) | ||
| * <li>Survive server restarts | ||
| * </ul> | ||
| * | ||
| * <p>Usage examples: | ||
| * | ||
| * <pre> | ||
| * -- Append a user to the SASL user list | ||
| * CALL sys.append_cluster_configs('security.sasl.users', 'bob:bob-secret'); | ||
| * | ||
| * -- Append multiple key-value pairs at one time | ||
| * CALL sys.append_cluster_configs('security.sasl.users', 'bob:bob-secret', 'security.sasl.users', 'alice:alice-secret'); | ||
| * </pre> | ||
| * | ||
| * <p><b>Note:</b> APPEND operations are only supported for list-type configuration keys. The server | ||
| * will reject the change if the configuration key is not a list type. | ||
| */ | ||
| public class AppendClusterConfigsProcedure extends ProcedureBase { | ||
|
|
||
| @ProcedureHint( | ||
| argument = {@ArgumentHint(name = "config_pairs", type = @DataTypeHint("STRING"))}, | ||
| isVarArgs = true) | ||
| public String[] call(ProcedureContext context, String... configPairs) throws Exception { | ||
| try { | ||
| if (configPairs.length == 0) { | ||
| throw new IllegalArgumentException( | ||
| "config_pairs cannot be null or empty. " | ||
| + "Please specify valid configuration pairs."); | ||
| } | ||
|
|
||
| if (configPairs.length % 2 != 0) { | ||
| throw new IllegalArgumentException( | ||
| "config_pairs must be set in pairs. " | ||
| + "Please specify valid configuration pairs."); | ||
| } | ||
|
|
||
| List<AlterConfig> configList = new ArrayList<>(); | ||
| List<String> resultMessage = new ArrayList<>(); | ||
|
|
||
| for (int i = 0; i < configPairs.length; i += 2) { | ||
| String configKey = configPairs[i].trim(); | ||
| if (configKey.isEmpty()) { | ||
| throw new IllegalArgumentException( | ||
| "Config key cannot be null or empty. " | ||
| + "Please specify a valid configuration key."); | ||
| } | ||
| String configValue = configPairs[i + 1]; | ||
|
|
||
| AlterConfig alterConfig = | ||
| new AlterConfig(configKey, configValue, AlterConfigOpType.APPEND); | ||
| configList.add(alterConfig); | ||
| resultMessage.add( | ||
| String.format( | ||
| "Successfully appended '%s' to configuration '%s'. ", | ||
| configValue, configKey)); | ||
| } | ||
|
|
||
| admin.alterClusterConfigs(configList).get(); | ||
|
|
||
| return resultMessage.toArray(new String[0]); | ||
| } catch (IllegalArgumentException e) { | ||
| throw e; | ||
| } catch (Exception e) { | ||
| throw new RuntimeException( | ||
| String.format("Failed to append cluster config: %s", e.getMessage()), e); | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
110 changes: 110 additions & 0 deletions
110
...ommon/src/main/java/org/apache/fluss/flink/procedure/SubtractClusterConfigsProcedure.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,110 @@ | ||
| /* | ||
| * 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.fluss.flink.procedure; | ||
|
|
||
| import org.apache.fluss.config.cluster.AlterConfig; | ||
| import org.apache.fluss.config.cluster.AlterConfigOpType; | ||
|
|
||
| import org.apache.flink.table.annotation.ArgumentHint; | ||
| import org.apache.flink.table.annotation.DataTypeHint; | ||
| import org.apache.flink.table.annotation.ProcedureHint; | ||
| import org.apache.flink.table.procedure.ProcedureContext; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
|
|
||
| /** | ||
| * Procedure to subtract (remove) values from list-type cluster configurations dynamically. | ||
| * | ||
| * <p>This procedure removes specific values from existing list-type configurations. The SUBTRACT | ||
| * operation only works on configurations defined as list types (e.g., {@code security.sasl.users}). | ||
| * If the list becomes empty after subtraction, the configuration key is removed entirely. The | ||
| * changes are: | ||
| * | ||
| * <ul> | ||
| * <li>Validated by the CoordinatorServer before persistence | ||
| * <li>Persisted in ZooKeeper for durability | ||
| * <li>Applied to all relevant servers (Coordinator and TabletServers) | ||
| * <li>Survive server restarts | ||
| * </ul> | ||
| * | ||
| * <p>Usage examples: | ||
| * | ||
| * <pre> | ||
| * -- Remove a user from the SASL user list | ||
| * CALL sys.subtract_cluster_configs('security.sasl.users', 'bob:bob-secret'); | ||
| * | ||
| * -- Remove multiple key-value pairs at one time | ||
| * CALL sys.subtract_cluster_configs('security.sasl.users', 'bob:bob-secret', 'security.sasl.users', 'alice:alice-secret'); | ||
| * </pre> | ||
| * | ||
| * <p><b>Note:</b> SUBTRACT operations are only supported for list-type configuration keys. The | ||
| * server will reject the change if the configuration key is not a list type. Subtracting a value | ||
| * that does not exist in the list is a no-op. | ||
| */ | ||
| public class SubtractClusterConfigsProcedure extends ProcedureBase { | ||
|
|
||
| @ProcedureHint( | ||
| argument = {@ArgumentHint(name = "config_pairs", type = @DataTypeHint("STRING"))}, | ||
| isVarArgs = true) | ||
| public String[] call(ProcedureContext context, String... configPairs) throws Exception { | ||
| try { | ||
| if (configPairs.length == 0) { | ||
| throw new IllegalArgumentException( | ||
| "config_pairs cannot be null or empty. " | ||
| + "Please specify valid configuration pairs."); | ||
| } | ||
|
|
||
| if (configPairs.length % 2 != 0) { | ||
| throw new IllegalArgumentException( | ||
| "config_pairs must be set in pairs. " | ||
| + "Please specify valid configuration pairs."); | ||
| } | ||
|
|
||
| List<AlterConfig> configList = new ArrayList<>(); | ||
| List<String> resultMessage = new ArrayList<>(); | ||
|
|
||
| for (int i = 0; i < configPairs.length; i += 2) { | ||
| String configKey = configPairs[i].trim(); | ||
| if (configKey.isEmpty()) { | ||
| throw new IllegalArgumentException( | ||
| "Config key cannot be null or empty. " | ||
| + "Please specify a valid configuration key."); | ||
| } | ||
| String configValue = configPairs[i + 1]; | ||
|
|
||
| AlterConfig alterConfig = | ||
| new AlterConfig(configKey, configValue, AlterConfigOpType.SUBTRACT); | ||
| configList.add(alterConfig); | ||
| resultMessage.add( | ||
| String.format( | ||
| "Successfully subtracted '%s' from configuration '%s'. ", | ||
| configValue, configKey)); | ||
| } | ||
|
|
||
| admin.alterClusterConfigs(configList).get(); | ||
|
|
||
| return resultMessage.toArray(new String[0]); | ||
| } catch (IllegalArgumentException e) { | ||
| throw e; | ||
| } catch (Exception e) { | ||
| throw new RuntimeException( | ||
| String.format("Failed to subtract cluster config: %s", e.getMessage()), e); | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This option stores plaintext credentials and is now exposed as a regular cluster config. To reduce accidental leakage (logs,
get_cluster_configs, UIs), consider marking this option as sensitive (if the config framework supports it) and/or ensuring config listing APIs mask/redact values forsecurity.sasl.users(and the derivedsecurity.sasl.plain.jaas.config). Also consider documenting the security implications explicitly in the description.