MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-03-03 15:20:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

Support case insensitive kafka SASL mechanism config values (#18398)

Browse Source
This commit is contained in:
Anis Eleuch 2023-11-08 20:04:01 -08:00 committed by GitHub
parent 0a25083fdb
commit 6ef8e87492
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
internal/event/target/kafka_scram_client_contrib.go
View File

@ -18,6 +18,7 @@ package target
import ( import (
"crypto/sha512" "crypto/sha512"
"strings"
"github.com/IBM/sarama" "github.com/IBM/sarama"
"github.com/xdg/scram" "github.com/xdg/scram"
@ -26,7 +27,7 @@ import (
) )
func initScramClient(args KafkaArgs, config *sarama.Config) { func initScramClient(args KafkaArgs, config *sarama.Config) {
switch args.SASL.Mechanism { switch strings.ToLower(args.SASL.Mechanism) {
case "sha512": case "sha512":
config.Net.SASL.SCRAMClientGeneratorFunc = func() sarama.SCRAMClient { return &XDGSCRAMClient{HashGeneratorFcn: KafkaSHA512} } config.Net.SASL.SCRAMClientGeneratorFunc = func() sarama.SCRAMClient { return &XDGSCRAMClient{HashGeneratorFcn: KafkaSHA512} }
config.Net.SASL.Mechanism = sarama.SASLMechanism(sarama.SASLTypeSCRAMSHA512) config.Net.SASL.Mechanism = sarama.SASLMechanism(sarama.SASLTypeSCRAMSHA512)

3
internal/logger/target/kafka/kafka_scram_client_contrib.go
View File

@ -19,6 +19,7 @@ package kafka
import ( import (
"crypto/sha512" "crypto/sha512"
"strings"
"github.com/IBM/sarama" "github.com/IBM/sarama"
"github.com/xdg/scram" "github.com/xdg/scram"
@ -27,7 +28,7 @@ import (
) )
func initScramClient(cfg Config, config *sarama.Config) { func initScramClient(cfg Config, config *sarama.Config) {
switch cfg.SASL.Mechanism { switch strings.ToLower(cfg.SASL.Mechanism) {
case "sha512": case "sha512":
config.Net.SASL.SCRAMClientGeneratorFunc = func() sarama.SCRAMClient { return &XDGSCRAMClient{HashGeneratorFcn: KafkaSHA512} } config.Net.SASL.SCRAMClientGeneratorFunc = func() sarama.SCRAMClient { return &XDGSCRAMClient{HashGeneratorFcn: KafkaSHA512} }
config.Net.SASL.Mechanism = sarama.SASLMechanism(sarama.SASLTypeSCRAMSHA512) config.Net.SASL.Mechanism = sarama.SASLMechanism(sarama.SASLTypeSCRAMSHA512)