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

[Feature] Added SASL_SSL Plain authentication for Kafka trigger scalar to work with Event Hubs #585

Merged
merged 1 commit into from
Jan 30, 2020
Merged

[Feature] Added SASL_SSL Plain authentication for Kafka trigger scalar to work with Event Hubs #585

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 21 additions & 4 deletions pkg/scalers/kafka_scaler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"fmt"
"strconv"
"strings"
"time"

"github.com/Shopify/sarama"
v2beta1 "k8s.io/api/autoscaling/v2beta1"
Expand Down Expand Up @@ -49,6 +50,7 @@ const (
kafkaAuthModeForSaslScramSha256 kafkaAuthMode = "sasl_scram_sha256"
kafkaAuthModeForSaslScramSha512 kafkaAuthMode = "sasl_scram_sha512"
kafkaAuthModeForSaslSSL kafkaAuthMode = "sasl_ssl"
kafkaAuthModeForSaslSSLPlain kafkaAuthMode = "sasl_ssl_plain"
ahmelsayed marked this conversation as resolved.
Show resolved Hide resolved
)

const (
Expand Down Expand Up @@ -108,8 +110,10 @@ func parseKafkaMetadata(resolvedEnv, metadata, authParams map[string]string) (ka

meta.authMode = kafkaAuthModeForNone
if val, ok := authParams["authMode"]; ok {
val = strings.TrimSpace(val)
rasavant-ms marked this conversation as resolved.
Show resolved Hide resolved
mode := kafkaAuthMode(val)
if mode != kafkaAuthModeForNone && mode != kafkaAuthModeForSaslPlaintext && mode != kafkaAuthModeForSaslSSL && mode != kafkaAuthModeForSaslScramSha256 && mode != kafkaAuthModeForSaslScramSha512 {

if mode != kafkaAuthModeForNone && mode != kafkaAuthModeForSaslPlaintext && mode != kafkaAuthModeForSaslSSL && mode != kafkaAuthModeForSaslSSLPlain && mode != kafkaAuthModeForSaslScramSha256 && mode != kafkaAuthModeForSaslScramSha512 {
return meta, fmt.Errorf("err auth mode %s given", mode)
}

Expand All @@ -120,12 +124,12 @@ func parseKafkaMetadata(resolvedEnv, metadata, authParams map[string]string) (ka
if authParams["username"] == "" {
return meta, errors.New("no username given")
}
meta.username = authParams["username"]
meta.username = strings.TrimSpace(authParams["username"])

if authParams["password"] == "" {
return meta, errors.New("no password given")
}
meta.password = authParams["password"]
meta.password = strings.TrimSpace(authParams["password"])
}

if meta.authMode == kafkaAuthModeForSaslSSL {
Expand Down Expand Up @@ -177,12 +181,25 @@ func getKafkaClients(metadata kafkaMetadata) (sarama.Client, sarama.ClusterAdmin
config := sarama.NewConfig()
config.Version = sarama.V1_0_0_0

if ok := metadata.authMode == kafkaAuthModeForSaslPlaintext || metadata.authMode == kafkaAuthModeForSaslSSL || metadata.authMode == kafkaAuthModeForSaslScramSha256 || metadata.authMode == kafkaAuthModeForSaslScramSha512; ok {
if ok := metadata.authMode == kafkaAuthModeForSaslPlaintext || metadata.authMode == kafkaAuthModeForSaslSSL || metadata.authMode == kafkaAuthModeForSaslSSLPlain || metadata.authMode == kafkaAuthModeForSaslScramSha256 || metadata.authMode == kafkaAuthModeForSaslScramSha512; ok {
config.Net.SASL.Enable = true
config.Net.SASL.User = metadata.username
config.Net.SASL.Password = metadata.password
}

if metadata.authMode == kafkaAuthModeForSaslSSLPlain {
config.Net.SASL.Mechanism = sarama.SASLMechanism(sarama.SASLTypePlaintext)

tlsConfig := &tls.Config{
InsecureSkipVerify: true,
ahmelsayed marked this conversation as resolved.
Show resolved Hide resolved
ClientAuth: 0,
}

config.Net.TLS.Enable = true
config.Net.TLS.Config = tlsConfig
config.Net.DialTimeout = 10 * time.Second
}

if metadata.authMode == kafkaAuthModeForSaslSSL {
cert, err := tls.X509KeyPair([]byte(metadata.cert), []byte(metadata.key))
if err != nil {
Expand Down