Skip to content
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.

Sign up for GitHub

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

Jump to bottom

[bitnami/kafka] Add SCRAM support for KRaft #42416

Closed
wants to merge 2 commits into from
Closed

[bitnami/kafka] Add SCRAM support for KRaft #42416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b1e58fc
Add SCRAM support for KRaft
Rablet Jul 26, 2023
4dc3eb6
Fix bug when SCRAM is not enabled
Rablet Jul 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions bitnami/kafka/3.5/debian-11/rootfs/opt/bitnami/scripts/kafka/setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,5 @@ done

# Ensure Kafka is initialized
kafka_initialize
# If KRaft is enabled initialize
if is_boolean_yes "$KAFKA_ENABLE_KRAFT"; then
kraft_initialize
fi
# Ensure custom initialization scripts are executed
kafka_custom_init_scripts
38 changes: 35 additions & 3 deletions bitnami/kafka/3.5/debian-11/rootfs/opt/bitnami/scripts/libkafka.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -786,7 +786,7 @@ kafka_configure_producer_consumer_message_sizes() {
# Globals:
# KAFKA_*
# Arguments:
# None
# $1 - Whether KRaft SCRAM credentials need to be generated
# Returns:
# None
#########################
Expand All @@ -800,7 +800,25 @@ kraft_initialize() {
fi

info "Formatting storage directories to add metadata..."
debug_execute "$KAFKA_HOME/bin/kafka-storage.sh" format --config "$(kafka_get_conf_file)" --cluster-id "$KAFKA_KRAFT_CLUSTER_ID" --ignore-formatted

local scram_command=""

if generate_kraft_scram=1; then
info "Creating users in KRaft"
read -r -a users <<<"$(tr ',;' ' ' <<<"${KAFKA_CLIENT_USERS}")"
read -r -a passwords <<<"$(tr ',;' ' ' <<<"${KAFKA_CLIENT_PASSWORDS}")"
if [[ "${KAFKA_CFG_SASL_MECHANISM_INTER_BROKER_PROTOCOL:-}" =~ SCRAM-SHA ]]; then
users+=("${KAFKA_INTER_BROKER_USER}")
passwords+=("${KAFKA_INTER_BROKER_PASSWORD}")
fi

for ((i = 0; i < ${#users[@]}; i++)); do
scram_command+="--add-scram SCRAM-SHA-256=[iterations=8192,name=${users[i]},password=${passwords[i]}] "
scram_command+="--add-scram SCRAM-SHA-512=[iterations=8192,name=${users[i]},password=${passwords[i]}] "

done
fi
debug_execute "$KAFKA_HOME/bin/kafka-storage.sh" format --config "$(kafka_get_conf_file)" --cluster-id "$KAFKA_KRAFT_CLUSTER_ID" --ignore-formatted ${scram_command}
}

########################
Expand Down Expand Up @@ -832,6 +850,8 @@ kafka_initialize() {
fi
done

local generate_kraft_scram=0

# DEPRECATED. Check for server.properties file in old conf directory to maintain compatibility with Helm chart.
if [[ ! -f "$KAFKA_BASE_DIR"/conf/server.properties ]] && [[ ! -f "$KAFKA_MOUNTED_CONF_DIR"/server.properties ]]; then
info "No injected configuration files found, creating default config files"
Expand Down Expand Up @@ -861,7 +881,13 @@ kafka_initialize() {
if [[ -n "$KAFKA_CFG_SASL_ENABLED_MECHANISMS" ]]; then
kafka_server_conf_set sasl.enabled.mechanisms "$KAFKA_CFG_SASL_ENABLED_MECHANISMS"
kafka_generate_jaas_authentication_file "${internal_protocol:-}" "${client_protocol:-}"
[[ "$KAFKA_CFG_SASL_ENABLED_MECHANISMS" =~ "SCRAM" ]] && kafka_create_sasl_scram_zookeeper_users
if [[ "$KAFKA_CFG_SASL_ENABLED_MECHANISMS" =~ "SCRAM" ]]; then
if is_boolean_yes "$KAFKA_ENABLE_KRAFT"; then
generate_kraft_scram=1
else
kafka_create_sasl_scram_zookeeper_users
fi
fi
else
print_validation_error "Specified SASL protocol but no SASL mechanisms provided in KAFKA_CFG_SASL_ENABLED_MECHANISMS"
fi
Expand All @@ -872,6 +898,12 @@ kafka_initialize() {
fi
kafka_configure_producer_consumer_message_sizes
fi

# If KRaft is enabled initialize
if is_boolean_yes "$KAFKA_ENABLE_KRAFT"; then
kraft_initialize $generate_kraft_scram
fi

true
}

Expand Down
Loading