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

Add Flag for Custom Authenticators in Cassandra Storage #5628

Merged
merged 12 commits into from
Jun 18, 2024
Merged

Add Flag for Custom Authenticators in Cassandra Storage #5628

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
7bb8259
added more options auth for cassandra
hellspawn679 Jun 14, 2024
e8775e7
added AllowedAuthenticators
hellspawn679 Jun 14, 2024
89b2275
Merge branch 'jaegertracing:main' into auth
hellspawn679 Jun 16, 2024
9346d16
added aiven auth
hellspawn679 Jun 16, 2024
4e4450c
reverting back
hellspawn679 Jun 16, 2024
279ab59
added flags for auth
hellspawn679 Jun 16, 2024
e2cf82e
Merge branch 'main' into auth
hellspawn679 Jun 17, 2024
504ac07
updated integration test for cassandra
hellspawn679 Jun 17, 2024
1959b26
added flags
hellspawn679 Jun 17, 2024
31a8da3
Merge branch 'main' into auth
hellspawn679 Jun 17, 2024
0c892c7
update flag description
hellspawn679 Jun 17, 2024
82204d4
updated flag
hellspawn679 Jun 17, 2024
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
20 changes: 18 additions & 2 deletions pkg/cassandra/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,21 @@
TLS tlscfg.Options `mapstructure:"tls"`
}

var (
defaultApprovedAuthenticators = []string{
"org.apache.cassandra.auth.PasswordAuthenticator",
"com.instaclustr.cassandra.auth.SharedSecretAuthenticator",
"com.datastax.bdp.cassandra.auth.DseAuthenticator",
"io.aiven.cassandra.auth.AivenAuthenticator",
"com.ericsson.bss.cassandra.ecaudit.auth.AuditPasswordAuthenticator",
"com.amazon.helenus.auth.HelenusAuthenticator",
"com.ericsson.bss.cassandra.ecaudit.auth.AuditAuthenticator",
"com.scylladb.auth.SaslauthdAuthenticator",
"com.scylladb.auth.TransitionalAuthenticator",
"com.instaclustr.cassandra.auth.InstaclustrPasswordAuthenticator",
}
)

// Authenticator holds the authentication properties needed to connect to a Cassandra cluster
type Authenticator struct {
Basic BasicAuthenticator `yaml:"basic" mapstructure:",squash"`
Expand Down Expand Up @@ -143,8 +158,9 @@

if c.Authenticator.Basic.Username != "" && c.Authenticator.Basic.Password != "" {
cluster.Authenticator = gocql.PasswordAuthenticator{
Username: c.Authenticator.Basic.Username,
Password: c.Authenticator.Basic.Password,
Username: c.Authenticator.Basic.Username,
Password: c.Authenticator.Basic.Password,
AllowedAuthenticators: defaultApprovedAuthenticators,

Check warning on line 163 in pkg/cassandra/config/config.go

View check run for this annotation

Codecov / codecov/patch

pkg/cassandra/config/config.go#L161-L163 

Added lines #L161 - L163 were not covered by tests
yurishkuro marked this conversation as resolved.
Show resolved Hide resolved
}
yurishkuro marked this conversation as resolved.
Show resolved Hide resolved
}
tlsCfg, err := c.TLS.Config(logger)
Expand Down
Loading