chteufleur
/
go-xmpp
1
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

Move the XMPP-specific part of TLS out of the XML stream.

This commit is contained in:
Matt Goodall 2012-07-08 22:50:10 +01:00
parent 0a11fbb155
commit f1c999d623
2 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/xmpp/client.go
View File

@ -41,8 +41,8 @@ func NewClientXMPP(jid JID, password string, config *ClientConfig) (*XMPP, error
// TLS?
if f.StartTLS != nil && (f.StartTLS.Required != nil || !config.NoTLS) {
tlsConfig := tls.Config{InsecureSkipVerify: config.InsecureSkipVerify}
if err := stream.UpgradeTLS(&tlsConfig); err != nil {
log.Println("Start TLS")
if err := startTLS(stream, config); err != nil {
return nil, err
}
continue // Restart
@ -96,6 +96,29 @@ func startClient(stream *Stream, jid JID) error {
return nil
}
func startTLS(stream *Stream, config *ClientConfig) error {
if err := stream.Send(&tlsStart{}); err != nil {
return err
}
p := tlsProceed{}
if err := stream.Decode(&p); err != nil {
return err
}
tlsConfig := tls.Config{InsecureSkipVerify: config.InsecureSkipVerify}
return stream.UpgradeTLS(&tlsConfig)
}
type tlsStart struct {
XMLName xml.Name `xml:"urn:ietf:params:xml:ns:xmpp-tls starttls"`
}
type tlsProceed struct {
XMLName xml.Name `xml:"urn:ietf:params:xml:ns:xmpp-tls proceed"`
}
func authenticate(stream *Stream, mechanisms []string, user, password string) error {
log.Println("authenticate, mechanisms=", mechanisms)

21
src/xmpp/stream.go
View File

@ -42,17 +42,6 @@ func NewStream(addr string) (*Stream, error) {
// Upgrade the stream's underlying net conncetion to TLS.
func (stream *Stream) UpgradeTLS(config *tls.Config) error {
log.Println("Upgrading to TLS")
if err := stream.Send(&tlsStart{}); err != nil {
return err
}
p := tlsProceed{}
if err := stream.Decode(&p); err != nil {
return err
}
conn := tls.Client(stream.conn, &tls.Config{InsecureSkipVerify: true})
if err := conn.Handshake(); err != nil {
return err
@ -135,13 +124,3 @@ func (stream *Stream) Decode(v interface{}) error {
func (stream *Stream) DecodeElement(v interface{}, start *xml.StartElement) error {
return stream.dec.DecodeElement(v, start)
}
type tlsStart struct {
XMLName xml.Name `xml:"urn:ietf:params:xml:ns:xmpp-tls starttls"`
}
type tlsProceed struct {
XMLName xml.Name `xml:"urn:ietf:params:xml:ns:xmpp-tls proceed"`
}
// BUG(matt): UpgradeTLS shoudln't be doing anything specific to XMPP.