Fetch latest changes

_example/example.go

@@ -32,8 +32,12 @@ func main() {
 	}
 	flag.Parse()
 	if *username == "" || *password == "" {
+		if *debug && *username == "" && *password == "" {
+			fmt.Fprintf(os.Stderr, "no username or password were given; attempting ANONYMOUS auth\n")
+		} else if *username != "" || *password != "" {
 			flag.Usage()
 		}
+	}
 
 	if !*notls {
 		xmpp.DefaultConfig = tls.Config{

xmpp.go

@@ -273,11 +273,14 @@ func (c *Client) init(o *Options) error {
 		c.p = xml.NewDecoder(c.conn)
 	}
 
+	var domain string
 	a := strings.SplitN(o.User, "@", 2)
+	if len(o.User) > 0 {
 		if len(a) != 2 {
 			return errors.New("xmpp: invalid username (want user@domain): " + o.User)
 		}
-	domain := a[1]
+		domain = a[1]
+	} // Otherwise, we'll be attempting ANONYMOUS
 
 	// Declare intent to be a jabber client and gather stream features.
 	f, err := c.startStream(o, domain)
@@ -290,6 +293,19 @@ func (c *Client) init(o *Options) error {
 		return err
 	}
 
+	if o.User == "" && o.Password == "" {
+		foundAnonymous := false
+		for _, m := range f.Mechanisms.Mechanism {
+			if m == "ANONYMOUS" {
+				fmt.Fprintf(c.conn, "<auth xmlns='%s' mechanism='ANONYMOUS' />\n", nsSASL)
+				foundAnonymous = true
+				break
+			}
+		}
+		if !foundAnonymous {
+			return fmt.Errorf("ANONYMOUS authentication is not an option and username and password were not specified")
+		}
+	} else {
 		// Even digest forms of authentication are unsafe if we do not know that the host
 		// we are talking to is the actual server, and not a man in the middle playing
 		// proxy.
@@ -371,7 +387,7 @@ func (c *Client) init(o *Options) error {
 		if mechanism == "" {
 			return fmt.Errorf("PLAIN authentication is not an option: %v", f.Mechanisms.Mechanism)
 		}
-
+	}
 	// Next message should be either success or failure.
 	name, val, err := next(c.p)
 	if err != nil {
@@ -514,10 +530,19 @@ type Chat struct {
 	Remote string
 	Type   string
 	Text   string
+	Roster Roster
 	Other  []string
 	Stamp  time.Time
 }
 
+type Roster []Contact
+
+type Contact struct {
+	Remote string
+	Name   string
+	Group  []string
+}
+
 // Presence is an XMPP presence notification.
 type Presence struct {
 	From string
@@ -541,13 +566,19 @@ func (c *Client) Recv() (stanza interface{}, err error) {
 				v.Delay.Stamp,
 			)
 			chat := Chat{
-				v.From,
-				v.Type,
-				v.Body,
-				v.Other,
-				stamp,
+				Remote: v.From,
+				Type:   v.Type,
+				Text:   v.Body,
+				Other:  v.Other,
+				Stamp:  stamp,
 			}
 			return chat, nil
+		case *clientQuery:
+			var r Roster
+			for _, item := range v.Item {
+				r = append(r, Contact{item.Jid, item.Name, item.Group})
+			}
+			return Chat{Type: "roster", Roster: r}, nil
 		case *clientPresence:
 			return Presence{v.From, v.To, v.Type, v.Show}, nil
 		}
@@ -574,6 +605,12 @@ func (c *Client) SendHtml(chat Chat) (n int, err error) {
 		xmlEscape(chat.Remote), xmlEscape(chat.Type), xmlEscape(chat.Text), chat.Text)
 }
 
+// Roster asks for the chat roster.
+func (c *Client) Roster() error {
+	fmt.Fprintf(c.conn, "<iq from='%s' type='get' id='roster1'><query xmlns='jabber:iq:roster'/></iq>\n", xmlEscape(c.jid))
+	return nil
+}
+
 // RFC 3920  C.1  Streams name space
 type streamFeatures struct {
 	XMLName    xml.Name `xml:"http://etherx.jabber.org/streams features"`
@@ -700,11 +737,23 @@ type clientError struct {
 	Text    string
 }
 
+type clientQuery struct {
+	Item []rosterItem
+}
+
+type rosterItem struct {
+	XMLName      xml.Name `xml:"jabber:iq:roster item"`
+	Jid          string   `xml:",attr"`
+	Name         string   `xml:",attr"`
+	Subscription string   `xml:",attr"`
+	Group        []string
+}
+
 // Scan XML token stream to find next StartElement.
 func nextStart(p *xml.Decoder) (xml.StartElement, error) {
 	for {
 		t, err := p.Token()
-		if err != nil && err != io.EOF {
+		if err != nil && err != io.EOF || t == nil {
 			return xml.StartElement{}, err
 		}
 		switch t := t.(type) {

xmpp_subscription.go

@@ -0,0 +1,20 @@
+package xmpp
+
+import (
+    "fmt"
+)
+
+func (c* Client) ApproveSubscription(jid string) {
+    fmt.Fprintf(c.conn, "<presence to='%s' type='subscribed'/>",
+            xmlEscape(jid))
+}
+
+func (c* Client) RevokeSubscription(jid string) {
+    fmt.Fprintf(c.conn, "<presence to='%s' type='unsubscribed'/>",
+            xmlEscape(jid))
+}
+
+func (c* Client) RequestSubscription(jid string) {
+    fmt.Fprintf(c.conn, "<presence to='%s' type='subscribe'/>",
+            xmlEscape(jid))
+}