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

Update go modules.

Browse Source
This commit is contained in:
Martin Dosch 2024-04-12 12:56:37 +02:00
parent d9df620fa4
commit fc3ed9a0b8
1 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
xmpp.go
View File

@ -757,6 +757,14 @@ func (c *Client) init(o *Options) error {
c.Fast.Token = v.Token.Token c.Fast.Token = v.Token.Token
c.Fast.Expiry, _ = time.Parse(time.RFC3339, v.Token.Expiry) c.Fast.Expiry, _ = time.Parse(time.RFC3339, v.Token.Expiry)
} }
if o.Session {
// if server support session, open it
cookie := getCookie() // generate new id value for session
fmt.Fprintf(c.stanzaWriter, "<iq to='%s' type='set' id='%x'><session xmlns='%s'/></iq>\n", xmlEscape(domain), cookie, nsSession)
}
// We're connected and can now receive and send messages.
fmt.Fprintf(c.stanzaWriter, "<presence xml:lang='en'><show>%s</show><status>%s</status></presence>\n", o.Status, o.StatusMessage)
return nil return nil
case *sasl2Challenge: case *sasl2Challenge:
sfm = v.Text sfm = v.Text
@ -955,21 +963,19 @@ func (c *Client) init(o *Options) error {
c.jid = v.AuthorizationIdentifier c.jid = v.AuthorizationIdentifier
} }
if v.Token.Token != "" { if v.Token.Token != "" {
if v.Token.Token != "" { m := f.Authentication.Inline.Fast.Mechanism
m := f.Authentication.Inline.Fast.Mechanism switch {
switch { case slices.Contains(m, "HT-SHA-256-EXPR") && tls13:
case slices.Contains(m, "HT-SHA-256-EXPR") && tls13: c.Fast.Mechanism = "HT-SHA-256-EXPR"
c.Fast.Mechanism = "HT-SHA-256-EXPR" case slices.Contains(m, "HT-SHA-256-UNIQ") && !tls13:
case slices.Contains(m, "HT-SHA-256-UNIQ") && !tls13: c.Fast.Mechanism = "HT-SHA-256-UNIQ"
c.Fast.Mechanism = "HT-SHA-256-UNIQ" case slices.Contains(m, "HT-SHA-256-ENDP"):
case slices.Contains(m, "HT-SHA-256-ENDP"): c.Fast.Mechanism = "HT-SHA-256-ENDP"
c.Fast.Mechanism = "HT-SHA-256-ENDP" case slices.Contains(m, "HT-SHA-256-NONE"):
case slices.Contains(m, "HT-SHA-256-NONE"): c.Fast.Mechanism = "HT-SHA-256-NONE"
c.Fast.Mechanism = "HT-SHA-256-NONE"
}
c.Fast.Token = v.Token.Token
c.Fast.Expiry, _ = time.Parse(time.RFC3339, v.Token.Expiry)
} }
c.Fast.Token = v.Token.Token
c.Fast.Expiry, _ = time.Parse(time.RFC3339, v.Token.Expiry)
} }
case *saslSuccess: case *saslSuccess:
if strings.HasPrefix(mechanism, "SCRAM-SHA") { if strings.HasPrefix(mechanism, "SCRAM-SHA") {