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

Replace references of Saml to Sasl #284

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Replace references of Saml to Sasl #284

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
8 changes: 4 additions & 4 deletions src/pq/connection.cr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ module PQ
end
end

struct SamlContext
struct SaslContext
SCRAM_NAME = "SCRAM-SHA-256"
SCRAM_PLUS_NAME = "SCRAM-SHA-256-PLUS"

Expand Down Expand Up @@ -359,17 +359,17 @@ module PQ

private def handle_auth_sasl(mechanism_list)
mechs = String.new(mechanism_list).split(Char::ZERO)
cbind = if mechs.includes?(SamlContext::SCRAM_PLUS_NAME)
cbind = if mechs.includes?(SaslContext::SCRAM_PLUS_NAME)
check_auth_method!("scram-sha-256-plus")
true
elsif mechs.includes?(SamlContext::SCRAM_NAME)
elsif mechs.includes?(SaslContext::SCRAM_NAME)
check_auth_method!("scram-sha-256")
false
else
raise ConnectionError.new("no known sasl mechanism in list: #{mechs.join(", ")}")
end

ctx = SamlContext.new(@conninfo.password || "", cbind, soc)
ctx = SaslContext.new(@conninfo.password || "", cbind, soc)

# send client-first-message
write_chr 'p' # SASLInitialResponse
Expand Down
Loading