-
Notifications
You must be signed in to change notification settings - Fork 4
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
feat: authentication support for kafka connection #530
Merged
Merged
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
299cdd2
feat: authentication support for kafka
aldy505 4ef97dc
chore: lessen struct copy
aldy505 99b8766
chore: changelog entry
aldy505 f2ccadb
chore: typo on changelog link
aldy505 edb9f7e
feat: support tls for kafka connection
aldy505 1315d27
chore: lint
aldy505 0d7aa4b
Merge branch 'main' into feat/kafka-with-auth
aldy505 43f8c48
Merge branch 'main' into feat/kafka-with-auth
aldy505 3b7843e
Merge branch 'main' into feat/kafka-with-auth
aldy505 ab23c00
feat: set explicit dialer for custom kafka transport
aldy505 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 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 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 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 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 |
---|---|---|
@@ -1,8 +1,91 @@ | ||
package main | ||
|
||
import ( | ||
"crypto/tls" | ||
"crypto/x509" | ||
"log" | ||
"net" | ||
"os" | ||
"strings" | ||
"time" | ||
|
||
"github.com/segmentio/kafka-go" | ||
"github.com/segmentio/kafka-go/sasl" | ||
"github.com/segmentio/kafka-go/sasl/plain" | ||
"github.com/segmentio/kafka-go/sasl/scram" | ||
) | ||
|
||
type MetricSummary struct { | ||
Min float64 | ||
Max float64 | ||
Sum float64 | ||
Count uint64 | ||
} | ||
|
||
func createKafkaRoundTripper(e ServiceConfig) kafka.RoundTripper { | ||
var saslMechanism sasl.Mechanism | ||
var tlsConfig *tls.Config | ||
|
||
switch strings.ToUpper(e.KafkaSaslMechanism) { | ||
case "PLAIN": | ||
saslMechanism = plain.Mechanism{ | ||
Username: e.KafkaSaslUsername, | ||
Password: e.KafkaSaslPassword, | ||
} | ||
case "SCRAM-SHA-256": | ||
mechanism, err := scram.Mechanism(scram.SHA256, e.KafkaSaslUsername, e.KafkaSaslPassword) | ||
if err != nil { | ||
log.Fatal("unable to create scram-sha-256 mechanism", err) | ||
return nil | ||
} | ||
|
||
saslMechanism = mechanism | ||
case "SCRAM-SHA-512": | ||
mechanism, err := scram.Mechanism(scram.SHA512, e.KafkaSaslUsername, e.KafkaSaslPassword) | ||
if err != nil { | ||
log.Fatal("unable to create scram-sha-512 mechanism", err) | ||
return nil | ||
} | ||
|
||
saslMechanism = mechanism | ||
} | ||
|
||
if e.KafkaSslCertPath != "" && e.KafkaSslKeyPath != "" { | ||
certs, err := tls.LoadX509KeyPair(e.KafkaSslCertPath, e.KafkaSslKeyPath) | ||
if err != nil { | ||
log.Fatal("unable to load certificate key pair", err) | ||
return nil | ||
} | ||
|
||
caCertificatePool, err := x509.SystemCertPool() | ||
if err != nil { | ||
caCertificatePool = x509.NewCertPool() | ||
} | ||
if e.KafkaSslCaPath != "" { | ||
caFile, err := os.ReadFile(e.KafkaSslCaPath) | ||
if err != nil { | ||
log.Fatal("unable to read ca file", err) | ||
return nil | ||
} | ||
|
||
if ok := caCertificatePool.AppendCertsFromPEM(caFile); !ok { | ||
log.Fatal("unable to append ca certificate to pool") | ||
return nil | ||
} | ||
} | ||
|
||
tlsConfig = &tls.Config{ | ||
RootCAs: caCertificatePool, | ||
Certificates: []tls.Certificate{certs}, | ||
} | ||
} | ||
|
||
return &kafka.Transport{ | ||
SASL: saslMechanism, | ||
TLS: tlsConfig, | ||
Dial: (&net.Dialer{ | ||
Timeout: 3 * time.Second, | ||
DualStack: true, | ||
}).DialContext, | ||
} | ||
} |
This file contains 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
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.
Don't you need to set a
Dialer
as well here?If writer
Transport
isnil
DefaultTransport is used, but in this case it won't as we're explicitly setting it withcreateKafkaRoundTripper
.I think here we should first create a Transport like here and then set the
SASL
andTLS
?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.
Updated.