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.

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

#100 allow other password authenticator to work ZDM-530 #101

Merged
merged 2 commits into from
Jun 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 4 additions & 3 deletions CHANGELOG/CHANGELOG-2.2.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,13 @@ When cutting a new release, update the `unreleased` heading to the tag being gen

## Unreleased

* [#112](https://github.com/datastax/zdm-proxy/pull/112) [ZDM-606](https://datastax.jira.com/browse/ZDM-606): Support COLON operator in fuzzy SAI queries and logical OR clause

## v2.2.0 - YYYY-MM-DD
## v2.2.0 - 2024-06-11

### New Features

* [#112](https://github.com/datastax/zdm-proxy/pull/112) [ZDM-606](https://datastax.jira.com/browse/ZDM-606): Support COLON operator in fuzzy SAI queries and logical OR clause
* [#101](https://github.com/datastax/zdm-proxy/pull/101) [ZDM-530](https://datastax.jira.com/browse/ZDM-530): Allow other password authenticators assuming they use username and secret flavor

### Improvements

### Bug Fixes
6 changes: 6 additions & 0 deletions RELEASE_NOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@ Build artifacts are available at [Docker Hub](https://hub.docker.com/repository/

For additional details on the changes included in a specific release, see the associated CHANGELOG-x.x.md file.

## v2.2.0 - 2024-06-11

Support SAI queries and third-party authenticators.

[Changelog](CHANGELOG/CHANGELOG-2.2.md#v220---2024-06-11)

## v2.1.0 - 2023-11-13

Enables read only workloads to work correctly with ZDM-Proxy and Datastax Astra.
Expand Down
6 changes: 2 additions & 4 deletions proxy/pkg/zdmproxy/auth.go
Original file line number Diff line number Diff line change
Expand Up @@ -96,13 +96,11 @@ var (
)

func (a *DsePlainTextAuthenticator) InitialResponse(authenticator string) ([]byte, error) {
switch authenticator {
case "com.datastax.bdp.cassandra.auth.DseAuthenticator":
if authenticator == "com.datastax.bdp.cassandra.auth.DseAuthenticator" {
return mechanism, nil
case "org.apache.cassandra.auth.PasswordAuthenticator":
} else {
return a.Credentials.Marshal(), nil
}
return nil, fmt.Errorf("unknown authenticator: %v", authenticator)
}

func (a *DsePlainTextAuthenticator) EvaluateChallenge(challenge []byte) ([]byte, error) {
Expand Down
Loading