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

Use existing functions from xdg-go/scram pkg #3481

Merged
merged 4 commits into from
Jan 18, 2022
Merged

Use existing functions from xdg-go/scram pkg #3481

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7275479
Use existing functions from scram pkg
yurishkuro Jan 17, 2022
7467f4b
clean
yurishkuro Jan 17, 2022
3562760
clean
yurishkuro Jan 17, 2022
4785764
Merge branch 'main' into scram
yurishkuro Jan 18, 2022
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
6 changes: 1 addition & 5 deletions pkg/kafka/auth/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,11 +68,7 @@ func (config *AuthenticationConfig) SetConfiguration(saramaConfig *sarama.Config
setKerberosConfiguration(&config.Kerberos, saramaConfig)
return nil
case plaintext:
err := setPlainTextConfiguration(&config.PlainText, saramaConfig)
if err != nil {
return err
}
return nil
return setPlainTextConfiguration(&config.PlainText, saramaConfig)
default:
return fmt.Errorf("Unknown/Unsupported authentication method %s to kafka cluster", config.Authentication)
}
Expand Down
17 changes: 8 additions & 9 deletions pkg/kafka/auth/plaintext.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,7 @@
package auth

import (
"crypto/sha256"
"crypto/sha512"
"fmt"
"hash"
"strings"

"github.com/Shopify/sarama"
Expand Down Expand Up @@ -65,20 +62,22 @@ type PlainTextConfig struct {

var _ sarama.SCRAMClient = (*scramClient)(nil)

func clientGenFunc(hashFn scram.HashGeneratorFcn) func() sarama.SCRAMClient {
return func() sarama.SCRAMClient {
return &scramClient{HashGeneratorFcn: hashFn}
}
}

func setPlainTextConfiguration(config *PlainTextConfig, saramaConfig *sarama.Config) error {
saramaConfig.Net.SASL.Enable = true
saramaConfig.Net.SASL.User = config.Username
saramaConfig.Net.SASL.Password = config.Password
switch strings.ToUpper(config.Mechanism) {
case "SCRAM-SHA-256":
saramaConfig.Net.SASL.SCRAMClientGeneratorFunc = func() sarama.SCRAMClient {
return &scramClient{HashGeneratorFcn: func() hash.Hash { return sha256.New() }}
}
saramaConfig.Net.SASL.SCRAMClientGeneratorFunc = clientGenFunc(scram.SHA256)
saramaConfig.Net.SASL.Mechanism = sarama.SASLTypeSCRAMSHA256
case "SCRAM-SHA-512":
saramaConfig.Net.SASL.SCRAMClientGeneratorFunc = func() sarama.SCRAMClient {
return &scramClient{HashGeneratorFcn: func() hash.Hash { return sha512.New() }}
}
saramaConfig.Net.SASL.SCRAMClientGeneratorFunc = clientGenFunc(scram.SHA512)
saramaConfig.Net.SASL.Mechanism = sarama.SASLTypeSCRAMSHA512
case "PLAIN":
saramaConfig.Net.SASL.Mechanism = sarama.SASLTypePlaintext
Expand Down