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

<features> may not come with stream header #4

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

<features> may not come with stream header #4

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
26 changes: 16 additions & 10 deletions starttls.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,17 +53,23 @@ func DoXMPP(tlsconfig *tls.Config, daneconfig *Config) (*tls.Conn, error) {
writer.WriteString(outstring)
writer.Flush()

// read response stream header; look for STARTTLS feature support
_, err = reader.Read(buf)
if err != nil {
return nil, err
}
line = string(buf)
transcript += fmt.Sprintf("recv: %s\n", line)
gotSTARTTLS := false
if strings.Contains(line, "<starttls") && strings.Contains(line,
"urn:ietf:params:xml:ns:xmpp-tls") {
gotSTARTTLS = true
gotFeatures := false
for !gotSTARTTLS && !gotFeatures {
// read response stream header; look for STARTTLS feature support
_, err = reader.Read(buf)
if err != nil {
return nil, err
}
line = string(buf)
transcript += fmt.Sprintf("recv: %s\n", line)
if strings.Contains(line, "<starttls") && strings.Contains(line,
"urn:ietf:params:xml:ns:xmpp-tls") {
gotSTARTTLS = true
}
if strings.Contains(line, "features") {
gotFeatures = true
}
}
if !gotSTARTTLS {
return nil, fmt.Errorf("XMPP STARTTLS unavailable")
Expand Down