uwaru/go-xmpp
1
0
Fork 0
forked from jshiffer/go-xmpp
Code Pull Requests Activity

Fix manual choice of auth mechanism. (#173)

Browse Source
This commit is contained in:
Martin 2024-01-10 15:49:08 +01:00 committed by GitHub
parent 5fdcf18a81
commit 424970d23c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 34 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
xmpp.go
View File

@ -406,10 +406,12 @@ func (c *Client) init(o *Options) error {
tlsConnOK = true tlsConnOK = true
} }
mechanism = "" mechanism = ""
switch { if o.Mechanism != "" {
case slices.Contains(f.Mechanisms.Mechanism, if slices.Contains(f.Mechanisms.Mechanism, o.Mechanism) {
o.Mechanism) && o.Mechanism != "":
mechanism = o.Mechanism mechanism = o.Mechanism
}
} else {
switch {
case slices.Contains(f.Mechanisms.Mechanism, case slices.Contains(f.Mechanisms.Mechanism,
"SCRAM-SHA-512-PLUS") && tlsConnOK: "SCRAM-SHA-512-PLUS") && tlsConnOK:
mechanism = "SCRAM-SHA-512-PLUS" mechanism = "SCRAM-SHA-512-PLUS"
@ -438,6 +440,7 @@ func (c *Client) init(o *Options) error {
"DIGEST-MD5"): "DIGEST-MD5"):
mechanism = "DIGEST-MD5" mechanism = "DIGEST-MD5"
} }
}
if strings.HasPrefix(mechanism, "SCRAM-SHA") { if strings.HasPrefix(mechanism, "SCRAM-SHA") {
if strings.HasSuffix(mechanism, "PLUS") { if strings.HasSuffix(mechanism, "PLUS") {
scramPlus = true scramPlus = true